From 25cccb5d87bb1896eb8512bd6b019e35d4eda603 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 23 Oct 2024 00:54:10 +0800
Subject: [PATCH 001/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E9=80=89=E6=8B=A9=E5=99=A8=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IconSelect/index.vue | 202 ++++++++++++++--------------
 src/views/demo/icon-selector.vue    |  18 +++
 2 files changed, 118 insertions(+), 102 deletions(-)
 create mode 100644 src/views/demo/icon-selector.vue

diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 2227d188..e7dfbf22 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -1,44 +1,47 @@
 <template>
-  <div ref="iconSelectRef" :style="'width:' + width">
-    <el-popover :visible="popoverVisible" :width="width" placement="bottom-end">
+  <div ref="iconSelectRef" :style="{ width: props.width }">
+    <el-popover
+      :visible="popoverVisible"
+      :width="props.width"
+      placement="bottom-end"
+    >
       <template #reference>
-        <el-input
-          v-model="selectedIcon"
-          class="reference"
-          readonly
-          placeholder="点击选择图标"
-          @click="popoverVisible = !popoverVisible"
-        >
-          <template #prepend>
-            <template
-              v-if="selectedIcon && selectedIcon.startsWith('el-icon-')"
-            >
-              <el-icon>
-                <component :is="selectedIcon.replace('el-icon-', '')" />
-              </el-icon>
-            </template>
-            <template v-else>
-              <svg-icon :icon-class="selectedIcon" />
-            </template>
-          </template>
-          <template #suffix>
-            <el-icon
-              :style="{
-                transform: popoverVisible ? 'rotate(180deg)' : 'rotate(0)',
-                transition: 'transform .5s',
-              }"
-              @click="popoverVisible = !popoverVisible"
+        <div @click="popoverVisible = !popoverVisible">
+          <slot>
+            <el-input
+              v-model="selectedIcon"
+              readonly
+              placeholder="点击选择图标"
+              class="reference"
             >
-              <ArrowDown />
-            </el-icon>
-          </template>
-        </el-input>
+              <template #prepend>
+                <!-- 根据图标类型展示 -->
+                <el-icon v-if="isElementIcon">
+                  <component :is="selectedIcon.replace('el-icon-', '')" />
+                </el-icon>
+                <template v-else>
+                  <svg-icon :icon-class="selectedIcon" />
+                </template>
+              </template>
+              <template #suffix>
+                <el-icon
+                  :style="{
+                    transform: popoverVisible ? 'rotate(180deg)' : 'rotate(0)',
+                    transition: 'transform .5s',
+                  }"
+                >
+                  <ArrowDown @click.stop="togglePopover" />
+                </el-icon>
+              </template>
+            </el-input>
+          </slot>
+        </div>
       </template>
 
-      <!-- 下拉选择弹窗 -->
+      <!-- 图标选择弹窗 -->
       <div ref="popoverContentRef">
         <el-input
-          v-model="searchText"
+          v-model="filterText"
           placeholder="搜索图标"
           clearable
           @input="filterIcons"
@@ -46,11 +49,11 @@
         <el-tabs v-model="activeTab" @tab-click="handleTabClick">
           <el-tab-pane label="SVG 图标" name="svg">
             <el-scrollbar height="300px">
-              <ul class="icon-container">
+              <ul class="icon-grid">
                 <li
                   v-for="icon in filteredSvgIcons"
                   :key="'svg-' + icon"
-                  class="icon-item"
+                  class="icon-grid-item"
                   @click="selectIcon(icon)"
                 >
                   <el-tooltip :content="icon" placement="bottom" effect="light">
@@ -62,11 +65,11 @@
           </el-tab-pane>
           <el-tab-pane label="Element 图标" name="element">
             <el-scrollbar height="300px">
-              <ul class="icon-container">
+              <ul class="icon-grid">
                 <li
-                  v-for="icon in filteredEpIcons"
+                  v-for="icon in filteredElementIcons"
                   :key="icon"
-                  class="icon-item"
+                  class="icon-grid-item"
                   @click="selectIcon(icon)"
                 >
                   <el-icon>
@@ -88,94 +91,89 @@ import * as ElementPlusIconsVue from "@element-plus/icons-vue";
 const props = defineProps({
   modelValue: {
     type: String,
-    require: false,
     default: "",
   },
   width: {
     type: String,
-    require: false,
     default: "500px",
   },
 });
 
 const emit = defineEmits(["update:modelValue"]);
-const selectedIcon = toRef(props, "modelValue");
 
 const iconSelectRef = ref();
 const popoverContentRef = ref();
-
-const activeTab = ref("svg"); // 默认激活的Tab
-const searchText = ref(""); // 筛选的值
-const popoverVisible = ref(false); // 弹窗显示状态
-
-const svgIcons: string[] = []; //  SVG图标集合
-const filteredSvgIcons = ref<string[]>([]); // 过滤后的SVG图标名称集合
-
-const epIcons: string[] = Object.keys(ElementPlusIconsVue); // Element Plus图标集合
-const filteredEpIcons = ref<string[]>([]); // 过滤后的Element Plus图标名称集合
-
-onMounted(() => {
-  loadIcons();
+const popoverVisible = ref(false);
+const activeTab = ref("svg");
+
+const svgIcons = ref<string[]>([]);
+const elementIcons = ref<string[]>(Object.keys(ElementPlusIconsVue));
+const selectedIcon = defineModel("modelValue", {
+  type: String,
+  required: true,
 });
 
-/**
- * icon 加载
- */
+const filterText = ref("");
+const filteredSvgIcons = ref<string[]>([]);
+const filteredElementIcons = ref<string[]>(elementIcons.value);
+const isElementIcon = computed(() => selectedIcon.value.startsWith("el-icon-"));
+
 function loadIcons() {
   const icons = import.meta.glob("../../assets/icons/*.svg");
   for (const path in icons) {
     const iconName = path.replace(/.*\/(.*)\.svg$/, "$1");
-    svgIcons.push(iconName);
+    svgIcons.value.push(iconName);
   }
-  filteredSvgIcons.value = svgIcons;
+  filteredSvgIcons.value = svgIcons.value;
 }
 
-/**
- * 选项卡切换
- */
 function handleTabClick(tabPane: any) {
   activeTab.value = tabPane.name;
   filterIcons();
 }
 
-/**
- * icon 筛选
- */
 function filterIcons() {
   if (activeTab.value === "svg") {
-    // 过滤SVG图标逻辑
-    filteredSvgIcons.value = searchText.value
-      ? svgIcons.filter((iconName) =>
-          iconName.toLowerCase().includes(searchText.value.toLowerCase())
+    filteredSvgIcons.value = filterText.value
+      ? svgIcons.value.filter((icon) =>
+          icon.toLowerCase().includes(filterText.value.toLowerCase())
         )
-      : svgIcons;
+      : svgIcons.value;
   } else {
-    // 过滤Element Plus图标逻辑 TODO
-    filteredEpIcons.value = searchText.value
-      ? epIcons.filter((iconName) =>
-          iconName.toLowerCase().includes(searchText.value.toLowerCase())
+    filteredElementIcons.value = filterText.value
+      ? elementIcons.value.filter((icon) =>
+          icon.toLowerCase().includes(filterText.value.toLowerCase())
         )
-      : epIcons;
+      : elementIcons.value;
   }
 }
 
-/**
- * 选择图标
- */
-function selectIcon(iconName: string) {
-  if (activeTab.value === "element") {
-    iconName = "el-icon-" + iconName;
-  }
+function selectIcon(icon: string) {
+  const iconName = activeTab.value === "element" ? "el-icon-" + icon : icon;
   emit("update:modelValue", iconName);
   popoverVisible.value = false;
 }
 
-/**
- * 点击容器外的区域关闭弹窗 VueUse onClickOutside
- */
+function togglePopover() {
+  popoverVisible.value = !popoverVisible.value;
+}
+
 onClickOutside(iconSelectRef, () => (popoverVisible.value = false), {
   ignore: [popoverContentRef],
 });
+
+onMounted(() => {
+  loadIcons();
+  if (selectedIcon.value) {
+    if (
+      elementIcons.value.includes(selectedIcon.value.replace("el-icon-", ""))
+    ) {
+      activeTab.value = "element";
+    } else {
+      activeTab.value = "svg";
+    }
+  }
+});
 </script>
 
 <style scoped lang="scss">
@@ -184,25 +182,25 @@ onClickOutside(iconSelectRef, () => (popoverVisible.value = false), {
   cursor: pointer;
 }
 
-.icon-container {
+.icon-grid {
   display: flex;
   flex-wrap: wrap;
+}
 
-  .icon-item {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    padding: 8px;
-    margin: 4px;
-    cursor: pointer;
-    border: 1px solid #dcdfe6;
-    border-radius: 4px;
-    transition: all 0.3s;
-  }
+.icon-grid-item {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 8px;
+  margin: 4px;
+  cursor: pointer;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  transition: all 0.3s;
+}
 
-  .icon-item:hover {
-    border-color: #4080ff;
-    scale: 1.2;
-  }
+.icon-grid-item:hover {
+  border-color: #4080ff;
+  transform: scale(1.2);
 }
 </style>
diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue
new file mode 100644
index 00000000..d9630bd8
--- /dev/null
+++ b/src/views/demo/icon-selector.vue
@@ -0,0 +1,18 @@
+<!-- 图标选择器示例 -->
+<script setup lang="ts">
+const iconName = ref("el-icon-edit");
+</script>
+
+<template>
+  <div class="app-container">
+    <el-link
+      href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/icon-selector.vue"
+      type="primary"
+      target="_blank"
+      class="mb-10"
+    >
+      示例源码 请点击>>>>
+    </el-link>
+    <icon-select v-model="iconName" />
+  </div>
+</template>

From 253502018f72d477d5f021d8a0d411336c2471d8 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 23 Oct 2024 00:58:52 +0800
Subject: [PATCH 002/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6=E5=88=9D=E5=A7=8B=E5=80=BC?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E5=9B=9E=E6=98=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dict/index.vue | 34 ++++++++++++++++++++--------------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 10773bb1..bf48b873 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -52,7 +52,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onBeforeMount } from "vue";
 import { useDictStore } from "@/store";
 
 const dictStore = useDictStore();
@@ -109,7 +108,24 @@ watch(
     if (props.type === "checkbox") {
       selectedValue.value = Array.isArray(newValue) ? newValue : [];
     } else {
-      selectedValue.value = newValue;
+      selectedValue.value = newValue?.toString() || "";
+    }
+  },
+  { immediate: true }
+);
+
+// 监听 options 变化并重新匹配 selectedValue
+watch(
+  () => options.value,
+  (newOptions) => {
+    // options 加载后，确保 selectedValue 可以正确匹配到 options
+    if (newOptions.length > 0 && selectedValue.value !== undefined) {
+      const matchedOption = newOptions.find(
+        (option) => option.value === selectedValue.value
+      );
+      if (!matchedOption) {
+        selectedValue.value = ""; // 如果找不到匹配项，清空选中
+      }
     }
   }
 );
@@ -120,17 +136,7 @@ function handleChange(val: any) {
 }
 
 // 获取字典数据
-onBeforeMount(async () => {
-  options.value = await dictStore.getDictionary(props.code);
-
-  if (props.modelValue !== undefined) {
-    if (props.type === "checkbox") {
-      selectedValue.value = Array.isArray(props.modelValue)
-        ? props.modelValue
-        : [];
-    } else {
-      selectedValue.value = props.modelValue;
-    }
-  }
+onMounted(() => {
+  options.value = dictStore.getDictionary(props.code);
 });
 </script>

From 71335e5287704c78ac7efad49ce6dd4dd33cdfc7 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 23 Oct 2024 01:01:27 +0800
Subject: [PATCH 003/497] =?UTF-8?q?chore:=20:hammer:=20upgrade=20vesion=20?=
 =?UTF-8?q?2.18.0=20=E2=86=92=202.18.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8b35f9e..1d536094 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.0",
+  "version": "2.18.1",
   "private": true,
   "type": "module",
   "scripts": {

From ca81612981858298f46f8e525e8113924c01741f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Wed, 23 Oct 2024 10:46:41 +0800
Subject: [PATCH 004/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=80=89=E5=8F=96=E7=BB=84=E4=BB=B6=E5=92=8C?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=A4=8D=E9=80=89=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复图标选取组件和字典复选组件的使用bug
---
 src/components/Dict/index.vue       | 2 +-
 src/components/IconSelect/index.vue | 5 ++++-
 src/views/demo/dictionary.vue       | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index bf48b873..1a6b931c 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -123,7 +123,7 @@ watch(
       const matchedOption = newOptions.find(
         (option) => option.value === selectedValue.value
       );
-      if (!matchedOption) {
+      if (!matchedOption && props.type !== "checkbox") {
         selectedValue.value = ""; // 如果找不到匹配项，清空选中
       }
     }
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index e7dfbf22..64336f16 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -111,12 +111,15 @@ const elementIcons = ref<string[]>(Object.keys(ElementPlusIconsVue));
 const selectedIcon = defineModel("modelValue", {
   type: String,
   required: true,
+  default: "",
 });
 
 const filterText = ref("");
 const filteredSvgIcons = ref<string[]>([]);
 const filteredElementIcons = ref<string[]>(elementIcons.value);
-const isElementIcon = computed(() => selectedIcon.value.startsWith("el-icon-"));
+const isElementIcon = computed(() => {
+  return selectedIcon.value && selectedIcon.value.startsWith("el-icon");
+});
 
 function loadIcons() {
   const icons = import.meta.glob("../../assets/icons/*.svg");
diff --git a/src/views/demo/dictionary.vue b/src/views/demo/dictionary.vue
index da817faf..b34d653c 100644
--- a/src/views/demo/dictionary.vue
+++ b/src/views/demo/dictionary.vue
@@ -2,7 +2,7 @@
 <script setup lang="ts">
 const stringValue = ref("1"); // 性别(值为String)
 const numberValue = ref(1); // 性别(值为Number)
-const arraryValue = ref(["1", "2"]); // 性别(值为Array)
+const arrayValue = ref(["1", "2"]); // 性别(值为Array)
 </script>
 
 <template>
@@ -38,7 +38,7 @@ const arraryValue = ref(["1", "2"]); // 性别(值为Array)
       </el-form-item>
 
       <el-form-item label="复选框字典">
-        <dict v-model="arraryValue" type="checkbox" code="gender" />
+        <dict v-model="arrayValue" type="checkbox" code="gender" />
         <el-link :underline="false" type="success" class="ml-5">
           值为Number: const value = ref(["1", "2"]);
         </el-link>

From 8914e6cf5191e1c71f00d2c2944f43af4afe634e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 24 Oct 2024 09:33:05 +0800
Subject: [PATCH 005/497] chore: :hammer: bump version to 2.18.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a8b35f9e..a696cad8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.0",
+  "version": "2.18.2",
   "private": true,
   "type": "module",
   "scripts": {

From 4786a50c2b5618f8d2c9943f47cd72b9108abdf6 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 24 Oct 2024 11:30:57 +0800
Subject: [PATCH 006/497] =?UTF-8?q?feat:=20:sparkles:=20=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=99=A8=E7=BB=84=E4=BB=B6=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=B7=B2=E9=80=89=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IconSelect/index.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 64336f16..1052e700 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -24,6 +24,15 @@
                 </template>
               </template>
               <template #suffix>
+                <!-- 清空按钮 -->
+                <el-icon
+                  v-if="selectedIcon"
+                  style="margin-right: 8px"
+                  @click.stop="clearSelectedIcon"
+                >
+                  <CircleClose />
+                </el-icon>
+
                 <el-icon
                   :style="{
                     transform: popoverVisible ? 'rotate(180deg)' : 'rotate(0)',
@@ -165,6 +174,13 @@ onClickOutside(iconSelectRef, () => (popoverVisible.value = false), {
   ignore: [popoverContentRef],
 });
 
+/**
+ * 清空已选图标
+ */
+function clearSelectedIcon() {
+  selectedIcon.value = "";
+}
+
 onMounted(() => {
   loadIcons();
   if (selectedIcon.value) {

From bfbd6d172d681122229b336b748fab09bac5ac4b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 28 Oct 2024 09:41:00 +0800
Subject: [PATCH 007/497] =?UTF-8?q?chore:=20:hammer:=20=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E7=A4=BA=E4=BE=8Blabel?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/dictionary.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/dictionary.vue b/src/views/demo/dictionary.vue
index b34d653c..98bf4233 100644
--- a/src/views/demo/dictionary.vue
+++ b/src/views/demo/dictionary.vue
@@ -30,7 +30,7 @@ const arrayValue = ref(["1", "2"]); // 性别(值为Array)
         </el-link>
       </el-form-item>
 
-      <el-form-item label="单字典">
+      <el-form-item label="单选框字典">
         <dict v-model="numberValue" type="radio" code="gender" />
         <el-link :underline="false" type="success" class="ml-5">
           值为Number: const value = ref(1);
@@ -40,7 +40,7 @@ const arrayValue = ref(["1", "2"]); // 性别(值为Array)
       <el-form-item label="复选框字典">
         <dict v-model="arrayValue" type="checkbox" code="gender" />
         <el-link :underline="false" type="success" class="ml-5">
-          值为Number: const value = ref(["1", "2"]);
+          值为Array: const value = ref(["1", "2"]);
         </el-link>
       </el-form-item>
     </el-form>

From b65b4ea7efdd0baab2fdbaafd182cdeca8498523 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 28 Oct 2024 09:48:49 +0800
Subject: [PATCH 008/497] =?UTF-8?q?chore:=20:hammer:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=80=89=E6=8B=A9=E5=99=A8=E7=9A=84value?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/icon-selector.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue
index d9630bd8..c9df065e 100644
--- a/src/views/demo/icon-selector.vue
+++ b/src/views/demo/icon-selector.vue
@@ -1,6 +1,9 @@
 <!-- 图标选择器示例 -->
 <script setup lang="ts">
+// element-plus 图标格式以el-icon-开头
 const iconName = ref("el-icon-edit");
+// 本地SVG图标格式取 src/assets/icons 下的文件名，不需要svg后缀
+// const iconName = ref("api");
 </script>
 
 <template>

From dbcd0f209b324fc625aefe6099fc8800c45b46ac Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 29 Oct 2024 23:51:24 +0800
Subject: [PATCH 009/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts                           |  3 ++-
 src/types/components.d.ts                     | 12 +++++-------
 src/views/login/index.vue                     |  3 ++-
 .../MyNotice.vue}                             |  0
 .../DeptTree.vue}                             |  0
 .../{import.vue => components/UserImport.vue} |  0
 src/views/system/user/index.vue               | 19 ++++++++++++-------
 7 files changed, 21 insertions(+), 16 deletions(-)
 rename src/views/system/notice/{my-notice.vue => components/MyNotice.vue} (100%)
 rename src/views/system/user/{dept-tree.vue => components/DeptTree.vue} (100%)
 rename src/views/system/user/{import.vue => components/UserImport.vue} (100%)

diff --git a/src/router/index.ts b/src/router/index.ts
index d3871fbe..fdc4bd2c 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -65,7 +65,8 @@ export const constantRoutes: RouteRecordRaw[] = [
       {
         path: "myNotice",
         name: "MyNotice",
-        component: () => import("@/views/system/notice/my-notice.vue"),
+        component: () =>
+          import("@/views/system/notice/components/MyNotice.vue"),
         meta: { title: "我的通知", icon: "user", hidden: true },
       },
     ],
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 4bf78f0e..1b92fb30 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -60,18 +60,18 @@ declare module "vue" {
     ElUpload: (typeof import("element-plus/es"))["ElUpload"];
     ElWatermark: (typeof import("element-plus/es"))["ElWatermark"];
     ElSkeleton: (typeof import("element-plus/es"))["ElSkeleton"];
+    FileUpload: (typeof import("./../components/Upload/FileUpload.vue"))["default"];
     Form: (typeof import("./../components/CURD/Form.vue"))["default"];
-    FunnelChart: (typeof import("./../views/dashboard/components/FunnelChart.vue"))["default"];
+    Fullscreen: (typeof import("./../components/Fullscreen/index.vue"))["default"];
     GithubCorner: (typeof import("./../components/GithubCorner/index.vue"))["default"];
     Hamburger: (typeof import("./../components/Hamburger/index.vue"))["default"];
     IconSelect: (typeof import("./../components/IconSelect/index.vue"))["default"];
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
-    Notice: (typeof import("./../components/Notice/index.vue"))["default"];
-    NoticeDetail: (typeof import("../views/system/notice/notice-detail.vue"))["default"];
+    MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
-    NavBar: (typeof import("./../layout/components/NavBar/index.vue"))["default"];
-    NavbarAction: (typeof import("./../layout/components/NavBar/components/NavbarAction.vue"))["default"];
+    Navbar: (typeof import("./../layout/components/Navbar/index.vue"))["default"];
+    NavbarRight: (typeof import("./../layout/components/Navbar/NavbarRight.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];
@@ -91,8 +91,6 @@ declare module "vue" {
     TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"];
     TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"];
     ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
-    FileUpload: (typeof import("./../components/Upload/FileUpload.vue"))["default"];
-    MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
     SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
   }
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ecb49c83..1aff0d6b 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -188,6 +188,7 @@ import defaultSettings from "@/settings";
 import { ThemeEnum } from "@/enums/ThemeEnum";
 
 import { useSettingsStore, useUserStore, useDictStore } from "@/store";
+
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
 const dictStore = useDictStore();
@@ -351,7 +352,7 @@ onMounted(() => {
 
     .title {
       margin: auto 5px;
-      font-size: 26px;
+      font-size: 24px;
       font-weight: bold;
       color: transparent;
       background: linear-gradient(to right, #3b82f6, #14b8a6);
diff --git a/src/views/system/notice/my-notice.vue b/src/views/system/notice/components/MyNotice.vue
similarity index 100%
rename from src/views/system/notice/my-notice.vue
rename to src/views/system/notice/components/MyNotice.vue
diff --git a/src/views/system/user/dept-tree.vue b/src/views/system/user/components/DeptTree.vue
similarity index 100%
rename from src/views/system/user/dept-tree.vue
rename to src/views/system/user/components/DeptTree.vue
diff --git a/src/views/system/user/import.vue b/src/views/system/user/components/UserImport.vue
similarity index 100%
rename from src/views/system/user/import.vue
rename to src/views/system/user/components/UserImport.vue
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 6bf78531..1e70ea60 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -307,11 +307,12 @@ import UserAPI, {
   UserPageQuery,
   UserPageVO,
 } from "@/api/system/user";
+
 import DeptAPI from "@/api/system/dept";
 import RoleAPI from "@/api/system/role";
 
-import DeptTree from "./dept-tree.vue";
-import UserImport from "./import.vue";
+import DeptTree from "./components/DeptTree.vue";
+import UserImport from "./components/UserImport.vue";
 
 const queryFormRef = ref(ElForm);
 const userFormRef = ref(ElForm);
@@ -320,17 +321,17 @@ const loading = ref(false);
 const removeIds = ref([]);
 const total = ref(0);
 const pageData = ref<UserPageVO[]>();
-/** 部门下拉选项 */
+// 部门下拉数据源
 const deptOptions = ref<OptionType[]>();
-/** 角色下拉选项 */
+// 角色下拉数据源
 const roleOptions = ref<OptionType[]>();
-/** 用户查询参数  */
+// 用户查询参数
 const queryParams = reactive<UserPageQuery>({
   pageNum: 1,
   pageSize: 10,
 });
 
-/**  用户弹窗对象  */
+// 用户弹窗
 const dialog = reactive({
   visible: false,
   title: "",
@@ -393,7 +394,11 @@ function handleSelectionChange(selection: any) {
   removeIds.value = selection.map((item: any) => item.id);
 }
 
-/** 重置密码 */
+/**
+ * 重置密码
+ *
+ *
+ */
 function hancleResetPassword(row: { [key: string]: any }) {
   ElMessageBox.prompt(
     "请输入用户「" + row.username + "」的新密码",

From 3900c14024016a1410568226a4beae0c03e16c3b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 29 Oct 2024 23:59:37 +0800
Subject: [PATCH 010/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E6=B7=BB=E5=8A=A0=E5=BF=AB=E6=8D=B7?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 266 ++++++++++++++++++----------
 1 file changed, 175 insertions(+), 91 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 7ccee2dc..49a093fa 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -1,39 +1,41 @@
 <template>
-  <div class="nav-action-item" @click="showSearchModal">
+  <div @click="openSearchModal">
     <svg-icon icon-class="search" />
     <el-dialog
-      v-model="visible"
+      v-model="isModalVisible"
       width="30%"
       :append-to-body="true"
       :show-close="false"
-      @close="hideSearchModal"
+      @close="closeSearchModal"
     >
       <template #header>
         <el-input
-          ref="menuSearchInput"
-          v-model="searchKey"
+          ref="searchInputRef"
+          v-model="searchKeyword"
           size="large"
-          placeholder="搜索"
+          placeholder="输入菜单名称关键字搜索"
           clearable
-          @keyup.enter="inputSearch"
-          @input="inputSearch"
+          @keyup.enter="selectActiveResult"
+          @input="updateSearchResults"
+          @keydown.up.prevent="navigateResults('up')"
+          @keydown.down.prevent="navigateResults('down')"
+          @keydown.esc="closeSearchModal"
         >
           <template #prepend>
             <el-button icon="Search" />
           </template>
         </el-input>
       </template>
-      <div class="search-content">
-        <ul v-if="searchResult.length > 0">
+
+      <div class="search-result">
+        <ul v-if="displayResults.length > 0">
           <li
-            v-for="(item, index) in searchResult"
-            :key="index"
-            @click="toMenu(item)"
+            v-for="(item, index) in displayResults"
+            :key="item.path"
+            :class="{ active: index === activeIndex }"
+            @click="navigateToRoute(item)"
           >
-            <el-icon
-              v-if="item.icon && item.icon.startsWith('el-icon')"
-              class="sub-el-icon"
-            >
+            <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
               <component :is="item.icon.replace('el-icon-', '')" />
             </el-icon>
             <svg-icon v-else-if="item.icon" :icon-class="item.icon" />
@@ -41,84 +43,119 @@
             {{ item.title }}
           </li>
         </ul>
-        <div v-else class="search-space">暂无数据</div>
+        <div v-else class="text-center py-5">暂无历史记录</div>
       </div>
-      <template #footer />
+
+      <template #footer>
+        <div class="dialog-footer">
+          <svg-icon icon-class="enter" size="20px" />
+          <span>选择</span>
+
+          <svg-icon icon-class="down" size="20px" class="ml-5" />
+          <svg-icon icon-class="up" size="20px" class="ml-1" />
+          <span>切换</span>
+
+          <svg-icon icon-class="esc" size="20px" class="ml-5" />
+          <span>退出</span>
+        </div>
+      </template>
     </el-dialog>
   </div>
 </template>
+
 <script setup lang="ts">
 import router from "@/router";
-
-const visible = ref(false);
-const searchKey = ref("");
 import { usePermissionStore } from "@/store";
 import { isExternal } from "@/utils";
 import { RouteRecordRaw } from "vue-router";
+
 const permissionStore = usePermissionStore();
-//获取当前拥有的路由
-const menuSearchInput = ref();
-const noSearchRoutePath = ref(["/redirect", "/login", "/401", "/404"]);
-const searchData = ref<SearchItem[]>([]);
-
-const searchResult = ref<SearchItem[]>([]);
-function showSearchModal() {
-  searchKey.value = "";
-  searchResult.value = [];
-  visible.value = true;
+const isModalVisible = ref(false);
+const searchKeyword = ref("");
+const searchInputRef = ref();
+const excludedRoutes = ref(["/redirect", "/login", "/401", "/404"]);
+const menuItems = ref<SearchItem[]>([]);
+const searchResults = ref<SearchItem[]>([]);
+const searchHistory = ref<SearchItem[]>([]);
+const activeIndex = ref(-1);
+
+interface SearchItem {
+  title: string;
+  path: string;
+  name?: string;
+  icon?: string;
+  redirect?: string;
+}
+
+// 打开搜索模态框
+function openSearchModal() {
+  searchKeyword.value = "";
+  activeIndex.value = -1;
+  isModalVisible.value = true;
   setTimeout(() => {
-    menuSearchInput.value.focus();
+    searchInputRef.value.focus();
   }, 100);
 }
-function hideSearchModal() {
-  visible.value = false;
-}
 
-function inputSearch() {
-  searchResult.value = [];
+// 关闭搜索模态框
+function closeSearchModal() {
+  isModalVisible.value = false;
+}
 
-  if (searchKey.value) {
-    let toLowerCaseKey = searchKey.value.toLowerCase();
-    searchResult.value = searchData.value.filter((item) =>
-      item.toLowerCaseTitle.includes(toLowerCaseKey)
+// 更新搜索结果
+function updateSearchResults() {
+  activeIndex.value = -1;
+  if (searchKeyword.value) {
+    const keyword = searchKeyword.value.toLowerCase();
+    searchResults.value = menuItems.value.filter((item) =>
+      item.title.toLowerCase().includes(keyword)
     );
+  } else {
+    searchResults.value = [];
   }
 }
 
-onMounted(() => {
-  searchResult.value = [];
-  initSearchData(permissionStore.routes);
+// 显示搜索结果或历史记录
+const displayResults = computed(() => {
+  return searchResults.value.length > 0
+    ? searchResults.value
+    : searchHistory.value.slice(0, 3);
 });
 
-function initSearchData(routes: RouteRecordRaw[], parentPath: string = "") {
-  parentPath = parentPath === "/" ? "" : parentPath;
-  routes.forEach((item: any) => {
-    if (noSearchRoutePath.value.includes(item.path)) {
-      return;
-    }
-    let path = item.path.startsWith("/")
-      ? item.path
-      : parentPath + "/" + item.path;
-    path = isExternal(item.path) ? item.path : path;
-    if (item.children) {
-      initSearchData(item.children, path);
-    } else if (item.meta && item.meta.title && item.path) {
-      let title = item.meta.title == "dashboard" ? "首页" : item.meta.title;
-      let toLowerCaseTitle = title.toLowerCase();
-      searchData.value.push({
-        title: title,
-        toLowerCaseTitle: toLowerCaseTitle,
-        path: path,
-        name: item.name,
-        icon: item.meta.icon,
-        redirect: item.redirect ? item.redirect : undefined,
-      });
-    }
-  });
+// 执行搜索
+function selectActiveResult() {
+  if (displayResults.value.length > 0 && activeIndex.value >= 0) {
+    navigateToRoute(displayResults.value[activeIndex.value]);
+  }
+}
+
+// 导航搜索结果
+function navigateResults(direction: string) {
+  if (displayResults.value.length === 0) return;
+
+  if (direction === "up") {
+    activeIndex.value =
+      activeIndex.value <= 0
+        ? displayResults.value.length - 1
+        : activeIndex.value - 1;
+  } else if (direction === "down") {
+    activeIndex.value =
+      activeIndex.value >= displayResults.value.length - 1
+        ? 0
+        : activeIndex.value + 1;
+  }
 }
 
-function toMenu(item: SearchItem) {
-  hideSearchModal();
+// 跳转
+function navigateToRoute(item: SearchItem) {
+  closeSearchModal();
+  if (!searchHistory.value.some((history) => history.path === item.path)) {
+    searchHistory.value.unshift(item);
+    if (searchHistory.value.length > 3) {
+      searchHistory.value.pop();
+    }
+  }
+
   if (isExternal(item.path)) {
     window.open(item.path, "_blank");
   } else {
@@ -126,35 +163,82 @@ function toMenu(item: SearchItem) {
   }
 }
 
-interface SearchItem {
-  title: string;
-  toLowerCaseTitle: string;
-  path: string;
-  name: string;
-  icon?: string;
-  redirect?: string;
+function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
+  routes.forEach((route) => {
+    const path = route.path.startsWith("/")
+      ? route.path
+      : `${parentPath}/${route.path}`;
+    if (excludedRoutes.value.includes(route.path) || isExternal(route.path))
+      return;
+
+    if (route.children) {
+      loadRoutes(route.children, path);
+    } else if (route.meta?.title) {
+      const title =
+        route.meta.title === "dashboard" ? "首页" : route.meta.title;
+      menuItems.value.push({
+        title,
+        path,
+        name: typeof route.name === "string" ? route.name : undefined,
+        icon: route.meta.icon,
+        redirect:
+          typeof route.redirect === "string" ? route.redirect : undefined,
+      });
+    }
+  });
 }
+
+// 初始化路由数据
+onMounted(() => {
+  loadRoutes(permissionStore.routes);
+});
 </script>
 
 <style scoped>
-.search-content ul li {
-  padding-left: 10px;
+.search-result {
+  max-height: 400px;
+  overflow-y: auto;
+}
+
+.search-result ul li {
+  padding: 10px;
   line-height: 40px;
   text-align: left;
+  cursor: pointer;
+}
 
-  &:hover {
-    background-color: #f5f5f5;
-  }
+.search-result ul li.active {
+  background-color: #e6f7ff;
 }
 
-.search-content {
-  max-height: 400px;
-  overflow-y: auto;
+.search-result ul li:hover {
+  background-color: #f5f5f5;
 }
 
-.search-space {
-  padding: 20px;
-  color: #999;
-  text-align: center;
+.dialog-footer {
+  display: flex;
+  align-items: center;
+  justify-content: start;
+
+  svg {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 2px;
+    margin-right: 0.4em;
+    color: #909399;
+    background: rgb(125 125 125 / 10%);
+    border: 0;
+    border-radius: 2px;
+    box-shadow:
+      inset 0 -2px 0 0 #cdcde6,
+      inset 0 0 1px 1px #fff,
+      0 1px 2px 1px rgb(30 35 90 / 40%);
+  }
+
+  span {
+    font-size: 12px;
+    color: #909399;
+  }
 }
 </style>

From 9d9b0eb035634b8e1c83a5524bcc3d8971122db7 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 00:16:22 +0800
Subject: [PATCH 011/497] =?UTF-8?q?feat:=20:sparkles:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87icon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/down.svg  | 1 +
 src/assets/icons/enter.svg | 1 +
 src/assets/icons/esc.svg   | 1 +
 src/assets/icons/up.svg    | 1 +
 4 files changed, 4 insertions(+)
 create mode 100644 src/assets/icons/down.svg
 create mode 100644 src/assets/icons/enter.svg
 create mode 100644 src/assets/icons/esc.svg
 create mode 100644 src/assets/icons/up.svg

diff --git a/src/assets/icons/down.svg b/src/assets/icons/down.svg
new file mode 100644
index 00000000..5fc8b88e
--- /dev/null
+++ b/src/assets/icons/down.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" aria-label="向下键" role="img"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"><path d="M7.5 3.5v8M10.5 8.5l-3 3-3-3"></path></g></svg>
diff --git a/src/assets/icons/enter.svg b/src/assets/icons/enter.svg
new file mode 100644
index 00000000..9e199df2
--- /dev/null
+++ b/src/assets/icons/enter.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" aria-label="回车键" role="img"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"><path d="M12 3.53088v3c0 1-1 2-2 2H4M7 11.53088l-3-3 3-3"></path></g></svg>
diff --git a/src/assets/icons/esc.svg b/src/assets/icons/esc.svg
new file mode 100644
index 00000000..2f85dd25
--- /dev/null
+++ b/src/assets/icons/esc.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" aria-label="Esc 键" role="img"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"><path d="M13.6167 8.936c-.1065.3583-.6883.962-1.4875.962-.7993 0-1.653-.9165-1.653-2.1258v-.5678c0-1.2548.7896-2.1016 1.653-2.1016.8634 0 1.3601.4778 1.4875 1.0724M9 6c-.1352-.4735-.7506-.9219-1.46-.8972-.7092.0246-1.344.57-1.344 1.2166s.4198.8812 1.3445.9805C8.465 7.3992 8.968 7.9337 9 8.5c.032.5663-.454 1.398-1.4595 1.398C6.6593 9.898 6 9 5.963 8.4851m-1.4748.5368c-.2635.5941-.8099.876-1.5443.876s-1.7073-.6248-1.7073-2.204v-.4603c0-1.0416.721-2.131 1.7073-2.131.9864 0 1.6425 1.031 1.5443 2.2492h-2.956"></path></g></svg>
diff --git a/src/assets/icons/up.svg b/src/assets/icons/up.svg
new file mode 100644
index 00000000..3b6c5353
--- /dev/null
+++ b/src/assets/icons/up.svg
@@ -0,0 +1 @@
+<svg width="15" height="15" aria-label="向上键" role="img"><g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="1.2"><path d="M7.5 11.5v-8M10.5 6.5l-3-3-3 3"></path></g></svg>

From a2fd2b0e750888fa01a4f083e2241e7c11f59f72 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 00:32:50 +0800
Subject: [PATCH 012/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Fullscreen/index.vue           |  11 ++
 src/components/Hamburger/index.vue            |   5 +-
 src/components/SizeSelect/index.vue           |  41 ++---
 .../NavBar/components/NavbarAction.vue        | 143 ------------------
 .../NavBar/components/NavbarRight.vue         |  81 ++++++++++
 .../NavBar/components/Notification.vue}       |   0
 .../NavBar/components/UserProfile.vue         |  74 +++++++++
 src/layout/components/NavBar/index.vue        |  29 ++--
 src/layout/components/Sidebar/index.vue       |  23 ++-
 src/layout/index.vue                          |   2 +-
 10 files changed, 227 insertions(+), 182 deletions(-)
 create mode 100644 src/components/Fullscreen/index.vue
 delete mode 100644 src/layout/components/NavBar/components/NavbarAction.vue
 create mode 100644 src/layout/components/NavBar/components/NavbarRight.vue
 rename src/{components/Notice/index.vue => layout/components/NavBar/components/Notification.vue} (100%)
 create mode 100644 src/layout/components/NavBar/components/UserProfile.vue

diff --git a/src/components/Fullscreen/index.vue b/src/components/Fullscreen/index.vue
new file mode 100644
index 00000000..bd85b4b4
--- /dev/null
+++ b/src/components/Fullscreen/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div @click="toggle">
+    <svg-icon :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
+  </div>
+</template>
+
+<script setup lang="ts">
+const { isFullscreen, toggle } = useFullscreen();
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 6ab2eb6d..c43073a2 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,15 +1,16 @@
+<!-- 汉堡按钮组件：展开/收缩菜单  -->
 <template>
   <div
     class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
     @click="toggleClick"
   >
     <svg-icon
-      class="hamburger"
-      :class="{ 'is-active': isActive }"
       icon-class="collapse"
+      :class="{ hamburger: true, 'is-active': isActive }"
     />
   </div>
 </template>
+
 <script setup lang="ts">
 defineProps({
   isActive: {
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index d3e83fe5..8c0f538c 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,21 +1,28 @@
 <template>
-  <el-dropdown trigger="click" @command="handleSizeChange">
-    <div>
-      <svg-icon icon-class="size" />
-    </div>
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item
-          v-for="item of sizeOptions"
-          :key="item.value"
-          :disabled="appStore.size == item.value"
-          :command="item.value"
-        >
-          {{ item.label }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
+  <!-- 布局大小 -->
+  <el-tooltip
+    :content="$t('sizeSelect.tooltip')"
+    effect="dark"
+    placement="bottom"
+  >
+    <el-dropdown trigger="click" @command="handleSizeChange">
+      <div>
+        <svg-icon icon-class="size" />
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item
+            v-for="item of sizeOptions"
+            :key="item.value"
+            :disabled="appStore.size == item.value"
+            :command="item.value"
+          >
+            {{ item.label }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
+  </el-tooltip>
 </template>
 
 <script setup lang="ts">
diff --git a/src/layout/components/NavBar/components/NavbarAction.vue b/src/layout/components/NavBar/components/NavbarAction.vue
deleted file mode 100644
index 9d721b6b..00000000
--- a/src/layout/components/NavBar/components/NavbarAction.vue
+++ /dev/null
@@ -1,143 +0,0 @@
-<template>
-  <div class="flex">
-    <template v-if="!isMobile">
-      <!--搜索 -->
-      <menu-search />
-      <!--全屏 -->
-      <div class="nav-action-item" @click="toggle">
-        <svg-icon
-          :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'"
-        />
-      </div>
-
-      <!-- 布局大小 -->
-      <el-tooltip
-        :content="$t('sizeSelect.tooltip')"
-        effect="dark"
-        placement="bottom"
-      >
-        <size-select class="nav-action-item" />
-      </el-tooltip>
-
-      <!-- 语言选择 -->
-      <lang-select class="nav-action-item" />
-
-      <!-- 消息通知 -->
-      <notice class="nav-action-item" />
-    </template>
-
-    <!-- 用户头像 -->
-    <el-dropdown class="nav-action-item" trigger="click">
-      <div class="flex-center h100% p10px">
-        <img
-          :src="http://github.com/userStore.userInfo.avatar"
-          class="rounded-full mr-10px w24px h24px"
-        />
-        <span>{{ userStore.userInfo.username }}</span>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="handleOpenUserProfile">
-            {{ $t("navbar.profile") }}
-          </el-dropdown-item>
-          <a
-            target="_blank"
-            href="https://gitee.com/youlaiorg/vue3-element-admin"
-          >
-            <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
-          </a>
-          <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
-            <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
-          </a>
-          <el-dropdown-item divided @click="logout">
-            {{ $t("navbar.logout") }}
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <!-- 设置 -->
-    <template v-if="defaultSettings.showSettings">
-      <div class="nav-action-item" @click="settingStore.settingsVisible = true">
-        <svg-icon icon-class="setting" />
-      </div>
-    </template>
-  </div>
-</template>
-<script setup lang="ts">
-import defaultSettings from "@/settings";
-import { DeviceEnum } from "@/enums/DeviceEnum";
-
-import {
-  useAppStore,
-  useTagsViewStore,
-  useUserStore,
-  useSettingsStore,
-} from "@/store";
-
-const appStore = useAppStore();
-const tagsViewStore = useTagsViewStore();
-const userStore = useUserStore();
-const settingStore = useSettingsStore();
-
-const route = useRoute();
-const router = useRouter();
-const { isFullscreen, toggle } = useFullscreen();
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
-
-/**
- * 打开个人中心页面
- */
-function handleOpenUserProfile() {
-  router.push({ name: "Profile" });
-}
-
-/**
- * 注销登出
- */
-function logout() {
-  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-    lockScroll: false,
-  }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login?redirect=${route.fullPath}`);
-      });
-  });
-}
-</script>
-<style lang="scss" scoped>
-.nav-action-item {
-  display: inline-block;
-  min-width: 40px;
-  height: $navbar-height;
-  line-height: $navbar-height;
-  color: var(--el-text-color);
-  text-align: center;
-  cursor: pointer;
-
-  &:hover {
-    background: rgb(0 0 0 / 10%);
-  }
-}
-
-:deep(.el-divider--horizontal) {
-  margin: 10px 0;
-}
-
-.dark .nav-action-item:hover {
-  background: rgb(255 255 255 / 20%);
-}
-
-.layout-top .nav-action-item,
-.layout-mix .nav-action-item {
-  color: #fff;
-}
-</style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
new file mode 100644
index 00000000..1b0ef528
--- /dev/null
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -0,0 +1,81 @@
+<template>
+  <div class="navbar__right">
+    <!-- 手机设备（窄屏）不显示 -->
+    <template v-if="!isMobile">
+      <!-- 搜索 -->
+      <MenuSearch />
+
+      <!-- 全屏 -->
+      <Fullscreen />
+
+      <!-- 布局大小 -->
+      <SizeSelect />
+
+      <!-- 语言选择 -->
+      <LangSelect />
+
+      <!-- 消息通知 -->
+      <Notification />
+    </template>
+
+    <!-- 用户头像（个人中心、注销登录等） -->
+    <UserProfile />
+
+    <!-- 设置面板 -->
+    <div
+      v-if="defaultSettings.showSettings"
+      @click="settingStore.settingsVisible = true"
+    >
+      <SvgIcon icon-class="setting" />
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import defaultSettings from "@/settings";
+import { DeviceEnum } from "@/enums/DeviceEnum";
+
+import { useAppStore, useSettingsStore } from "@/store";
+
+import UserProfile from "./UserProfile.vue";
+import Notification from "./Notification.vue";
+
+const appStore = useAppStore();
+const settingStore = useSettingsStore();
+
+const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+</script>
+
+<style lang="scss" scoped>
+.navbar__right {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+
+  & > * {
+    display: inline-block;
+    min-width: 40px;
+    height: $navbar-height;
+    line-height: $navbar-height;
+    color: var(--el-text-color);
+    text-align: center;
+    cursor: pointer;
+
+    &:hover {
+      background: rgb(0 0 0 / 10%);
+    }
+  }
+}
+
+:deep(.el-divider--horizontal) {
+  margin: 10px 0;
+}
+
+.dark .navbar__right > *:hover {
+  background: rgb(255 255 255 / 20%);
+}
+
+.layout-top .navbar__right > *,
+.layout-mix .navbar__right > * {
+  color: #fff;
+}
+</style>
diff --git a/src/components/Notice/index.vue b/src/layout/components/NavBar/components/Notification.vue
similarity index 100%
rename from src/components/Notice/index.vue
rename to src/layout/components/NavBar/components/Notification.vue
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
new file mode 100644
index 00000000..ccf8911b
--- /dev/null
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -0,0 +1,74 @@
+<template>
+  <el-dropdown trigger="click">
+    <div class="flex-center h100% p13px">
+      <img
+        :src="http://github.com/userStore.userInfo.avatar"
+        class="rounded-full mr-10px w24px h24px"
+      />
+      <span>{{ userStore.userInfo.username }}</span>
+    </div>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item @click="handleOpenUserProfile">
+          {{ $t("navbar.profile") }}
+        </el-dropdown-item>
+        <a
+          target="_blank"
+          href="https://gitee.com/youlaiorg/vue3-element-admin"
+        >
+          <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
+        </a>
+        <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
+          <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
+        </a>
+        <el-dropdown-item divided @click="logout">
+          {{ $t("navbar.logout") }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+
+<script setup lang="ts">
+defineOptions({
+  name: "UserProfile",
+});
+
+import { useTagsViewStore, useUserStore } from "@/store";
+
+const tagsViewStore = useTagsViewStore();
+const userStore = useUserStore();
+
+const route = useRoute();
+const router = useRouter();
+
+/**
+ * 打开个人中心页面
+ */
+function handleOpenUserProfile() {
+  router.push({ name: "Profile" });
+}
+
+/**
+ * 注销登出
+ */
+function logout() {
+  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    lockScroll: false,
+  }).then(() => {
+    userStore
+      .logout()
+      .then(() => {
+        tagsViewStore.delAllViews();
+      })
+      .then(() => {
+        router.push(`/login?redirect=${route.fullPath}`);
+      });
+  });
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index c985c0b9..9e8c61a5 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -1,15 +1,13 @@
 <template>
-  <div class="navbar-container">
-    <!-- 导航栏面包屑 -->
-    <div class="flex">
-      <hamburger
-        :is-active="appStore.sidebar.opened"
-        @toggle-click="toggleSideBar"
-      />
+  <div class="navbar">
+    <div class="navbar__left">
+      <!-- 展开/收缩菜单  -->
+      <Hamburger :is-active="isSidebarOpened" @toggle-click="toggleSideBar" />
+      <!-- 面包屑 -->
       <breadcrumb />
     </div>
     <!-- 导航栏右侧 -->
-    <NavbarAction />
+    <NavbarRight />
   </div>
 </template>
 
@@ -18,16 +16,25 @@ import { useAppStore } from "@/store";
 
 const appStore = useAppStore();
 
+// 侧边栏是否打开
+const isSidebarOpened = computed(() => appStore.sidebar.opened);
+
+// 展开/收缩菜单
 function toggleSideBar() {
   appStore.toggleSidebar();
 }
 </script>
 
 <style lang="scss" scoped>
-.navbar-container {
-  @apply flex-x-between;
-
+.navbar {
+  display: flex;
+  justify-content: space-between;
   height: $navbar-height;
   background: var(--el-bg-color);
+
+  &__left {
+    display: flex;
+    align-items: center;
+  }
 }
 </style>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 67a3df09..cb3d90a4 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,25 +1,28 @@
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
-    <!-- 混合布局的顶部的Sidebar -->
-    <div v-if="layout == LayoutEnum.MIX" class="flex w-full">
-      <SidebarLogo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
+    <!-- 混合布局顶部  -->
+    <div v-if="isMixLayout" class="flex w-full">
+      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
-      <NavbarAction />
+      <NavbarRight />
     </div>
-    <!-- 左侧和顶部布局的Sidebar -->
+
+    <!-- 顶部布局顶部 || 左侧布局左侧 -->
     <template v-else>
-      <SidebarLogo v-if="sidebarLogo" :collapse="!appStore.sidebar.opened" />
+      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <el-scrollbar>
         <SidebarMenu :menu-list="permissionStore.routes" base-path="" />
       </el-scrollbar>
-      <NavbarAction v-if="layout === LayoutEnum.TOP" />
+
+      <!-- 顶部布局导航 -->
+      <NavbarRight v-if="isTopLayout" />
     </template>
   </div>
 </template>
 
 <script setup lang="ts">
-import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 import { LayoutEnum } from "@/enums/LayoutEnum";
+import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
@@ -27,6 +30,10 @@ const permissionStore = usePermissionStore();
 
 const sidebarLogo = computed(() => settingsStore.sidebarLogo);
 const layout = computed(() => settingsStore.layout);
+
+const isMixLayout = computed(() => layout.value === LayoutEnum.MIX);
+const isTopLayout = computed(() => layout.value === LayoutEnum.TOP);
+const isSidebarCollapsed = computed(() => !appStore.sidebar.opened);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 082f52e2..18e460b9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -43,7 +43,7 @@
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
-        <NavBar v-if="layout === LayoutEnum.LEFT" />
+        <Navbar v-if="layout === LayoutEnum.LEFT" />
         <TagsView v-if="showTagsView" />
       </div>
       <AppMain />

From 853716a453f30491c724f2ac0abf6c0f399b0067 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 01:05:16 +0800
Subject: [PATCH 013/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AF=BC=E5=85=A5=E7=BB=84=E4=BB=B6=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 18e460b9..b4675845 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -62,6 +62,8 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
+import Navbar from "./components/NavBar/index.vue";
+
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();

From b4183f59a96d8dee439ae91992d7f8707778994b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 08:07:44 +0800
Subject: [PATCH 014/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E7=A7=BB=E9=99=A4=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 49a093fa..5491b5c3 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -43,7 +43,7 @@
             {{ item.title }}
           </li>
         </ul>
-        <div v-else class="text-center py-5">暂无历史记录</div>
+        <el-empty v-else description="暂无数据" />
       </div>
 
       <template #footer>
@@ -76,7 +76,6 @@ const searchInputRef = ref();
 const excludedRoutes = ref(["/redirect", "/login", "/401", "/404"]);
 const menuItems = ref<SearchItem[]>([]);
 const searchResults = ref<SearchItem[]>([]);
-const searchHistory = ref<SearchItem[]>([]);
 const activeIndex = ref(-1);
 
 interface SearchItem {
@@ -115,12 +114,8 @@ function updateSearchResults() {
   }
 }
 
-// 显示搜索结果或历史记录
-const displayResults = computed(() => {
-  return searchResults.value.length > 0
-    ? searchResults.value
-    : searchHistory.value.slice(0, 3);
-});
+// 显示搜索结果
+const displayResults = computed(() => searchResults.value);
 
 // 执行搜索
 function selectActiveResult() {
@@ -146,16 +141,9 @@ function navigateResults(direction: string) {
   }
 }
 
-// 跳转
+// 跳转到
 function navigateToRoute(item: SearchItem) {
   closeSearchModal();
-  if (!searchHistory.value.some((history) => history.path === item.path)) {
-    searchHistory.value.unshift(item);
-    if (searchHistory.value.length > 3) {
-      searchHistory.value.pop();
-    }
-  }
-
   if (isExternal(item.path)) {
     window.open(item.path, "_blank");
   } else {

From 98ee8ff2d1240e09b603bc1fb62e57c5f7784b01 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 30 Oct 2024 08:21:05 +0800
Subject: [PATCH 015/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E5=85=A8=E5=B1=80=E8=87=AA=E5=8A=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E6=94=B9=E4=B8=BA=E6=89=8B=E5=8A=A8=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=EF=BC=88=E5=8F=AA=E6=9C=89=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BC=95=E7=94=A8=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue | 2 ++
 src/types/components.d.ts               | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index cb3d90a4..022c4594 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,6 +24,8 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
+import NavbarRight from "../NavBar/components/NavbarRight.vue";
+
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 1b92fb30..fcc072db 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -70,8 +70,6 @@ declare module "vue" {
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
     MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
-    Navbar: (typeof import("./../layout/components/Navbar/index.vue"))["default"];
-    NavbarRight: (typeof import("./../layout/components/Navbar/NavbarRight.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];

From 2caf089eac714b0d23582ae4f35c38299f455964 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:06:26 +0800
Subject: [PATCH 016/497] =?UTF-8?q?chore:=20:hammer:=20=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dict/index.vue                 |  3 ++-
 src/store/modules/permission.ts               | 17 ++++++++---------
 src/views/system/user/components/DeptTree.vue |  4 +++-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 1a6b931c..743ae2b9 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -124,7 +124,8 @@ watch(
         (option) => option.value === selectedValue.value
       );
       if (!matchedOption && props.type !== "checkbox") {
-        selectedValue.value = ""; // 如果找不到匹配项，清空选中
+        // 如果找不到匹配项，清空选中
+        selectedValue.value = "";
       }
     }
   }
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 77940aed..de3a0c3f 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -1,19 +1,18 @@
 import type { RouteRecordRaw } from "vue-router";
 import { constantRoutes } from "@/router";
 import { store } from "@/store";
-import MenuAPI, { type RouteVO } from "@/api/system/menu";
+import router from "@/router";
 
+import MenuAPI, { type RouteVO } from "@/api/system/menu";
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
 
-import router from "@/router";
-
 export const usePermissionStore = defineStore("permission", () => {
-  /** 所有路由，包括静态和动态路由 */
+  // 所有路由，包括静态和动态路由
   const routes = ref<RouteRecordRaw[]>([]);
-  /** 混合模式左侧菜单 */
+  // 混合模式左侧菜单
   const mixLeftMenus = ref<RouteRecordRaw[]>([]);
-
+  // 路由是否已加载
   const isRoutesLoaded = ref(false);
 
   /**
@@ -53,7 +52,8 @@ export const usePermissionStore = defineStore("permission", () => {
     // 删除动态路由，保留静态路由
     routes.value.forEach((route) => {
       if (route.name && !constantRoutes.find((r) => r.name === route.name)) {
-        router.removeRoute(route.name); // 从 router 实例中移除动态路由
+        // 从 router 实例中移除动态路由
+        router.removeRoute(route.name);
       }
     });
 
@@ -103,8 +103,7 @@ const transformRoutes = (routes: RouteVO[]) => {
 };
 
 /**
- * 在组件外使用 Pinia store 实例
- * @see https://pinia.vuejs.org/core-concepts/outside-component-usage.html
+ * 在组件外使用 Pinia store 实例 @see https://pinia.vuejs.org/core-concepts/outside-component-usage.html
  */
 export function usePermissionStoreHook() {
   return usePermissionStore(store);
diff --git a/src/views/system/user/components/DeptTree.vue b/src/views/system/user/components/DeptTree.vue
index 56633afe..9558f36e 100644
--- a/src/views/system/user/components/DeptTree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -46,7 +46,9 @@ watchEffect(
   }
 );
 
-/** 部门筛选 */
+/**
+ * 部门筛选
+ */
 function handleFilter(value: string, data: any) {
   if (!value) {
     return true;

From dd81dd6793eed46eecc4881aa19a1e7431cc9dab Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:08:46 +0800
Subject: [PATCH 017/497] =?UTF-8?q?refactor:=20:recycle:=20store=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E8=A7=84=E8=8C=83=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/{tagsView.ts => tags-view.ts} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/store/modules/{tagsView.ts => tags-view.ts} (100%)

diff --git a/src/store/modules/tagsView.ts b/src/store/modules/tags-view.ts
similarity index 100%
rename from src/store/modules/tagsView.ts
rename to src/store/modules/tags-view.ts

From 702856f31f37439086d2b2136952647f7bfca2fe Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:10:20 +0800
Subject: [PATCH 018/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=8F=98=E9=87=8F=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/AppMain/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index 0bdc2cbb..3445407a 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="app-main" :style="{ height: height }">
+  <section class="app-main" :style="{ height: appMainHeight }">
     <router-view>
       <template #default="{ Component, route }">
         <transition
@@ -21,7 +21,7 @@ import variables from "@/styles/variables.module.scss";
 
 // 缓存页面集合
 const cachedViews = computed(() => useTagsViewStore().cachedViews);
-const height = computed(() => {
+const appMainHeight = computed(() => {
   if (useSettingsStore().tagsView) {
     return `calc(100vh - ${variables["navbar-height"]} - ${variables["tags-view-height"]})`;
   } else {

From c3bb7946a079fbcaff5a9c982912ef6d690bcf60 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:11:56 +0800
Subject: [PATCH 019/497] =?UTF-8?q?refactor:=20:recycle:=20css=20=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarLogo.vue        | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 8c2154f3..867fedb7 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -1,9 +1,9 @@
 <template>
-  <div class="logo-container">
+  <div class="logo">
     <transition enter-active-class="animate__animated animate__fadeInLeft">
       <router-link :key="+collapse" class="wh-full flex-center" to="/">
-        <img :src="http://github.com/logo" class="logo-image" />
-        <span v-if="!collapse" class="logo-title">
+        <img :src="http://github.com/logo" class="w20px h20px" />
+        <span v-if="!collapse" class="title">
           {{ defaultSettings.title }}
         </span>
       </router-link>
@@ -12,8 +12,8 @@
 </template>
 
 <script lang="ts" setup>
-import logo from "@/assets/logo.png";
 import defaultSettings from "@/settings";
+import logo from "@/assets/logo.png";
 
 defineProps({
   collapse: {
@@ -24,17 +24,12 @@ defineProps({
 </script>
 
 <style lang="scss" scoped>
-.logo-container {
+.logo {
   width: 100%;
   height: $navbar-height;
   background-color: $sidebar-logo-background;
 
-  .logo-image {
-    width: 20px;
-    height: 20px;
-  }
-
-  .logo-title {
+  .title {
     flex-shrink: 0; /* 防止容器在空间不足时缩小 */
     margin-left: 10px;
     font-size: 14px;
@@ -45,12 +40,12 @@ defineProps({
 
 .layout-top,
 .layout-mix {
-  .logo-container {
+  .logo {
     width: $sidebar-width;
   }
 
   &.hideSidebar {
-    .logo-container {
+    .logo {
       width: $sidebar-width-collapsed;
     }
   }

From 3c136601247891bad378b1e9a06dba5e74131594 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:14:57 +0800
Subject: [PATCH 020/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20tit?=
 =?UTF-8?q?le=20=E5=9C=A8=E9=9D=9E=20chrome=20=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1aff0d6b..f4370d54 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -354,10 +354,7 @@ onMounted(() => {
       margin: auto 5px;
       font-size: 24px;
       font-weight: bold;
-      color: transparent;
-      background: linear-gradient(to right, #3b82f6, #14b8a6);
-      background-clip: text;
-      -webkit-text-fill-color: transparent;
+      color: #3b82f6;
     }
   }
 

From 5ff88be9275ba426a4f1d713a382237058163a98 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:17:05 +0800
Subject: [PATCH 021/497] =?UTF-8?q?refactor:=20:recycle:=20store=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/index.ts b/src/store/index.ts
index 4ba5089f..6c0115a5 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -11,7 +11,7 @@ export function setupStore(app: App<Element>) {
 export * from "./modules/app";
 export * from "./modules/permission";
 export * from "./modules/settings";
-export * from "./modules/tagsView";
+export * from "./modules/tags-view";
 export * from "./modules/user";
 export * from "./modules/dict";
 export { store };

From 2146d16338546a2fbeb87ab5881e2ff7bc1a993f Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:18:07 +0800
Subject: [PATCH 022/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenu.vue        | 72 +++++++++++--------
 1 file changed, 43 insertions(+), 29 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 5936a1f9..7907041a 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -1,4 +1,4 @@
-<!-- 左侧边菜单：包括左侧布局(left)、顶部布局(all)、混合布局(left) -->
+<!-- 菜单组件 -->
 <template>
   <el-menu
     ref="menuRef"
@@ -10,27 +10,29 @@
     :unique-opened="false"
     :collapse-transition="false"
     :mode="menuMode"
-    @open="handleOpen"
-    @close="handleClose"
+    @open="onMenuOpen"
+    @close="onMenuClose"
   >
+    <!-- 菜单项 -->
     <SidebarMenuItem
       v-for="route in menuList"
       :key="route.path"
       :item="route"
-      :base-path="getFullPath(route.path)"
+      :base-path="resolveFullPath(route.path)"
     />
   </el-menu>
 </template>
 
 <script lang="ts" setup>
-import path from "path-browserify"; // 第三方库
-import { useSettingsStore, useAppStore } from "@/store"; // 内部模块
-import { isExternal } from "@/utils/index"; // 工具函数
-import variables from "@/styles/variables.module.scss"; // 样式
-import { LayoutEnum } from "@/enums/LayoutEnum"; // 枚举
-import type { MenuInstance } from "element-plus"; // 类型
+import path from "path-browserify";
+import type { MenuInstance } from "element-plus";
+
+import { LayoutEnum } from "@/enums/LayoutEnum";
+import { useSettingsStore, useAppStore } from "@/store";
+import { isExternal } from "@/utils/index";
+
+import variables from "@/styles/variables.module.scss";
 
-// 定义组件 props
 const props = defineProps({
   menuList: {
     type: Array<any>,
@@ -40,6 +42,7 @@ const props = defineProps({
   basePath: {
     type: String,
     required: true,
+    example: "/system",
   },
 });
 
@@ -48,52 +51,63 @@ const settingsStore = useSettingsStore();
 const appStore = useAppStore();
 const currentRoute = useRoute();
 
-// 根据布局计算菜单模式
+// 存储已展开的菜单项索引
+const expandedMenuIndexes = ref<string[]>([]);
+
+// 根据布局模式设置菜单的显示方式：顶部布局使用水平模式，其他使用垂直模式
 const menuMode = computed(() => {
   return settingsStore.layout === LayoutEnum.TOP ? "horizontal" : "vertical";
 });
+
 /**
  * 获取完整路径
- * @param routePath 路由路径 /user
- * @returns 完整的路径
+ *
+ * @param routePath 当前路由的相对路径  /user
+ * @returns 完整的绝对路径 D://vue3-element-admin/system/user
  */
-function getFullPath(routePath: string) {
+function resolveFullPath(routePath: string) {
   if (isExternal(routePath)) {
     return routePath;
   }
   if (isExternal(props.basePath)) {
     return props.basePath;
   }
-  return path.resolve(props.basePath, routePath); // 父路径 + 子路径
-}
 
-// 存储已打开菜单的索引
-const openMenuIndexes = ref<string[]>([]);
+  // 解析路径，生成完整的绝对路径
+  return path.resolve(props.basePath, routePath);
+}
 
 /**
- * 菜单打开时添加索引
- * @param index 当前菜单索引
+ * 打开菜单
+ *
+ * @param index 当前展开的菜单项索引
  */
-const handleOpen = (index: string) => {
-  openMenuIndexes.value.push(index);
+const onMenuOpen = (index: string) => {
+  expandedMenuIndexes.value.push(index);
 };
 
 /**
- * 菜单关闭时移除索引
- * @param index 当前菜单索引
+ * 关闭菜单
+ *
+ * @param index 当前收起的菜单项索引
  */
-const handleClose = (index: string) => {
-  openMenuIndexes.value = openMenuIndexes.value.filter(
+const onMenuClose = (index: string) => {
+  expandedMenuIndexes.value = expandedMenuIndexes.value.filter(
     (item) => item !== index
   );
 };
 
-// 监听菜单模式变化，横向时关闭所有菜单
+/**
+ * 监听菜单模式变化：当菜单模式切换为水平模式时，关闭所有展开的菜单项，
+ * 避免在水平模式下菜单项显示错位。
+ *
+ * @see https://gitee.com/youlaiorg/vue3-element-admin/issues/IAJ1DR
+ */
 watch(
   () => menuMode.value,
   () => {
     if (menuMode.value === "horizontal") {
-      openMenuIndexes.value.forEach((item) => menuRef.value!.close(item));
+      expandedMenuIndexes.value.forEach((item) => menuRef.value!.close(item));
     }
   }
 );

From ea6feac8ced8d0934344c6dfd325916522d0655a Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:19:33 +0800
Subject: [PATCH 023/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=8F=B6=E5=AD=90=E8=8A=82=E7=82=B9=E8=AE=BE=E7=BD=AE=E5=A7=8B?=
 =?UTF-8?q?=E7=BB=88=E6=98=BE=E7=A4=BA=E6=97=B6=E8=8F=9C=E5=8D=95=E9=A1=B9?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E4=B8=8B=E6=8B=89=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenuItem.vue    | 71 +++++++++----------
 1 file changed, 33 insertions(+), 38 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 2fe39daa..33b6c565 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -1,12 +1,14 @@
 <template>
-  <!-- 如果菜单项未隐藏，显示菜单项 -->
   <div v-if="!item.meta || !item.meta.hidden">
-    <!-- 如果只有一个子路由或没有子路由，显示该菜单项 -->
+    <!--【叶子节点】显示叶子节点或唯一子节点且父节点未配置始终显示 -->
     <template
       v-if="
-        hasOneShowingChild(item.children, item as RouteRecordRaw) &&
-        (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
-        !item.meta?.alwaysShow
+        // 判断条件：仅有一个子节点，且父节点未配置始终显示
+        (hasOneShowingChild(item.children, item) &&
+          (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
+          !item.meta?.alwaysShow) ||
+        // 父节点即使配置了始终显示，但无子节点，也显示未叶子节点
+        (item.meta?.alwaysShow && !item.children)
       "
     >
       <AppLink
@@ -21,19 +23,19 @@
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
           <SidebarMenuItemTitle
-            :icon="onlyOneChild.meta.icon || (item.meta && item.meta.icon)"
+            :icon="onlyOneChild.meta.icon || item.meta?.icon"
             :title="onlyOneChild.meta.title"
           />
         </el-menu-item>
       </AppLink>
     </template>
 
-    <!-- 如果有多个子路由，显示父菜单项 -->
+    <!--【非叶子节点】显示含多个子节点的父菜单，或始终显示的单子节点 -->
     <el-sub-menu v-else :index="resolvePath(item.path)" teleported>
       <template #title>
         <SidebarMenuItemTitle
           v-if="item.meta"
-          :icon="item.meta && item.meta.icon"
+          :icon="item.meta.icon"
           :title="item.meta.title"
         />
       </template>
@@ -56,15 +58,16 @@ defineOptions({
 });
 
 import path from "path-browserify";
-import { isExternal } from "@/utils";
 import { RouteRecordRaw } from "vue-router";
 
+import { isExternal } from "@/utils";
+
 const props = defineProps({
   /**
    * 当前路由对象
    */
   item: {
-    type: Object,
+    type: Object as PropType<RouteRecordRaw>,
     required: true,
   },
 
@@ -85,36 +88,35 @@ const props = defineProps({
   },
 });
 
+// 可见的唯一子节点
 const onlyOneChild = ref();
 
 /**
- * 判断是否只有一个可见的子路由
+ * 检查是否仅有一个可见子节点
  *
  * @param children 子路由数组
- * @param parent 父级路由对象
- * @returns 是否只有一个可见子路由
+ * @param parent 父级路由
+ * @returns 是否仅有一个可见子节点
  */
 function hasOneShowingChild(
   children: RouteRecordRaw[] = [],
   parent: RouteRecordRaw
 ) {
-  // 筛选出可见的子路由
+  // 过滤出可见子节点
   const showingChildren = children.filter((route: RouteRecordRaw) => {
-    if (route.meta?.hidden) {
-      return false;
-    } else {
-      route.meta!.hidden = false;
+    if (!route.meta?.hidden) {
       onlyOneChild.value = route;
       return true;
     }
+    return false;
   });
 
-  // 如果只有一个或没有可见的子路由
+  // 仅有一个或无子节点
   if (showingChildren.length === 1) {
     return true;
   }
 
-  // 如果没有子路由，使用父级路由
+  // 无子节点时，设置父节点为唯一显示节点
   if (showingChildren.length === 0) {
     onlyOneChild.value = { ...parent, path: "", noShowingChildren: true };
     return true;
@@ -123,22 +125,17 @@ function hasOneShowingChild(
 }
 
 /**
- * 解析路径，将相对路径转换为绝对路径
+ * 获取完整路径，适配外部链接
  *
  * @param routePath 路由路径
  * @returns 绝对路径
  */
 function resolvePath(routePath: string) {
-  if (isExternal(routePath)) {
-    return routePath;
-  }
-  if (isExternal(props.basePath)) {
-    return props.basePath;
-  }
+  if (isExternal(routePath)) return routePath;
+  if (isExternal(props.basePath)) return props.basePath;
 
-  // 组合父级路径和路由路径形成完整路径
-  const fullPath = path.resolve(props.basePath, routePath);
-  return fullPath;
+  // 拼接父路径和当前路径
+  return path.resolve(props.basePath, routePath);
 }
 </script>
 
@@ -185,14 +182,12 @@ function resolvePath(routePath: string) {
     width: $sidebar-width-collapsed;
 
     .el-sub-menu {
-      & > .el-sub-menu__title {
-        & > span {
-          display: inline-block;
-          width: 0;
-          height: 0;
-          overflow: hidden;
-          visibility: hidden;
-        }
+      & > .el-sub-menu__title > span {
+        display: inline-block;
+        width: 0;
+        height: 0;
+        overflow: hidden;
+        visibility: hidden;
       }
     }
   }

From 7e554a7751d0f668e0558e69ee9b67fdfa6cb2b9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:20:41 +0800
Subject: [PATCH 024/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8=E5=AD=97=E5=85=B8=E7=BF=BB=E8=AF=91?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts          |   2 +-
 src/views/system/user/index.vue | 113 ++++++++++++++++----------------
 2 files changed, 58 insertions(+), 57 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 865e306d..6a1d23af 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -257,7 +257,7 @@ export interface UserPageVO {
   /** 用户邮箱 */
   email?: string;
   /** 性别 */
-  genderLabel?: string;
+  gender?: number;
   /** 用户ID */
   id?: number;
   /** 手机号 */
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 1e70ea60..0e263b2d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -59,41 +59,47 @@
           </el-form>
         </div>
 
-        <el-card shadow="never" class="table-wrapper">
-          <template #header>
-            <div class="flex-x-between">
-              <div>
-                <el-button
-                  v-hasPerm="['sys:user:add']"
-                  type="success"
-                  @click="handleOpenDialog()"
-                >
-                  <template #icon><Plus /></template>
-                  新增
-                </el-button>
-                <el-button
-                  v-hasPerm="['sys:user:delete']"
-                  type="danger"
-                  :disabled="removeIds.length === 0"
-                  @click="handleDelete()"
-                >
-                  <template #icon><Delete /></template>
-                  删除
-                </el-button>
-              </div>
-              <div>
-                <el-button class="ml-3" @click="handleOpenImportDialog">
-                  <template #icon><Upload /></template>
-                  导入
-                </el-button>
+        <el-card shadow="never">
+          <div class="flex-x-between mb-10px">
+            <div>
+              <el-button
+                v-hasPerm="['sys:user:add']"
+                type="success"
+                @click="handleOpenDialog()"
+              >
+                <template #icon><Plus /></template>
+                新增
+              </el-button>
+              <el-button
+                v-hasPerm="['sys:user:delete']"
+                type="danger"
+                :disabled="removeIds.length === 0"
+                @click="handleDelete()"
+              >
+                <template #icon><Delete /></template>
+                删除
+              </el-button>
+            </div>
+            <div>
+              <el-button
+                v-hasPerm="['sys:user:import']"
+                type="default"
+                icon="upload"
+                @click="handleOpenImportDialog"
+              >
+                导入
+              </el-button>
 
-                <el-button class="ml-3" @click="handleExport">
-                  <template #icon><Download /></template>
-                  导出
-                </el-button>
-              </div>
+              <el-button
+                v-hasPerm="['sys:user:export']"
+                type="default"
+                icon="download"
+                @click="handleExport"
+              >
+                导出
+              </el-button>
             </div>
-          </template>
+          </div>
 
           <el-table
             v-loading="loading"
@@ -116,12 +122,11 @@
             />
             <el-table-column label="用户昵称" align="center" prop="nickname" />
 
-            <el-table-column
-              label="性别"
-              width="100"
-              align="center"
-              prop="genderLabel"
-            />
+            <el-table-column label="性别" width="100" align="center">
+              <template #default="scope">
+                <DictLabel :v-modle="scope.row.gender" code="gender" />
+              </template>
+            </el-table-column>
 
             <el-table-column
               label="部门"
@@ -291,7 +296,7 @@
     <!-- 用户导入弹窗 -->
     <UserImport
       v-model:visible="importDialogVisible"
-      @import-success="handleUserImportSuccess"
+      @import-success="handleQuery()"
     />
   </div>
 </template>
@@ -337,7 +342,7 @@ const dialog = reactive({
   title: "",
 });
 
-/** 导入弹窗显示状态 */
+// 导入弹窗显示状态
 const importDialogVisible = ref(false);
 
 // 用户表单数据
@@ -345,7 +350,7 @@ const formData = reactive<UserForm>({
   status: 1,
 });
 
-/** 用户表单校验规则  */
+// 用户表单校验规则
 const rules = reactive({
   username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
   nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
@@ -367,7 +372,7 @@ const rules = reactive({
   ],
 });
 
-/** 查询 */
+//查询
 function handleQuery() {
   loading.value = true;
   UserAPI.getPage(queryParams)
@@ -380,7 +385,7 @@ function handleQuery() {
     });
 }
 
-/** 重置查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
@@ -389,16 +394,12 @@ function handleResetQuery() {
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中记录选中ID集合
 function handleSelectionChange(selection: any) {
   removeIds.value = selection.map((item: any) => item.id);
 }
 
-/**
- * 重置密码
- *
- *
- */
+// 重置密码
 function hancleResetPassword(row: { [key: string]: any }) {
   ElMessageBox.prompt(
     "请输入用户「" + row.username + "」的新密码",
@@ -446,7 +447,7 @@ async function handleOpenDialog(id?: number) {
   }
 }
 
-/** 关闭弹窗 */
+// 关闭弹窗
 function handleCloseDialog() {
   dialog.visible = false;
   userFormRef.value.resetFields();
@@ -456,7 +457,7 @@ function handleCloseDialog() {
   formData.status = 1;
 }
 
-/** 表单提交 */
+// 表单提交
 const handleSubmit = useThrottleFn(() => {
   userFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -483,7 +484,7 @@ const handleSubmit = useThrottleFn(() => {
   });
 }, 3000);
 
-/** 删除用户 */
+// 删除用户
 function handleDelete(id?: number) {
   const userIds = [id || removeIds.value].join(",");
   if (!userIds) {
@@ -510,17 +511,17 @@ function handleDelete(id?: number) {
     }
   );
 }
-/** 打开导入弹窗 */
+// 打开导入弹窗 *
 function handleOpenImportDialog() {
   importDialogVisible.value = true;
 }
 
-/** 导入用户成功 */
+// 导入用户成功
 function handleUserImportSuccess() {
   handleQuery();
 }
 
-/** 导出用户 */
+// 导出用户
 function handleExport() {
   UserAPI.export(queryParams).then((response: any) => {
     const fileData = response.data;

From 30fdd06e096fcaf4018950942fccac203b65aa4d Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:21:48 +0800
Subject: [PATCH 025/497] chore: :hammer: bump version to 2.18.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a696cad8..3f5bbaa2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.2",
+  "version": "2.18.4",
   "private": true,
   "type": "module",
   "scripts": {

From 04fab0a18244ec05c95128953703aaff67e53c32 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 31 Oct 2024 01:29:33 +0800
Subject: [PATCH 026/497] =?UTF-8?q?fix:=20:bug:=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E7=BB=84=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index b4675845..26af93b0 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -62,7 +62,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import Navbar from "./components/NavBar/index.vue";
+import Navbar from "./components/Navbar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From acc9f945b97b566cc190d1a849b512960071e371 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 09:03:33 +0800
Subject: [PATCH 027/497] =?UTF-8?q?fix:=20:bug:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8Aicon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 255c995d..0453b9ab 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -152,10 +152,7 @@
         <el-card>
           <template #header>
             <div class="flex-x-between">
-              <div class="flex-y-center">
-                通知公告
-                <el-icon class="ml-1"><Notification /></el-icon>
-              </div>
+              <div class="flex-y-center">通知公告</div>
               <el-link type="primary">
                 <span class="text-xs" @click="viewMoreNotice">查看更多</span>
                 <el-icon class="text-xs"><ArrowRight /></el-icon>

From 5776d8dba047d4135c0e6117e5a2d396f2fc6978 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 15:11:26 +0800
Subject: [PATCH 028/497] =?UTF-8?q?chore:=20:hammer:=20typescript=20?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=99=A8=E9=85=8D=E7=BD=AE=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=92=8C=E4=B9=A6=E5=86=99=E9=A1=BA=E5=BA=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tsconfig.json | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/tsconfig.json b/tsconfig.json
index cbe0a4da..7afb4fcd 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,25 +1,33 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "useDefineForClassFields": true,
     "module": "esnext",
     "moduleResolution": "node",
-    "strict": true,
-    "noLib": false,
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "esModuleInterop": true,
     "lib": ["esnext", "dom"],
     "baseUrl": ".",
-    "allowJs": true,
-    "skipLibCheck": true,
-    "allowSyntheticDefaultImports": true,
-    "forceConsistentCasingInFileNames": true,
     "paths": {
       "@/*": ["src/*"]
     },
+
+    // 严格性和类型检查相关配置
+    "strict": true,
+    "skipLibCheck": true,
+    "forceConsistentCasingInFileNames": true,
+
+    // 模块和兼容性相关配置
+    "allowSyntheticDefaultImports": true,
+    "esModuleInterop": true,
+    "resolveJsonModule": true,
+
+    // 调试和兼容性相关配置
+    "sourceMap": true,
+    "useDefineForClassFields": true,
+    "allowJs": true,
+
+    // 类型声明相关配置
     "types": ["node", "vite/client", "element-plus/global"]
   },
+
   "include": ["mock/**/*.ts", "src/**/*.ts", "src/**/*.vue", "vite.config.ts"],
   "exclude": ["node_modules", "dist"]
 }

From 7f8f69f00ea03a08dc2f0c5fe1043beb733485a1 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 15:17:20 +0800
Subject: [PATCH 029/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=B1=BB=E5=9E=8B=E7=BC=96=E7=A0=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E5=8F=AF=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/role.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/system/role.ts b/src/api/system/role.ts
index 95188796..cc21e342 100644
--- a/src/api/system/role.ts
+++ b/src/api/system/role.ts
@@ -126,11 +126,11 @@ export interface RoleForm {
   /** 角色ID */
   id?: number;
   /** 角色编码 */
-  code: string;
+  code?: string;
   /** 数据权限 */
   dataScope?: number;
   /** 角色名称 */
-  name: string;
+  name?: string;
   /** 排序 */
   sort?: number;
   /** 角色状态(1-正常；0-停用) */

From 32010211e6bf1982345d953d4421ebc5cff68630 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 15:34:01 +0800
Subject: [PATCH 030/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f4370d54..0804c5ea 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -2,16 +2,6 @@
   <div class="login">
     <!-- 登录页头部 -->
     <div class="login-header">
-      <div class="flex-y-center">
-        <el-image :src="http://github.com/logo" class="logo" />
-        <span class="title">
-          {{ defaultSettings.title }}
-        </span>
-        <el-tag size="small" type="success">
-          {{ defaultSettings.version }}
-        </el-tag>
-      </div>
-
       <div class="flex-y-center">
         <el-switch
           v-model="isDark"
@@ -32,7 +22,7 @@
       <div class="login-form">
         <el-form ref="loginFormRef" :model="loginData" :rules="loginRules">
           <div class="form-title">
-            {{ $t("login.login") }}
+            <h2>{{ defaultSettings.title }}</h2>
             <el-dropdown style="position: absolute; right: 0">
               <div class="cursor-pointer">
                 <el-icon>
@@ -41,6 +31,13 @@
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
+                  <el-dropdown-item>
+                    版本号：
+                    <el-tag type="success">
+                      {{ defaultSettings.version }}
+                    </el-tag>
+                  </el-dropdown-item>
+
                   <el-dropdown-item
                     @click="setLoginCredentials('root', '123456')"
                   >
@@ -160,7 +157,7 @@
       </div>
     </div>
 
-    <!--  -->
+    <!-- 登录页底部 -->
     <div class="login-footer">
       <el-text size="small">
         Copyright © 2021 - 2024 youlai.tech All Rights Reserved.
@@ -245,7 +242,7 @@ const loginRules = computed(() => {
   };
 });
 
-/** 获取验证码 */
+// 获取验证码
 function getCaptcha() {
   AuthAPI.getCaptcha().then((data) => {
     loginData.value.captchaKey = data.captchaKey;
@@ -253,7 +250,7 @@ function getCaptcha() {
   });
 }
 
-/** 登录表单提交 */
+// 登录
 async function handleLoginSubmit() {
   loginFormRef.value?.validate((valid: boolean) => {
     if (valid) {
@@ -262,7 +259,8 @@ async function handleLoginSubmit() {
         .login(loginData.value)
         .then(async () => {
           await userStore.getUserInfo();
-          await dictStore.loadDictionaries(); // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常
+          // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常
+          await dictStore.loadDictionaries();
           // 跳转到登录前的页面
           const { path, queryParams } = parseRedirect();
           router.push({ path: path, query: queryParams });
@@ -341,7 +339,7 @@ onMounted(() => {
     position: absolute;
     top: 0;
     display: flex;
-    justify-content: space-between;
+    justify-content: right;
     width: 100%;
     padding: 15px;
 
@@ -360,7 +358,7 @@ onMounted(() => {
 
   .login-content {
     display: flex;
-    width: 850px;
+    width: 960px;
     overflow: hidden;
     background-color: #fff;
     border-radius: 5px;
@@ -370,6 +368,7 @@ onMounted(() => {
       flex-direction: column;
       max-width: 100%;
       height: 100vh;
+      padding: 0 30px;
       border-radius: 0;
       box-shadow: none;
     }
@@ -404,8 +403,7 @@ onMounted(() => {
         display: flex;
         align-items: center;
         justify-content: center;
-        padding: 20px 0;
-        font-size: 20px;
+        padding: 0 0 20px;
         text-align: center;
       }
 

From 6ea4c6d718d05cfd5468f762b37ac6ac4ba835fa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 15:46:25 +0800
Subject: [PATCH 031/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 2882e3d6..0658fade 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -18,16 +18,14 @@ import {
   devDependencies,
 } from "./package.json";
 
-// 平台的名称、版本、运行所需的`node`版本、依赖、构建时间的类型提示
+// 平台的名称、版本、运行所需的 node 版本、依赖、构建时间的类型提示
 const __APP_INFO__ = {
   pkg: { name, version, engines, dependencies, devDependencies },
   buildTimestamp: Date.now(),
 };
 
 const pathSrc = resolve(__dirname, "src");
-/**
- * Vite配置 @see https://cn.vitejs.dev/config
- */
+// Vite配置  https://cn.vitejs.dev/config
 export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
   const env = loadEnv(mode, process.cwd());
   return {
@@ -37,7 +35,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       },
     },
     css: {
-      // CSS 预处理器
       preprocessorOptions: {
         // 定义全局 SCSS 变量
         scss: {
@@ -50,17 +47,14 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       },
     },
     server: {
-      // 主机地址
       host: "0.0.0.0",
-      // 端口号
       port: +env.VITE_APP_PORT,
-      // 是否自动在浏览器中打开
       open: true,
       proxy: {
-        // 代理前缀为 /dev-api 的请求
+        // 代理 /dev-api 的请求
         [env.VITE_APP_BASE_API]: {
           changeOrigin: true,
-          // 代理目标真实接口地址：https://api.youlai.tech
+          // 代理目标地址：https://api.youlai.tech
           target: env.VITE_APP_API_URL,
           rewrite: (path) =>
             path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
@@ -69,49 +63,41 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
     },
     plugins: [
       vue(),
-      // MOCK 服务
       env.VITE_MOCK_DEV_SERVER === "true" ? mockDevServerPlugin() : null,
       UnoCSS({
         hmrTopLevelAwait: false,
       }),
-      /**
-       * 自动导入配置
-       *
-       * @see https://github.com/sxzz/element-plus-best-practices/blob/main/vite.config.ts1
-       */
+      // 自动导入配置 https://github.com/sxzz/element-plus-best-practices/blob/main/vite.config.ts
       AutoImport({
-        // 自动导入 Vue 相关函数，如：ref, reactive, toRef 等
+        // 导入 Vue 函数，如：ref, reactive, toRef 等
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
         resolvers: [
-          // 自动导入 Element Plus 相关函数，如：ElMessage, ElMessageBox... (带样式)
+          // 导入 Element Plus函数，如：ElMessage, ElMessageBox 等
           ElementPlusResolver(),
         ],
         eslintrc: {
-          // 是否自动生成 eslint 规则，建议生成之后设置 false
           enabled: false,
-          // 指定自动导入函数 eslint 规则的文件
           filepath: "./.eslintrc-auto-import.json",
           globalsPropValue: true,
         },
-        // 是否在 vue 模板中自动导入
         vueTemplate: true,
-        // 指定自动导入函数TS类型声明文件路径 (false:关闭自动生成)
+        // 导入函数类型声明文件路径 (false:关闭自动生成)
         dts: false,
         // dts: "src/types/auto-imports.d.ts",
       }),
       Components({
         resolvers: [
-          // 自动导入 Element Plus 组件
+          // 导入 Element Plus 组件
           ElementPlusResolver(),
         ],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],
-        // 指定自动导入组件TS类型声明文件路径 (false:关闭自动生成)
+        // 导入组件类型声明文件路径 (false:关闭自动生成)
         dts: false,
         // dts: "src/types/components.d.ts",
       }),
       createSvgIconsPlugin({
-        // 指定需要缓存的图标文件夹
+        // 缓存图标位置
         iconDirs: [resolve(pathSrc, "assets/icons")],
         symbolId: "icon-[dir]-[name]",
       }),

From d37d70b04c247844a9a26e255b08c0a8f139dd1f Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 1 Nov 2024 15:59:06 +0800
Subject: [PATCH 032/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavBar/components/NavbarRight.vue | 2 +-
 src/layout/components/Sidebar/index.vue                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 1b0ef528..7f577ebf 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="navbar__right">
-    <!-- 手机设备（窄屏）不显示 -->
+    <!-- 非手机设备（窄屏）才显示 -->
     <template v-if="!isMobile">
       <!-- 搜索 -->
       <MenuSearch />
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 022c4594..4db8f35a 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,7 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-import NavbarRight from "../NavBar/components/NavbarRight.vue";
+import NavbarRight from "../Navbar/components/NavbarRight.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From 04605b891e72929744d48749972360e4c091f8aa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 4 Nov 2024 08:22:45 +0800
Subject: [PATCH 033/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 39 +++++++++++++++------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 86edd757..cf27f622 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -24,8 +24,8 @@
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <template #header>
+    <el-card shadow="never">
+      <div class="mb-10px">
         <el-button type="success" @click="handleOpenDialog()">
           <template #icon><Plus /></template>
           新增
@@ -38,7 +38,7 @@
           <template #icon><Delete /></template>
           删除
         </el-button>
-      </template>
+      </div>
 
       <el-table
         ref="dataTableRef"
@@ -67,27 +67,27 @@
               type="primary"
               size="small"
               link
+              icon="position"
               @click="handleOpenAssignPermDialog(scope.row)"
             >
-              <template #icon><Position /></template>
               分配权限
             </el-button>
             <el-button
               type="primary"
               size="small"
               link
+              icon="edit"
               @click="handleOpenDialog(scope.row.id)"
             >
-              <template #icon><Edit /></template>
               编辑
             </el-button>
             <el-button
               type="danger"
               size="small"
               link
+              icon="delete"
               @click="handleDelete(scope.row.id)"
             >
-              <template #icon><Delete /></template>
               删除
             </el-button>
           </template>
@@ -218,7 +218,6 @@
           {{ data.label }}
         </template>
       </el-tree>
-
       <template #footer>
         <div class="dialog-footer">
           <el-button type="primary" @click="handleAssignPermSubmit">
@@ -271,8 +270,6 @@ const dialog = reactive({
 const formData = reactive<RoleForm>({
   sort: 1,
   status: 1,
-  code: "",
-  name: "",
 });
 
 const rules = reactive({
@@ -295,7 +292,7 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
-/** 查询 */
+// 查询
 function handleQuery() {
   loading.value = true;
   RoleAPI.getPage(queryParams)
@@ -308,19 +305,19 @@ function handleQuery() {
     });
 }
 
-/** 重置查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
 
-/** 打开角色弹窗 */
+// 打开角色弹窗
 function handleOpenDialog(roleId?: number) {
   dialog.visible = true;
   if (roleId) {
@@ -333,7 +330,7 @@ function handleOpenDialog(roleId?: number) {
   }
 }
 
-/** 提交角色表单 */
+// 提交角色表单
 function handleSubmit() {
   roleFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -360,7 +357,7 @@ function handleSubmit() {
   });
 }
 
-/** 关闭角色弹窗 */
+// 关闭弹窗
 function handleCloseDialog() {
   dialog.visible = false;
 
@@ -372,7 +369,7 @@ function handleCloseDialog() {
   formData.status = 1;
 }
 
-/** 删除角色 */
+// 删除角色
 function handleDelete(roleId?: number) {
   const roleIds = [roleId || ids.value].join(",");
   if (!roleIds) {
@@ -400,7 +397,7 @@ function handleDelete(roleId?: number) {
   );
 }
 
-/** 打开分配菜单权限弹窗 */
+// 打开分配菜单权限弹窗
 async function handleOpenAssignPermDialog(row: RolePageVO) {
   const roleId = row.id;
   if (roleId) {
@@ -427,7 +424,7 @@ async function handleOpenAssignPermDialog(row: RolePageVO) {
   }
 }
 
-/** 分配菜单权限提交 */
+// 分配菜单权限提交
 function handleAssignPermSubmit() {
   const roleId = checkedRole.value.id;
   if (roleId) {
@@ -448,7 +445,7 @@ function handleAssignPermSubmit() {
   }
 }
 
-/** 展开/收缩 菜单权限树  */
+// 展开/收缩 菜单权限树
 function togglePermTree() {
   isExpanded.value = !isExpanded.value;
   if (permTreeRef.value) {
@@ -462,7 +459,7 @@ function togglePermTree() {
   }
 }
 
-/** 权限筛选 */
+// 权限筛选
 watch(permKeywords, (val) => {
   permTreeRef.value!.filter(val);
 });
@@ -477,7 +474,7 @@ function handlePermFilter(
   return data.label.includes(value);
 }
 
-/** 父子菜单节点是否联动 change*/
+// 父子菜单节点是否联动
 function handleparentChildLinkedChange(val: any) {
   parentChildLinked.value = val;
 }

From 825103a58896c229624a47630e573b3199efb3a7 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 5 Nov 2024 05:45:23 +0800
Subject: [PATCH 034/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=80=A7=E5=88=AB=E5=AD=97=E5=85=B8=E6=9C=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 28 +++++++++++-----------------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 0e263b2d..ce0936fd 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -107,30 +107,24 @@
             @selection-change="handleSelectionChange"
           >
             <el-table-column type="selection" width="50" align="center" />
+            <el-table-column label="编号" align="center" prop="id" width="60" />
+            <el-table-column label="用户名" align="center" prop="username" />
             <el-table-column
-              key="id"
-              label="编号"
-              align="center"
-              prop="id"
-              width="80"
-            />
-            <el-table-column
-              key="username"
-              label="用户名"
+              label="昵称"
+              width="100"
               align="center"
-              prop="username"
+              prop="nickname"
             />
-            <el-table-column label="用户昵称" align="center" prop="nickname" />
 
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
-                <DictLabel :v-modle="scope.row.gender" code="gender" />
+                <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>
 
             <el-table-column
               label="部门"
-              width="150"
+              width="120"
               align="center"
               prop="deptName"
             />
@@ -145,7 +139,7 @@
               label="状态"
               align="center"
               prop="status"
-              width="100"
+              width="80"
             >
               <template #default="scope">
                 <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">
@@ -157,7 +151,7 @@
               label="创建时间"
               align="center"
               prop="createTime"
-              width="180"
+              width="120"
             />
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
@@ -206,7 +200,7 @@
       </el-col>
     </el-row>
 
-    <!-- 用户表单弹窗 -->
+    <!-- 用户表单 -->
     <el-drawer
       v-model="dialog.visible"
       :title="dialog.title"
@@ -296,7 +290,7 @@
     <!-- 用户导入弹窗 -->
     <UserImport
       v-model:visible="importDialogVisible"
-      @import-success="handleQuery()"
+      @import-success="handleUserImportSuccess()"
     />
   </div>
 </template>

From afd4b75cdb3858bbb9929334e2882422d1e7f476 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Tue, 5 Nov 2024 11:36:24 +0800
Subject: [PATCH 035/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=E9=87=8D=E7=BD=AE=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=9B=BE=E7=89=87=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复字典管理重置按钮图片显示不正常
---
 src/views/system/dict/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index b367d5f2..91387f27 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -21,8 +21,8 @@
           <el-button @click="handleResetQuery()">
             <template #icon>
               <Refresh />
-              重置
             </template>
+            重置
           </el-button>
         </el-form-item>
       </el-form>

From 2fc574a352e9696137142aff2723e777f1471d55 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 8 Nov 2024 07:04:30 +0800
Subject: [PATCH 036/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=B2=BE?=
 =?UTF-8?q?=E7=AE=80=20eslint=20=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js | 52 +++++++++++-------------------------------------
 1 file changed, 12 insertions(+), 40 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index bfba6828..f5997a7f 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -32,13 +32,6 @@ export default [
       ...configPrettier.rules,
       ...pluginPrettier.configs.recommended.rules,
       "no-debug": "off", // 禁止 debugger
-      "no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_",
-          varsIgnorePattern: "^_",
-        },
-      ], // 允许未使用的变量，以 _ 开头的变量不检查
       "prettier/prettier": [
         "error",
         {
@@ -62,23 +55,13 @@ export default [
     },
     rules: {
       ...pluginTypeScript.configs.strict.rules,
-      "@typescript-eslint/ban-types": "off", // 禁止特定类型
-      "@typescript-eslint/no-redeclare": "error", // 禁止重复声明
-      "@typescript-eslint/ban-ts-comment": "off", // 禁止特定注释
-      "@typescript-eslint/no-explicit-any": "off", // 禁止使用 any
-      "@typescript-eslint/prefer-as-const": "warn", // 使用 as const 替代 as 'const'
-      "@typescript-eslint/no-empty-function": "off", // 禁止空函数
-      "@typescript-eslint/no-non-null-assertion": "off", // 禁止非空断言
-      "@typescript-eslint/no-import-type-side-effects": "error", // 禁止导入类型产生副作用
-      "@typescript-eslint/explicit-module-boundary-types": "off", // 显式函数返回类型
+      "@typescript-eslint/no-explicit-any": "off", // 允许使用 any
+      "@typescript-eslint/no-empty-function": "off", // 允许空函数
+      "@typescript-eslint/no-empty-object-type": "off", // 允许空对象类型
       "@typescript-eslint/consistent-type-imports": [
         "error",
         { disallowTypeAnnotations: false, fixStyle: "inline-type-imports" },
-      ], // 一致的类型导入
-      "@typescript-eslint/prefer-literal-enum-member": [
-        "error",
-        { allowBitwiseExpressions: true },
-      ], // 使用字面量枚举成员
+      ], // 统一类型导入风格
     },
   },
 
@@ -88,15 +71,15 @@ export default [
     rules: {
       "eslint-comments/no-unlimited-disable": "off",
       "unused-imports/no-unused-vars": "off",
+      "@typescript-eslint/ban-ts-comment": "off", // 允许使用 @ts-nocheck 注释
     },
   },
 
-  // JavaScript 配置（包含 commonjs）
+  // JavaScript (commonjs) 配置
   {
     files: ["**/*.?([cm])js"],
     rules: {
-      "@typescript-eslint/no-require-imports": "off", // 禁止 require
-      "@typescript-eslint/no-var-requires": "off", // 禁止 require
+      "@typescript-eslint/no-var-requires": "off", // 允许 require
     },
   },
 
@@ -106,7 +89,6 @@ export default [
     languageOptions: {
       parser: parserVue,
       parserOptions: {
-        extraFileExtensions: [".vue"],
         parser: "@typescript-eslint/parser",
         sourceType: "module",
       },
@@ -116,24 +98,14 @@ export default [
     },
     processor: pluginVue.processors[".vue"],
     rules: {
-      ...pluginVue.configs.base.rules, // Vue 基础配置
-      ...pluginVue.configs["vue3-essential"].rules, // Vue3 基础配置
-      ...pluginVue.configs["vue3-recommended"].rules, // Vue3 推荐配置
-      "no-undef": "off",
-      "no-unused-vars": "off",
-      "vue/no-v-html": "off",
-      "vue/require-default-prop": "off",
-      "vue/require-explicit-emits": "off",
-      "vue/multi-word-component-names": "off",
-      "vue/no-setup-props-reactivity-loss": "off",
+      ...pluginVue.configs["vue3-recommended"].rules,
+      "vue/no-v-html": "off", // 允许 v-html
+      "vue/require-default-prop": "off", // 允许没有默认值的 prop
+      "vue/multi-word-component-names": "off", // 关闭组件名称多词要求
       "vue/html-self-closing": [
         "error",
         {
-          html: {
-            void: "always",
-            normal: "always",
-            component: "always",
-          },
+          html: { void: "always", normal: "always", component: "always" },
           svg: "always",
           math: "always",
         },

From 96f4abbf82015991bb54e912b33d5b2da9e8c29e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 8 Nov 2024 14:00:34 +0800
Subject: [PATCH 037/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20pri?=
 =?UTF-8?q?ntWidth=20=E8=AE=BE=E7=BD=AE=E6=AF=8F=E8=A1=8C=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=AD=97=E7=AC=A6=E6=95=B0=E6=97=A0=E6=95=88=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

举例：行最大字符长度设置 180 ，行字符数 179 就换行了

#IB2SDA #IB2SDA
---
 .prettierrc     | 28 ++++++++++++++++++++++++++++
 .prettierrc.cjs | 46 ----------------------------------------------
 2 files changed, 28 insertions(+), 46 deletions(-)
 create mode 100644 .prettierrc
 delete mode 100644 .prettierrc.cjs

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 00000000..8d1ba245
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,28 @@
+{
+  "arrowParens": "always",
+  "bracketSameLine": false,
+  "bracketSpacing": true,
+  "embeddedLanguageFormatting": "auto",
+  "htmlWhitespaceSensitivity": "ignore",
+  "insertPragma": false,
+  "jsxSingleQuote": false,
+  "printWidth": 80,
+  "proseWrap": "preserve",
+  "quoteProps": "as-needed",
+  "requirePragma": false,
+  "semi": true,
+  "singleQuote": false,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "useTabs": false,
+  "vueIndentScriptAndStyle": false,
+  "endOfLine": "auto",
+  "overrides": [
+    {
+      "files": "*.html",
+      "options": {
+        "parser": "html"
+      }
+    }
+  ]
+}
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
deleted file mode 100644
index 419b91e6..00000000
--- a/.prettierrc.cjs
+++ /dev/null
@@ -1,46 +0,0 @@
-module.exports = {
-  // (x)=>{},单个参数箭头函数是否显示小括号。(always:始终显示;avoid:省略括号。默认:always)
-  arrowParens: "always",
-  // 开始标签的右尖括号是否跟随在最后一行属性末尾，默认false
-  bracketSameLine: false,
-  // 对象字面量的括号之间打印空格 (true - Example: { foo: bar } ; false - Example: {foo:bar})
-  bracketSpacing: true,
-  // 是否格式化一些文件中被嵌入的代码片段的风格(auto|off;默认auto)
-  embeddedLanguageFormatting: "auto",
-  // 指定 HTML 文件的空格敏感度 (css|strict|ignore;默认css)
-  htmlWhitespaceSensitivity: "ignore",
-  // 当文件已经被 Prettier 格式化之后，是否会在文件顶部插入一个特殊的 @format 标记，默认false
-  insertPragma: false,
-  // 在 JSX 中使用单引号替代双引号，默认false
-  jsxSingleQuote: false,
-  // 每行最多字符数量，超出换行(默认80)
-  printWidth: 80,
-  // 超出打印宽度 (always | never | preserve )
-  proseWrap: "preserve",
-  // 对象属性是否使用引号(as-needed | consistent | preserve;默认as-needed:对象的属性需要加引号才添加;)
-  quoteProps: "as-needed",
-  // 是否只格式化在文件顶部包含特定注释(@prettier| @format)的文件，默认false
-  requirePragma: false,
-  // 结尾添加分号
-  semi: true,
-  // 使用单引号 (true:单引号;false:双引号)
-  singleQuote: false,
-  // 缩进空格数，默认2个空格
-  tabWidth: 2,
-  // 元素末尾是否加逗号，默认es5: ES5中的 objects, arrays 等会添加逗号，TypeScript 中的 type 后不加逗号
-  trailingComma: "es5",
-  // 指定缩进方式，空格或tab，默认false，即使用空格
-  useTabs: false,
-  // vue 文件中是否缩进 <style> 和 <script> 标签，默认 false
-  vueIndentScriptAndStyle: false,
-
-  endOfLine: "auto",
-  overrides: [
-    {
-      files: "*.html",
-      options: {
-        parser: "html",
-      },
-    },
-  ],
-};

From e22f850e554fafeb55905bca92f814d615ed9a19 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 8 Nov 2024 21:10:39 +0800
Subject: [PATCH 038/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts                        |   4 +-
 .../system/user/components/UserImport.vue     |  80 ++++----
 src/views/system/user/index.vue               | 183 ++++++------------
 3 files changed, 94 insertions(+), 173 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 6a1d23af..9e3b590c 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -248,6 +248,8 @@ export interface UserPageQuery extends PageQuery {
 
 /** 用户分页对象 */
 export interface UserPageVO {
+  /** 用户ID */
+  id: number;
   /** 用户头像URL */
   avatar?: string;
   /** 创建时间 */
@@ -258,8 +260,6 @@ export interface UserPageVO {
   email?: string;
   /** 性别 */
   gender?: number;
-  /** 用户ID */
-  id?: number;
   /** 手机号 */
   mobile?: string;
   /** 用户昵称 */
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 5cefc690..bfe37fd7 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    v-model="dialogVisible"
+    v-model="visible"
     :align-center="true"
     title="导入数据"
     width="600px"
@@ -52,7 +52,7 @@
         <el-button
           type="primary"
           :disabled="importFormData.files.length === 0"
-          @click="handleSubmit"
+          @click="handleUpload"
         >
           确 定
         </el-button>
@@ -63,24 +63,14 @@
 </template>
 
 <script lang="ts" setup>
-import { type UploadUserFile } from "element-plus";
-
+import { ElMessage, type UploadUserFile } from "element-plus";
 import UserAPI from "@/api/system/user";
 
-const props = defineProps({
-  visible: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-const emit = defineEmits(["update:visible", "import-success"]);
-
-const dialogVisible = computed({
-  get: () => props.visible,
-  set: (val) => {
-    emit("update:visible", val);
-  },
+const emit = defineEmits(["import-success"]);
+const visible = defineModel("modelValue", {
+  type: Boolean,
+  required: true,
+  default: false,
 });
 
 const importFormRef = ref(null);
@@ -96,41 +86,16 @@ const importFormRules = {
   files: [{ required: true, message: "文件不能为空", trigger: "blur" }],
 };
 
-const emptyFileList = () => {
-  importFormData.files.length = 0;
-};
-
-const handleClose = () => {
-  emptyFileList();
-  dialogVisible.value = false;
-};
-
-const handleSubmit = async () => {
-  if (!importFormData.files.length) {
-    ElMessage.warning("请选择文件");
-    return;
-  }
-
-  try {
-    await UserAPI.import(1, importFormData.files[0].raw as File);
-    ElMessage.success("上传成功");
-    emit("import-success");
-    handleClose();
-  } catch (error) {
-    ElMessage.error("上传失败");
-  }
-};
-
+// 文件超出个数限制
 const handleFileExceed = () => {
   ElMessage.warning("只能上传一个文件");
 };
 
+// 下载导入模板
 const handleDownloadTemplate = () => {
   UserAPI.downloadTemplate().then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
+    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 
@@ -148,4 +113,27 @@ const handleDownloadTemplate = () => {
     window.URL.revokeObjectURL(downloadUrl);
   });
 };
+
+// 上传文件
+const handleUpload = async () => {
+  if (!importFormData.files.length) {
+    ElMessage.warning("请选择文件");
+    return;
+  }
+
+  try {
+    await UserAPI.import(1, importFormData.files[0].raw as File);
+    ElMessage.success("上传成功");
+    emit("import-success");
+    handleClose();
+  } catch (error) {
+    ElMessage.error("上传失败");
+  }
+};
+
+// 关闭弹窗
+const handleClose = () => {
+  importFormData.files.length = 0;
+  visible.value = false;
+};
 </script>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ce0936fd..076a7419 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,14 +47,8 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" @click="handleQuery">
-                <template #icon><Search /></template>
-                搜索
-              </el-button>
-              <el-button @click="handleResetQuery">
-                <template #icon><Refresh /></template>
-                重置
-              </el-button>
+              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+              <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -65,18 +59,18 @@
               <el-button
                 v-hasPerm="['sys:user:add']"
                 type="success"
+                icon="plus"
                 @click="handleOpenDialog()"
               >
-                <template #icon><Plus /></template>
                 新增
               </el-button>
               <el-button
                 v-hasPerm="['sys:user:delete']"
                 type="danger"
-                :disabled="removeIds.length === 0"
+                icon="delete"
+                :disabled="selectIds.length === 0"
                 @click="handleDelete()"
               >
-                <template #icon><Delete /></template>
                 删除
               </el-button>
             </div>
@@ -101,88 +95,56 @@
             </div>
           </div>
 
-          <el-table
-            v-loading="loading"
-            :data="pageData"
-            @selection-change="handleSelectionChange"
-          >
+          <el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="编号" align="center" prop="id" width="60" />
             <el-table-column label="用户名" align="center" prop="username" />
-            <el-table-column
-              label="昵称"
-              width="100"
-              align="center"
-              prop="nickname"
-            />
-
+            <el-table-column label="昵称" width="100" align="center" prop="nickname" />
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
                 <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>
-
-            <el-table-column
-              label="部门"
-              width="120"
-              align="center"
-              prop="deptName"
-            />
-            <el-table-column
-              label="手机号码"
-              align="center"
-              prop="mobile"
-              width="120"
-            />
-
-            <el-table-column
-              label="状态"
-              align="center"
-              prop="status"
-              width="80"
-            >
+            <el-table-column label="部门" width="120" align="center" prop="deptName" />
+            <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+            <el-table-column label="状态" align="center" prop="status" width="80">
               <template #default="scope">
                 <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">
                   {{ scope.row.status == 1 ? "正常" : "禁用" }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              label="创建时间"
-              align="center"
-              prop="createTime"
-              width="120"
-            />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="120" />
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
                   v-hasPerm="['sys:user:password:reset']"
                   type="primary"
+                  icon="RefreshLeft"
                   size="small"
                   link
                   @click="hancleResetPassword(scope.row)"
                 >
-                  <template #icon><RefreshLeft /></template>
                   重置密码
                 </el-button>
                 <el-button
                   v-hasPerm="['sys:user:edit']"
                   type="primary"
+                  icon="edit"
                   link
                   size="small"
                   @click="handleOpenDialog(scope.row.id)"
                 >
-                  <template #icon><Edit /></template>
                   编辑
                 </el-button>
                 <el-button
                   v-hasPerm="['sys:user:delete']"
                   type="danger"
+                  icon="delete"
                   link
                   size="small"
                   @click="handleDelete(scope.row.id)"
                 >
-                  <template #icon><Delete /></template>
                   删除
                 </el-button>
               </template>
@@ -207,12 +169,7 @@
       append-to-body
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="userFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="userFormRef" :model="formData" :rules="rules" label-width="80px">
         <el-form-item label="用户名" prop="username">
           <el-input
             v-model="formData.username"
@@ -252,19 +209,11 @@
         </el-form-item>
 
         <el-form-item label="手机号码" prop="mobile">
-          <el-input
-            v-model="formData.mobile"
-            placeholder="请输入手机号码"
-            maxlength="11"
-          />
+          <el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11" />
         </el-form-item>
 
         <el-form-item label="邮箱" prop="email">
-          <el-input
-            v-model="formData.email"
-            placeholder="请输入邮箱"
-            maxlength="50"
-          />
+          <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
@@ -287,25 +236,13 @@
       </template>
     </el-drawer>
 
-    <!-- 用户导入弹窗 -->
-    <UserImport
-      v-model:visible="importDialogVisible"
-      @import-success="handleUserImportSuccess()"
-    />
+    <!-- 用户导入 -->
+    <UserImport v-model="importDialogVisible" @import-success="handleQuery()" />
   </div>
 </template>
 
 <script setup lang="ts">
-defineOptions({
-  name: "User",
-  inheritAttrs: false,
-});
-
-import UserAPI, {
-  UserForm,
-  UserPageQuery,
-  UserPageVO,
-} from "@/api/system/user";
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user";
 
 import DeptAPI from "@/api/system/dept";
 import RoleAPI from "@/api/system/role";
@@ -313,38 +250,32 @@ import RoleAPI from "@/api/system/role";
 import DeptTree from "./components/DeptTree.vue";
 import UserImport from "./components/UserImport.vue";
 
+defineOptions({
+  name: "User",
+  inheritAttrs: false,
+});
+
 const queryFormRef = ref(ElForm);
 const userFormRef = ref(ElForm);
 
-const loading = ref(false);
-const removeIds = ref([]);
-const total = ref(0);
-const pageData = ref<UserPageVO[]>();
-// 部门下拉数据源
-const deptOptions = ref<OptionType[]>();
-// 角色下拉数据源
-const roleOptions = ref<OptionType[]>();
-// 用户查询参数
 const queryParams = reactive<UserPageQuery>({
   pageNum: 1,
   pageSize: 10,
 });
 
-// 用户弹窗
+const pageData = ref<UserPageVO[]>();
+const total = ref(0);
+const loading = ref(false);
+
 const dialog = reactive({
   visible: false,
-  title: "",
+  title: "新增用户",
 });
 
-// 导入弹窗显示状态
-const importDialogVisible = ref(false);
-
-// 用户表单数据
 const formData = reactive<UserForm>({
   status: 1,
 });
 
-// 用户表单校验规则
 const rules = reactive({
   username: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
   nickname: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
@@ -366,7 +297,16 @@ const rules = reactive({
   ],
 });
 
-//查询
+// 选中的用户ID
+const selectIds = ref<number[]>([]);
+// 部门下拉数据源
+const deptOptions = ref<OptionType[]>();
+// 角色下拉数据源
+const roleOptions = ref<OptionType[]>();
+// 导入弹窗显示状态
+const importDialogVisible = ref(false);
+
+// 查询
 function handleQuery() {
   loading.value = true;
   UserAPI.getPage(queryParams)
@@ -388,24 +328,19 @@ function handleResetQuery() {
   handleQuery();
 }
 
-// 行复选框选中记录选中ID集合
-function handleSelectionChange(selection: any) {
-  removeIds.value = selection.map((item: any) => item.id);
+// 选中项发生变化
+function handleSelectionChange(selection: any[]) {
+  selectIds.value = selection.map((item) => item.id);
 }
 
 // 重置密码
-function hancleResetPassword(row: { [key: string]: any }) {
-  ElMessageBox.prompt(
-    "请输入用户「" + row.username + "」的新密码",
-    "重置密码",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-    }
-  ).then(
+function hancleResetPassword(row: UserPageVO) {
+  ElMessageBox.prompt("请输入用户【" + row.username + "】的新密码", "重置密码", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+  }).then(
     ({ value }) => {
       if (!value || value.length < 6) {
-        // 检查密码是否为空或少于6位
         ElMessage.warning("密码至少需要6位字符，请重新输入");
         return false;
       }
@@ -451,7 +386,7 @@ function handleCloseDialog() {
   formData.status = 1;
 }
 
-// 表单提交
+// 提交用户表单（防抖处理）
 const handleSubmit = useThrottleFn(() => {
   userFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -478,9 +413,13 @@ const handleSubmit = useThrottleFn(() => {
   });
 }, 3000);
 
-// 删除用户
+/**
+ * 删除用户
+ *
+ * @param id  用户ID
+ */
 function handleDelete(id?: number) {
-  const userIds = [id || removeIds.value].join(",");
+  const userIds = [id || selectIds.value].join(",");
   if (!userIds) {
     ElMessage.warning("请勾选删除项");
     return;
@@ -505,23 +444,17 @@ function handleDelete(id?: number) {
     }
   );
 }
-// 打开导入弹窗 *
+
+// 打开导入弹窗
 function handleOpenImportDialog() {
   importDialogVisible.value = true;
 }
 
-// 导入用户成功
-function handleUserImportSuccess() {
-  handleQuery();
-}
-
 // 导出用户
 function handleExport() {
   UserAPI.export(queryParams).then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
+    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 

From 1502ba981caf5ba79d1e1e86be020e20eb4471ef Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 8 Nov 2024 22:32:05 +0800
Subject: [PATCH 039/497] =?UTF-8?q?chore:=20:hammer:=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20prettier=20=E8=A1=8C=E6=9C=80=E5=A4=A7=E5=AD=97=E7=AC=A6?=
 =?UTF-8?q?=E4=B8=BA=20100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.prettierrc b/.prettierrc
index 8d1ba245..df438cb8 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,7 +6,7 @@
   "htmlWhitespaceSensitivity": "ignore",
   "insertPragma": false,
   "jsxSingleQuote": false,
-  "printWidth": 80,
+  "printWidth": 100,
   "proseWrap": "preserve",
   "quoteProps": "as-needed",
   "requirePragma": false,

From eb2f87c129bc39a9708a0c5f8997006dd4a54beb Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 8 Nov 2024 23:48:28 +0800
Subject: [PATCH 040/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 79 ++++++++++++------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index fe8e7793..86ec1538 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,68 +1,55 @@
 <template>
-  <el-drawer
-    v-model="settingsVisible"
-    size="300"
-    :title="$t('settings.project')"
-  >
+  <el-drawer v-model="settingsVisible" size="300" :title="$t('settings.project')">
     <el-divider>{{ $t("settings.theme") }}</el-divider>
 
     <div class="flex-center">
-      <el-switch
-        v-model="isDark"
-        active-icon="Moon"
-        inactive-icon="Sunny"
-        @change="changeTheme"
-      />
+      <el-switch v-model="isDark" active-icon="Moon" inactive-icon="Sunny" @change="changeTheme" />
     </div>
 
     <el-divider>{{ $t("settings.interface") }}</el-divider>
 
-    <div class="setting-item">
+    <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.themeColor") }}</span>
-      <ThemeColorPicker
-        v-model="settingsStore.themeColor"
-        @update:model-value="changeThemeColor"
-      />
+      <ThemeColorPicker v-model="settingsStore.themeColor" @update:model-value="changeThemeColor" />
     </div>
 
-    <div class="setting-item">
+    <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.tagsView") }}</span>
       <el-switch v-model="settingsStore.tagsView" />
     </div>
 
-    <div class="setting-item">
+    <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.fixedHeader") }}</span>
       <el-switch v-model="settingsStore.fixedHeader" />
     </div>
 
-    <div class="setting-item">
+    <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.sidebarLogo") }}</span>
       <el-switch v-model="settingsStore.sidebarLogo" />
     </div>
 
-    <div class="setting-item">
+    <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.watermark") }}</span>
       <el-switch v-model="settingsStore.watermarkEnabled" />
     </div>
 
     <el-divider>{{ $t("settings.navigation") }}</el-divider>
 
-    <LayoutSelect
-      v-model="settingsStore.layout"
-      @update:model-value="changeLayout"
-    />
+    <LayoutSelect v-model="settingsStore.layout" @update:model-value="changeLayout" />
   </el-drawer>
 </template>
 
 <script setup lang="ts">
-import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { ThemeEnum } from "@/enums/ThemeEnum";
 
+import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
+
 const route = useRoute();
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
+const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
 
 const settingsVisible = computed({
   get() {
@@ -73,19 +60,30 @@ const settingsVisible = computed({
   },
 });
 
-/** 切换主题颜色 */
+/**
+ *  切换主题颜色
+ *
+ * @param color 颜色
+ */
 function changeThemeColor(color: string) {
   settingsStore.changeThemeColor(color);
 }
 
-/** 切换主题 */
-const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
+/**
+ * 切换主题
+ *
+ * @param val 是否为暗黑模式
+ */
 const changeTheme = (val: any) => {
   isDark.value = val;
   settingsStore.changeTheme(isDark.value ? ThemeEnum.DARK : ThemeEnum.LIGHT);
 };
 
-/** 切换布局 */
+/**
+ * 切换布局
+ *
+ * @param layout 布局  LayoutEnum
+ */
 function changeLayout(layout: string) {
   settingsStore.changeLayout(layout);
   if (layout === LayoutEnum.MIX) {
@@ -93,15 +91,24 @@ function changeLayout(layout: string) {
   }
 }
 
-/** 重新激活顶部菜单 */
-function againActiveTop(newVal: string) {
-  const parent = findOutermostParent(permissionStore.routes, newVal);
+/**
+ * 重新激活顶部菜单
+ *
+ * @param routeName 路由名称
+ */
+function againActiveTop(routeName: string) {
+  const parent = findOutermostParent(permissionStore.routes, routeName);
   if (appStore.activeTopMenuPath !== parent.path) {
     appStore.activeTopMenu(parent.path);
   }
 }
 
-/** 递归查找最外层父节点 */
+/**
+ * 查找最外层父级
+ *
+ * @param tree 树形数据
+ * @param findName 查找的名称
+ */
 function findOutermostParent(tree: any[], findName: string) {
   let parentMap: any = {};
 
@@ -131,8 +138,4 @@ function findOutermostParent(tree: any[], findName: string) {
 }
 </script>
 
-<style lang="scss" scoped>
-.setting-item {
-  @apply py-1 flex-x-between;
-}
-</style>
+<style lang="scss" scoped></style>

From 79cacae85e06fda5d861e8100ad563537f8be5d7 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 11 Nov 2024 00:42:38 +0800
Subject: [PATCH 041/497] =?UTF-8?q?fix:=20:bug:=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 26af93b0..b4675845 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -62,7 +62,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import Navbar from "./components/Navbar/index.vue";
+import Navbar from "./components/NavBar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From 817b576ca7376619b61457d91c234284dea01be4 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 11 Nov 2024 08:09:54 +0800
Subject: [PATCH 042/497] =?UTF-8?q?chore:=20:hammer:=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E8=A1=8C=E6=9C=80=E5=A4=A7=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6?=
 =?UTF-8?q?=E4=B8=BA80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.prettierrc b/.prettierrc
index df438cb8..8d1ba245 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,7 +6,7 @@
   "htmlWhitespaceSensitivity": "ignore",
   "insertPragma": false,
   "jsxSingleQuote": false,
-  "printWidth": 100,
+  "printWidth": 80,
   "proseWrap": "preserve",
   "quoteProps": "as-needed",
   "requirePragma": false,

From 8bc430e3093cd8ed183d8c696f21e5ff96082421 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 11 Nov 2024 08:13:57 +0800
Subject: [PATCH 043/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96=E5=92=8C=E5=AF=BC=E5=85=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/NavbarRight.vue         |  4 +-
 src/layout/components/Settings/index.vue      | 23 ++++-
 src/layout/index.vue                          |  2 +-
 src/store/modules/user.ts                     |  2 +-
 src/styles/index.scss                         |  4 -
 src/views/system/dept/index.vue               |  6 +-
 .../system/user/components/UserImport.vue     |  4 +-
 src/views/system/user/index.vue               | 94 +++++++++++++++----
 vite.config.ts                                |  1 +
 9 files changed, 105 insertions(+), 35 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 7f577ebf..224d3f82 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -36,8 +36,8 @@ import { DeviceEnum } from "@/enums/DeviceEnum";
 
 import { useAppStore, useSettingsStore } from "@/store";
 
-import UserProfile from "./UserProfile.vue";
-import Notification from "./Notification.vue";
+import UserProfile from "@/layout/components/NavBar/components/UserProfile.vue";
+import Notification from "@/layout/components/NavBar/components/Notification.vue";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 86ec1538..7255c45d 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,16 +1,28 @@
 <template>
-  <el-drawer v-model="settingsVisible" size="300" :title="$t('settings.project')">
+  <el-drawer
+    v-model="settingsVisible"
+    size="300"
+    :title="$t('settings.project')"
+  >
     <el-divider>{{ $t("settings.theme") }}</el-divider>
 
     <div class="flex-center">
-      <el-switch v-model="isDark" active-icon="Moon" inactive-icon="Sunny" @change="changeTheme" />
+      <el-switch
+        v-model="isDark"
+        active-icon="Moon"
+        inactive-icon="Sunny"
+        @change="changeTheme"
+      />
     </div>
 
     <el-divider>{{ $t("settings.interface") }}</el-divider>
 
     <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.themeColor") }}</span>
-      <ThemeColorPicker v-model="settingsStore.themeColor" @update:model-value="changeThemeColor" />
+      <ThemeColorPicker
+        v-model="settingsStore.themeColor"
+        @update:model-value="changeThemeColor"
+      />
     </div>
 
     <div class="py-1 flex-x-between">
@@ -35,7 +47,10 @@
 
     <el-divider>{{ $t("settings.navigation") }}</el-divider>
 
-    <LayoutSelect v-model="settingsStore.layout" @update:model-value="changeLayout" />
+    <LayoutSelect
+      v-model="settingsStore.layout"
+      @update:model-value="changeLayout"
+    />
   </el-drawer>
 </template>
 
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b4675845..ea52148c 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -62,7 +62,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import Navbar from "./components/NavBar/index.vue";
+import Navbar from "@/layout/components/NavBar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index f5251aa1..59fdee2b 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -69,7 +69,7 @@ export const useUserStore = defineStore("user", () => {
   }
 
   /**
-   *  清理用户会话
+   * 清理用户会话
    *
    * @returns
    */
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 1ad8ad8c..349c84fd 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -26,7 +26,3 @@
     color: rgb(32 160 255);
   }
 }
-
-.search-container .el-form .el-input {
-  width: 16rem !important;
-}
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ff06d2eb..f53def24 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -38,8 +38,8 @@
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <template #header>
+    <el-card shadow="never">
+      <div class="mb-10px">
         <el-button
           v-hasPerm="['sys:dept:add']"
           type="success"
@@ -61,7 +61,7 @@
           </template>
           删除
         </el-button>
-      </template>
+      </div>
 
       <el-table
         v-loading="loading"
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index bfe37fd7..f04a47df 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -95,7 +95,9 @@ const handleFileExceed = () => {
 const handleDownloadTemplate = () => {
   UserAPI.downloadTemplate().then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
+    const fileName = decodeURI(
+      response.headers["content-disposition"].split(";")[1].split("=")[1]
+    );
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 076a7419..805be941 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,8 +47,12 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-              <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              <el-button type="primary" icon="search" @click="handleQuery">
+                搜索
+              </el-button>
+              <el-button icon="refresh" @click="handleResetQuery">
+                重置
+              </el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -95,26 +99,55 @@
             </div>
           </div>
 
-          <el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange">
+          <el-table
+            v-loading="loading"
+            :data="pageData"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="编号" align="center" prop="id" width="60" />
             <el-table-column label="用户名" align="center" prop="username" />
-            <el-table-column label="昵称" width="100" align="center" prop="nickname" />
+            <el-table-column
+              label="昵称"
+              width="100"
+              align="center"
+              prop="nickname"
+            />
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
                 <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>
-            <el-table-column label="部门" width="120" align="center" prop="deptName" />
-            <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
-            <el-table-column label="状态" align="center" prop="status" width="80">
+            <el-table-column
+              label="部门"
+              width="120"
+              align="center"
+              prop="deptName"
+            />
+            <el-table-column
+              label="手机号码"
+              align="center"
+              prop="mobile"
+              width="120"
+            />
+            <el-table-column
+              label="状态"
+              align="center"
+              prop="status"
+              width="80"
+            >
               <template #default="scope">
                 <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">
                   {{ scope.row.status == 1 ? "正常" : "禁用" }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="120" />
+            <el-table-column
+              label="创建时间"
+              align="center"
+              prop="createTime"
+              width="120"
+            />
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
@@ -169,7 +202,12 @@
       append-to-body
       @close="handleCloseDialog"
     >
-      <el-form ref="userFormRef" :model="formData" :rules="rules" label-width="80px">
+      <el-form
+        ref="userFormRef"
+        :model="formData"
+        :rules="rules"
+        label-width="80px"
+      >
         <el-form-item label="用户名" prop="username">
           <el-input
             v-model="formData.username"
@@ -209,11 +247,19 @@
         </el-form-item>
 
         <el-form-item label="手机号码" prop="mobile">
-          <el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11" />
+          <el-input
+            v-model="formData.mobile"
+            placeholder="请输入手机号码"
+            maxlength="11"
+          />
         </el-form-item>
 
         <el-form-item label="邮箱" prop="email">
-          <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
+          <el-input
+            v-model="formData.email"
+            placeholder="请输入邮箱"
+            maxlength="50"
+          />
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
@@ -242,13 +288,17 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user";
+import UserAPI, {
+  UserForm,
+  UserPageQuery,
+  UserPageVO,
+} from "@/api/system/user";
 
 import DeptAPI from "@/api/system/dept";
 import RoleAPI from "@/api/system/role";
 
-import DeptTree from "./components/DeptTree.vue";
-import UserImport from "./components/UserImport.vue";
+import DeptTree from "@/views/system/user/components/DeptTree.vue";
+import UserImport from "@/views/system/user/components/UserImport.vue";
 
 defineOptions({
   name: "User",
@@ -335,10 +385,14 @@ function handleSelectionChange(selection: any[]) {
 
 // 重置密码
 function hancleResetPassword(row: UserPageVO) {
-  ElMessageBox.prompt("请输入用户【" + row.username + "】的新密码", "重置密码", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-  }).then(
+  ElMessageBox.prompt(
+    "请输入用户【" + row.username + "】的新密码",
+    "重置密码",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    }
+  ).then(
     ({ value }) => {
       if (!value || value.length < 6) {
         ElMessage.warning("密码至少需要6位字符，请重新输入");
@@ -454,7 +508,9 @@ function handleOpenImportDialog() {
 function handleExport() {
   UserAPI.export(queryParams).then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
+    const fileName = decodeURI(
+      response.headers["content-disposition"].split(";")[1].split("=")[1]
+    );
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 
diff --git a/vite.config.ts b/vite.config.ts
index 0658fade..aa6468e6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -107,6 +107,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       include: [
         "vue",
         "vue-router",
+        "element-plus",
         "pinia",
         "axios",
         "@vueuse/core",

From c0de46905934eccf62f43c981d041c44ef5a993e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 11 Nov 2024 08:15:30 +0800
Subject: [PATCH 044/497] chore: :hammer: bump version to 2.18.5

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3f5bbaa2..7656720e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.4",
+  "version": "2.18.5",
   "private": true,
   "type": "module",
   "scripts": {

From d2435385fb72a4ac0f7b9cb981b237488dc50038 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 00:13:56 +0800
Subject: [PATCH 045/497] =?UTF-8?q?chore:=20:hammer:=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E8=A1=8C=E6=9C=80=E5=A4=A7=E5=AD=97=E7=AC=A6=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA100?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.prettierrc b/.prettierrc
index 8d1ba245..df438cb8 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -6,7 +6,7 @@
   "htmlWhitespaceSensitivity": "ignore",
   "insertPragma": false,
   "jsxSingleQuote": false,
-  "printWidth": 80,
+  "printWidth": 100,
   "proseWrap": "preserve",
   "quoteProps": "as-needed",
   "requirePragma": false,

From c34cbcb03ddeb4dca3b7f7bd6b1da1b08d8d6ecf Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 00:17:53 +0800
Subject: [PATCH 046/497] =?UTF-8?q?fix:=20:bug:=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4=E5=BC=95=E5=8F=91=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/NavbarRight.vue          |  9 +++------
 src/layout/components/Sidebar/index.vue        |  2 +-
 src/layout/index.vue                           | 18 +++++-------------
 3 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 224d3f82..c4ad28ac 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -22,10 +22,7 @@
     <UserProfile />
 
     <!-- 设置面板 -->
-    <div
-      v-if="defaultSettings.showSettings"
-      @click="settingStore.settingsVisible = true"
-    >
+    <div v-if="defaultSettings.showSettings" @click="settingStore.settingsVisible = true">
       <SvgIcon icon-class="setting" />
     </div>
   </div>
@@ -36,8 +33,8 @@ import { DeviceEnum } from "@/enums/DeviceEnum";
 
 import { useAppStore, useSettingsStore } from "@/store";
 
-import UserProfile from "@/layout/components/NavBar/components/UserProfile.vue";
-import Notification from "@/layout/components/NavBar/components/Notification.vue";
+import UserProfile from "./UserProfile.vue";
+import Notification from "./Notification.vue";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 4db8f35a..022c4594 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,7 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-import NavbarRight from "../Navbar/components/NavbarRight.vue";
+import NavbarRight from "../NavBar/components/NavbarRight.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/layout/index.vue b/src/layout/index.vue
index ea52148c..5fd72995 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -14,16 +14,10 @@
     <div v-if="layout === LayoutEnum.MIX" class="mix-container">
       <div class="mix-container-sidebar">
         <el-scrollbar>
-          <SidebarMenu
-            :menu-list="mixLeftMenus"
-            :base-path="activeTopMenuPath"
-          />
+          <SidebarMenu :menu-list="mixLeftMenus" :base-path="activeTopMenuPath" />
         </el-scrollbar>
         <div class="sidebar-toggle">
-          <hamburger
-            :is-active="appStore.sidebar.opened"
-            @toggle-click="toggleSidebar"
-          />
+          <hamburger :is-active="appStore.sidebar.opened" @toggle-click="toggleSidebar" />
         </div>
       </div>
 
@@ -43,7 +37,7 @@
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
-        <Navbar v-if="layout === LayoutEnum.LEFT" />
+        <NavBar v-if="layout === LayoutEnum.LEFT" />
         <TagsView v-if="showTagsView" />
       </div>
       <AppMain />
@@ -62,7 +56,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import Navbar from "@/layout/components/NavBar/index.vue";
+import NavBar from "./components/NavBar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
@@ -97,9 +91,7 @@ const classObj = computed(() => ({
 }));
 
 watchEffect(() => {
-  appStore.toggleDevice(
-    width.value < WIDTH_DESKTOP ? DeviceEnum.MOBILE : DeviceEnum.DESKTOP
-  );
+  appStore.toggleDevice(width.value < WIDTH_DESKTOP ? DeviceEnum.MOBILE : DeviceEnum.DESKTOP);
   if (width.value >= WIDTH_DESKTOP) {
     appStore.openSideBar();
   } else {

From 43ac2a823cc4de805c0fd9478e0877ad5b3c366d Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 00:20:31 +0800
Subject: [PATCH 047/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E7=BB=84=E4=BB=B6=E8=B7=AF=E5=BE=84=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E4=B8=BA=E7=9B=B8=E5=AF=B9=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 94 +++++++--------------------------
 1 file changed, 19 insertions(+), 75 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 805be941..076a7419 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -47,12 +47,8 @@
             </el-form-item>
 
             <el-form-item>
-              <el-button type="primary" icon="search" @click="handleQuery">
-                搜索
-              </el-button>
-              <el-button icon="refresh" @click="handleResetQuery">
-                重置
-              </el-button>
+              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+              <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
             </el-form-item>
           </el-form>
         </div>
@@ -99,55 +95,26 @@
             </div>
           </div>
 
-          <el-table
-            v-loading="loading"
-            :data="pageData"
-            @selection-change="handleSelectionChange"
-          >
+          <el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="编号" align="center" prop="id" width="60" />
             <el-table-column label="用户名" align="center" prop="username" />
-            <el-table-column
-              label="昵称"
-              width="100"
-              align="center"
-              prop="nickname"
-            />
+            <el-table-column label="昵称" width="100" align="center" prop="nickname" />
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
                 <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>
-            <el-table-column
-              label="部门"
-              width="120"
-              align="center"
-              prop="deptName"
-            />
-            <el-table-column
-              label="手机号码"
-              align="center"
-              prop="mobile"
-              width="120"
-            />
-            <el-table-column
-              label="状态"
-              align="center"
-              prop="status"
-              width="80"
-            >
+            <el-table-column label="部门" width="120" align="center" prop="deptName" />
+            <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+            <el-table-column label="状态" align="center" prop="status" width="80">
               <template #default="scope">
                 <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">
                   {{ scope.row.status == 1 ? "正常" : "禁用" }}
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column
-              label="创建时间"
-              align="center"
-              prop="createTime"
-              width="120"
-            />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="120" />
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
@@ -202,12 +169,7 @@
       append-to-body
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="userFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="userFormRef" :model="formData" :rules="rules" label-width="80px">
         <el-form-item label="用户名" prop="username">
           <el-input
             v-model="formData.username"
@@ -247,19 +209,11 @@
         </el-form-item>
 
         <el-form-item label="手机号码" prop="mobile">
-          <el-input
-            v-model="formData.mobile"
-            placeholder="请输入手机号码"
-            maxlength="11"
-          />
+          <el-input v-model="formData.mobile" placeholder="请输入手机号码" maxlength="11" />
         </el-form-item>
 
         <el-form-item label="邮箱" prop="email">
-          <el-input
-            v-model="formData.email"
-            placeholder="请输入邮箱"
-            maxlength="50"
-          />
+          <el-input v-model="formData.email" placeholder="请输入邮箱" maxlength="50" />
         </el-form-item>
 
         <el-form-item label="状态" prop="status">
@@ -288,17 +242,13 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI, {
-  UserForm,
-  UserPageQuery,
-  UserPageVO,
-} from "@/api/system/user";
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user";
 
 import DeptAPI from "@/api/system/dept";
 import RoleAPI from "@/api/system/role";
 
-import DeptTree from "@/views/system/user/components/DeptTree.vue";
-import UserImport from "@/views/system/user/components/UserImport.vue";
+import DeptTree from "./components/DeptTree.vue";
+import UserImport from "./components/UserImport.vue";
 
 defineOptions({
   name: "User",
@@ -385,14 +335,10 @@ function handleSelectionChange(selection: any[]) {
 
 // 重置密码
 function hancleResetPassword(row: UserPageVO) {
-  ElMessageBox.prompt(
-    "请输入用户【" + row.username + "】的新密码",
-    "重置密码",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-    }
-  ).then(
+  ElMessageBox.prompt("请输入用户【" + row.username + "】的新密码", "重置密码", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+  }).then(
     ({ value }) => {
       if (!value || value.length < 6) {
         ElMessage.warning("密码至少需要6位字符，请重新输入");
@@ -508,9 +454,7 @@ function handleOpenImportDialog() {
 function handleExport() {
   UserAPI.export(queryParams).then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
+    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 

From e597853e5b57cf7312230d9b33bf693883b3d456 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 00:21:53 +0800
Subject: [PATCH 048/497] =?UTF-8?q?refactor:=20:recycle:=20vue=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=B1=BB=E5=9E=8B=E5=A3=B0=E6=98=8E=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/env.d.ts       | 6 ------
 src/types/shims-vue.d.ts | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)
 create mode 100644 src/types/shims-vue.d.ts

diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 49813f31..301f03ea 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -1,11 +1,5 @@
 // https://cn.vitejs.dev/guide/env-and-mode
 
-declare module "*.vue" {
-  import type { DefineComponent } from "vue";
-  const component: DefineComponent<object, object, any>;
-  export default component;
-}
-
 // TypeScript 类型提示都为 string： https://github.com/vitejs/vite/issues/6930
 interface ImportMetaEnv {
   /** 应用端口 */
diff --git a/src/types/shims-vue.d.ts b/src/types/shims-vue.d.ts
new file mode 100644
index 00000000..d77b62be
--- /dev/null
+++ b/src/types/shims-vue.d.ts
@@ -0,0 +1,5 @@
+declare module "*.vue" {
+  import type { DefineComponent } from "vue";
+  const component: DefineComponent<{}, {}, any>;
+  export default component;
+}

From 8c5c15f383948ef7de2f612f26888959d437275c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Tue, 12 Nov 2024 14:33:04 +0800
Subject: [PATCH 049/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BA=86=E7=B3=BB=E7=BB=9F=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复了系统配置的语法错误
代码规范文件增加注释
---
 .prettierrc                       | 28 -----------
 .prettierrc.yaml                  | 41 ++++++++++++++++
 src/views/system/config/index.vue | 78 ++++++-------------------------
 3 files changed, 55 insertions(+), 92 deletions(-)
 delete mode 100644 .prettierrc
 create mode 100644 .prettierrc.yaml

diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index df438cb8..00000000
--- a/.prettierrc
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "arrowParens": "always",
-  "bracketSameLine": false,
-  "bracketSpacing": true,
-  "embeddedLanguageFormatting": "auto",
-  "htmlWhitespaceSensitivity": "ignore",
-  "insertPragma": false,
-  "jsxSingleQuote": false,
-  "printWidth": 100,
-  "proseWrap": "preserve",
-  "quoteProps": "as-needed",
-  "requirePragma": false,
-  "semi": true,
-  "singleQuote": false,
-  "tabWidth": 2,
-  "trailingComma": "es5",
-  "useTabs": false,
-  "vueIndentScriptAndStyle": false,
-  "endOfLine": "auto",
-  "overrides": [
-    {
-      "files": "*.html",
-      "options": {
-        "parser": "html"
-      }
-    }
-  ]
-}
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
new file mode 100644
index 00000000..d9cf0c72
--- /dev/null
+++ b/.prettierrc.yaml
@@ -0,0 +1,41 @@
+# 在单参数箭头函数中始终添加括号
+arrowParens: "always"
+# JSX 多行元素的闭合标签另起一行
+bracketSameLine: false
+# 对象字面量中的括号之间添加空格
+bracketSpacing: true
+# 自动格式化嵌入的代码（如 Markdown 和 HTML 内的代码）
+embeddedLanguageFormatting: "auto"
+# 忽略 HTML 空白敏感度，将空白视为非重要内容
+htmlWhitespaceSensitivity: "ignore"
+# 不插入 @prettier 的 pragma 注释
+insertPragma: false
+# 在 JSX 中使用双引号
+jsxSingleQuote: false
+# 每行代码的最大长度限制为 100 字符
+printWidth: 100
+# 在 Markdown 中保留原有的换行格式
+proseWrap: "preserve"
+# 仅在必要时添加对象属性的引号
+quoteProps: "as-needed"
+# 不要求文件开头插入 @prettier 的 pragma 注释
+requirePragma: false
+# 在语句末尾添加分号
+semi: true
+# 使用双引号而不是单引号
+singleQuote: false
+# 缩进使用 2 个空格
+tabWidth: 2
+# 在多行元素的末尾添加逗号（ES5 支持的对象、数组等）
+trailingComma: "es5"
+# 使用空格而不是制表符缩进
+useTabs: false
+# Vue 文件中的 <script> 和 <style> 不增加额外的缩进
+vueIndentScriptAndStyle: false
+# 根据系统自动检测换行符
+endOfLine: "auto"
+# 对 HTML 文件应用特定格式化规则
+overrides:
+  - files: "*.html"
+    options:
+      parser: "html"
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ac099608..8c3d8b46 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -30,21 +30,13 @@
 
     <el-card shadow="never" class="table-wrapper">
       <template #header>
-        <el-button
-          v-hasPerm="['sys:config:add']"
-          type="success"
-          @click="handleOpenDialog()"
-        >
+        <el-button v-hasPerm="['sys:config:add']" type="success" @click="handleOpenDialog()">
           <template #icon>
             <Plus />
           </template>
           新增
         </el-button>
-        <el-button
-          v-hasPerm="['sys:config:refresh']"
-          color="#626aef"
-          @click="handleRefreshCache"
-        >
+        <el-button v-hasPerm="['sys:config:refresh']" color="#626aef" @click="handleRefreshCache">
           <el-icon><RefreshLeft /></el-icon>
           刷新缓存
         </el-button>
@@ -58,30 +50,10 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column
-          key="configName"
-          label="配置名称"
-          prop="configName"
-          min-width="100"
-        />
-        <el-table-column
-          key="configKey"
-          label="配置键"
-          prop="configKey"
-          min-width="100"
-        />
-        <el-table-column
-          key="configValue"
-          label="配置值"
-          prop="configValue"
-          min-width="100"
-        />
-        <el-table-column
-          key="remark"
-          label="描述"
-          prop="remark"
-          min-width="100"
-        />
+        <el-table-column key="configName" label="配置名称" prop="configName" min-width="100" />
+        <el-table-column key="configKey" label="配置键" prop="configKey" min-width="100" />
+        <el-table-column key="configValue" label="配置值" prop="configValue" min-width="100" />
+        <el-table-column key="remark" label="描述" prop="remark" min-width="100" />
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button
@@ -136,25 +108,13 @@
         label-width="100px"
       >
         <el-form-item label="配置名称" prop="configName">
-          <el-input
-            v-model="formData.configName"
-            placeholder="请输入配置名称"
-            :maxlength="50"
-          />
+          <el-input v-model="formData.configName" placeholder="请输入配置名称" :maxlength="50" />
         </el-form-item>
         <el-form-item label="配置键" prop="configKey">
-          <el-input
-            v-model="formData.configKey"
-            placeholder="请输入配置键"
-            :maxlength="50"
-          />
+          <el-input v-model="formData.configKey" placeholder="请输入配置键" :maxlength="50" />
         </el-form-item>
         <el-form-item label="配置值" prop="configValue">
-          <el-input
-            v-model="formData.configValue"
-            placeholder="请输入配置值"
-            :maxlength="100"
-          />
+          <el-input v-model="formData.configValue" placeholder="请输入配置值" :maxlength="100" />
         </el-form-item>
         <el-form-item label="描述" prop="remark">
           <el-input
@@ -183,11 +143,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import ConfigAPI, {
-  ConfigPageVO,
-  ConfigForm,
-  ConfigPageQuery,
-} from "@/api/system/config";
+import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -220,15 +176,9 @@ const formData = reactive<ConfigForm>({
 });
 
 const rules = reactive({
-  configName: [
-    { required: true, message: "请输入系统配置名称", trigger: "blur" },
-  ],
-  configKey: [
-    { required: true, message: "请输入系统配置编码", trigger: "blur" },
-  ],
-  configValue: [
-    { required: true, message: "请输入系统配置值", trigger: "blur" },
-  ],
+  configName: [{ required: true, message: "请输入系统配置名称", trigger: "blur" }],
+  configKey: [{ required: true, message: "请输入系统配置编码", trigger: "blur" }],
+  configValue: [{ required: true, message: "请输入系统配置值", trigger: "blur" }],
 });
 
 /** 查询系统配置 */
@@ -308,7 +258,7 @@ function handleCloseDialog() {
   dialog.visible = false;
   dataFormRef.value.resetFields();
   dataFormRef.value.clearValidate();
-  formData.id != undefined;
+  formData.id = undefined;
 }
 
 /** 删除系统配置 */

From c3db786d51ce692bdff3edf89194651dbbe5619e Mon Sep 17 00:00:00 2001
From: zhou-leo <zhou_leo@outlook.com>
Date: Tue, 12 Nov 2024 16:30:05 +0800
Subject: [PATCH 050/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=BB=91=E6=9A=97=E6=A8=A1=E5=BC=8F=E4=B8=8B=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E8=A2=AB=E9=80=89=E4=B8=AD=E5=90=8E=E9=AB=98=E4=BA=AE=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E8=89=B2=E5=BC=82=E5=B8=B8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.ts                  | 2 ++
 src/styles/dark/css-vars.css | 7 +++++++
 2 files changed, 9 insertions(+)
 create mode 100644 src/styles/dark/css-vars.css

diff --git a/src/main.ts b/src/main.ts
index ba50e461..b3ba592f 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -7,6 +7,8 @@ import "virtual:svg-icons-register";
 
 // 样式
 import "element-plus/theme-chalk/dark/css-vars.css";
+// 暗黑模式自定义变量
+import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
 import "animate.css";
diff --git a/src/styles/dark/css-vars.css b/src/styles/dark/css-vars.css
new file mode 100644
index 00000000..823aabf0
--- /dev/null
+++ b/src/styles/dark/css-vars.css
@@ -0,0 +1,7 @@
+/* 暗黑模式通过 CSS 自定义变量，官方链接：https://element-plus.org/zh-CN/guide/dark-mode.html#%E9%80%9A%E8%BF%87-css */
+html.dark {
+  .el-table {
+    /* 自定义表格选中高亮时当前行的背景颜色 */
+    --el-table-current-row-bg-color: var(--el-fill-color-light);
+  }
+}

From a442aa727d4bf7b9bff11868153e7e4e90fae5c3 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 22:10:53 +0800
Subject: [PATCH 051/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   |   42 +-
 pnpm-lock.yaml | 1226 +++++++++++++++++++++++++-----------------------
 2 files changed, 653 insertions(+), 615 deletions(-)

diff --git a/package.json b/package.json
index 7656720e..aa2ebd7d 100644
--- a/package.json
+++ b/package.json
@@ -54,65 +54,65 @@
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "echarts": "^5.5.1",
-    "element-plus": "^2.8.5",
+    "element-plus": "^2.8.7",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.3.0",
-    "pinia": "^2.2.4",
+    "pinia": "^2.2.6",
     "qs": "^6.13.0",
     "sortablejs": "^1.15.3",
-    "vue": "^3.5.11",
+    "vue": "^3.5.12",
     "vue-i18n": "9.9.1",
     "vue-router": "^4.4.5"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.5.0",
     "@commitlint/config-conventional": "^19.5.0",
-    "@eslint/js": "^9.12.0",
+    "@eslint/js": "^9.14.0",
     "@types/codemirror": "^5.60.15",
-    "@types/lodash": "^4.17.10",
-    "@types/node": "^22.7.5",
+    "@types/lodash": "^4.17.13",
+    "@types/node": "^22.9.0",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.16",
+    "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.8.1",
-    "@typescript-eslint/parser": "^8.8.1",
-    "@vitejs/plugin-vue": "^5.1.4",
+    "@typescript-eslint/eslint-plugin": "^8.14.0",
+    "@typescript-eslint/parser": "^8.14.0",
+    "@vitejs/plugin-vue": "^5.1.5",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "1.9.4",
-    "eslint": "^9.12.0",
+    "eslint": "^9.14.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-vue": "^9.29.0",
-    "globals": "^15.11.0",
+    "eslint-plugin-vue": "^9.31.0",
+    "globals": "^15.12.0",
     "husky": "^9.1.6",
     "lint-staged": "^15.2.10",
-    "postcss": "^8.4.47",
+    "postcss": "^8.4.49",
     "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.3.3",
-    "sass": "^1.79.5",
-    "stylelint": "^16.9.0",
+    "sass": "^1.80.6",
+    "stylelint": "^16.10.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard": "^36.0.1",
-    "terser": "^5.34.1",
+    "terser": "^5.36.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.8.1",
-    "unocss": "^0.63.4",
+    "typescript-eslint": "^8.14.0",
+    "unocss": "^0.63.6",
     "unplugin-auto-import": "^0.18.3",
     "unplugin-vue-components": "^0.27.4",
-    "vite": "^5.4.8",
+    "vite": "^5.4.11",
     "vite-plugin-mock-dev-server": "^1.8.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
-    "vue-tsc": "^2.1.6"
+    "vue-tsc": "^2.1.10"
   },
   "engines": {
     "node": ">=18.0.0"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1e5eb4dc..4c8e171c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,8 +36,8 @@ dependencies:
     specifier: ^5.5.1
     version: 5.5.1
   element-plus:
-    specifier: ^2.8.5
-    version: 2.8.5(vue@3.5.12)
+    specifier: ^2.8.7
+    version: 2.8.7(vue@3.5.12)
   exceljs:
     specifier: ^4.4.0
     version: 4.4.0
@@ -54,8 +54,8 @@ dependencies:
     specifier: ^6.3.0
     version: 6.3.0
   pinia:
-    specifier: ^2.2.4
-    version: 2.2.4(typescript@5.5.4)(vue@3.5.12)
+    specifier: ^2.2.6
+    version: 2.2.6(typescript@5.5.4)(vue@3.5.12)
   qs:
     specifier: ^6.13.0
     version: 6.13.0
@@ -63,7 +63,7 @@ dependencies:
     specifier: ^1.15.3
     version: 1.15.3
   vue:
-    specifier: ^3.5.11
+    specifier: ^3.5.12
     version: 3.5.12(typescript@5.5.4)
   vue-i18n:
     specifier: 9.9.1
@@ -75,22 +75,22 @@ dependencies:
 devDependencies:
   '@commitlint/cli':
     specifier: ^19.5.0
-    version: 19.5.0(@types/node@22.7.5)(typescript@5.5.4)
+    version: 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
   '@commitlint/config-conventional':
     specifier: ^19.5.0
     version: 19.5.0
   '@eslint/js':
-    specifier: ^9.12.0
-    version: 9.12.0
+    specifier: ^9.14.0
+    version: 9.14.0
   '@types/codemirror':
     specifier: ^5.60.15
     version: 5.60.15
   '@types/lodash':
-    specifier: ^4.17.10
-    version: 4.17.10
+    specifier: ^4.17.13
+    version: 4.17.13
   '@types/node':
-    specifier: ^22.7.5
-    version: 22.7.5
+    specifier: ^22.9.0
+    version: 22.9.0
   '@types/nprogress':
     specifier: ^0.2.3
     version: 0.2.3
@@ -98,44 +98,44 @@ devDependencies:
     specifier: ^1.0.3
     version: 1.0.3
   '@types/qs':
-    specifier: ^6.9.16
-    version: 6.9.16
+    specifier: ^6.9.17
+    version: 6.9.17
   '@types/sortablejs':
     specifier: ^1.15.8
     version: 1.15.8
   '@typescript-eslint/eslint-plugin':
-    specifier: ^8.8.1
-    version: 8.8.1(@typescript-eslint/parser@8.8.1)(eslint@9.12.0)(typescript@5.5.4)
+    specifier: ^8.14.0
+    version: 8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4)
   '@typescript-eslint/parser':
-    specifier: ^8.8.1
-    version: 8.8.1(eslint@9.12.0)(typescript@5.5.4)
+    specifier: ^8.14.0
+    version: 8.14.0(eslint@9.14.0)(typescript@5.5.4)
   '@vitejs/plugin-vue':
-    specifier: ^5.1.4
-    version: 5.1.4(vite@5.4.8)(vue@3.5.12)
+    specifier: ^5.1.5
+    version: 5.1.5(vite@5.4.11)(vue@3.5.12)
   autoprefixer:
     specifier: ^10.4.20
-    version: 10.4.20(postcss@8.4.47)
+    version: 10.4.20(postcss@8.4.49)
   commitizen:
     specifier: ^4.3.1
-    version: 4.3.1(@types/node@22.7.5)(typescript@5.5.4)
+    version: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
   cz-git:
     specifier: 1.9.4
     version: 1.9.4
   eslint:
-    specifier: ^9.12.0
-    version: 9.12.0
+    specifier: ^9.14.0
+    version: 9.14.0
   eslint-config-prettier:
     specifier: ^9.1.0
-    version: 9.1.0(eslint@9.12.0)
+    version: 9.1.0(eslint@9.14.0)
   eslint-plugin-prettier:
     specifier: ^5.2.1
-    version: 5.2.1(eslint-config-prettier@9.1.0)(eslint@9.12.0)(prettier@3.3.3)
+    version: 5.2.1(eslint-config-prettier@9.1.0)(eslint@9.14.0)(prettier@3.3.3)
   eslint-plugin-vue:
-    specifier: ^9.29.0
-    version: 9.29.0(eslint@9.12.0)
+    specifier: ^9.31.0
+    version: 9.31.0(eslint@9.14.0)
   globals:
-    specifier: ^15.11.0
-    version: 15.11.0
+    specifier: ^15.12.0
+    version: 15.12.0
   husky:
     specifier: ^9.1.6
     version: 9.1.6
@@ -143,22 +143,22 @@ devDependencies:
     specifier: ^15.2.10
     version: 15.2.10
   postcss:
-    specifier: ^8.4.47
-    version: 8.4.47
+    specifier: ^8.4.49
+    version: 8.4.49
   postcss-html:
     specifier: ^1.7.0
     version: 1.7.0
   postcss-scss:
     specifier: ^4.0.9
-    version: 4.0.9(postcss@8.4.47)
+    version: 4.0.9(postcss@8.4.49)
   prettier:
     specifier: ^3.3.3
     version: 3.3.3
   sass:
-    specifier: ^1.79.5
-    version: 1.79.5
+    specifier: ^1.80.6
+    version: 1.80.6
   stylelint:
-    specifier: ^16.9.0
+    specifier: ^16.10.0
     version: 16.10.0(typescript@5.5.4)
   stylelint-config-html:
     specifier: ^1.1.0
@@ -168,7 +168,7 @@ devDependencies:
     version: 5.1.1(stylelint@16.10.0)
   stylelint-config-recommended-scss:
     specifier: ^14.1.0
-    version: 14.1.0(postcss@8.4.47)(stylelint@16.10.0)
+    version: 14.1.0(postcss@8.4.49)(stylelint@16.10.0)
   stylelint-config-recommended-vue:
     specifier: ^1.5.0
     version: 1.5.0(postcss-html@1.7.0)(stylelint@16.10.0)
@@ -176,17 +176,17 @@ devDependencies:
     specifier: ^36.0.1
     version: 36.0.1(stylelint@16.10.0)
   terser:
-    specifier: ^5.34.1
-    version: 5.34.1
+    specifier: ^5.36.0
+    version: 5.36.0
   typescript:
     specifier: 5.5.4
     version: 5.5.4
   typescript-eslint:
-    specifier: ^8.8.1
-    version: 8.8.1(eslint@9.12.0)(typescript@5.5.4)
+    specifier: ^8.14.0
+    version: 8.14.0(eslint@9.14.0)(typescript@5.5.4)
   unocss:
-    specifier: ^0.63.4
-    version: 0.63.4(postcss@8.4.47)(vite@5.4.8)
+    specifier: ^0.63.6
+    version: 0.63.6(postcss@8.4.49)(typescript@5.5.4)(vite@5.4.11)
   unplugin-auto-import:
     specifier: ^0.18.3
     version: 0.18.3(@vueuse/core@10.11.1)
@@ -194,20 +194,20 @@ devDependencies:
     specifier: ^0.27.4
     version: 0.27.4(vue@3.5.12)
   vite:
-    specifier: ^5.4.8
-    version: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+    specifier: ^5.4.11
+    version: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
   vite-plugin-mock-dev-server:
     specifier: ^1.8.0
-    version: 1.8.0(esbuild@0.23.1)(vite@5.4.8)
+    version: 1.8.0(esbuild@0.23.1)(vite@5.4.11)
   vite-plugin-svg-icons:
     specifier: ^2.0.1
-    version: 2.0.1(vite@5.4.8)
+    version: 2.0.1(vite@5.4.11)
   vue-eslint-parser:
     specifier: ^9.4.3
-    version: 9.4.3(eslint@9.12.0)
+    version: 9.4.3(eslint@9.14.0)
   vue-tsc:
-    specifier: ^2.1.6
-    version: 2.1.6(typescript@5.5.4)
+    specifier: ^2.1.10
+    version: 2.1.10(typescript@5.5.4)
 
 packages:
 
@@ -223,72 +223,62 @@ packages:
     resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==}
     dependencies:
       package-manager-detector: 0.2.2
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
     dev: true
 
   /@antfu/utils@0.7.10:
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
     dev: true
 
-  /@babel/code-frame@7.25.7:
-    resolution: {integrity: sha512-0xZJFNE5XMpENsgfHYTw8FbX4kv53mFLn2i3XPoq69LyhYSCBJtitaHx9QnsVTrsogI4Z3+HtEfZ2/GFPOtf5g==}
+  /@babel/code-frame@7.26.2:
+    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/highlight': 7.25.7
-      picocolors: 1.1.0
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
     dev: true
 
-  /@babel/helper-string-parser@7.25.7:
-    resolution: {integrity: sha512-CbkjYdsJNHFk8uqpEkpCvRs3YRp9tY6FmFY7wLMSYuGYkrdUi7r2lc4/wqsvlHoMznX3WJ9IP8giGPq68T/Y6g==}
+  /@babel/helper-string-parser@7.25.9:
+    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier@7.25.7:
-    resolution: {integrity: sha512-AM6TzwYqGChO45oiuPqwL2t20/HdMC1rTPAesnBCgPCSF1x3oN9MVUwQV2iyz4xqWrctwK5RNC8LV22kaQCNYg==}
+  /@babel/helper-validator-identifier@7.25.9:
+    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/highlight@7.25.7:
-    resolution: {integrity: sha512-iYyACpW3iW8Fw+ZybQK+drQre+ns/tKpXbNESfrhNnPLIklLbXr7MYJ6gPEd0iETGLOK+SxMjVvKb/ffmk+FEw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.25.7
-      chalk: 2.4.2
-      js-tokens: 4.0.0
-      picocolors: 1.1.0
-    dev: true
-
-  /@babel/parser@7.25.8:
-    resolution: {integrity: sha512-HcttkxzdPucv3nNFmfOOMfFf64KgdJVqm1KaCm25dPGMLElo9nsLvXeJECQg8UzPuBGLyTSA0ZzqCtDSzKTEoQ==}
+  /@babel/parser@7.26.2:
+    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
     dependencies:
-      '@babel/types': 7.25.8
+      '@babel/types': 7.26.0
 
-  /@babel/runtime@7.25.7:
-    resolution: {integrity: sha512-FjoyLe754PMiYsFaN5C94ttGiOmBNYTf6pLr4xXHAT5uctHb092PBszndLDR5XA/jghQvn4n7JMHl7dmTgbm9w==}
+  /@babel/runtime@7.26.0:
+    resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.14.1
     dev: false
 
-  /@babel/types@7.25.8:
-    resolution: {integrity: sha512-JWtuCu8VQsMladxVz/P4HzHUGCAwpuqacmowgXFs5XjxIgKuNjnLokQzuVjlTvIzODaDmpjT3oxcC48vyk9EWg==}
+  /@babel/types@7.26.0:
+    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
     engines: {node: '>=6.9.0'}
     dependencies:
-      '@babel/helper-string-parser': 7.25.7
-      '@babel/helper-validator-identifier': 7.25.7
-      to-fast-properties: 2.0.0
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
 
-  /@commitlint/cli@19.5.0(@types/node@22.7.5)(typescript@5.5.4):
+  /@commitlint/cli@19.5.0(@types/node@22.9.0)(typescript@5.5.4):
     resolution: {integrity: sha512-gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ==}
     engines: {node: '>=v18'}
     hasBin: true
     dependencies:
       '@commitlint/format': 19.5.0
       '@commitlint/lint': 19.5.0
-      '@commitlint/load': 19.5.0(@types/node@22.7.5)(typescript@5.5.4)
+      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
       '@commitlint/read': 19.5.0
       '@commitlint/types': 19.5.0
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
       yargs: 17.7.2
     transitivePeerDependencies:
       - '@types/node'
@@ -354,7 +344,7 @@ packages:
       '@commitlint/types': 19.5.0
     dev: true
 
-  /@commitlint/load@19.5.0(@types/node@22.7.5)(typescript@5.5.4):
+  /@commitlint/load@19.5.0(@types/node@22.9.0)(typescript@5.5.4):
     resolution: {integrity: sha512-INOUhkL/qaKqwcTUvCE8iIUf5XHsEPCLY9looJ/ipzi7jtGhgmtH7OOFiNvwYgH7mA8osUWOUDV8t4E2HAi4xA==}
     engines: {node: '>=v18'}
     dependencies:
@@ -364,7 +354,7 @@ packages:
       '@commitlint/types': 19.5.0
       chalk: 5.3.0
       cosmiconfig: 9.0.0(typescript@5.5.4)
-      cosmiconfig-typescript-loader: 5.0.0(@types/node@22.7.5)(cosmiconfig@9.0.0)(typescript@5.5.4)
+      cosmiconfig-typescript-loader: 5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0)(typescript@5.5.4)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -395,7 +385,7 @@ packages:
       '@commitlint/types': 19.5.0
       git-raw-commits: 4.0.0
       minimist: 1.2.8
-      tinyexec: 0.3.0
+      tinyexec: 0.3.1
     dev: true
 
   /@commitlint/resolve-extends@19.5.0:
@@ -440,29 +430,29 @@ packages:
       chalk: 5.3.0
     dev: true
 
-  /@csstools/css-parser-algorithms@3.0.2(@csstools/css-tokenizer@3.0.2):
-    resolution: {integrity: sha512-6tC/MnlEvs5suR4Ahef4YlBccJDHZuxGsAlxXmybWjZ5jPxlzLSMlRZ9mVHSRvlD+CmtE7+hJ+UQbfXrws/rUQ==}
+  /@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3):
+    resolution: {integrity: sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==}
     engines: {node: '>=18'}
     peerDependencies:
-      '@csstools/css-tokenizer': ^3.0.2
+      '@csstools/css-tokenizer': ^3.0.3
     dependencies:
-      '@csstools/css-tokenizer': 3.0.2
+      '@csstools/css-tokenizer': 3.0.3
     dev: true
 
-  /@csstools/css-tokenizer@3.0.2:
-    resolution: {integrity: sha512-IuTRcD53WHsXPCZ6W7ubfGqReTJ9Ra0yRRFmXYP/Re8hFYYfoIYIK4080X5luslVLWimhIeFq0hj09urVMQzTw==}
+  /@csstools/css-tokenizer@3.0.3:
+    resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==}
     engines: {node: '>=18'}
     dev: true
 
-  /@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.2)(@csstools/css-tokenizer@3.0.2):
+  /@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.4)(@csstools/css-tokenizer@3.0.3):
     resolution: {integrity: sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^3.0.1
       '@csstools/css-tokenizer': ^3.0.1
     dependencies:
-      '@csstools/css-parser-algorithms': 3.0.2(@csstools/css-tokenizer@3.0.2)
-      '@csstools/css-tokenizer': 3.0.2
+      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
+      '@csstools/css-tokenizer': 3.0.3
     dev: true
 
   /@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.2):
@@ -914,18 +904,18 @@ packages:
     dev: true
     optional: true
 
-  /@eslint-community/eslint-utils@4.4.0(eslint@9.12.0):
-    resolution: {integrity: sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==}
+  /@eslint-community/eslint-utils@4.4.1(eslint@9.14.0):
+    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
     dependencies:
-      eslint: 9.12.0
+      eslint: 9.14.0
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@eslint-community/regexpp@4.11.1:
-    resolution: {integrity: sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==}
+  /@eslint-community/regexpp@4.12.1:
+    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
     dev: true
 
@@ -940,8 +930,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/core@0.6.0:
-    resolution: {integrity: sha512-8I2Q8ykA4J0x0o7cg67FPVnehcqWTBehu/lmY+bolPFHGjh49YzGBMXTvpqVgEbBdvNCSxj6iFgiIyHzf03lzg==}
+  /@eslint/core@0.7.0:
+    resolution: {integrity: sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
@@ -951,7 +941,7 @@ packages:
     dependencies:
       ajv: 6.12.6
       debug: 4.3.7
-      espree: 10.2.0
+      espree: 10.3.0
       globals: 14.0.0
       ignore: 5.3.2
       import-fresh: 3.3.0
@@ -962,8 +952,8 @@ packages:
       - supports-color
     dev: true
 
-  /@eslint/js@9.12.0:
-    resolution: {integrity: sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==}
+  /@eslint/js@9.14.0:
+    resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
@@ -972,8 +962,8 @@ packages:
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
-  /@eslint/plugin-kit@0.2.0:
-    resolution: {integrity: sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==}
+  /@eslint/plugin-kit@0.2.2:
+    resolution: {integrity: sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
       levn: 0.4.1
@@ -1008,8 +998,8 @@ packages:
       '@floating-ui/utils': 0.2.8
     dev: false
 
-  /@floating-ui/dom@1.6.11:
-    resolution: {integrity: sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==}
+  /@floating-ui/dom@1.6.12:
+    resolution: {integrity: sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==}
     dependencies:
       '@floating-ui/core': 1.6.8
       '@floating-ui/utils': 0.2.8
@@ -1023,16 +1013,16 @@ packages:
     resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
     dev: true
 
-  /@humanfs/core@0.19.0:
-    resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==}
+  /@humanfs/core@0.19.1:
+    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
     engines: {node: '>=18.18.0'}
     dev: true
 
-  /@humanfs/node@0.16.5:
-    resolution: {integrity: sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==}
+  /@humanfs/node@0.16.6:
+    resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==}
     engines: {node: '>=18.18.0'}
     dependencies:
-      '@humanfs/core': 0.19.0
+      '@humanfs/core': 0.19.1
       '@humanwhocodes/retry': 0.3.1
     dev: true
 
@@ -1046,6 +1036,11 @@ packages:
     engines: {node: '>=18.18'}
     dev: true
 
+  /@humanwhocodes/retry@0.4.1:
+    resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==}
+    engines: {node: '>=18.18'}
+    dev: true
+
   /@iconify/types@2.0.0:
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
     dev: true
@@ -1142,8 +1137,8 @@ packages:
       fastq: 1.17.1
     dev: true
 
-  /@parcel/watcher-android-arm64@2.4.1:
-    resolution: {integrity: sha512-LOi/WTbbh3aTn2RYddrO8pnapixAziFl6SMxHM69r3tvdSm94JtCenaKgk1GRg5FJ5wpMCpHeW+7yqPlvZv7kg==}
+  /@parcel/watcher-android-arm64@2.5.0:
+    resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
@@ -1151,8 +1146,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-darwin-arm64@2.4.1:
-    resolution: {integrity: sha512-ln41eihm5YXIY043vBrrHfn94SIBlqOWmoROhsMVTSXGh0QahKGy77tfEywQ7v3NywyxBBkGIfrWRHm0hsKtzA==}
+  /@parcel/watcher-darwin-arm64@2.5.0:
+    resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
@@ -1160,8 +1155,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-darwin-x64@2.4.1:
-    resolution: {integrity: sha512-yrw81BRLjjtHyDu7J61oPuSoeYWR3lDElcPGJyOvIXmor6DEo7/G2u1o7I38cwlcoBHQFULqF6nesIX3tsEXMg==}
+  /@parcel/watcher-darwin-x64@2.5.0:
+    resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
@@ -1169,8 +1164,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-freebsd-x64@2.4.1:
-    resolution: {integrity: sha512-TJa3Pex/gX3CWIx/Co8k+ykNdDCLx+TuZj3f3h7eOjgpdKM+Mnix37RYsYU4LHhiYJz3DK5nFCCra81p6g050w==}
+  /@parcel/watcher-freebsd-x64@2.5.0:
+    resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
@@ -1178,8 +1173,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-linux-arm-glibc@2.4.1:
-    resolution: {integrity: sha512-4rVYDlsMEYfa537BRXxJ5UF4ddNwnr2/1O4MHM5PjI9cvV2qymvhwZSFgXqbS8YoTk5i/JR0L0JDs69BUn45YA==}
+  /@parcel/watcher-linux-arm-glibc@2.5.0:
+    resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
@@ -1188,8 +1183,18 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-linux-arm64-glibc@2.4.1:
-    resolution: {integrity: sha512-BJ7mH985OADVLpbrzCLgrJ3TOpiZggE9FMblfO65PlOCdG++xJpKUJ0Aol74ZUIYfb8WsRlUdgrZxKkz3zXWYA==}
+  /@parcel/watcher-linux-arm-musl@2.5.0:
+    resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
+    engines: {node: '>= 10.0.0'}
+    cpu: [arm]
+    os: [linux]
+    libc: [musl]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@parcel/watcher-linux-arm64-glibc@2.5.0:
+    resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
@@ -1198,8 +1203,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-linux-arm64-musl@2.4.1:
-    resolution: {integrity: sha512-p4Xb7JGq3MLgAfYhslU2SjoV9G0kI0Xry0kuxeG/41UfpjHGOhv7UoUDAz/jb1u2elbhazy4rRBL8PegPJFBhA==}
+  /@parcel/watcher-linux-arm64-musl@2.5.0:
+    resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
@@ -1208,8 +1213,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-linux-x64-glibc@2.4.1:
-    resolution: {integrity: sha512-s9O3fByZ/2pyYDPoLM6zt92yu6P4E39a03zvO0qCHOTjxmt3GHRMLuRZEWhWLASTMSrrnVNWdVI/+pUElJBBBg==}
+  /@parcel/watcher-linux-x64-glibc@2.5.0:
+    resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
@@ -1218,8 +1223,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-linux-x64-musl@2.4.1:
-    resolution: {integrity: sha512-L2nZTYR1myLNST0O632g0Dx9LyMNHrn6TOt76sYxWLdff3cB22/GZX2UPtJnaqQPdCRoszoY5rcOj4oMTtp5fQ==}
+  /@parcel/watcher-linux-x64-musl@2.5.0:
+    resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
@@ -1228,8 +1233,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-win32-arm64@2.4.1:
-    resolution: {integrity: sha512-Uq2BPp5GWhrq/lcuItCHoqxjULU1QYEcyjSO5jqqOK8RNFDBQnenMMx4gAl3v8GiWa59E9+uDM7yZ6LxwUIfRg==}
+  /@parcel/watcher-win32-arm64@2.5.0:
+    resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
@@ -1237,8 +1242,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-win32-ia32@2.4.1:
-    resolution: {integrity: sha512-maNRit5QQV2kgHFSYwftmPBxiuK5u4DXjbXx7q6eKjq5dsLXZ4FJiVvlcw35QXzk0KrUecJmuVFbj4uV9oYrcw==}
+  /@parcel/watcher-win32-ia32@2.5.0:
+    resolution: {integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==}
     engines: {node: '>= 10.0.0'}
     cpu: [ia32]
     os: [win32]
@@ -1246,8 +1251,8 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher-win32-x64@2.4.1:
-    resolution: {integrity: sha512-+DvS92F9ezicfswqrvIRM2njcYJbd5mb9CUgtrHCHmvn7pPPa+nMDRu1o1bYYz/l5IB2NVGNJWiH7h1E58IF2A==}
+  /@parcel/watcher-win32-x64@2.5.0:
+    resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
@@ -1255,28 +1260,31 @@ packages:
     dev: true
     optional: true
 
-  /@parcel/watcher@2.4.1:
-    resolution: {integrity: sha512-HNjmfLQEVRZmHRET336f20H/8kOozUGwk7yajvsonjNxbj2wBTK1WsQuHkD5yYh9RxFGL2EyDHryOihOwUoKDA==}
+  /@parcel/watcher@2.5.0:
+    resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
     engines: {node: '>= 10.0.0'}
+    requiresBuild: true
     dependencies:
       detect-libc: 1.0.3
       is-glob: 4.0.3
       micromatch: 4.0.8
       node-addon-api: 7.1.1
     optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.4.1
-      '@parcel/watcher-darwin-arm64': 2.4.1
-      '@parcel/watcher-darwin-x64': 2.4.1
-      '@parcel/watcher-freebsd-x64': 2.4.1
-      '@parcel/watcher-linux-arm-glibc': 2.4.1
-      '@parcel/watcher-linux-arm64-glibc': 2.4.1
-      '@parcel/watcher-linux-arm64-musl': 2.4.1
-      '@parcel/watcher-linux-x64-glibc': 2.4.1
-      '@parcel/watcher-linux-x64-musl': 2.4.1
-      '@parcel/watcher-win32-arm64': 2.4.1
-      '@parcel/watcher-win32-ia32': 2.4.1
-      '@parcel/watcher-win32-x64': 2.4.1
+      '@parcel/watcher-android-arm64': 2.5.0
+      '@parcel/watcher-darwin-arm64': 2.5.0
+      '@parcel/watcher-darwin-x64': 2.5.0
+      '@parcel/watcher-freebsd-x64': 2.5.0
+      '@parcel/watcher-linux-arm-glibc': 2.5.0
+      '@parcel/watcher-linux-arm-musl': 2.5.0
+      '@parcel/watcher-linux-arm64-glibc': 2.5.0
+      '@parcel/watcher-linux-arm64-musl': 2.5.0
+      '@parcel/watcher-linux-x64-glibc': 2.5.0
+      '@parcel/watcher-linux-x64-musl': 2.5.0
+      '@parcel/watcher-win32-arm64': 2.5.0
+      '@parcel/watcher-win32-ia32': 2.5.0
+      '@parcel/watcher-win32-x64': 2.5.0
     dev: true
+    optional: true
 
   /@pengzhanbo/utils@1.1.2:
     resolution: {integrity: sha512-geM6O5jEs2Hvg3LxwffjxrhZVftqysM6VDFvGHm+XMf2ZwunZIehPkd/W2mwbJBbFoqVqACl+c1/y48MffMiDg==}
@@ -1291,8 +1299,8 @@ packages:
     resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
     dev: true
 
-  /@rollup/pluginutils@5.1.2:
-    resolution: {integrity: sha512-/FIdS3PyZ39bjZlwqFnWqCOVnW7o963LtKMwQOD0NhQqw22gSr2YY1afu3FxRip4ZCZNsD5jq6Aaz6QV3D/Njw==}
+  /@rollup/pluginutils@5.1.3:
+    resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
@@ -1302,43 +1310,59 @@ packages:
     dependencies:
       '@types/estree': 1.0.6
       estree-walker: 2.0.2
-      picomatch: 2.3.1
+      picomatch: 4.0.2
     dev: true
 
-  /@rollup/rollup-android-arm-eabi@4.24.0:
-    resolution: {integrity: sha512-Q6HJd7Y6xdB48x8ZNVDOqsbh2uByBhgK8PiQgPhwkIw/HC/YX5Ghq2mQY5sRMZWHb3VsFkWooUVOZHKr7DmDIA==}
+  /@rollup/rollup-android-arm-eabi@4.25.0:
+    resolution: {integrity: sha512-CC/ZqFZwlAIbU1wUPisHyV/XRc5RydFrNLtgl3dGYskdwPZdt4HERtKm50a/+DtTlKeCq9IXFEWR+P6blwjqBA==}
     cpu: [arm]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-android-arm64@4.24.0:
-    resolution: {integrity: sha512-ijLnS1qFId8xhKjT81uBHuuJp2lU4x2yxa4ctFPtG+MqEE6+C5f/+X/bStmxapgmwLwiL3ih122xv8kVARNAZA==}
+  /@rollup/rollup-android-arm64@4.25.0:
+    resolution: {integrity: sha512-/Y76tmLGUJqVBXXCfVS8Q8FJqYGhgH4wl4qTA24E9v/IJM0XvJCGQVSW1QZ4J+VURO9h8YCa28sTFacZXwK7Rg==}
     cpu: [arm64]
     os: [android]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-arm64@4.24.0:
-    resolution: {integrity: sha512-bIv+X9xeSs1XCk6DVvkO+S/z8/2AMt/2lMqdQbMrmVpgFvXlmde9mLcbQpztXm1tajC3raFDqegsH18HQPMYtA==}
+  /@rollup/rollup-darwin-arm64@4.25.0:
+    resolution: {integrity: sha512-YVT6L3UrKTlC0FpCZd0MGA7NVdp7YNaEqkENbWQ7AOVOqd/7VzyHpgIpc1mIaxRAo1ZsJRH45fq8j4N63I/vvg==}
     cpu: [arm64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-darwin-x64@4.24.0:
-    resolution: {integrity: sha512-X6/nOwoFN7RT2svEQWUsW/5C/fYMBe4fnLK9DQk4SX4mgVBiTA9h64kjUYPvGQ0F/9xwJ5U5UfTbl6BEjaQdBQ==}
+  /@rollup/rollup-darwin-x64@4.25.0:
+    resolution: {integrity: sha512-ZRL+gexs3+ZmmWmGKEU43Bdn67kWnMeWXLFhcVv5Un8FQcx38yulHBA7XR2+KQdYIOtD0yZDWBCudmfj6lQJoA==}
     cpu: [x64]
     os: [darwin]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.24.0:
-    resolution: {integrity: sha512-0KXvIJQMOImLCVCz9uvvdPgfyWo93aHHp8ui3FrtOP57svqrF/roSSR5pjqL2hcMp0ljeGlU4q9o/rQaAQ3AYA==}
+  /@rollup/rollup-freebsd-arm64@4.25.0:
+    resolution: {integrity: sha512-xpEIXhiP27EAylEpreCozozsxWQ2TJbOLSivGfXhU4G1TBVEYtUPi2pOZBnvGXHyOdLAUUhPnJzH3ah5cqF01g==}
+    cpu: [arm64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-freebsd-x64@4.25.0:
+    resolution: {integrity: sha512-sC5FsmZGlJv5dOcURrsnIK7ngc3Kirnx3as2XU9uER+zjfyqIjdcMVgzy4cOawhsssqzoAX19qmxgJ8a14Qrqw==}
+    cpu: [x64]
+    os: [freebsd]
+    requiresBuild: true
+    dev: true
+    optional: true
+
+  /@rollup/rollup-linux-arm-gnueabihf@4.25.0:
+    resolution: {integrity: sha512-uD/dbLSs1BEPzg564TpRAQ/YvTnCds2XxyOndAO8nJhaQcqQGFgv/DAVko/ZHap3boCvxnzYMa3mTkV/B/3SWA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
@@ -1346,8 +1370,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm-musleabihf@4.24.0:
-    resolution: {integrity: sha512-it2BW6kKFVh8xk/BnHfakEeoLPv8STIISekpoF+nBgWM4d55CZKc7T4Dx1pEbTnYm/xEKMgy1MNtYuoA8RFIWw==}
+  /@rollup/rollup-linux-arm-musleabihf@4.25.0:
+    resolution: {integrity: sha512-ZVt/XkrDlQWegDWrwyC3l0OfAF7yeJUF4fq5RMS07YM72BlSfn2fQQ6lPyBNjt+YbczMguPiJoCfaQC2dnflpQ==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
@@ -1355,8 +1379,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.24.0:
-    resolution: {integrity: sha512-i0xTLXjqap2eRfulFVlSnM5dEbTVque/3Pi4g2y7cxrs7+a9De42z4XxKLYJ7+OhE3IgxvfQM7vQc43bwTgPwA==}
+  /@rollup/rollup-linux-arm64-gnu@4.25.0:
+    resolution: {integrity: sha512-qboZ+T0gHAW2kkSDPHxu7quaFaaBlynODXpBVnPxUgvWYaE84xgCKAPEYE+fSMd3Zv5PyFZR+L0tCdYCMAtG0A==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
@@ -1364,8 +1388,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.24.0:
-    resolution: {integrity: sha512-9E6MKUJhDuDh604Qco5yP/3qn3y7SLXYuiC0Rpr89aMScS2UAmK1wHP2b7KAa1nSjWJc/f/Lc0Wl1L47qjiyQw==}
+  /@rollup/rollup-linux-arm64-musl@4.25.0:
+    resolution: {integrity: sha512-ndWTSEmAaKr88dBuogGH2NZaxe7u2rDoArsejNslugHZ+r44NfWiwjzizVS1nUOHo+n1Z6qV3X60rqE/HlISgw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
@@ -1373,8 +1397,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-powerpc64le-gnu@4.24.0:
-    resolution: {integrity: sha512-2XFFPJ2XMEiF5Zi2EBf4h73oR1V/lycirxZxHZNc93SqDN/IWhYYSYj8I9381ikUFXZrz2v7r2tOVk2NBwxrWw==}
+  /@rollup/rollup-linux-powerpc64le-gnu@4.25.0:
+    resolution: {integrity: sha512-BVSQvVa2v5hKwJSy6X7W1fjDex6yZnNKy3Kx1JGimccHft6HV0THTwNtC2zawtNXKUu+S5CjXslilYdKBAadzA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
@@ -1382,8 +1406,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.24.0:
-    resolution: {integrity: sha512-M3Dg4hlwuntUCdzU7KjYqbbd+BLq3JMAOhCKdBE3TcMGMZbKkDdJ5ivNdehOssMCIokNHFOsv7DO4rlEOfyKpg==}
+  /@rollup/rollup-linux-riscv64-gnu@4.25.0:
+    resolution: {integrity: sha512-G4hTREQrIdeV0PE2JruzI+vXdRnaK1pg64hemHq2v5fhv8C7WjVaeXc9P5i4Q5UC06d/L+zA0mszYIKl+wY8oA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
@@ -1391,8 +1415,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-s390x-gnu@4.24.0:
-    resolution: {integrity: sha512-mjBaoo4ocxJppTorZVKWFpy1bfFj9FeCMJqzlMQGjpNPY9JwQi7OuS1axzNIk0nMX6jSgy6ZURDZ2w0QW6D56g==}
+  /@rollup/rollup-linux-s390x-gnu@4.25.0:
+    resolution: {integrity: sha512-9T/w0kQ+upxdkFL9zPVB6zy9vWW1deA3g8IauJxojN4bnz5FwSsUAD034KpXIVX5j5p/rn6XqumBMxfRkcHapQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
@@ -1400,8 +1424,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.24.0:
-    resolution: {integrity: sha512-ZXFk7M72R0YYFN5q13niV0B7G8/5dcQ9JDp8keJSfr3GoZeXEoMHP/HlvqROA3OMbMdfr19IjCeNAnPUG93b6A==}
+  /@rollup/rollup-linux-x64-gnu@4.25.0:
+    resolution: {integrity: sha512-ThcnU0EcMDn+J4B9LD++OgBYxZusuA7iemIIiz5yzEcFg04VZFzdFjuwPdlURmYPZw+fgVrFzj4CA64jSTG4Ig==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
@@ -1409,8 +1433,8 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.24.0:
-    resolution: {integrity: sha512-w1i+L7kAXZNdYl+vFvzSZy8Y1arS7vMgIy8wusXJzRrPyof5LAb02KGr1PD2EkRcl73kHulIID0M501lN+vobQ==}
+  /@rollup/rollup-linux-x64-musl@4.25.0:
+    resolution: {integrity: sha512-zx71aY2oQxGxAT1JShfhNG79PnjYhMC6voAjzpu/xmMjDnKNf6Nl/xv7YaB/9SIa9jDYf8RBPWEnjcdlhlv1rQ==}
     cpu: [x64]
     os: [linux]
     libc: [musl]
@@ -1418,24 +1442,24 @@ packages:
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.24.0:
-    resolution: {integrity: sha512-VXBrnPWgBpVDCVY6XF3LEW0pOU51KbaHhccHw6AS6vBWIC60eqsH19DAeeObl+g8nKAz04QFdl/Cefta0xQtUQ==}
+  /@rollup/rollup-win32-arm64-msvc@4.25.0:
+    resolution: {integrity: sha512-JT8tcjNocMs4CylWY/CxVLnv8e1lE7ff1fi6kbGocWwxDq9pj30IJ28Peb+Y8yiPNSF28oad42ApJB8oUkwGww==}
     cpu: [arm64]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.24.0:
-    resolution: {integrity: sha512-xrNcGDU0OxVcPTH/8n/ShH4UevZxKIO6HJFK0e15XItZP2UcaiLFd5kiX7hJnqCbSztUF8Qot+JWBC/QXRPYWQ==}
+  /@rollup/rollup-win32-ia32-msvc@4.25.0:
+    resolution: {integrity: sha512-dRLjLsO3dNOfSN6tjyVlG+Msm4IiZnGkuZ7G5NmpzwF9oOc582FZG05+UdfTbz5Jd4buK/wMb6UeHFhG18+OEg==}
     cpu: [ia32]
     os: [win32]
     requiresBuild: true
     dev: true
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.24.0:
-    resolution: {integrity: sha512-fbMkAF7fufku0N2dE5TBXcNlg0pt0cJue4xBRE2Qc5Vqikxr4VCgKj/ht6SMdFcOacVA9rqF70APJ8RN/4vMJw==}
+  /@rollup/rollup-win32-x64-msvc@4.25.0:
+    resolution: {integrity: sha512-/RqrIFtLB926frMhZD0a5oDa4eFIbyNEwLLloMTEjmqfwZWXywwVVOVmwTsuyhC9HKkVEZcOOi+KV4U9wmOdlg==}
     cpu: [x64]
     os: [win32]
     requiresBuild: true
@@ -1468,7 +1492,7 @@ packages:
   /@types/conventional-commits-parser@5.0.0:
     resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==}
     dependencies:
-      '@types/node': 22.7.5
+      '@types/node': 22.9.0
     dev: true
 
   /@types/estree@1.0.6:
@@ -1486,18 +1510,18 @@ packages:
   /@types/lodash-es@4.17.12:
     resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
     dependencies:
-      '@types/lodash': 4.17.10
+      '@types/lodash': 4.17.13
     dev: false
 
-  /@types/lodash@4.17.10:
-    resolution: {integrity: sha512-YpS0zzoduEhuOWjAotS6A5AVCva7X4lVlYLF0FYHAY9sdraBfnatttHItlWeZdGhuEkf+OzMNg2ZYAx8t+52uQ==}
+  /@types/lodash@4.17.13:
+    resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
 
   /@types/node@14.18.63:
     resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
     dev: false
 
-  /@types/node@22.7.5:
-    resolution: {integrity: sha512-jML7s2NAzMWc//QSJ1a3prpk78cOPchGvXJsC3C6R6PSMoooztvRVQEz89gmBTBY1SPMaqo5teB4uNHPdetShQ==}
+  /@types/node@22.9.0:
+    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
     dependencies:
       undici-types: 6.19.8
     dev: true
@@ -1510,8 +1534,8 @@ packages:
     resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
     dev: true
 
-  /@types/qs@6.9.16:
-    resolution: {integrity: sha512-7i+zxXdPD0T4cKDuxCUXJ4wHcsJLwENa6Z3dCu8cfCK743OGy5Nu1RmAGqDPsoTDINVEcdXKRvR/zre+P2Ku1A==}
+  /@types/qs@6.9.17:
+    resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==}
     dev: true
 
   /@types/sortablejs@1.15.8:
@@ -1521,7 +1545,7 @@ packages:
   /@types/svgo@2.6.4:
     resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
     dependencies:
-      '@types/node': 22.7.5
+      '@types/node': 22.9.0
     dev: true
 
   /@types/tern@0.23.9:
@@ -1537,8 +1561,8 @@ packages:
   /@types/web-bluetooth@0.0.20:
     resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
 
-  /@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1)(eslint@9.12.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==}
+  /@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-tqp8H7UWFaZj0yNO6bycd5YjMwxa6wIHOLZvWPkidwbgLCsBMetQoGj7DPuAlWa2yGO3H48xmPwjhsSPPCGU5w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
@@ -1548,24 +1572,24 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@eslint-community/regexpp': 4.11.1
-      '@typescript-eslint/parser': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
-      '@typescript-eslint/scope-manager': 8.8.1
-      '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.8.1
-      eslint: 9.12.0
+      '@eslint-community/regexpp': 4.12.1
+      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/scope-manager': 8.14.0
+      '@typescript-eslint/type-utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.14.0
+      eslint: 9.14.0
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      ts-api-utils: 1.4.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser@8.8.1(eslint@9.12.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==}
+  /@typescript-eslint/parser@8.14.0(eslint@9.14.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
@@ -1574,27 +1598,27 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/scope-manager': 8.8.1
-      '@typescript-eslint/types': 8.8.1
-      '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.8.1
+      '@typescript-eslint/scope-manager': 8.14.0
+      '@typescript-eslint/types': 8.14.0
+      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
+      '@typescript-eslint/visitor-keys': 8.14.0
       debug: 4.3.7
-      eslint: 9.12.0
+      eslint: 9.14.0
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/scope-manager@8.8.1:
-    resolution: {integrity: sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==}
+  /@typescript-eslint/scope-manager@8.14.0:
+    resolution: {integrity: sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
-      '@typescript-eslint/types': 8.8.1
-      '@typescript-eslint/visitor-keys': 8.8.1
+      '@typescript-eslint/types': 8.14.0
+      '@typescript-eslint/visitor-keys': 8.14.0
     dev: true
 
-  /@typescript-eslint/type-utils@8.8.1(eslint@9.12.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==}
+  /@typescript-eslint/type-utils@8.14.0(eslint@9.14.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-Xcz9qOtZuGusVOH5Uk07NGs39wrKkf3AxlkK79RBK6aJC1l03CobXjJbwBPSidetAOV+5rEVuiT1VSBUOAsanQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -1602,23 +1626,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
+      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
       debug: 4.3.7
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      ts-api-utils: 1.4.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint
       - supports-color
     dev: true
 
-  /@typescript-eslint/types@8.8.1:
-    resolution: {integrity: sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==}
+  /@typescript-eslint/types@8.14.0:
+    resolution: {integrity: sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree@8.8.1(typescript@5.5.4):
-    resolution: {integrity: sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==}
+  /@typescript-eslint/typescript-estree@8.14.0(typescript@5.5.4):
+    resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -1626,70 +1650,71 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/types': 8.8.1
-      '@typescript-eslint/visitor-keys': 8.8.1
+      '@typescript-eslint/types': 8.14.0
+      '@typescript-eslint/visitor-keys': 8.14.0
       debug: 4.3.7
       fast-glob: 3.3.2
       is-glob: 4.0.3
       minimatch: 9.0.5
       semver: 7.6.3
-      ts-api-utils: 1.3.0(typescript@5.5.4)
+      ts-api-utils: 1.4.0(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils@8.8.1(eslint@9.12.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==}
+  /@typescript-eslint/utils@8.14.0(eslint@9.14.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       eslint: ^8.57.0 || ^9.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0)
-      '@typescript-eslint/scope-manager': 8.8.1
-      '@typescript-eslint/types': 8.8.1
-      '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.5.4)
-      eslint: 9.12.0
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
+      '@typescript-eslint/scope-manager': 8.14.0
+      '@typescript-eslint/types': 8.14.0
+      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
+      eslint: 9.14.0
     transitivePeerDependencies:
       - supports-color
       - typescript
     dev: true
 
-  /@typescript-eslint/visitor-keys@8.8.1:
-    resolution: {integrity: sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==}
+  /@typescript-eslint/visitor-keys@8.14.0:
+    resolution: {integrity: sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
-      '@typescript-eslint/types': 8.8.1
+      '@typescript-eslint/types': 8.14.0
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@unocss/astro@0.63.4(vite@5.4.8):
-    resolution: {integrity: sha512-qu1uMDUT8lXU3mm5EjZpnizvjSYtfY0TTDivR5QNm1i3Xd+ErHfdfOpXdJ2mYvxv+X7C570//KUugkTI3Mb3kQ==}
+  /@unocss/astro@0.63.6(typescript@5.5.4)(vite@5.4.11):
+    resolution: {integrity: sha512-5Fjlv6dpQo6o2PUAcEv8p24G8rn8Op79xLFofq2V+iA/Q32G9/UsxTLOpj+yc+q0YdJrFfDCT2X/3pvVY8Db5g==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
     peerDependenciesMeta:
       vite:
         optional: true
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/reset': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.8)
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      '@unocss/core': 0.63.6
+      '@unocss/reset': 0.63.6
+      '@unocss/vite': 0.63.6(typescript@5.5.4)(vite@5.4.11)
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
+      - typescript
     dev: true
 
-  /@unocss/cli@0.63.4:
-    resolution: {integrity: sha512-kBWEiVW7KWfjptAJsk38w9dVqOmrO2/z0WADFnlX2RuKNDoCn422Rus6tFB12wZsEujC9eFM34P2nnU7IWWtlQ==}
+  /@unocss/cli@0.63.6:
+    resolution: {integrity: sha512-OZb8hO0x4nCJjFd3Gq3km78YnyMAdq282D+BLiDE6IhQ5WHCVL7fyhfgIVL6xwxISDVxiyITwNb72ky0MEutPg==}
     engines: {node: '>=14'}
     hasBin: true
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.2
-      '@unocss/config': 0.63.4
-      '@unocss/core': 0.63.4
-      '@unocss/preset-uno': 0.63.4
+      '@rollup/pluginutils': 5.1.3
+      '@unocss/config': 0.63.6
+      '@unocss/core': 0.63.6
+      '@unocss/preset-uno': 0.63.6
       cac: 6.7.14
       chokidar: 3.6.0
       colorette: 2.0.20
@@ -1697,173 +1722,177 @@ packages:
       magic-string: 0.30.12
       pathe: 1.1.2
       perfect-debounce: 1.0.0
-      tinyglobby: 0.2.9
+      tinyglobby: 0.2.10
     transitivePeerDependencies:
       - rollup
       - supports-color
     dev: true
 
-  /@unocss/config@0.63.4:
-    resolution: {integrity: sha512-LfAzM8z0r2comUW94KaSo4JaaEZjPkvrfyVWfO/hyaXa+/xSVIkCTW7+lfWh77hrg1e2SUY1HEvIFBg9Jvb1xQ==}
+  /@unocss/config@0.63.6:
+    resolution: {integrity: sha512-+4Lt5uTwRgu1z7vhOUzDf+mL+BQYdaa/Z8NMT2Fiqb37tcjEKvmwaUHdfE22Vif1luDgC6xqFsn6qqFtOxhoWQ==}
     engines: {node: '>=14'}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
       unconfig: 0.5.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@unocss/core@0.63.4:
-    resolution: {integrity: sha512-VB4DJ5DsRWpX64si5tWYRXf1n5UkYQqe2s1V22qFiWmXa7Ec+Vf9s3cxWZmoWFC5P9RQiwM9kAqxdg1G+elVkQ==}
+  /@unocss/core@0.63.6:
+    resolution: {integrity: sha512-Q4QPgJ271Up89+vIqqOKgtdCKkFpHqvHN8W1LUlKPqtYnOvVYaOIVNAZowaIdEhPuc83yLc6Tg2+7riK18QKEw==}
     dev: true
 
-  /@unocss/extractor-arbitrary-variants@0.63.4:
-    resolution: {integrity: sha512-gI/+2Nv+cH/ZoOc/4X7RLD9CuBXH51jfwGJ1xRveS7tj+EBs8VshP7Vhbn6Jyp69E00wt4hyzjviDoGqcIA8bA==}
+  /@unocss/extractor-arbitrary-variants@0.63.6:
+    resolution: {integrity: sha512-HJX0oAa9uzwKYoU8CoJdP1gxjuqFmOLxyZmITjStAmZNZpIxlz2wz4VrHmqml2dkvx/mifGGGc/GxZpQ36D12Q==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/inspector@0.63.4:
-    resolution: {integrity: sha512-NHvOTScsMrh6oMmwGMrqB1q1RCFTHZCIK0Vwp8hL8/gmNlza2Kd2cQ/WYSEsjW132xeLCOqTME5qny1gpG6SpA==}
+  /@unocss/inspector@0.63.6(typescript@5.5.4):
+    resolution: {integrity: sha512-DQDJnhtzdHIQXD2vCdj5ytFnHfQCWJGPmrHJHXxzkTYn8nIovV1roVl1ITLxkDIIYK9bdYneg2imQN5JCZhHmQ==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/rule-utils': 0.63.4
+      '@unocss/core': 0.63.6
+      '@unocss/rule-utils': 0.63.6
       gzip-size: 6.0.0
       sirv: 2.0.4
+      vue-flow-layout: 0.0.5(typescript@5.5.4)
+    transitivePeerDependencies:
+      - typescript
     dev: true
 
-  /@unocss/postcss@0.63.4(postcss@8.4.47):
-    resolution: {integrity: sha512-JnSAV1hAZumkm0KZGXYqWsP2I7wnOdr+oeDckHKLdZR2mHNVbDm46H8XGbie55t/gPftaLSsMbaPvRjU2Fclqg==}
+  /@unocss/postcss@0.63.6(postcss@8.4.49):
+    resolution: {integrity: sha512-XI6U1jMwbQoSHVWpZZu3Cxp3t1PVj5VOj+IYtz7xmcWP9GVK+eyETo/xyB0l4muD4emXfSrhNDrFYzSyIyF5cg==}
     engines: {node: '>=14'}
     peerDependencies:
       postcss: ^8.4.21
     dependencies:
-      '@unocss/config': 0.63.4
-      '@unocss/core': 0.63.4
-      '@unocss/rule-utils': 0.63.4
-      css-tree: 3.0.0
-      postcss: 8.4.47
-      tinyglobby: 0.2.9
+      '@unocss/config': 0.63.6
+      '@unocss/core': 0.63.6
+      '@unocss/rule-utils': 0.63.6
+      css-tree: 3.0.1
+      postcss: 8.4.49
+      tinyglobby: 0.2.10
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@unocss/preset-attributify@0.63.4:
-    resolution: {integrity: sha512-Q2DT4oVdxaL7XxD9sDP3adb5tnYr05sCxCxPhv3ch8brU7uvwbyqkiEw105pWbj0Hb3i/0kD4iq7lVMZYRH5nw==}
+  /@unocss/preset-attributify@0.63.6:
+    resolution: {integrity: sha512-sHH17mfl/THHLxCLAHqPdUniCNMFjAxBHFDZYgGi83azuarF2evI5Mtc3Qsj3nzoSQwTPmK2VY3XYUUrpPDGWQ==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/preset-icons@0.63.4:
-    resolution: {integrity: sha512-V7JV2xvEGeNVjP6HT4IG/BY/HgajJt9CLT2sgKbaVCU9hNOuBs1YTOxua0KLynbTYwr5F5cDMuE/9slQYinZmg==}
+  /@unocss/preset-icons@0.63.6:
+    resolution: {integrity: sha512-fRU44wXABnMPT/9zhKBNSUeDJlOxJhUJP9W3FSRnc+ktjAifJIj0xpUKtEqxL46QMq825Bsj2yDSquzP+XYGnQ==}
     dependencies:
       '@iconify/utils': 2.1.33
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
       ofetch: 1.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@unocss/preset-mini@0.63.4:
-    resolution: {integrity: sha512-sim1/uy/XaVzdnMdepXdbdacXF5QNkPDnl4PYBWTyGuT5yKFpuipWpJDS5zZH5W6PYzKdcDA3YiaJ0S5CiUWpQ==}
+  /@unocss/preset-mini@0.63.6:
+    resolution: {integrity: sha512-pZDZbSuxabHSwPIy3zCgQ4MNdVCSHvOvZecreH+v96R1oOhquiwU8WiSbkxvZiKiLQJd7JUVW87E1pAzr5ZGGQ==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/extractor-arbitrary-variants': 0.63.4
-      '@unocss/rule-utils': 0.63.4
+      '@unocss/core': 0.63.6
+      '@unocss/extractor-arbitrary-variants': 0.63.6
+      '@unocss/rule-utils': 0.63.6
     dev: true
 
-  /@unocss/preset-tagify@0.63.4:
-    resolution: {integrity: sha512-RQkeSCKrGAowomjh8/chlnVWWOFlC+QkHB1oY5isRXNO2HStESZljyL/MisRpgjj0ubPiocoFCI2hRzXT/HrSg==}
+  /@unocss/preset-tagify@0.63.6:
+    resolution: {integrity: sha512-3lKhk4MW3RqJBwIvBXHj0H0/kHkFlKtCIBQFiBcCJh8TXOID8IZ0iVjuGwdlk63VTizI/wnsNDOVpj6YcjRRlw==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/preset-typography@0.63.4:
-    resolution: {integrity: sha512-PtRXDqF8dW1GYDxiF1Opl+M5fhZeKx63bhvtXXf3iHjVzPDSHB6w1kTElh6vIWeLDNM9GZbbJyB5f2C8DBjibw==}
+  /@unocss/preset-typography@0.63.6:
+    resolution: {integrity: sha512-AXmBVnbV54gUIv5kbywjZek9ZlKRwJfBDVMtWOcLOjN3AHirGx1W2oq2UzNkfYZ2leof/Y2BocxeTwGCCRhqDQ==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/preset-mini': 0.63.4
+      '@unocss/core': 0.63.6
+      '@unocss/preset-mini': 0.63.6
     dev: true
 
-  /@unocss/preset-uno@0.63.4:
-    resolution: {integrity: sha512-VMc2R0XRMjXA5u5HnP0SkiWtc8EnEJvipNPKsWBuyyVb0QrsIXtF5z3l3cuZmD6V7m/o9s81yshL0gFOBpF7iQ==}
+  /@unocss/preset-uno@0.63.6:
+    resolution: {integrity: sha512-67PbHyVgAe9Rz0Rhyl3zBibFuGmqQMRPMkRjNYrwmmtNydpQYsXbfnDs0p8mZFp6uO2o3Jkh7urqEtixHHvq0Q==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/preset-mini': 0.63.4
-      '@unocss/preset-wind': 0.63.4
-      '@unocss/rule-utils': 0.63.4
+      '@unocss/core': 0.63.6
+      '@unocss/preset-mini': 0.63.6
+      '@unocss/preset-wind': 0.63.6
+      '@unocss/rule-utils': 0.63.6
     dev: true
 
-  /@unocss/preset-web-fonts@0.63.4:
-    resolution: {integrity: sha512-XuU4dNwTQ0ULlYpQFSKk2JRYACTzpIzpPGP5ZnqdwBxEQH5JhXx4mEmaOhu1OH3c2hZURAkdQvBzYWia4oZ6og==}
+  /@unocss/preset-web-fonts@0.63.6:
+    resolution: {integrity: sha512-ko1aHDax0u5CQi1BXggv6uW5Vq/LQRWwzOxqBFTh1JlGHPZTw4CdVJkYnlpt3WEW+FPUzZYjhKmMmQY7KtOTng==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
       ofetch: 1.4.1
     dev: true
 
-  /@unocss/preset-wind@0.63.4:
-    resolution: {integrity: sha512-8fTUp6ZxH9YiScz4nZ1tRqprayrlQSfguzkjxDvOrwazfNcmxvHSZfC9dtpEmY+QssM1zHH0mmWmWgQYwU9Zdw==}
+  /@unocss/preset-wind@0.63.6:
+    resolution: {integrity: sha512-W3oZ2TXSqStNE+X++kcspRTF2Szu2ej6NW5Kiyy6WQn/+ZD77AF4VtvzHtzFVZ2QKpEIovGBpU5tywooHbB7hw==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/preset-mini': 0.63.4
-      '@unocss/rule-utils': 0.63.4
+      '@unocss/core': 0.63.6
+      '@unocss/preset-mini': 0.63.6
+      '@unocss/rule-utils': 0.63.6
     dev: true
 
-  /@unocss/reset@0.63.4:
-    resolution: {integrity: sha512-7lnVH9zuVMekY0IUtcQRrbEqlkhvyGixgzHSWPBF/JA/Pto18bhd+cMeZhuz4eHRbN274bANX+//I+Ilfo7SSg==}
+  /@unocss/reset@0.63.6:
+    resolution: {integrity: sha512-gq73RSZj54MOloqrivkoMPXCqNG2WpIyBT1AYlF76uKxEEbUD41E8uBUhLSKs7gFgF01yQJLRaIuyN1yw09pbQ==}
     dev: true
 
-  /@unocss/rule-utils@0.63.4:
-    resolution: {integrity: sha512-7yRWF881ymxnMcCJSiI/1kMI8uwRqRi3l5XnV+JSGjjF2fDr1POUQjSLaA4s7ZfdEgmjagdLK3F5xqkfMMECNA==}
+  /@unocss/rule-utils@0.63.6:
+    resolution: {integrity: sha512-moeDEq5d9mB8gSYeoqHMkXWWekaFFdhg7QCuwwCbxCc+NPMOgGkmfAoafz+y2tdvK7pEuT191RWOiHQ0MkA5oQ==}
     engines: {node: '>=14'}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
       magic-string: 0.30.12
     dev: true
 
-  /@unocss/transformer-attributify-jsx@0.63.4:
-    resolution: {integrity: sha512-5cO9BY/Bga6YmbTch1Neg+E46HerJp5wLxPkIcFCDNsqy2MsB97jsFG1dO0jDUg43E26MRI19tg1eqrWL6sTYg==}
+  /@unocss/transformer-attributify-jsx@0.63.6:
+    resolution: {integrity: sha512-/RU09MF+hJK7cFbLJ+8vloCGyhn6Oys8R6gey0auB0+nw/ucUXoLQKWgUqo9taQlLuYOiehdkYjQSdWn5lyA/Q==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/transformer-compile-class@0.63.4:
-    resolution: {integrity: sha512-ta6mqq2S5OWcfBzzYnaiMt3ekn2ECNZTqzzqMglnIKPkE+GmqUmmRavRnpc+NGobuqMRcI4F6x8MSSHf4MV0jw==}
+  /@unocss/transformer-compile-class@0.63.6:
+    resolution: {integrity: sha512-zzAqs8adnTUOLA88RgcToadcrz9gjxrZk6IrcmMqMmWqk0MOWNQHIN0RzKa/yaw4QhO2xuGyIz4/WHyXuCXMQg==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/transformer-directives@0.63.4:
-    resolution: {integrity: sha512-N/dNhmn3e9/Z4IvAujxCdwhNMfx2SihPA2/7GFSMMRi7F0Hn/o2hOqQquRqIJbQwIvi6bJtKwyasxjDoUhJqBA==}
+  /@unocss/transformer-directives@0.63.6:
+    resolution: {integrity: sha512-XcNOwLRbfrJSU6YXyLgiMzAigSzjIdvHwS3lLCZ2n6DWuLmTuXBfvVtRxeJ+aflNkhpQNKONCClC4s6I2r53uw==}
     dependencies:
-      '@unocss/core': 0.63.4
-      '@unocss/rule-utils': 0.63.4
-      css-tree: 3.0.0
+      '@unocss/core': 0.63.6
+      '@unocss/rule-utils': 0.63.6
+      css-tree: 3.0.1
     dev: true
 
-  /@unocss/transformer-variant-group@0.63.4:
-    resolution: {integrity: sha512-uEHltdfR0Y1nvs1eqHwsgevRFhZkLmA/MsaMEfNblDJ6CLHe/ACNmMoLX1Mcuq/lAPs0X6jGnKudk4QTrCv15Q==}
+  /@unocss/transformer-variant-group@0.63.6:
+    resolution: {integrity: sha512-ebYSjZnZrtcJYjmAEDwGVwPuaQ9EVWKNDDJFFSusP8k/6PjJoHDh0qkj+hdPPDhYn81yzJQalU1eSUSlfC30VA==}
     dependencies:
-      '@unocss/core': 0.63.4
+      '@unocss/core': 0.63.6
     dev: true
 
-  /@unocss/vite@0.63.4(vite@5.4.8):
-    resolution: {integrity: sha512-YK0L177GD8Kx+JtfiCJy4YyBYckAXo4ogC8LZ+pYVNXDMN+F+XItpGI/ofLRaGIaewNg+MJgGY+CQZceABEAfg==}
+  /@unocss/vite@0.63.6(typescript@5.5.4)(vite@5.4.11):
+    resolution: {integrity: sha512-gxK3gtvYQH5S/qtuvsY4M0S+KJPZnYrOQI/Gopufx+b2qgmwZ/TSAe66gWeKYfe3DfQsmA3PPh/GXpkK+/FnHg==}
     peerDependencies:
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.2
-      '@unocss/config': 0.63.4
-      '@unocss/core': 0.63.4
-      '@unocss/inspector': 0.63.4
+      '@rollup/pluginutils': 5.1.3
+      '@unocss/config': 0.63.6
+      '@unocss/core': 0.63.6
+      '@unocss/inspector': 0.63.6(typescript@5.5.4)
       chokidar: 3.6.0
       magic-string: 0.30.12
-      tinyglobby: 0.2.9
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      tinyglobby: 0.2.10
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
+      - typescript
     dev: true
 
   /@uppy/companion-client@2.2.2:
@@ -1883,7 +1912,7 @@ packages:
       mime-match: 1.0.2
       namespace-emitter: 2.0.1
       nanoid: 3.3.7
-      preact: 10.24.2
+      preact: 10.24.3
     dev: false
 
   /@uppy/store-default@2.1.1:
@@ -1907,31 +1936,31 @@ packages:
       nanoid: 3.3.7
     dev: false
 
-  /@vitejs/plugin-vue@5.1.4(vite@5.4.8)(vue@3.5.12):
-    resolution: {integrity: sha512-N2XSI2n3sQqp5w7Y/AN/L2XDjBIRGqXko+eDp42sydYSBeJuSm5a1sLf8zakmo8u7tA8NmBgoDLA1HeOESjp9A==}
+  /@vitejs/plugin-vue@5.1.5(vite@5.4.11)(vue@3.5.12):
+    resolution: {integrity: sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==}
     engines: {node: ^18.0.0 || >=20.0.0}
     peerDependencies:
       vite: ^5.0.0
       vue: ^3.2.25
     dependencies:
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
       vue: 3.5.12(typescript@5.5.4)
     dev: true
 
-  /@volar/language-core@2.4.6:
-    resolution: {integrity: sha512-FxUfxaB8sCqvY46YjyAAV6c3mMIq/NWQMVvJ+uS4yxr1KzOvyg61gAuOnNvgCvO4TZ7HcLExBEsWcDu4+K4E8A==}
+  /@volar/language-core@2.4.10:
+    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
     dependencies:
-      '@volar/source-map': 2.4.6
+      '@volar/source-map': 2.4.10
     dev: true
 
-  /@volar/source-map@2.4.6:
-    resolution: {integrity: sha512-Nsh7UW2ruK+uURIPzjJgF0YRGP5CX9nQHypA2OMqdM2FKy7rh+uv3XgPnWPw30JADbKvZ5HuBzG4gSbVDYVtiw==}
+  /@volar/source-map@2.4.10:
+    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
     dev: true
 
-  /@volar/typescript@2.4.6:
-    resolution: {integrity: sha512-NMIrA7y5OOqddL9VtngPWYmdQU03htNKFtAYidbYfWA0TOhyGVd9tfcP4TsLWQ+RBWDZCbBqsr8xzU0ZOxYTCQ==}
+  /@volar/typescript@2.4.10:
+    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
     dependencies:
-      '@volar/language-core': 2.4.6
+      '@volar/language-core': 2.4.10
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
     dev: true
@@ -1939,7 +1968,7 @@ packages:
   /@vue/compiler-core@3.5.12:
     resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
     dependencies:
-      '@babel/parser': 7.25.8
+      '@babel/parser': 7.26.2
       '@vue/shared': 3.5.12
       entities: 4.5.0
       estree-walker: 2.0.2
@@ -1954,14 +1983,14 @@ packages:
   /@vue/compiler-sfc@3.5.12:
     resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
     dependencies:
-      '@babel/parser': 7.25.8
+      '@babel/parser': 7.26.2
       '@vue/compiler-core': 3.5.12
       '@vue/compiler-dom': 3.5.12
       '@vue/compiler-ssr': 3.5.12
       '@vue/shared': 3.5.12
       estree-walker: 2.0.2
       magic-string: 0.30.12
-      postcss: 8.4.47
+      postcss: 8.4.49
       source-map-js: 1.2.1
 
   /@vue/compiler-ssr@3.5.12:
@@ -1981,19 +2010,19 @@ packages:
     resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
     dev: false
 
-  /@vue/language-core@2.1.6(typescript@5.5.4):
-    resolution: {integrity: sha512-MW569cSky9R/ooKMh6xa2g1D0AtRKbL56k83dzus/bx//RDJk24RHWkMzbAlXjMdDNyxAaagKPRquBIxkxlCkg==}
+  /@vue/language-core@2.1.10(typescript@5.5.4):
+    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
     peerDependencies:
       typescript: '*'
     peerDependenciesMeta:
       typescript:
         optional: true
     dependencies:
-      '@volar/language-core': 2.4.6
+      '@volar/language-core': 2.4.10
       '@vue/compiler-dom': 3.5.12
       '@vue/compiler-vue2': 2.7.16
       '@vue/shared': 3.5.12
-      computeds: 0.0.1
+      alien-signals: 0.2.1
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
@@ -2272,16 +2301,16 @@ packages:
       through: 2.3.8
     dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.12.1):
+  /acorn-jsx@5.3.2(acorn@8.14.0):
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
       acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
     dev: true
 
-  /acorn@8.12.1:
-    resolution: {integrity: sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==}
+  /acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
     engines: {node: '>=0.4.0'}
     hasBin: true
     dev: true
@@ -2299,11 +2328,15 @@ packages:
     resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
     dependencies:
       fast-deep-equal: 3.1.3
-      fast-uri: 3.0.2
+      fast-uri: 3.0.3
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
     dev: true
 
+  /alien-signals@0.2.1:
+    resolution: {integrity: sha512-FlEQrDJe9r2RI4cDlnK2zYqJezvx1uJaWEuwxsnlFqnPwvJbgitNBRumWrLDv8lA+7cCikpMxfJD2TTHiaTklA==}
+    dev: true
+
   /animate.css@4.1.1:
     resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
     dev: false
@@ -2506,19 +2539,19 @@ packages:
     hasBin: true
     dev: true
 
-  /autoprefixer@10.4.20(postcss@8.4.47):
+  /autoprefixer@10.4.20(postcss@8.4.49):
     resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
     engines: {node: ^10 || ^12 || >=14}
     hasBin: true
     peerDependencies:
       postcss: ^8.1.0
     dependencies:
-      browserslist: 4.24.0
-      caniuse-lite: 1.0.30001668
+      browserslist: 4.24.2
+      caniuse-lite: 1.0.30001680
       fraction.js: 4.3.7
       normalize-range: 0.1.2
-      picocolors: 1.1.0
-      postcss: 8.4.47
+      picocolors: 1.1.1
+      postcss: 8.4.49
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -2638,15 +2671,15 @@ packages:
       fill-range: 7.1.1
     dev: true
 
-  /browserslist@4.24.0:
-    resolution: {integrity: sha512-Rmb62sR1Zpjql25eSanFGEhAxcFwfA1K0GuQcLoaJBAcENegrQut3hYdhXFF1obQfiDyqIW/cLM5HSJ/9k884A==}
+  /browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
     hasBin: true
     dependencies:
-      caniuse-lite: 1.0.30001668
-      electron-to-chromium: 1.5.36
+      caniuse-lite: 1.0.30001680
+      electron-to-chromium: 1.5.56
       node-releases: 2.0.18
-      update-browserslist-db: 1.1.1(browserslist@4.24.0)
+      update-browserslist-db: 1.1.1(browserslist@4.24.2)
     dev: true
 
   /buffer-crc32@0.2.13:
@@ -2728,8 +2761,8 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /caniuse-lite@1.0.30001668:
-    resolution: {integrity: sha512-nWLrdxqCdblixUO+27JtGJJE/txpJlyUy5YN1u53wLZkP0emYCo5zgS6QYft7VUYR42LGgi/S5hdLZTrnyIddw==}
+  /caniuse-lite@1.0.30001680:
+    resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==}
     dev: true
 
   /chainsaw@0.1.0:
@@ -2943,13 +2976,13 @@ packages:
     engines: {node: '>= 10'}
     dev: true
 
-  /commitizen@4.3.1(@types/node@22.7.5)(typescript@5.5.4):
+  /commitizen@4.3.1(@types/node@22.9.0)(typescript@5.5.4):
     resolution: {integrity: sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==}
     engines: {node: '>= 12'}
     hasBin: true
     dependencies:
       cachedir: 2.3.0
-      cz-conventional-changelog: 3.3.0(@types/node@22.7.5)(typescript@5.5.4)
+      cz-conventional-changelog: 3.3.0(@types/node@22.9.0)(typescript@5.5.4)
       dedent: 0.7.0
       detect-indent: 6.1.0
       find-node-modules: 2.1.3
@@ -2992,10 +3025,6 @@ packages:
     resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
     dev: false
 
-  /computeds@0.0.1:
-    resolution: {integrity: sha512-7CEBgcMjVmitjYo5q8JTJVra6X5mQ20uTThdK+0kR7UEaDrAWEQcRiBtWJzga4eRpP6afNwwLsX2SET2JhVB1Q==}
-    dev: true
-
   /concat-map@0.0.1:
     resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
 
@@ -3062,15 +3091,15 @@ packages:
       vary: 1.1.2
     dev: true
 
-  /cosmiconfig-typescript-loader@5.0.0(@types/node@22.7.5)(cosmiconfig@9.0.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-+8cK7jRAReYkMwMiG+bxhcNKiHJDM6bR9FD/nGBXOWdMLuYawjF5cGrtLilJ+LGd3ZjCXnJjR5DkfWPoIVlqJA==}
+  /cosmiconfig-typescript-loader@5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==}
     engines: {node: '>=v16'}
     peerDependencies:
       '@types/node': '*'
       cosmiconfig: '>=8.2'
       typescript: '>=4'
     dependencies:
-      '@types/node': 22.7.5
+      '@types/node': 22.9.0
       cosmiconfig: 9.0.0(typescript@5.5.4)
       jiti: 1.21.6
       typescript: 5.5.4
@@ -3106,8 +3135,8 @@ packages:
       readable-stream: 3.6.2
     dev: false
 
-  /cross-spawn@7.0.3:
-    resolution: {integrity: sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==}
+  /cross-spawn@7.0.5:
+    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
     engines: {node: '>= 8'}
     dependencies:
       path-key: 3.1.1
@@ -3138,19 +3167,11 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /css-tree@2.3.1:
-    resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
-    dependencies:
-      mdn-data: 2.0.30
-      source-map-js: 1.2.1
-    dev: true
-
-  /css-tree@3.0.0:
-    resolution: {integrity: sha512-o88DVQ6GzsABn1+6+zo2ct801dBO5OASVyxbbvA2W20ue2puSh/VOuqUj90eUeMSX/xqGqBmOKiRQN7tJOuBXw==}
+  /css-tree@3.0.1:
+    resolution: {integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==}
     engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
     dependencies:
-      mdn-data: 2.10.0
+      mdn-data: 2.12.1
       source-map-js: 1.2.1
     dev: true
 
@@ -3175,18 +3196,18 @@ packages:
   /csstype@3.1.3:
     resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
 
-  /cz-conventional-changelog@3.3.0(@types/node@22.7.5)(typescript@5.5.4):
+  /cz-conventional-changelog@3.3.0(@types/node@22.9.0)(typescript@5.5.4):
     resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==}
     engines: {node: '>= 10'}
     dependencies:
       chalk: 2.4.2
-      commitizen: 4.3.1(@types/node@22.7.5)(typescript@5.5.4)
+      commitizen: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
       conventional-commit-types: 3.0.0
       lodash.map: 4.6.0
       longest: 2.0.1
       word-wrap: 1.2.5
     optionalDependencies:
-      '@commitlint/load': 19.5.0(@types/node@22.7.5)(typescript@5.5.4)
+      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
     transitivePeerDependencies:
       - '@types/node'
       - typescript
@@ -3358,7 +3379,9 @@ packages:
     resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
     engines: {node: '>=0.10'}
     hasBin: true
+    requiresBuild: true
     dev: true
+    optional: true
 
   /dezalgo@1.0.4:
     resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
@@ -3482,20 +3505,20 @@ packages:
       zrender: 5.6.0
     dev: false
 
-  /electron-to-chromium@1.5.36:
-    resolution: {integrity: sha512-HYTX8tKge/VNp6FGO+f/uVDmUkq+cEfcxYhKf15Akc4M5yxt5YmorwlAitKWjWhWQnKcDRBAQKXkhqqXMqcrjw==}
+  /electron-to-chromium@1.5.56:
+    resolution: {integrity: sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==}
     dev: true
 
-  /element-plus@2.8.5(vue@3.5.12):
-    resolution: {integrity: sha512-Px+kPbRTVvn5oa5+9saa7QEOnUweKXm0JVI7yJHzKF/doQGixwcFMsQEF2+3Fy62EA/7dRRKVuhsNGGZYNk3cw==}
+  /element-plus@2.8.7(vue@3.5.12):
+    resolution: {integrity: sha512-oGQyFRufFOgjd872tZc+T4xQAYLlX4hj6d3ixeY13L4fFNUuc1N49JHAqJGPda0tdx3qCnjceZoh1kqqj2+tXQ==}
     peerDependencies:
       vue: ^3.2.0
     dependencies:
       '@ctrl/tinycolor': 3.6.1
       '@element-plus/icons-vue': 2.3.1(vue@3.5.12)
-      '@floating-ui/dom': 1.6.11
+      '@floating-ui/dom': 1.6.12
       '@popperjs/core': /@sxzz/popperjs-es@2.11.7
-      '@types/lodash': 4.17.10
+      '@types/lodash': 4.17.13
       '@types/lodash-es': 4.17.12
       '@vueuse/core': 9.13.0(vue@3.5.12)
       async-validator: 4.2.5
@@ -3593,7 +3616,7 @@ packages:
       is-string: 1.0.7
       is-typed-array: 1.1.13
       is-weakref: 1.0.2
-      object-inspect: 1.13.2
+      object-inspect: 1.13.3
       object-keys: 1.1.1
       object.assign: 4.1.5
       regexp.prototype.flags: 1.5.3
@@ -3759,16 +3782,16 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /eslint-config-prettier@9.1.0(eslint@9.12.0):
+  /eslint-config-prettier@9.1.0(eslint@9.14.0):
     resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
     hasBin: true
     peerDependencies:
       eslint: '>=7.0.0'
     dependencies:
-      eslint: 9.12.0
+      eslint: 9.14.0
     dev: true
 
-  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@9.12.0)(prettier@3.3.3):
+  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@9.14.0)(prettier@3.3.3):
     resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     peerDependencies:
@@ -3782,27 +3805,27 @@ packages:
       eslint-config-prettier:
         optional: true
     dependencies:
-      eslint: 9.12.0
-      eslint-config-prettier: 9.1.0(eslint@9.12.0)
+      eslint: 9.14.0
+      eslint-config-prettier: 9.1.0(eslint@9.14.0)
       prettier: 3.3.3
       prettier-linter-helpers: 1.0.0
       synckit: 0.9.2
     dev: true
 
-  /eslint-plugin-vue@9.29.0(eslint@9.12.0):
-    resolution: {integrity: sha512-hamyjrBhNH6Li6R1h1VF9KHfshJlKgKEg3ARbGTn72CMNDSMhWbgC7NdkRDEh25AFW+4SDATzyNM+3gWuZii8g==}
+  /eslint-plugin-vue@9.31.0(eslint@9.14.0):
+    resolution: {integrity: sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0)
-      eslint: 9.12.0
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
+      eslint: 9.14.0
       globals: 13.24.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.1.2
       semver: 7.6.3
-      vue-eslint-parser: 9.4.3(eslint@9.12.0)
+      vue-eslint-parser: 9.4.3(eslint@9.14.0)
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
@@ -3816,8 +3839,8 @@ packages:
       estraverse: 5.3.0
     dev: true
 
-  /eslint-scope@8.1.0:
-    resolution: {integrity: sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==}
+  /eslint-scope@8.2.0:
+    resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
       esrecurse: 4.3.0
@@ -3829,13 +3852,13 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /eslint-visitor-keys@4.1.0:
-    resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==}
+  /eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dev: true
 
-  /eslint@9.12.0:
-    resolution: {integrity: sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==}
+  /eslint@9.14.0:
+    resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     hasBin: true
     peerDependencies:
@@ -3844,26 +3867,26 @@ packages:
       jiti:
         optional: true
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0)
-      '@eslint-community/regexpp': 4.11.1
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
+      '@eslint-community/regexpp': 4.12.1
       '@eslint/config-array': 0.18.0
-      '@eslint/core': 0.6.0
+      '@eslint/core': 0.7.0
       '@eslint/eslintrc': 3.1.0
-      '@eslint/js': 9.12.0
-      '@eslint/plugin-kit': 0.2.0
-      '@humanfs/node': 0.16.5
+      '@eslint/js': 9.14.0
+      '@eslint/plugin-kit': 0.2.2
+      '@humanfs/node': 0.16.6
       '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.3.1
+      '@humanwhocodes/retry': 0.4.1
       '@types/estree': 1.0.6
       '@types/json-schema': 7.0.15
       ajv: 6.12.6
       chalk: 4.1.2
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.5
       debug: 4.3.7
       escape-string-regexp: 4.0.0
-      eslint-scope: 8.1.0
-      eslint-visitor-keys: 4.1.0
-      espree: 10.2.0
+      eslint-scope: 8.2.0
+      eslint-visitor-keys: 4.2.0
+      espree: 10.3.0
       esquery: 1.6.0
       esutils: 2.0.3
       fast-deep-equal: 3.1.3
@@ -3893,21 +3916,21 @@ packages:
       type: 2.7.3
     dev: false
 
-  /espree@10.2.0:
-    resolution: {integrity: sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==}
+  /espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
-      eslint-visitor-keys: 4.1.0
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
+      eslint-visitor-keys: 4.2.0
     dev: true
 
   /espree@9.6.1:
     resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dependencies:
-      acorn: 8.12.1
-      acorn-jsx: 5.3.2(acorn@8.12.1)
+      acorn: 8.14.0
+      acorn-jsx: 5.3.2(acorn@8.14.0)
       eslint-visitor-keys: 3.4.3
     dev: true
 
@@ -3979,7 +4002,7 @@ packages:
     resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
     engines: {node: '>=16.17'}
     dependencies:
-      cross-spawn: 7.0.3
+      cross-spawn: 7.0.5
       get-stream: 8.0.1
       human-signals: 5.0.0
       is-stream: 3.0.0
@@ -4093,8 +4116,8 @@ packages:
     resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
     dev: true
 
-  /fast-uri@3.0.2:
-    resolution: {integrity: sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==}
+  /fast-uri@3.0.3:
+    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
     dev: true
 
   /fastest-levenshtein@1.0.16:
@@ -4108,8 +4131,8 @@ packages:
       reusify: 1.0.4
     dev: true
 
-  /fdir@6.4.0(picomatch@4.0.2):
-    resolution: {integrity: sha512-3oB133prH1o4j/L5lLW7uOCF1PlD+/It2L0eL/iAqWMB91RBbqTewABqxhj0ibBd90EEmWZq7ntIWzVaWcXTGQ==}
+  /fdir@6.4.2(picomatch@4.0.2):
+    resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
     peerDependencies:
       picomatch: ^3 || ^4
     peerDependenciesMeta:
@@ -4332,8 +4355,8 @@ packages:
     engines: {node: 6.* || 8.* || >= 10.*}
     dev: true
 
-  /get-east-asian-width@1.2.0:
-    resolution: {integrity: sha512-2nk+7SIVb14QrgXFHcm84tD4bKQz0RxPuMT8Ag5KPOq7J5fEmAg0UbXdTOSHqNuHSU28k55qnceesxXRZGzKWA==}
+  /get-east-asian-width@1.3.0:
+    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
     engines: {node: '>=18'}
     dev: true
 
@@ -4462,8 +4485,8 @@ packages:
     engines: {node: '>=18'}
     dev: true
 
-  /globals@15.11.0:
-    resolution: {integrity: sha512-yeyNSjdbyVaWurlwCpcA6XNBrHTMIeDdj0/hnvX/OLJ9ekOXYbLsLinH/MucQyGvNnXhidTdNhTtJaffL2sMfw==}
+  /globals@15.12.0:
+    resolution: {integrity: sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==}
     engines: {node: '>=18'}
     dev: true
 
@@ -4650,8 +4673,8 @@ packages:
       toidentifier: 1.0.1
     dev: true
 
-  /http-status@1.7.4:
-    resolution: {integrity: sha512-c2qSwNtTlHVYAhMj9JpGdyo0No/+DiKXCJ9pHtZ2Yf3QmPnBIytKSRT7BuyIiQ7icXLynavGmxUqkOjSrAuMuA==}
+  /http-status@1.8.1:
+    resolution: {integrity: sha512-YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==}
     engines: {node: '>= 0.4.0'}
     dev: true
 
@@ -4669,7 +4692,7 @@ packages:
   /i18next@20.6.1:
     resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
     dependencies:
-      '@babel/runtime': 7.25.7
+      '@babel/runtime': 7.26.0
     dev: false
 
   /iconv-lite@0.4.24:
@@ -4731,7 +4754,7 @@ packages:
       jiti: 2.0.0-beta.3
       jiti-v1: /jiti@1.21.6
       pathe: 1.1.2
-      tsx: 4.19.1
+      tsx: 4.19.2
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4919,7 +4942,7 @@ packages:
     resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
     engines: {node: '>=18'}
     dependencies:
-      get-east-asian-width: 1.2.0
+      get-east-asian-width: 1.3.0
     dev: true
 
   /is-glob@4.0.3:
@@ -5203,6 +5226,10 @@ packages:
     resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
     dev: true
 
+  /known-css-properties@0.35.0:
+    resolution: {integrity: sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==}
+    dev: true
+
   /kolorist@1.8.0:
     resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
     dev: true
@@ -5481,12 +5508,12 @@ packages:
     resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
     dev: true
 
-  /mdn-data@2.0.30:
-    resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==}
+  /mdn-data@2.12.1:
+    resolution: {integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==}
     dev: true
 
-  /mdn-data@2.10.0:
-    resolution: {integrity: sha512-qq7C3EtK3yJXMwz1zAab65pjl+UhohqMOctTgcqjLOWABqmwj+me02LSsCuEUxnst9X1lCBpoE0WArGKgdGDzw==}
+  /mdn-data@2.12.2:
+    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
     dev: true
 
   /media-typer@0.3.0:
@@ -5632,7 +5659,7 @@ packages:
   /mlly@1.7.2:
     resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       pathe: 1.1.2
       pkg-types: 1.2.1
       ufo: 1.5.4
@@ -5697,7 +5724,9 @@ packages:
 
   /node-addon-api@7.1.1:
     resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+    requiresBuild: true
     dev: true
+    optional: true
 
   /node-fetch-native@1.6.4:
     resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
@@ -5751,8 +5780,8 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-inspect@1.13.2:
-    resolution: {integrity: sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==}
+  /object-inspect@1.13.3:
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
     engines: {node: '>= 0.4'}
 
   /object-keys@1.1.1:
@@ -5897,7 +5926,7 @@ packages:
     resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
     engines: {node: '>=8'}
     dependencies:
-      '@babel/code-frame': 7.25.7
+      '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
@@ -5965,8 +5994,8 @@ packages:
     resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
     dev: true
 
-  /picocolors@1.1.0:
-    resolution: {integrity: sha512-TQ92mBOW0l3LeMeyLV6mzy/kWr8lkd/hp3mTg7wYK7zJhuBStmGMBG0BdeDZS/dZx1IukaX6Bk11zcln25o1Aw==}
+  /picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
   /picomatch@2.3.1:
     resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
@@ -5984,12 +6013,12 @@ packages:
     hasBin: true
     dev: true
 
-  /pinia@2.2.4(typescript@5.5.4)(vue@3.5.12):
-    resolution: {integrity: sha512-K7ZhpMY9iJ9ShTC0cR2+PnxdQRuwVIsXDO/WIEV/RnMC/vmSoKDTKW/exNQYPI+4ij10UjXqdNiEHwn47McANQ==}
+  /pinia@2.2.6(typescript@5.5.4)(vue@3.5.12):
+    resolution: {integrity: sha512-vIsR8JkDN5Ga2vAxqOE2cJj4VtsHnzpR1Fz30kClxlh0yCHfec6uoMeM3e/ddqmwFUejK3NlrcQa/shnpyT4hA==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
       typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.3.0
+      vue: ^2.6.14 || ^3.5.11
     peerDependenciesMeta:
       '@vue/composition-api':
         optional: true
@@ -6026,8 +6055,8 @@ packages:
     dependencies:
       htmlparser2: 8.0.2
       js-tokens: 9.0.0
-      postcss: 8.4.47
-      postcss-safe-parser: 6.0.0(postcss@8.4.47)
+      postcss: 8.4.49
+      postcss-safe-parser: 6.0.0(postcss@8.4.49)
     dev: true
 
   /postcss-media-query-parser@0.2.3:
@@ -6046,31 +6075,31 @@ packages:
     resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
     dev: true
 
-  /postcss-safe-parser@6.0.0(postcss@8.4.47):
+  /postcss-safe-parser@6.0.0(postcss@8.4.49):
     resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.3.3
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
     dev: true
 
-  /postcss-safe-parser@7.0.1(postcss@8.4.47):
+  /postcss-safe-parser@7.0.1(postcss@8.4.49):
     resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==}
     engines: {node: '>=18.0'}
     peerDependencies:
       postcss: ^8.4.31
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
     dev: true
 
-  /postcss-scss@4.0.9(postcss@8.4.47):
+  /postcss-scss@4.0.9(postcss@8.4.49):
     resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==}
     engines: {node: '>=12.0'}
     peerDependencies:
       postcss: ^8.4.29
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
     dev: true
 
   /postcss-selector-parser@6.1.2:
@@ -6081,12 +6110,12 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /postcss-sorting@8.0.2(postcss@8.4.47):
+  /postcss-sorting@8.0.2(postcss@8.4.49):
     resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
     peerDependencies:
       postcss: ^8.4.20
     dependencies:
-      postcss: 8.4.47
+      postcss: 8.4.49
     dev: true
 
   /postcss-value-parser@4.2.0:
@@ -6103,12 +6132,12 @@ packages:
       supports-color: 3.2.3
     dev: true
 
-  /postcss@8.4.47:
-    resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==}
+  /postcss@8.4.49:
+    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
     engines: {node: ^10 || ^12 || >=14}
     dependencies:
       nanoid: 3.3.7
-      picocolors: 1.1.0
+      picocolors: 1.1.1
       source-map-js: 1.2.1
 
   /posthtml-parser@0.2.1:
@@ -6146,8 +6175,8 @@ packages:
       posthtml-render: 1.4.0
     dev: true
 
-  /preact@10.24.2:
-    resolution: {integrity: sha512-1cSoF0aCC8uaARATfrlz4VCBqE8LwZwRfLgkxJOQwAlQt6ayTmi0D9OF7nXid1POI5SZidFuG9CnlXbDfLqY/Q==}
+  /preact@10.24.3:
+    resolution: {integrity: sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==}
     dev: false
 
   /prelude-ls@1.2.1:
@@ -6359,29 +6388,31 @@ packages:
       glob: 7.2.3
     dev: false
 
-  /rollup@4.24.0:
-    resolution: {integrity: sha512-DOmrlGSXNk1DM0ljiQA+i+o0rSLhtii1je5wgk60j49d1jHT5YYttBv1iWOnYSTG+fZZESUOSNiAl89SIet+Cg==}
+  /rollup@4.25.0:
+    resolution: {integrity: sha512-uVbClXmR6wvx5R1M3Od4utyLUxrmOcEm3pAtMphn73Apq19PDtHpgZoEvqH2YnnaNUuvKmg2DgRd2Sqv+odyqg==}
     engines: {node: '>=18.0.0', npm: '>=8.0.0'}
     hasBin: true
     dependencies:
       '@types/estree': 1.0.6
     optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.24.0
-      '@rollup/rollup-android-arm64': 4.24.0
-      '@rollup/rollup-darwin-arm64': 4.24.0
-      '@rollup/rollup-darwin-x64': 4.24.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.24.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.24.0
-      '@rollup/rollup-linux-arm64-gnu': 4.24.0
-      '@rollup/rollup-linux-arm64-musl': 4.24.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.24.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.24.0
-      '@rollup/rollup-linux-s390x-gnu': 4.24.0
-      '@rollup/rollup-linux-x64-gnu': 4.24.0
-      '@rollup/rollup-linux-x64-musl': 4.24.0
-      '@rollup/rollup-win32-arm64-msvc': 4.24.0
-      '@rollup/rollup-win32-ia32-msvc': 4.24.0
-      '@rollup/rollup-win32-x64-msvc': 4.24.0
+      '@rollup/rollup-android-arm-eabi': 4.25.0
+      '@rollup/rollup-android-arm64': 4.25.0
+      '@rollup/rollup-darwin-arm64': 4.25.0
+      '@rollup/rollup-darwin-x64': 4.25.0
+      '@rollup/rollup-freebsd-arm64': 4.25.0
+      '@rollup/rollup-freebsd-x64': 4.25.0
+      '@rollup/rollup-linux-arm-gnueabihf': 4.25.0
+      '@rollup/rollup-linux-arm-musleabihf': 4.25.0
+      '@rollup/rollup-linux-arm64-gnu': 4.25.0
+      '@rollup/rollup-linux-arm64-musl': 4.25.0
+      '@rollup/rollup-linux-powerpc64le-gnu': 4.25.0
+      '@rollup/rollup-linux-riscv64-gnu': 4.25.0
+      '@rollup/rollup-linux-s390x-gnu': 4.25.0
+      '@rollup/rollup-linux-x64-gnu': 4.25.0
+      '@rollup/rollup-linux-x64-musl': 4.25.0
+      '@rollup/rollup-win32-arm64-msvc': 4.25.0
+      '@rollup/rollup-win32-ia32-msvc': 4.25.0
+      '@rollup/rollup-win32-x64-msvc': 4.25.0
       fsevents: 2.3.3
     dev: true
 
@@ -6399,7 +6430,7 @@ packages:
   /rxjs@7.8.1:
     resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
     dependencies:
-      tslib: 2.7.0
+      tslib: 2.8.1
     dev: true
 
   /safe-array-concat@1.1.2:
@@ -6438,15 +6469,16 @@ packages:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
     dev: true
 
-  /sass@1.79.5:
-    resolution: {integrity: sha512-W1h5kp6bdhqFh2tk3DsI771MoEJjvrSY/2ihJRJS4pjIyfJCw0nTsxqhnrUzaLMOJjFchj8rOvraI/YUVjtx5g==}
+  /sass@1.80.6:
+    resolution: {integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==}
     engines: {node: '>=14.0.0'}
     hasBin: true
     dependencies:
-      '@parcel/watcher': 2.4.1
       chokidar: 4.0.1
       immutable: 4.3.7
       source-map-js: 1.2.1
+    optionalDependencies:
+      '@parcel/watcher': 2.5.0
     dev: true
 
   /saxes@5.0.1:
@@ -6530,7 +6562,7 @@ packages:
       call-bind: 1.0.7
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
-      object-inspect: 1.13.2
+      object-inspect: 1.13.3
 
   /signal-exit@3.0.7:
     resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
@@ -6733,7 +6765,7 @@ packages:
     engines: {node: '>=18'}
     dependencies:
       emoji-regex: 10.4.0
-      get-east-asian-width: 1.2.0
+      get-east-asian-width: 1.3.0
       strip-ansi: 7.1.0
     dev: true
 
@@ -6837,7 +6869,7 @@ packages:
       stylelint-order: 6.0.4(stylelint@16.10.0)
     dev: true
 
-  /stylelint-config-recommended-scss@14.1.0(postcss@8.4.47)(stylelint@16.10.0):
+  /stylelint-config-recommended-scss@14.1.0(postcss@8.4.49)(stylelint@16.10.0):
     resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
     engines: {node: '>=18.12.0'}
     peerDependencies:
@@ -6847,11 +6879,11 @@ packages:
       postcss:
         optional: true
     dependencies:
-      postcss: 8.4.47
-      postcss-scss: 4.0.9(postcss@8.4.47)
+      postcss: 8.4.49
+      postcss-scss: 4.0.9(postcss@8.4.49)
       stylelint: 16.10.0(typescript@5.5.4)
       stylelint-config-recommended: 14.0.1(stylelint@16.10.0)
-      stylelint-scss: 6.7.0(stylelint@16.10.0)
+      stylelint-scss: 6.9.0(stylelint@16.10.0)
     dev: true
 
   /stylelint-config-recommended-vue@1.5.0(postcss-html@1.7.0)(stylelint@16.10.0):
@@ -6892,20 +6924,21 @@ packages:
     peerDependencies:
       stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
     dependencies:
-      postcss: 8.4.47
-      postcss-sorting: 8.0.2(postcss@8.4.47)
+      postcss: 8.4.49
+      postcss-sorting: 8.0.2(postcss@8.4.49)
       stylelint: 16.10.0(typescript@5.5.4)
     dev: true
 
-  /stylelint-scss@6.7.0(stylelint@16.10.0):
-    resolution: {integrity: sha512-RFIa2A+pVWS5wjNT+whtK7wsbZEWazyqesCuSaPbPlZ8lh2TujwVJSnCYJijg6ChZzwI8pZPRZS1L6A9aCbXDg==}
+  /stylelint-scss@6.9.0(stylelint@16.10.0):
+    resolution: {integrity: sha512-oWOR+g6ccagfrENecImGmorWWjVyWpt2R8bmkhOW8FkNNPGStZPQMqb8QWMW4Lwu9TyPqmyjHkkAsy3weqsnNw==}
     engines: {node: '>=18.12.0'}
     peerDependencies:
       stylelint: ^16.0.2
     dependencies:
-      css-tree: 2.3.1
+      css-tree: 3.0.1
       is-plain-object: 5.0.0
-      known-css-properties: 0.34.0
+      known-css-properties: 0.35.0
+      mdn-data: 2.12.2
       postcss-media-query-parser: 0.2.3
       postcss-resolve-nested-selector: 0.1.6
       postcss-selector-parser: 6.1.2
@@ -6918,16 +6951,16 @@ packages:
     engines: {node: '>=18.12.0'}
     hasBin: true
     dependencies:
-      '@csstools/css-parser-algorithms': 3.0.2(@csstools/css-tokenizer@3.0.2)
-      '@csstools/css-tokenizer': 3.0.2
-      '@csstools/media-query-list-parser': 3.0.1(@csstools/css-parser-algorithms@3.0.2)(@csstools/css-tokenizer@3.0.2)
+      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
+      '@csstools/css-tokenizer': 3.0.3
+      '@csstools/media-query-list-parser': 3.0.1(@csstools/css-parser-algorithms@3.0.4)(@csstools/css-tokenizer@3.0.3)
       '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2)
       '@dual-bundle/import-meta-resolve': 4.1.0
       balanced-match: 2.0.0
       colord: 2.9.3
       cosmiconfig: 9.0.0(typescript@5.5.4)
       css-functions-list: 3.2.3
-      css-tree: 3.0.0
+      css-tree: 3.0.1
       debug: 4.3.7
       fast-glob: 3.3.2
       fastest-levenshtein: 1.0.16
@@ -6944,10 +6977,10 @@ packages:
       meow: 13.2.0
       micromatch: 4.0.8
       normalize-path: 3.0.0
-      picocolors: 1.1.0
-      postcss: 8.4.47
+      picocolors: 1.1.1
+      postcss: 8.4.49
       postcss-resolve-nested-selector: 0.1.6
-      postcss-safe-parser: 7.0.1(postcss@8.4.47)
+      postcss-safe-parser: 7.0.1(postcss@8.4.49)
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
       resolve-from: 5.0.0
@@ -7029,7 +7062,7 @@ packages:
       css-select: 4.3.0
       css-tree: 1.1.3
       csso: 4.2.0
-      picocolors: 1.1.0
+      picocolors: 1.1.1
       stable: 0.1.8
     dev: true
 
@@ -7038,7 +7071,7 @@ packages:
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
       '@pkgr/core': 0.1.1
-      tslib: 2.7.0
+      tslib: 2.8.1
     dev: true
 
   /table@6.8.2:
@@ -7063,13 +7096,13 @@ packages:
       readable-stream: 3.6.2
     dev: false
 
-  /terser@5.34.1:
-    resolution: {integrity: sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==}
+  /terser@5.36.0:
+    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
       '@jridgewell/source-map': 0.3.6
-      acorn: 8.12.1
+      acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
     dev: true
@@ -7091,15 +7124,15 @@ packages:
     resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
     dev: false
 
-  /tinyexec@0.3.0:
-    resolution: {integrity: sha512-tVGE0mVJPGb0chKhqmsoosjsS+qUnJVGJpZgsHYQcGoPlG3B51R3PouqTgEGH2Dc9jjFyOqOpix6ZHNMXp1FZg==}
+  /tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
     dev: true
 
-  /tinyglobby@0.2.9:
-    resolution: {integrity: sha512-8or1+BGEdk1Zkkw2ii16qSS7uVrQJPre5A9o/XkWPATkk23FZh/15BKFxPnlTy6vkljZxLqYCzzBMj30ZrSvjw==}
+  /tinyglobby@0.2.10:
+    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      fdir: 6.4.0(picomatch@4.0.2)
+      fdir: 6.4.2(picomatch@4.0.2)
       picomatch: 4.0.2
     dev: true
 
@@ -7115,10 +7148,6 @@ packages:
     engines: {node: '>=14.14'}
     dev: false
 
-  /to-fast-properties@2.0.0:
-    resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
-    engines: {node: '>=4'}
-
   /to-object-path@0.3.0:
     resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
     engines: {node: '>=0.10.0'}
@@ -7174,8 +7203,8 @@ packages:
       which-typed-array: 1.1.15
     dev: true
 
-  /ts-api-utils@1.3.0(typescript@5.5.4):
-    resolution: {integrity: sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==}
+  /ts-api-utils@1.4.0(typescript@5.5.4):
+    resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==}
     engines: {node: '>=16'}
     peerDependencies:
       typescript: '>=4.2.0'
@@ -7187,8 +7216,8 @@ packages:
     resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
     dev: false
 
-  /tslib@2.7.0:
-    resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==}
+  /tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
     dev: true
 
   /tsscmp@1.0.6:
@@ -7196,8 +7225,8 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: true
 
-  /tsx@4.19.1:
-    resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==}
+  /tsx@4.19.2:
+    resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
     engines: {node: '>=18.0.0'}
     hasBin: true
     dependencies:
@@ -7292,8 +7321,8 @@ packages:
       typed-array-byte-offset: 1.0.2
     dev: true
 
-  /typescript-eslint@8.8.1(eslint@9.12.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-R0dsXFt6t4SAFjUSKFjMh4pXDtq04SsFKCVGDP3ZOzNP7itF0jBcZYU4fMsZr4y7O7V7Nc751dDeESbe4PbQMQ==}
+  /typescript-eslint@8.14.0(eslint@9.14.0)(typescript@5.5.4):
+    resolution: {integrity: sha512-K8fBJHxVL3kxMmwByvz8hNdBJ8a0YqKzKDX6jRlrjMuNXyd5T2V02HIq37+OiWXvUUOXgOOGiSSOh26Mh8pC3w==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
     peerDependencies:
       typescript: '*'
@@ -7301,9 +7330,9 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1)(eslint@9.12.0)(typescript@5.5.4)
-      '@typescript-eslint/parser': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.8.1(eslint@9.12.0)(typescript@5.5.4)
+      '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint
@@ -7350,8 +7379,8 @@ packages:
   /unimport@3.13.1:
     resolution: {integrity: sha512-nNrVzcs93yrZQOW77qnyOVHtb68LegvhYFwxFMfuuWScmwQmyVCG/NBuN8tYsaGzgQUVYv34E/af+Cc9u4og4A==}
     dependencies:
-      '@rollup/pluginutils': 5.1.2
-      acorn: 8.12.1
+      '@rollup/pluginutils': 5.1.3
+      acorn: 8.14.0
       escape-string-regexp: 5.0.0
       estree-walker: 3.0.3
       fast-glob: 3.3.2
@@ -7362,7 +7391,7 @@ packages:
       pkg-types: 1.2.1
       scule: 1.3.0
       strip-literal: 2.1.0
-      unplugin: 1.14.1
+      unplugin: 1.15.0
     transitivePeerDependencies:
       - rollup
       - webpack-sources
@@ -7383,11 +7412,11 @@ packages:
     engines: {node: '>= 10.0.0'}
     dev: true
 
-  /unocss@0.63.4(postcss@8.4.47)(vite@5.4.8):
-    resolution: {integrity: sha512-MQ/ktuJ2MoXBsd117DEONFubJRQN6Og4mQJLbT+0nna2aTW4jYJESJ479mJYWq/ajonxEaM+zrf8M92VIWxzEw==}
+  /unocss@0.63.6(postcss@8.4.49)(typescript@5.5.4)(vite@5.4.11):
+    resolution: {integrity: sha512-OKJJKEFWVz+Lsf3JdOgRiRtL+QOUQRBov89taUcCPFPZtrhP6pPVFCZHD9qMvY4IChMX7dzalQax3ZXJ3hbtkQ==}
     engines: {node: '>=14'}
     peerDependencies:
-      '@unocss/webpack': 0.63.4
+      '@unocss/webpack': 0.63.6
       vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
     peerDependenciesMeta:
       '@unocss/webpack':
@@ -7395,28 +7424,29 @@ packages:
       vite:
         optional: true
     dependencies:
-      '@unocss/astro': 0.63.4(vite@5.4.8)
-      '@unocss/cli': 0.63.4
-      '@unocss/core': 0.63.4
-      '@unocss/postcss': 0.63.4(postcss@8.4.47)
-      '@unocss/preset-attributify': 0.63.4
-      '@unocss/preset-icons': 0.63.4
-      '@unocss/preset-mini': 0.63.4
-      '@unocss/preset-tagify': 0.63.4
-      '@unocss/preset-typography': 0.63.4
-      '@unocss/preset-uno': 0.63.4
-      '@unocss/preset-web-fonts': 0.63.4
-      '@unocss/preset-wind': 0.63.4
-      '@unocss/transformer-attributify-jsx': 0.63.4
-      '@unocss/transformer-compile-class': 0.63.4
-      '@unocss/transformer-directives': 0.63.4
-      '@unocss/transformer-variant-group': 0.63.4
-      '@unocss/vite': 0.63.4(vite@5.4.8)
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      '@unocss/astro': 0.63.6(typescript@5.5.4)(vite@5.4.11)
+      '@unocss/cli': 0.63.6
+      '@unocss/core': 0.63.6
+      '@unocss/postcss': 0.63.6(postcss@8.4.49)
+      '@unocss/preset-attributify': 0.63.6
+      '@unocss/preset-icons': 0.63.6
+      '@unocss/preset-mini': 0.63.6
+      '@unocss/preset-tagify': 0.63.6
+      '@unocss/preset-typography': 0.63.6
+      '@unocss/preset-uno': 0.63.6
+      '@unocss/preset-web-fonts': 0.63.6
+      '@unocss/preset-wind': 0.63.6
+      '@unocss/transformer-attributify-jsx': 0.63.6
+      '@unocss/transformer-compile-class': 0.63.6
+      '@unocss/transformer-directives': 0.63.6
+      '@unocss/transformer-variant-group': 0.63.6
+      '@unocss/vite': 0.63.6(typescript@5.5.4)(vite@5.4.11)
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - postcss
       - rollup
       - supports-color
+      - typescript
     dev: true
 
   /unpipe@1.0.0:
@@ -7437,14 +7467,14 @@ packages:
         optional: true
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.2
+      '@rollup/pluginutils': 5.1.3
       '@vueuse/core': 10.11.1(vue@3.5.12)
       fast-glob: 3.3.2
       local-pkg: 0.5.0
       magic-string: 0.30.12
       minimatch: 9.0.5
       unimport: 3.13.1
-      unplugin: 1.14.1
+      unplugin: 1.15.0
     transitivePeerDependencies:
       - rollup
       - webpack-sources
@@ -7464,7 +7494,7 @@ packages:
         optional: true
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.2
+      '@rollup/pluginutils': 5.1.3
       chokidar: 3.6.0
       debug: 4.3.7
       fast-glob: 3.3.2
@@ -7472,7 +7502,7 @@ packages:
       magic-string: 0.30.12
       minimatch: 9.0.5
       mlly: 1.7.2
-      unplugin: 1.14.1
+      unplugin: 1.15.0
       vue: 3.5.12(typescript@5.5.4)
     transitivePeerDependencies:
       - rollup
@@ -7480,8 +7510,8 @@ packages:
       - webpack-sources
     dev: true
 
-  /unplugin@1.14.1:
-    resolution: {integrity: sha512-lBlHbfSFPToDYp9pjXlUEFVxYLaue9f9T1HC+4OHlmj+HnMDdz9oZY+erXfoCe/5V/7gKUSY2jpXPb9S7f0f/w==}
+  /unplugin@1.15.0:
+    resolution: {integrity: sha512-jTPIs63W+DUEDW207ztbaoO7cQ4p5aVaB823LSlxpsFEU3Mykwxf3ZGC/wzxFJeZlASZYgVrWeo7LgOrqJZ8RA==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
       webpack-sources: ^3
@@ -7489,7 +7519,7 @@ packages:
       webpack-sources:
         optional: true
     dependencies:
-      acorn: 8.12.1
+      acorn: 8.14.0
       webpack-virtual-modules: 0.6.2
     dev: true
 
@@ -7516,15 +7546,15 @@ packages:
       setimmediate: 1.0.5
     dev: false
 
-  /update-browserslist-db@1.1.1(browserslist@4.24.0):
+  /update-browserslist-db@1.1.1(browserslist@4.24.2):
     resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
     hasBin: true
     peerDependencies:
       browserslist: '>= 4.21.0'
     dependencies:
-      browserslist: 4.24.0
+      browserslist: 4.24.2
       escalade: 3.2.0
-      picocolors: 1.1.0
+      picocolors: 1.1.1
     dev: true
 
   /uri-js@4.4.1:
@@ -7556,7 +7586,7 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
-  /vite-plugin-mock-dev-server@1.8.0(esbuild@0.23.1)(vite@5.4.8):
+  /vite-plugin-mock-dev-server@1.8.0(esbuild@0.23.1)(vite@5.4.11):
     resolution: {integrity: sha512-YAf0MZbBX/RYyr75kcTfjyCV9ybGoJZNN6FS6nMwKswoB/6uVQOcnjPc3bJBTwEsKord3TaYiuXkHk6e12pv6A==}
     engines: {node: ^18 || >= 20}
     peerDependencies:
@@ -7567,7 +7597,7 @@ packages:
         optional: true
     dependencies:
       '@pengzhanbo/utils': 1.1.2
-      '@rollup/pluginutils': 5.1.2
+      '@rollup/pluginutils': 5.1.3
       chokidar: 3.6.0
       co-body: 6.2.0
       cookies: 0.9.1
@@ -7576,13 +7606,13 @@ packages:
       esbuild: 0.23.1
       fast-glob: 3.3.2
       formidable: 2.1.2
-      http-status: 1.7.4
+      http-status: 1.8.1
       is-core-module: 2.15.1
       json5: 2.2.3
       mime-types: 2.1.35
       path-to-regexp: 6.2.2
-      picocolors: 1.1.0
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      picocolors: 1.1.1
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
       ws: 8.18.0
     transitivePeerDependencies:
       - bufferutil
@@ -7591,7 +7621,7 @@ packages:
       - utf-8-validate
     dev: true
 
-  /vite-plugin-svg-icons@2.0.1(vite@5.4.8):
+  /vite-plugin-svg-icons@2.0.1(vite@5.4.11):
     resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
     peerDependencies:
       vite: '>=2.0.0'
@@ -7604,13 +7634,13 @@ packages:
       pathe: 0.2.0
       svg-baker: 1.7.0
       svgo: 2.8.0
-      vite: 5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1)
+      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@5.4.8(@types/node@22.7.5)(sass@1.79.5)(terser@5.34.1):
-    resolution: {integrity: sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==}
+  /vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0):
+    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
     engines: {node: ^18.0.0 || >=20.0.0}
     hasBin: true
     peerDependencies:
@@ -7640,12 +7670,12 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 22.7.5
+      '@types/node': 22.9.0
       esbuild: 0.21.5
-      postcss: 8.4.47
-      rollup: 4.24.0
-      sass: 1.79.5
-      terser: 5.34.1
+      postcss: 8.4.49
+      rollup: 4.25.0
+      sass: 1.80.6
+      terser: 5.36.0
     optionalDependencies:
       fsevents: 2.3.3
     dev: true
@@ -7668,14 +7698,14 @@ packages:
     dependencies:
       vue: 3.5.12(typescript@5.5.4)
 
-  /vue-eslint-parser@9.4.3(eslint@9.12.0):
+  /vue-eslint-parser@9.4.3(eslint@9.14.0):
     resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
     engines: {node: ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: '>=6.0.0'
     dependencies:
       debug: 4.3.7
-      eslint: 9.12.0
+      eslint: 9.14.0
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
@@ -7686,6 +7716,14 @@ packages:
       - supports-color
     dev: true
 
+  /vue-flow-layout@0.0.5(typescript@5.5.4):
+    resolution: {integrity: sha512-lZlqQ/Se1trGMtBMneZDWaiQiQBuxU8ivZ+KpJMem5zKROFpzuPq9KqyWABbSYbxq0qhqZs1I4DBwrY041rtOA==}
+    dependencies:
+      vue: 3.5.12(typescript@5.5.4)
+    transitivePeerDependencies:
+      - typescript
+    dev: true
+
   /vue-i18n@9.9.1(vue@3.5.12):
     resolution: {integrity: sha512-xyQ4VspLdNSPTKBFBPWa1tvtj+9HuockZwgFeD2OhxxXuC2CWeNvV4seu2o9+vbQOyQbhAM5Ez56oxUrrnTWdw==}
     engines: {node: '>= 16'}
@@ -7707,14 +7745,14 @@ packages:
       vue: 3.5.12(typescript@5.5.4)
     dev: false
 
-  /vue-tsc@2.1.6(typescript@5.5.4):
-    resolution: {integrity: sha512-f98dyZp5FOukcYmbFpuSCJ4Z0vHSOSmxGttZJCsFeX0M4w/Rsq0s4uKXjcSRsZqsRgQa6z7SfuO+y0HVICE57Q==}
+  /vue-tsc@2.1.10(typescript@5.5.4):
+    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
     hasBin: true
     peerDependencies:
       typescript: '>=5.0.0'
     dependencies:
-      '@volar/typescript': 2.4.6
-      '@vue/language-core': 2.1.6(typescript@5.5.4)
+      '@volar/typescript': 2.4.10
+      '@vue/language-core': 2.1.10(typescript@5.5.4)
       semver: 7.6.3
       typescript: 5.5.4
     dev: true

From 78cafd9653e3acd30df3c06372cb9842498068a9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 22:29:47 +0800
Subject: [PATCH 052/497] =?UTF-8?q?chore:=20:hammer:=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E5=BF=BD=E7=95=A5pnpm-lock.yaml?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.prettierignore b/.prettierignore
index f3e9850f..44421a7a 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -9,3 +9,4 @@ public
 
 src/assets
 stats.html
+pnpm-lock.yaml

From a5a6e21ae9b0a7083a3fdbe1150bd38da89029e4 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 12 Nov 2024 22:32:46 +0800
Subject: [PATCH 053/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96button=E5=9B=BE=E6=A0=87=E4=BD=BF=E7=94=A8=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/index.vue             | 154 ++++--------
 src/views/system/dept/index.vue               |  85 +++----
 src/views/system/dict/data.vue                |  56 +----
 src/views/system/dict/index.vue               |  69 +-----
 src/views/system/log/index.vue                |  34 +--
 src/views/system/menu/index.vue               | 224 ++++--------------
 .../system/notice/components/MyNotice.vue     |  30 +--
 src/views/system/notice/index.vue             | 129 +++-------
 src/views/system/role/index.vue               |  54 +----
 9 files changed, 204 insertions(+), 631 deletions(-)

diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ac099608..15bbb16e 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -12,43 +12,31 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <template #header>
+    <el-card shadow="never">
+      <div class="mb-10px">
         <el-button
           v-hasPerm="['sys:config:add']"
           type="success"
+          icon="plus"
           @click="handleOpenDialog()"
         >
-          <template #icon>
-            <Plus />
-          </template>
           新增
         </el-button>
         <el-button
           v-hasPerm="['sys:config:refresh']"
           color="#626aef"
+          icon="RefreshLeft"
           @click="handleRefreshCache"
         >
-          <el-icon><RefreshLeft /></el-icon>
           刷新缓存
         </el-button>
-      </template>
+      </div>
 
       <el-table
         ref="dataTableRef"
@@ -58,30 +46,10 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="index" label="序号" width="60" />
-        <el-table-column
-          key="configName"
-          label="配置名称"
-          prop="configName"
-          min-width="100"
-        />
-        <el-table-column
-          key="configKey"
-          label="配置键"
-          prop="configKey"
-          min-width="100"
-        />
-        <el-table-column
-          key="configValue"
-          label="配置值"
-          prop="configValue"
-          min-width="100"
-        />
-        <el-table-column
-          key="remark"
-          label="描述"
-          prop="remark"
-          min-width="100"
-        />
+        <el-table-column key="configName" label="配置名称" prop="configName" min-width="100" />
+        <el-table-column key="configKey" label="配置键" prop="configKey" min-width="100" />
+        <el-table-column key="configValue" label="配置值" prop="configValue" min-width="100" />
+        <el-table-column key="remark" label="描述" prop="remark" min-width="100" />
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button
@@ -89,11 +57,9 @@
               type="primary"
               size="small"
               link
+              icon="edit"
               @click="handleOpenDialog(scope.row.id)"
             >
-              <template #icon>
-                <Edit />
-              </template>
               编辑
             </el-button>
             <el-button
@@ -101,11 +67,9 @@
               type="danger"
               size="small"
               link
+              icon="delete"
               @click="handleDelete(scope.row.id)"
             >
-              <template #icon>
-                <Delete />
-              </template>
               删除
             </el-button>
           </template>
@@ -136,25 +100,13 @@
         label-width="100px"
       >
         <el-form-item label="配置名称" prop="configName">
-          <el-input
-            v-model="formData.configName"
-            placeholder="请输入配置名称"
-            :maxlength="50"
-          />
+          <el-input v-model="formData.configName" placeholder="请输入配置名称" :maxlength="50" />
         </el-form-item>
         <el-form-item label="配置键" prop="configKey">
-          <el-input
-            v-model="formData.configKey"
-            placeholder="请输入配置键"
-            :maxlength="50"
-          />
+          <el-input v-model="formData.configKey" placeholder="请输入配置键" :maxlength="50" />
         </el-form-item>
         <el-form-item label="配置值" prop="configValue">
-          <el-input
-            v-model="formData.configValue"
-            placeholder="请输入配置值"
-            :maxlength="100"
-          />
+          <el-input v-model="formData.configValue" placeholder="请输入配置值" :maxlength="100" />
         </el-form-item>
         <el-form-item label="描述" prop="remark">
           <el-input
@@ -183,17 +135,13 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import ConfigAPI, {
-  ConfigPageVO,
-  ConfigForm,
-  ConfigPageQuery,
-} from "@/api/system/config";
+import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
 
 const loading = ref(false);
-const ids = ref<number[]>([]);
+const selectIds = ref<number[]>([]);
 const total = ref(0);
 
 const queryParams = reactive<ConfigPageQuery>({
@@ -205,12 +153,11 @@ const queryParams = reactive<ConfigPageQuery>({
 // 系统配置表格数据
 const pageData = ref<ConfigPageVO[]>([]);
 
-// 弹窗
 const dialog = reactive({
   title: "",
   visible: false,
 });
-// 系统配置表单
+
 const formData = reactive<ConfigForm>({
   id: undefined,
   configName: "",
@@ -220,18 +167,12 @@ const formData = reactive<ConfigForm>({
 });
 
 const rules = reactive({
-  configName: [
-    { required: true, message: "请输入系统配置名称", trigger: "blur" },
-  ],
-  configKey: [
-    { required: true, message: "请输入系统配置编码", trigger: "blur" },
-  ],
-  configValue: [
-    { required: true, message: "请输入系统配置值", trigger: "blur" },
-  ],
+  configName: [{ required: true, message: "请输入系统配置名称", trigger: "blur" }],
+  configKey: [{ required: true, message: "请输入系统配置编码", trigger: "blur" }],
+  configValue: [{ required: true, message: "请输入系统配置值", trigger: "blur" }],
 });
 
-/** 查询系统配置 */
+// 查询系统配置
 function handleQuery() {
   loading.value = true;
   ConfigAPI.getPage(queryParams)
@@ -243,19 +184,20 @@ function handleQuery() {
       loading.value = false;
     });
 }
-/** 重置系统配置查询 */
+
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中项变化
 function handleSelectionChange(selection: any) {
-  ids.value = selection.map((item: any) => item.id);
+  selectIds.value = selection.map((item: any) => item.id);
 }
 
-/** 打开系统配置弹窗 */
+// 打开系统配置弹窗
 function handleOpenDialog(id?: number) {
   dialog.visible = true;
   if (id) {
@@ -269,14 +211,14 @@ function handleOpenDialog(id?: number) {
   }
 }
 
-/** 刷新缓存 **/
+// 刷新缓存
 function handleRefreshCache() {
   ConfigAPI.refreshCache().then(() => {
     ElMessage.success("刷新成功");
   });
 }
 
-/** 提交系统配置表单 */
+// 系统配置表单提交
 function handleSubmit() {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -303,32 +245,34 @@ function handleSubmit() {
   });
 }
 
-/** 关闭系统配置弹窗 */
-function handleCloseDialog() {
-  dialog.visible = false;
+// 重置表单
+function resetForm() {
   dataFormRef.value.resetFields();
   dataFormRef.value.clearValidate();
-  formData.id != undefined;
+  formData.id = undefined;
 }
 
-/** 删除系统配置 */
+// 关闭系统配置弹窗
+function handleCloseDialog() {
+  dialog.visible = false;
+  resetForm();
+}
+
+// 删除系统配置
 function handleDelete(id: number) {
   ElMessageBox.confirm("确认删除该项配置?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(
-    () => {
-      loading.value = true;
-      ConfigAPI.deleteById(id)
-        .then(() => {
-          ElMessage.success("删除成功");
-          handleResetQuery();
-        })
-        .finally(() => (loading.value = false));
-    },
-    () => {}
-  );
+  }).then(() => {
+    loading.value = true;
+    ConfigAPI.deleteById(id)
+      .then(() => {
+        ElMessage.success("删除成功");
+        handleResetQuery();
+      })
+      .finally(() => (loading.value = false));
+  });
 }
 
 onMounted(() => {
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f53def24..716d1fd6 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -11,29 +11,16 @@
         </el-form-item>
 
         <el-form-item label="部门状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="全部"
-            clearable
-            class="!w-[100px]"
-          >
+          <el-select v-model="queryParams.status" placeholder="全部" clearable class="!w-[100px]">
             <el-option :value="1" label="正常" />
             <el-option :value="0" label="禁用" />
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button class="filter-item" type="primary" @click="handleQuery">
-            <template #icon>
-              <Search />
-            </template>
+          <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
             搜索
           </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -43,22 +30,18 @@
         <el-button
           v-hasPerm="['sys:dept:add']"
           type="success"
+          icon="plus"
           @click="handleOpenDialog(0, undefined)"
         >
-          <template #icon>
-            <Plus />
-          </template>
           新增
         </el-button>
         <el-button
           v-hasPerm="['sys:dept:delete']"
           type="danger"
-          :disabled="ids.length === 0"
+          :disabled="selectIds.length === 0"
+          icon="delete"
           @click="handleDelete()"
         >
-          <template #icon>
-            <Delete />
-          </template>
           删除
         </el-button>
       </div>
@@ -90,11 +73,9 @@
               type="primary"
               link
               size="small"
+              icon="plus"
               @click.stop="handleOpenDialog(scope.row.id, undefined)"
             >
-              <template #icon>
-                <Plus />
-              </template>
               新增
             </el-button>
             <el-button
@@ -102,11 +83,9 @@
               type="primary"
               link
               size="small"
+              icon="edit"
               @click.stop="handleOpenDialog(scope.row.parentId, scope.row.id)"
             >
-              <template #icon>
-                <Edit />
-              </template>
               编辑
             </el-button>
             <el-button
@@ -114,11 +93,9 @@
               type="danger"
               link
               size="small"
+              icon="delete"
               @click.stop="handleDelete(scope.row.id)"
             >
-              <template #icon>
-                <Delete />
-              </template>
               删除
             </el-button>
           </template>
@@ -132,12 +109,7 @@
       width="600px"
       @closed="handleCloseDialog"
     >
-      <el-form
-        ref="deptFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="deptFormRef" :model="formData" :rules="rules" label-width="80px">
         <el-form-item label="上级部门" prop="parentId">
           <el-tree-select
             v-model="formData.parentId"
@@ -192,17 +164,16 @@ const queryFormRef = ref(ElForm);
 const deptFormRef = ref(ElForm);
 
 const loading = ref(false);
-const ids = ref<number[]>([]);
+const selectIds = ref<number[]>([]);
+const queryParams = reactive<DeptQuery>({});
+
 const dialog = reactive({
   title: "",
   visible: false,
 });
 
-const queryParams = reactive<DeptQuery>({});
 const deptList = ref<DeptVO[]>();
-
 const deptOptions = ref<OptionType[]>();
-
 const formData = reactive<DeptForm>({
   status: 1,
   parentId: 0,
@@ -210,15 +181,13 @@ const formData = reactive<DeptForm>({
 });
 
 const rules = reactive({
-  parentId: [
-    { required: true, message: "上级部门不能为空", trigger: "change" },
-  ],
+  parentId: [{ required: true, message: "上级部门不能为空", trigger: "change" }],
   name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
   code: [{ required: true, message: "部门编号不能为空", trigger: "blur" }],
   sort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
 });
 
-/** 查询部门 */
+// 查询部门
 function handleQuery() {
   loading.value = true;
   DeptAPI.getList(queryParams).then((data) => {
@@ -227,15 +196,15 @@ function handleQuery() {
   });
 }
 
-/** 重置查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 处理选中项变化
 function handleSelectionChange(selection: any) {
-  ids.value = selection.map((item: any) => item.id);
+  selectIds.value = selection.map((item: any) => item.id);
 }
 
 /**
@@ -267,7 +236,7 @@ async function handleOpenDialog(parentId?: number, deptId?: number) {
   }
 }
 
-/** 提交部门表单 */
+// 部门表单提交
 function handleSubmit() {
   deptFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -294,9 +263,9 @@ function handleSubmit() {
   });
 }
 
-/** 删除部门 */
+// 删除部门
 function handleDelete(deptId?: number) {
-  const deptIds = [deptId || ids.value].join(",");
+  const deptIds = [deptId || selectIds.value].join(",");
 
   if (!deptIds) {
     ElMessage.warning("请勾选删除项");
@@ -323,10 +292,8 @@ function handleDelete(deptId?: number) {
   );
 }
 
-/** 关闭弹窗 */
-function handleCloseDialog() {
-  dialog.visible = false;
-
+// 重置表单
+function resetForm() {
   deptFormRef.value.resetFields();
   deptFormRef.value.clearValidate();
 
@@ -336,6 +303,12 @@ function handleCloseDialog() {
   formData.sort = 1;
 }
 
+// 关闭弹窗
+function handleCloseDialog() {
+  dialog.visible = false;
+  resetForm();
+}
+
 onMounted(() => {
   handleQuery();
 });
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 0cd16a10..2f7a3c65 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -12,38 +12,16 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery()">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery()">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <el-card shadow="never">
       <div class="mb-[10px]">
-        <el-button type="success" @click="handleOpenDialog()">
-          <template #icon>
-            <Plus />
-          </template>
-          新增
-        </el-button>
-        <el-button
-          type="danger"
-          :disabled="ids.length === 0"
-          @click="handleDelete()"
-        >
-          <template #icon>
-            <Delete />
-          </template>
+        <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
+        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
           删除
         </el-button>
       </div>
@@ -73,22 +51,18 @@
               type="primary"
               link
               size="small"
+              icon="edit"
               @click.stop="handleOpenDialog(scope.row)"
             >
-              <template #icon>
-                <Edit />
-              </template>
               编辑
             </el-button>
             <el-button
               type="danger"
               link
               size="small"
+              icon="delete"
               @click.stop="handleDelete(scope.row.id)"
             >
-              <template #icon>
-                <Delete />
-              </template>
               删除
             </el-button>
           </template>
@@ -111,12 +85,7 @@
       width="820px"
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="computedRules"
-        label-width="100px"
-      >
+      <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="100px">
         <el-card shadow="never">
           <el-form-item label="字典标签" prop="label">
             <el-input v-model="formData.label" placeholder="请输入字典标签" />
@@ -131,17 +100,10 @@
             </el-radio-group>
           </el-form-item>
           <el-form-item label="排序">
-            <el-input-number
-              v-model="formData.sort"
-              controls-position="right"
-            />
+            <el-input-number v-model="formData.sort" controls-position="right" />
           </el-form-item>
           <el-form-item label="标签类型">
-            <el-tag
-              v-if="formData.tagType"
-              :type="formData.tagType"
-              class="mr-2"
-            >
+            <el-tag v-if="formData.tagType" :type="formData.tagType" class="mr-2">
               {{ formData.label }}
             </el-tag>
             <el-radio-group v-model="formData.tagType">
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 91387f27..32517f01 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -12,38 +12,16 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery()">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery()">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <el-card shadow="never">
       <div class="mb-[10px]">
-        <el-button type="success" @click="handleAddClick()">
-          <template #icon>
-            <Plus />
-          </template>
-          新增
-        </el-button>
-        <el-button
-          type="danger"
-          :disabled="ids.length === 0"
-          @click="handleDelete()"
-        >
-          <template #icon>
-            <Delete />
-          </template>
+        <el-button type="success" icon="plus" @click="handleAddClick()">新增</el-button>
+        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
           删除
         </el-button>
       </div>
@@ -67,12 +45,7 @@
         </el-table-column>
         <el-table-column fixed="right" label="操作" align="center" width="220">
           <template #default="scope">
-            <el-button
-              type="primary"
-              link
-              size="small"
-              @click.stop="handleOpenDictData(scope.row)"
-            >
+            <el-button type="primary" link size="small" @click.stop="handleOpenDictData(scope.row)">
               <template #icon>
                 <Collection />
               </template>
@@ -83,22 +56,18 @@
               type="primary"
               link
               size="small"
+              icon="edit"
               @click.stop="handleEditClick(scope.row.id, scope.row.name)"
             >
-              <template #icon>
-                <Edit />
-              </template>
               编辑
             </el-button>
             <el-button
               type="danger"
               link
               size="small"
+              icon="delete"
               @click.stop="handleDelete(scope.row.id)"
             >
-              <template #icon>
-                <Delete />
-              </template>
               删除
             </el-button>
           </template>
@@ -121,22 +90,14 @@
       width="500px"
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="computedRules"
-        label-width="100px"
-      >
+      <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="100px">
         <el-card shadow="never">
           <el-form-item label="字典名称" prop="name">
             <el-input v-model="formData.name" placeholder="请输入字典名称" />
           </el-form-item>
 
           <el-form-item label="字典编码" prop="dictCode">
-            <el-input
-              v-model="formData.dictCode"
-              placeholder="请输入字典编码"
-            />
+            <el-input v-model="formData.dictCode" placeholder="请输入字典编码" />
           </el-form-item>
 
           <el-form-item label="状态">
@@ -147,11 +108,7 @@
           </el-form-item>
 
           <el-form-item label="备注">
-            <el-input
-              v-model="formData.remark"
-              type="textarea"
-              placeholder="请输入备注"
-            />
+            <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
           </el-form-item>
         </el-card>
       </el-form>
@@ -172,11 +129,7 @@ defineOptions({
   inherititems: false,
 });
 
-import DictAPI, {
-  DictPageQuery,
-  DictPageVO,
-  DictForm,
-} from "@/api/system/dict";
+import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict";
 
 import router from "@/router";
 
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 68980900..13cca4ef 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -24,29 +24,14 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <el-card shadow="never">
-      <el-table
-        v-loading="loading"
-        :data="pageData"
-        highlight-current-row
-        border
-      >
+      <el-table v-loading="loading" :data="pageData" highlight-current-row border>
         <el-table-column label="操作时间" prop="createTime" width="180" />
         <el-table-column label="操作人" prop="operator" width="120" />
         <el-table-column label="日志模块" prop="module" width="100" />
@@ -54,17 +39,8 @@
         <el-table-column label="IP 地址" prop="ip" width="150" />
         <el-table-column label="地区" prop="region" width="150" />
         <el-table-column label="浏览器" prop="browser" width="150" />
-        <el-table-column
-          label="终端系统"
-          prop="os"
-          width="200"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          label="执行时间(ms)"
-          prop="executionTime"
-          width="150"
-        />
+        <el-table-column label="终端系统" prop="os" width="200" show-overflow-tooltip />
+        <el-table-column label="执行时间(ms)" prop="executionTime" width="150" />
       </el-table>
 
       <pagination
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2ebbc2ca..b06202f3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -11,29 +11,23 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <template #icon><Search /></template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon><Refresh /></template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <template #header>
+    <el-card shadow="never">
+      <div class="mb-10px">
         <el-button
           v-hasPerm="['sys:menu:add']"
           type="success"
+          icon="plus"
           @click="handleOpenDialog(0)"
         >
-          <template #icon><Plus /></template>
           新增
         </el-button>
-      </template>
+      </div>
 
       <el-table
         v-loading="loading"
@@ -49,9 +43,7 @@
       >
         <el-table-column label="菜单名称" min-width="200">
           <template #default="scope">
-            <template
-              v-if="scope.row.icon && scope.row.icon.startsWith('el-icon')"
-            >
+            <template v-if="scope.row.icon && scope.row.icon.startsWith('el-icon')">
               <el-icon style="vertical-align: -0.15em">
                 <component :is="scope.row.icon.replace('el-icon-', '')" />
               </el-icon>
@@ -59,70 +51,29 @@
             <template v-else-if="scope.row.icon">
               <svg-icon :icon-class="scope.row.icon" />
             </template>
-            <template v-else>
-              <svg-icon icon-class="menu" />
-            </template>
             {{ scope.row.name }}
           </template>
         </el-table-column>
 
         <el-table-column label="类型" align="center" width="80">
           <template #default="scope">
-            <el-tag
-              v-if="scope.row.type === MenuTypeEnum.CATALOG"
-              type="warning"
-            >
-              目录
-            </el-tag>
-            <el-tag v-if="scope.row.type === MenuTypeEnum.MENU" type="success">
-              菜单
-            </el-tag>
-            <el-tag v-if="scope.row.type === MenuTypeEnum.BUTTON" type="danger">
-              按钮
-            </el-tag>
-            <el-tag v-if="scope.row.type === MenuTypeEnum.EXTLINK" type="info">
-              外链
-            </el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.CATALOG" type="warning">目录</el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.MENU" type="success">菜单</el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.BUTTON" type="danger">按钮</el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.EXTLINK" type="info">外链</el-tag>
           </template>
         </el-table-column>
-
-        <el-table-column
-          label="路由名称"
-          align="left"
-          width="150"
-          prop="routeName"
-        />
-
-        <el-table-column
-          label="路由路径"
-          align="left"
-          width="150"
-          prop="routePath"
-        />
-
-        <el-table-column
-          label="组件路径"
-          align="left"
-          width="250"
-          prop="component"
-        />
-
-        <el-table-column
-          label="权限标识"
-          align="center"
-          width="200"
-          prop="perm"
-        />
-
+        <el-table-column label="路由名称" align="left" width="150" prop="routeName" />
+        <el-table-column label="路由路径" align="left" width="150" prop="routePath" />
+        <el-table-column label="组件路径" align="left" width="250" prop="component" />
+        <el-table-column label="权限标识" align="center" width="200" prop="perm" />
         <el-table-column label="状态" align="center" width="80">
           <template #default="scope">
             <el-tag v-if="scope.row.visible === 1" type="success">显示</el-tag>
             <el-tag v-else type="info">隐藏</el-tag>
           </template>
         </el-table-column>
-
         <el-table-column label="排序" align="center" width="80" prop="sort" />
-
         <el-table-column fixed="right" align="center" label="操作" width="220">
           <template #default="scope">
             <el-button
@@ -131,9 +82,9 @@
               type="primary"
               link
               size="small"
+              icon="plus"
               @click.stop="handleOpenDialog(scope.row.id)"
             >
-              <template #icon><Plus /></template>
               新增
             </el-button>
 
@@ -142,9 +93,9 @@
               type="primary"
               link
               size="small"
+              icon="edit"
               @click.stop="handleOpenDialog(undefined, scope.row.id)"
             >
-              <template #icon><Edit /></template>
               编辑
             </el-button>
             <el-button
@@ -152,9 +103,9 @@
               type="danger"
               link
               size="small"
+              icon="delete"
               @click.stop="handleDelete(scope.row.id)"
             >
-              <template #icon><Delete /></template>
               删除
             </el-button>
           </template>
@@ -162,18 +113,8 @@
       </el-table>
     </el-card>
 
-    <el-drawer
-      v-model="dialog.visible"
-      :title="dialog.title"
-      size="50%"
-      @close="handleCloseDialog"
-    >
-      <el-form
-        ref="menuFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
+    <el-drawer v-model="dialog.visible" :title="dialog.title" size="50%" @close="handleCloseDialog">
+      <el-form ref="menuFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="父级菜单" prop="parentId">
           <el-tree-select
             v-model="formData.parentId"
@@ -190,10 +131,7 @@
         </el-form-item>
 
         <el-form-item label="菜单类型" prop="type">
-          <el-radio-group
-            v-model="formData.type"
-            @change="handleMenuTypeChange"
-          >
+          <el-radio-group v-model="formData.type" @change="handleMenuTypeChange">
             <el-radio value="CATALOG">目录</el-radio>
             <el-radio value="MENU">菜单</el-radio>
             <el-radio value="BUTTON">按钮</el-radio>
@@ -201,30 +139,18 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type == 'EXTLINK'"
-          label="外链地址"
-          prop="path"
-        >
-          <el-input
-            v-model="formData.routePath"
-            placeholder="请输入外链完整路径"
-          />
+        <el-form-item v-if="formData.type == 'EXTLINK'" label="外链地址" prop="path">
+          <el-input v-model="formData.routePath" placeholder="请输入外链完整路径" />
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type == MenuTypeEnum.MENU"
-          prop="routeName"
-        >
+        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="routeName">
           <template #label>
             <div class="flex-y-center">
               路由名称
               <el-tooltip placement="bottom" effect="light">
                 <template #content>
-                  如果需要开启缓存，需保证页面 defineOptions 中的 name
-                  与此处一致，建议使用驼峰。
+                  如果需要开启缓存，需保证页面 defineOptions 中的 name 与此处一致，建议使用驼峰。
                 </template>
-
                 <el-icon class="ml-1 cursor-pointer">
                   <QuestionFilled />
                 </el-icon>
@@ -235,10 +161,7 @@
         </el-form-item>
 
         <el-form-item
-          v-if="
-            formData.type == MenuTypeEnum.CATALOG ||
-            formData.type == MenuTypeEnum.MENU
-          "
+          v-if="formData.type == MenuTypeEnum.CATALOG || formData.type == MenuTypeEnum.MENU"
           prop="routePath"
         >
           <template #label>
@@ -246,8 +169,7 @@
               路由路径
               <el-tooltip placement="bottom" effect="light">
                 <template #content>
-                  定义应用中不同页面对应的 URL 路径，目录需以 /
-                  开头，菜单项不用。例如：系统管理目录
+                  定义应用中不同页面对应的 URL 路径，目录需以 / 开头，菜单项不用。例如：系统管理目录
                   /system，系统管理下的用户管理菜单 user。
                 </template>
                 <el-icon class="ml-1 cursor-pointer">
@@ -264,17 +186,13 @@
           <el-input v-else v-model="formData.routePath" placeholder="user" />
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type == MenuTypeEnum.MENU"
-          prop="component"
-        >
+        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="component">
           <template #label>
             <div class="flex-y-center">
               组件路径
               <el-tooltip placement="bottom" effect="light">
                 <template #content>
-                  组件页面完整路径，相对于 src/views/，如
-                  system/user/index，缺省后缀 .vue
+                  组件页面完整路径，相对于 src/views/，如 system/user/index，缺省后缀 .vue
                 </template>
                 <el-icon class="ml-1 cursor-pointer">
                   <QuestionFilled />
@@ -283,17 +201,9 @@
             </div>
           </template>
 
-          <el-input
-            v-model="formData.component"
-            placeholder="system/user/index"
-            style="width: 95%"
-          >
-            <template v-if="formData.type == MenuTypeEnum.MENU" #prepend>
-              src/views/
-            </template>
-            <template v-if="formData.type == MenuTypeEnum.MENU" #append>
-              .vue
-            </template>
+          <el-input v-model="formData.component" placeholder="system/user/index" style="width: 95%">
+            <template v-if="formData.type == MenuTypeEnum.MENU" #prepend>src/views/</template>
+            <template v-if="formData.type == MenuTypeEnum.MENU" #append>.vue</template>
           </el-input>
         </el-form-item>
 
@@ -313,35 +223,21 @@
           </template>
 
           <div v-if="!formData.params || formData.params.length === 0">
-            <el-button
-              type="success"
-              plain
-              @click="formData.params = [{ key: '', value: '' }]"
-            >
+            <el-button type="success" plain @click="formData.params = [{ key: '', value: '' }]">
               添加路由参数
             </el-button>
           </div>
 
           <div v-else>
             <div v-for="(item, index) in formData.params" :key="index">
-              <el-input
-                v-model="item.key"
-                placeholder="参数名"
-                style="width: 100px"
-              />
+              <el-input v-model="item.key" placeholder="参数名" style="width: 100px" />
 
               <span class="mx-1">=</span>
 
-              <el-input
-                v-model="item.value"
-                placeholder="参数值"
-                style="width: 100px"
-              />
+              <el-input v-model="item.value" placeholder="参数值" style="width: 100px" />
 
               <el-icon
-                v-if="
-                  formData.params.indexOf(item) === formData.params.length - 1
-                "
+                v-if="formData.params.indexOf(item) === formData.params.length - 1"
                 class="ml-2 cursor-pointer color-[var(--el-color-success)]"
                 style="vertical-align: -0.15em"
                 @click="formData.params.push({ key: '', value: '' })"
@@ -351,9 +247,7 @@
               <el-icon
                 class="ml-2 cursor-pointer color-[var(--el-color-danger)]"
                 style="vertical-align: -0.15em"
-                @click="
-                  formData.params.splice(formData.params.indexOf(item), 1)
-                "
+                @click="formData.params.splice(formData.params.indexOf(item), 1)"
               >
                 <DeleteFilled />
               </el-icon>
@@ -361,11 +255,7 @@
           </div>
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type !== MenuTypeEnum.BUTTON"
-          prop="visible"
-          label="显示状态"
-        >
+        <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" prop="visible" label="显示状态">
           <el-radio-group v-model="formData.visible">
             <el-radio :value="1">显示</el-radio>
             <el-radio :value="0">隐藏</el-radio>
@@ -373,10 +263,7 @@
         </el-form-item>
 
         <el-form-item
-          v-if="
-            formData.type === MenuTypeEnum.CATALOG ||
-            formData.type === MenuTypeEnum.MENU
-          "
+          v-if="formData.type === MenuTypeEnum.CATALOG || formData.type === MenuTypeEnum.MENU"
         >
           <template #label>
             <div class="flex-y-center">
@@ -402,10 +289,7 @@
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type === MenuTypeEnum.MENU"
-          label="缓存页面"
-        >
+        <el-form-item v-if="formData.type === MenuTypeEnum.MENU" label="缓存页面">
           <el-radio-group v-model="formData.keepAlive">
             <el-radio :value="1">开启</el-radio>
             <el-radio :value="0">关闭</el-radio>
@@ -422,34 +306,23 @@
         </el-form-item>
 
         <!-- 权限标识 -->
-        <el-form-item
-          v-if="formData.type == MenuTypeEnum.BUTTON"
-          label="权限标识"
-          prop="perm"
-        >
+        <el-form-item v-if="formData.type == MenuTypeEnum.BUTTON" label="权限标识" prop="perm">
           <el-input v-model="formData.perm" placeholder="sys:user:add" />
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type !== MenuTypeEnum.BUTTON"
-          label="图标"
-          prop="icon"
-        >
+        <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" label="图标" prop="icon">
           <!-- 图标选择器 -->
           <icon-select v-model="formData.icon" />
         </el-form-item>
 
-        <el-form-item
-          v-if="formData.type == MenuTypeEnum.CATALOG"
-          label="跳转路由"
-        >
+        <el-form-item v-if="formData.type == MenuTypeEnum.CATALOG" label="跳转路由">
           <el-input v-model="formData.redirect" placeholder="跳转路由" />
         </el-form-item>
       </el-form>
 
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button type="primary" @click="handleSubmit">确 定</el-button>
           <el-button @click="handleCloseDialog">取 消</el-button>
         </div>
       </template>
@@ -481,7 +354,6 @@ const queryParams = reactive<MenuQuery>({});
 const menuTableData = ref<MenuVO[]>([]);
 // 顶级菜单下拉选项
 const menuOptions = ref<OptionType[]>([]);
-
 // 初始菜单表单数据
 const initialMenuFormData = ref<MenuForm>({
   id: undefined,
@@ -493,10 +365,8 @@ const initialMenuFormData = ref<MenuForm>({
   keepAlive: 1,
   params: [],
 });
-
 // 菜单表单数据
 const formData = ref({ ...initialMenuFormData.value });
-
 // 表单验证规则
 const rules = reactive({
   parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }],
@@ -578,8 +448,10 @@ function handleMenuTypeChange() {
   }
 }
 
-/** 菜单保存提交 */
-function submitForm() {
+/**
+ * 提交表单
+ */
+function handleSubmit() {
   menuFormRef.value.validate((isValid: boolean) => {
     if (isValid) {
       const menuId = formData.value.id;
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index 6fec0d85..9aa09bec 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -27,13 +27,8 @@
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <el-table
-        ref="dataTableRef"
-        v-loading="loading"
-        :data="pageData"
-        highlight-current-row
-      >
+    <el-card shadow="never">
+      <el-table ref="dataTableRef" v-loading="loading" :data="pageData" highlight-current-row>
         <el-table-column type="index" label="序号" width="60" />
         <el-table-column label="通知标题" prop="title" min-width="200" />
         <el-table-column align="center" label="通知类型" width="150">
@@ -41,12 +36,7 @@
             <DictLabel v-model="scope.row.type" code="notice_type" />
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="发布人"
-          prop="publisherName"
-          width="100"
-        />
+        <el-table-column align="center" label="发布人" prop="publisherName" width="100" />
         <el-table-column align="center" label="通知等级" width="100">
           <template #default="scope">
             <DictLabel v-model="scope.row.level" code="notice_level" />
@@ -60,12 +50,7 @@
           width="150"
         />
 
-        <el-table-column
-          align="center"
-          label="发布人"
-          prop="publisherName"
-          width="150"
-        />
+        <el-table-column align="center" label="发布人" prop="publisherName" width="150" />
         <el-table-column align="center" label="状态" width="100">
           <template #default="scope">
             <el-tag v-if="scope.row.isRead == 1" type="success">已读</el-tag>
@@ -74,12 +59,7 @@
         </el-table-column>
         <el-table-column align="center" fixed="right" label="操作" width="80">
           <template #default="scope">
-            <el-button
-              type="primary"
-              size="small"
-              link
-              @click="viewNoticeDetail(scope.row.id)"
-            >
+            <el-button type="primary" size="small" link @click="viewNoticeDetail(scope.row.id)">
               查看
             </el-button>
           </template>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 04954a7a..b9188338 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,12 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form
-        ref="queryFormRef"
-        :model="queryParams"
-        :inline="true"
-        label-suffix=":"
-      >
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-suffix=":">
         <el-form-item label="标题" prop="title">
           <el-input
             v-model="queryParams.title"
@@ -28,14 +23,8 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="handleQuery()">
-            <template #icon><Search /></template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery()">
-            <template #icon><Refresh /></template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -45,18 +34,18 @@
         <el-button
           v-hasPerm="['sys:notice:add']"
           type="success"
+          icon="plus"
           @click="handleOpenDialog()"
         >
-          <template #icon><Plus /></template>
           新增通知
         </el-button>
         <el-button
           v-hasPerm="['sys:notice:delete']"
           type="danger"
-          :disabled="ids.length === 0"
+          :disabled="selectIds.length === 0"
+          icon="delete"
           @click="handleDelete()"
         >
-          <template #icon><Delete /></template>
           删除
         </el-button>
       </template>
@@ -76,43 +65,23 @@
             <DictLabel v-model="scope.row.type" :code="'notice_type'" />
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="发布人"
-          prop="publisherName"
-          width="150"
-        />
+        <el-table-column align="center" label="发布人" prop="publisherName" width="150" />
         <el-table-column align="center" label="通知等级" width="100">
           <template #default="scope">
             <DictLabel v-model="scope.row.level" code="notice_level" />
           </template>
         </el-table-column>
-        <el-table-column
-          align="center"
-          label="通告目标类型"
-          prop="targetType"
-          min-width="100"
-        >
+        <el-table-column align="center" label="通告目标类型" prop="targetType" min-width="100">
           <template #default="scope">
-            <el-tag v-if="scope.row.targetType == 1" type="warning">
-              全体
-            </el-tag>
-            <el-tag v-if="scope.row.targetType == 2" type="success">
-              指定
-            </el-tag>
+            <el-tag v-if="scope.row.targetType == 1" type="warning">全体</el-tag>
+            <el-tag v-if="scope.row.targetType == 2" type="success">指定</el-tag>
           </template>
         </el-table-column>
         <el-table-column align="center" label="发布状态" min-width="100">
           <template #default="scope">
-            <el-tag v-if="scope.row.publishStatus == 0" type="info">
-              未发布
-            </el-tag>
-            <el-tag v-if="scope.row.publishStatus == 1" type="success">
-              已发布
-            </el-tag>
-            <el-tag v-if="scope.row.publishStatus == -1" type="warning">
-              已撤回
-            </el-tag>
+            <el-tag v-if="scope.row.publishStatus == 0" type="info">未发布</el-tag>
+            <el-tag v-if="scope.row.publishStatus == 1" type="success">已发布</el-tag>
+            <el-tag v-if="scope.row.publishStatus == -1" type="warning">已撤回</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="操作时间" width="250">
@@ -126,10 +95,7 @@
               <span>发布时间：</span>
               <span>{{ scope.row.publishTime || "-" }}</span>
             </div>
-            <div
-              v-else-if="scope.row.publishStatus === -1"
-              class="flex-x-start"
-            >
+            <div v-else-if="scope.row.publishStatus === -1" class="flex-x-start">
               <span>撤回时间：</span>
               <span>{{ scope.row.revokeTime || "-" }}</span>
             </div>
@@ -141,7 +107,7 @@
               type="primary"
               size="small"
               link
-              @click="openNoticeDetailDialog(scope.row.id)"
+              @click="handleOpenNoticeDetailDialog(scope.row.id)"
             >
               查看
             </el-button>
@@ -151,7 +117,7 @@
               type="primary"
               size="small"
               link
-              @click="handlePublishNotice(scope.row.id)"
+              @click="handlePublish(scope.row.id)"
             >
               发布
             </el-button>
@@ -161,7 +127,7 @@
               type="primary"
               size="small"
               link
-              @click="revokeNotice(scope.row.id)"
+              @click="handleRevoke(scope.row.id)"
             >
               撤回
             </el-button>
@@ -206,20 +172,12 @@
       width="1250"
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="dataFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
+      <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="通知标题" prop="title">
           <el-input v-model="formData.title" placeholder="通知标题" clearable />
         </el-form-item>
         <el-form-item label="通知内容" prop="content">
-          <WangEditor
-            v-model="formData.content"
-            style="min-height: 480px; max-height: 500px"
-          />
+          <WangEditor v-model="formData.content" style="min-height: 480px; max-height: 500px" />
         </el-form-item>
         <el-form-item label="通知类型" prop="type">
           <Dict v-model="formData.type" type="button" code="notice_type" />
@@ -233,17 +191,8 @@
             <el-radio :value="2">指定</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item
-          v-if="formData.targetType == 2"
-          label="指定用户"
-          prop="targetUserIds"
-        >
-          <el-select
-            v-model="formData.targetUserIds"
-            multiple
-            search
-            placeholder="请选择指定用户"
-          >
+        <el-form-item v-if="formData.targetType == 2" label="指定用户" prop="targetUserIds">
+          <el-select v-model="formData.targetUserIds" multiple search placeholder="请选择指定用户">
             <el-option
               v-for="item in userOptions"
               :key="item.value"
@@ -271,11 +220,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import NoticeAPI, {
-  NoticePageVO,
-  NoticeForm,
-  NoticePageQuery,
-} from "@/api/system/notice";
+import NoticeAPI, { NoticePageVO, NoticeForm, NoticePageQuery } from "@/api/system/notice";
 import UserAPI from "@/api/system/user";
 
 const queryFormRef = ref(ElForm);
@@ -283,7 +228,7 @@ const dataFormRef = ref(ElForm);
 const noticeDetailRef = ref();
 
 const loading = ref(false);
-const ids = ref<number[]>([]);
+const selectIds = ref<number[]>([]);
 const total = ref(0);
 
 const queryParams = reactive<NoticePageQuery>({
@@ -327,7 +272,7 @@ const rules = reactive({
   type: [{ required: true, message: "请选择通知类型", trigger: "change" }],
 });
 
-/** 查询通知公告 */
+// 查询通知公告
 function handleQuery() {
   loading.value = true;
   NoticeAPI.getPage(queryParams)
@@ -340,19 +285,19 @@ function handleQuery() {
     });
 }
 
-/** 重置通知公告查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value!.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中项变化
 function handleSelectionChange(selection: any) {
-  ids.value = selection.map((item: any) => item.id);
+  selectIds.value = selection.map((item: any) => item.id);
 }
 
-/** 打开通知公告弹窗 */
+// 打开通知公告弹窗
 function handleOpenDialog(id?: number) {
   UserAPI.getOptions().then((data) => {
     userOptions.value = data;
@@ -370,21 +315,23 @@ function handleOpenDialog(id?: number) {
   }
 }
 
-function handlePublishNotice(id: number) {
+// 发布通知公告
+function handlePublish(id: number) {
   NoticeAPI.publish(id).then(() => {
     ElMessage.success("发布成功");
     handleQuery();
   });
 }
 
-function revokeNotice(id: number) {
+// 撤回通知公告
+function handleRevoke(id: number) {
   NoticeAPI.revoke(id).then(() => {
     ElMessage.success("撤回成功");
     handleQuery();
   });
 }
 
-/** 提交通知公告表单 */
+// 通知公告表单提交
 function handleSubmit() {
   dataFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -411,7 +358,7 @@ function handleSubmit() {
   });
 }
 
-/** 关闭通知公告弹窗 */
+// 关闭通知公告弹窗
 function handleCloseDialog() {
   dialog.visible = false;
   dataFormRef.value.resetFields();
@@ -419,9 +366,9 @@ function handleCloseDialog() {
   formData.id = undefined;
 }
 
-/** 删除通知公告 */
+// 删除通知公告
 function handleDelete(id?: number) {
-  const deleteIds = [id || ids.value].join(",");
+  const deleteIds = [id || selectIds.value].join(",");
   if (!deleteIds) {
     ElMessage.warning("请勾选删除项");
     return;
@@ -447,8 +394,8 @@ function handleDelete(id?: number) {
   );
 }
 
-/** 打开通知公告详情弹窗 */
-function openNoticeDetailDialog(id: number) {
+// 打开通知公告详情弹窗
+function handleOpenNoticeDetailDialog(id: number) {
   noticeDetailRef.value.openNotice(id);
 }
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index cf27f622..3f279355 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -12,30 +12,16 @@
         </el-form-item>
 
         <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <template #icon><Search /></template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon><Refresh /></template>
-            重置
-          </el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
 
     <el-card shadow="never">
       <div class="mb-10px">
-        <el-button type="success" @click="handleOpenDialog()">
-          <template #icon><Plus /></template>
-          新增
-        </el-button>
-        <el-button
-          type="danger"
-          :disabled="ids.length === 0"
-          @click="handleDelete()"
-        >
-          <template #icon><Delete /></template>
+        <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
+        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
           删除
         </el-button>
       </div>
@@ -110,12 +96,7 @@
       width="500px"
       @close="handleCloseDialog"
     >
-      <el-form
-        ref="roleFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="100px"
-      >
+      <el-form ref="roleFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="name">
           <el-input v-model="formData.name" placeholder="请输入角色名称" />
         </el-form-item>
@@ -165,12 +146,7 @@
       size="500"
     >
       <div class="flex-x-between">
-        <el-input
-          v-model="permKeywords"
-          clearable
-          class="w-[150px]"
-          placeholder="菜单权限名称"
-        >
+        <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单权限名称">
           <template #prefix>
             <Search />
           </template>
@@ -195,9 +171,7 @@
             <template #content>
               如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
             </template>
-            <el-icon
-              class="ml-1 color-[--el-color-primary] inline-block cursor-pointer"
-            >
+            <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
               <QuestionFilled />
             </el-icon>
           </el-tooltip>
@@ -220,9 +194,7 @@
       </el-tree>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="handleAssignPermSubmit">
-            确 定
-          </el-button>
+          <el-button type="primary" @click="handleAssignPermSubmit">确 定</el-button>
           <el-button @click="assignPermDialogVisible = false">取 消</el-button>
         </div>
       </template>
@@ -236,11 +208,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import RoleAPI, {
-  RolePageVO,
-  RoleForm,
-  RolePageQuery,
-} from "@/api/system/role";
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role";
 import MenuAPI from "@/api/system/menu";
 
 const queryFormRef = ref(ElForm);
@@ -414,9 +382,7 @@ async function handleOpenAssignPermDialog(row: RolePageVO) {
     RoleAPI.getRoleMenuIds(roleId)
       .then((data) => {
         const checkedMenuIds = data;
-        checkedMenuIds.forEach((menuId) =>
-          permTreeRef.value!.setChecked(menuId, true, false)
-        );
+        checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
       })
       .finally(() => {
         loading.value = false;

From d91928e9edf565f3d5bcf9be0d39c643d3db6c47 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 13 Nov 2024 12:43:30 +0800
Subject: [PATCH 054/497] =?UTF-8?q?fix:=20:bug:=20=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=92=8C=E7=AD=89?=
 =?UTF-8?q?=E7=BA=A7=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/notice/index.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index b9188338..f8e4db0b 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -180,10 +180,10 @@
           <WangEditor v-model="formData.content" style="min-height: 480px; max-height: 500px" />
         </el-form-item>
         <el-form-item label="通知类型" prop="type">
-          <Dict v-model="formData.type" type="button" code="notice_type" />
+          <Dict v-model="formData.type" code="notice_type" />
         </el-form-item>
         <el-form-item label="通知等级" prop="level">
-          <Dict v-model="formData.level" type="button" code="notice_level" />
+          <Dict v-model="formData.level" code="notice_level" />
         </el-form-item>
         <el-form-item label="目标类型" prop="targetType">
           <el-radio-group v-model="formData.targetType">
@@ -358,12 +358,18 @@ function handleSubmit() {
   });
 }
 
-// 关闭通知公告弹窗
-function handleCloseDialog() {
-  dialog.visible = false;
+// 重置表单
+function resetForm() {
   dataFormRef.value.resetFields();
   dataFormRef.value.clearValidate();
   formData.id = undefined;
+  formData.targetType = 1;
+}
+
+// 关闭通知公告弹窗
+function handleCloseDialog() {
+  dialog.visible = false;
+  resetForm();
 }
 
 // 删除通知公告

From f1598aedfdbe9c7b68b5f7709e5b003947bf2084 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 13 Nov 2024 12:54:07 +0800
Subject: [PATCH 055/497] =?UTF-8?q?refactor:=20:recycle:=20request=20?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts     | 12 ++++++++++++
 src/api/system/user.ts    |  2 +-
 src/store/modules/user.ts |  6 +++---
 src/utils/request.ts      | 27 ++++++++++++++-------------
 4 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index 8d38dcb4..299782b9 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -20,6 +20,18 @@ const AuthAPI = {
     });
   },
 
+  /** 刷新token 接口*/
+  refreshToken(refreshToken: string) {
+    return request<any, LoginResult>({
+      url: `${AUTH_BASE_URL}/refresh-token`,
+      method: "post",
+      data: { refreshToken: refreshToken },
+      headers: {
+        Authorization: "no-auth",
+      },
+    });
+  },
+
   /** 注销 接口*/
   logout() {
     return request({
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 9e3b590c..c9fe47a6 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -113,7 +113,7 @@ const UserAPI = {
       url: `${USER_BASE_URL}/export`,
       method: "get",
       params: queryParams,
-      responseType: "arraybuffer",
+      responseType: "blob",
     });
   },
 
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 59fdee2b..b206dfa5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -59,7 +59,7 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.logout()
         .then(() => {
-          clearUserSession();
+          clearUserData();
           resolve();
         })
         .catch((error) => {
@@ -73,7 +73,7 @@ export const useUserStore = defineStore("user", () => {
    *
    * @returns
    */
-  function clearUserSession() {
+  function clearUserData() {
     return new Promise<void>((resolve) => {
       clearToken();
       usePermissionStoreHook().resetRouter();
@@ -87,7 +87,7 @@ export const useUserStore = defineStore("user", () => {
     getUserInfo,
     login,
     logout,
-    clearUserSession,
+    clearUserData,
   };
 });
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 6d0f8eb7..6ed449b5 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,4 @@
-import axios, {
-  type InternalAxiosRequestConfig,
-  type AxiosResponse,
-} from "axios";
+import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user";
 import { ResultEnum } from "@/enums/ResultEnum";
@@ -20,9 +17,14 @@ const service = axios.create({
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    const accessToken = getToken();
-    if (accessToken) {
-      config.headers.Authorization = accessToken;
+    // 如果设置了 "no-auth"，则不携带 Authorization 头，用于登录、刷新 token 等接口
+    if (config.headers.Authorization === "no-auth") {
+      delete config.headers.Authorization;
+    } else {
+      const accessToken = getToken();
+      if (accessToken) {
+        config.headers.Authorization = accessToken;
+      }
     }
     return config;
   },
@@ -34,11 +36,10 @@ service.interceptors.request.use(
 // 响应拦截器
 service.interceptors.response.use(
   (response: AxiosResponse) => {
-    // 检查配置的响应类型是否为二进制类型（'blob' 或 'arraybuffer'）, 如果是，直接返回响应对象
-    if (
-      response.config.responseType === "blob" ||
-      response.config.responseType === "arraybuffer"
-    ) {
+    const { responseType } = response.config;
+
+    // 如果响应类型是二进制数据（文件导出场景）, 则直接返回 response
+    if (responseType === "blob") {
       return response;
     }
 
@@ -61,7 +62,7 @@ service.interceptors.response.use(
           type: "info",
         });
         useUserStoreHook()
-          .clearUserSession()
+          .clearUserData()
           .then(() => {
             location.reload();
           });

From 9bc060b5125e5cefed5b23966a74037f240cf234 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 13 Nov 2024 12:55:58 +0800
Subject: [PATCH 056/497] chore: :hammer: bump version to 2.18.6

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index aa2ebd7d..676262d8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.5",
+  "version": "2.18.6",
   "private": true,
   "type": "module",
   "scripts": {

From 5e90e5ca06056c8ec4285ddd61b5cadd4bd09c50 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 13 Nov 2024 13:36:29 +0800
Subject: [PATCH 057/497] =?UTF-8?q?fix:=20:bug:=20=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E6=B8=85=E9=99=A4=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E5=90=8D=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/permission.ts | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index f93db995..2922cb09 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,8 +1,4 @@
-import type {
-  NavigationGuardNext,
-  RouteLocationNormalized,
-  RouteRecordRaw,
-} from "vue-router";
+import type { NavigationGuardNext, RouteLocationNormalized, RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
 import { getToken } from "@/utils/auth";
 import router from "@/router";
@@ -22,15 +18,14 @@ export function setupPermission() {
         next({ path: "/" });
       } else {
         const permissionStore = usePermissionStore();
-        // 判断路由是否加载过
+        // 判断路由是否加载完成
         if (permissionStore.isRoutesLoaded) {
           if (to.matched.length === 0) {
             // 路由未匹配，跳转到404
             next("/404");
           } else {
             // 动态设置页面标题
-            const title =
-              (to.params.title as string) || (to.query.title as string);
+            const title = (to.params.title as string) || (to.query.title as string);
             if (title) {
               to.meta.title = title;
             }
@@ -40,14 +35,12 @@ export function setupPermission() {
           try {
             // 生成动态路由
             const dynamicRoutes = await permissionStore.generateRoutes();
-            dynamicRoutes.forEach((route: RouteRecordRaw) =>
-              router.addRoute(route)
-            );
-            next({ ...to, replace: true }); // 添加动态路由后重新导航
+            dynamicRoutes.forEach((route: RouteRecordRaw) => router.addRoute(route));
+            next({ ...to, replace: true });
           } catch (error) {
             console.error(error);
             // 路由加载失败，重置 token 并重定向到登录页
-            await useUserStore().clearUserSession();
+            await useUserStore().clearUserData();
             redirectToLogin(to, next);
             NProgress.done();
           }
@@ -60,7 +53,7 @@ export function setupPermission() {
       } else {
         // 不在白名单，重定向到登录页
         redirectToLogin(to, next);
-        NProgress.done(); // 关闭进度条
+        NProgress.done();
       }
     }
   });
@@ -72,10 +65,7 @@ export function setupPermission() {
 }
 
 /** 重定向到登录页 */
-function redirectToLogin(
-  to: RouteLocationNormalized,
-  next: NavigationGuardNext
-) {
+function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext) {
   const params = new URLSearchParams(to.query as Record<string, string>);
   const queryString = params.toString();
   const redirect = queryString ? `${to.path}?${queryString}` : to.path;
@@ -83,10 +73,7 @@ function redirectToLogin(
 }
 
 /** 判断是否有权限 */
-export function hasAuth(
-  value: string | string[],
-  type: "button" | "role" = "button"
-) {
+export function hasAuth(value: string | string[], type: "button" | "role" = "button") {
   const { roles, perms } = useUserStore().userInfo;
 
   // 超级管理员 拥有所有权限

From ebe43bb2d04c85de520b5b36e088a88e2c7ec99b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 14 Nov 2024 18:14:00 +0800
Subject: [PATCH 058/497] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/settings.ts b/src/settings.ts
index 88396a95..202eb5cc 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -25,7 +25,9 @@ const defaultSettings: AppSettings = {
   layout: LayoutEnum.LEFT,
   // 主题，根据操作系统的色彩方案自动选择
   theme: mediaQueryList.matches ? ThemeEnum.DARK : ThemeEnum.LIGHT,
+  // 组件大小 default | medium | small | large
   size: SizeEnum.DEFAULT,
+  // 语言
   language: LanguageEnum.ZH_CN,
   // 主题颜色
   themeColor: "#4080FF",

From 0902e2320fd0193b1ea41c06278c669af4880f30 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 14 Nov 2024 18:20:36 +0800
Subject: [PATCH 059/497] =?UTF-8?q?fix:=20:bug:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenuItem.vue          | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 33b6c565..c142180f 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -7,7 +7,7 @@
         (hasOneShowingChild(item.children, item) &&
           (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
           !item.meta?.alwaysShow) ||
-        // 父节点即使配置了始终显示，但无子节点，也显示未叶子节点
+        // 父节点即使配置了始终显示，但无子节点，也显示为叶子节点
         (item.meta?.alwaysShow && !item.children)
       "
     >
@@ -33,11 +33,7 @@
     <!--【非叶子节点】显示含多个子节点的父菜单，或始终显示的单子节点 -->
     <el-sub-menu v-else :index="resolvePath(item.path)" teleported>
       <template #title>
-        <SidebarMenuItemTitle
-          v-if="item.meta"
-          :icon="item.meta.icon"
-          :title="item.meta.title"
-        />
+        <SidebarMenuItemTitle v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
       </template>
 
       <SidebarMenuItem
@@ -98,10 +94,7 @@ const onlyOneChild = ref();
  * @param parent 父级路由
  * @returns 是否仅有一个可见子节点
  */
-function hasOneShowingChild(
-  children: RouteRecordRaw[] = [],
-  parent: RouteRecordRaw
-) {
+function hasOneShowingChild(children: RouteRecordRaw[] = [], parent: RouteRecordRaw) {
   // 过滤出可见子节点
   const showingChildren = children.filter((route: RouteRecordRaw) => {
     if (!route.meta?.hidden) {

From ad9dd5e1d1c56d3984faafba4668d87159c9f353 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 14 Nov 2024 18:32:23 +0800
Subject: [PATCH 060/497] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=20JWT=20=E5=88=B7=E6=96=B0=E6=A8=A1=E5=BC=8F=EF=BC=8C=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=9B=A0=E8=AE=BF=E9=97=AE=E4=BB=A4=E7=89=8C=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E8=80=8C=E5=A4=B1=E8=B4=A5=E7=9A=84=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts     | 24 +++++-----
 src/enums/ResultEnum.ts   |  9 +++-
 src/store/modules/user.ts | 28 +++++++++--
 src/utils/auth.ts         | 22 +++++++--
 src/utils/request.ts      | 98 ++++++++++++++++++++++++++-------------
 5 files changed, 127 insertions(+), 54 deletions(-)

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index 299782b9..7728ad61 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 const AUTH_BASE_URL = "/api/v1/auth";
 
 const AuthAPI = {
-  /** 登录 接口*/
+  /** 登录接口*/
   login(data: LoginData) {
     const formData = new FormData();
     formData.append("username", data.username);
@@ -20,7 +20,7 @@ const AuthAPI = {
     });
   },
 
-  /** 刷新token 接口*/
+  /** 刷新 token 接口*/
   refreshToken(refreshToken: string) {
     return request<any, LoginResult>({
       url: `${AUTH_BASE_URL}/refresh-token`,
@@ -32,7 +32,7 @@ const AuthAPI = {
     });
   },
 
-  /** 注销 接口*/
+  /** 注销接口*/
   logout() {
     return request({
       url: `${AUTH_BASE_URL}/logout`,
@@ -40,7 +40,7 @@ const AuthAPI = {
     });
   },
 
-  /** 获取验证码 接口*/
+  /** 获取验证码接口*/
   getCaptcha() {
     return request<any, CaptchaResult>({
       url: `${AUTH_BASE_URL}/captcha`,
@@ -65,14 +65,14 @@ export interface LoginData {
 
 /** 登录响应 */
 export interface LoginResult {
-  /** 访问token */
-  accessToken?: string;
-  /** 过期时间(单位：毫秒) */
-  expires?: number;
-  /** 刷新token */
-  refreshToken?: string;
-  /** token 类型 */
-  tokenType?: string;
+  /** 访问令牌 */
+  accessToken: string;
+  /** 刷新令牌 */
+  refreshToken: string;
+  /** 令牌类型 */
+  tokenType: string;
+  /** 过期时间(秒) */
+  expiresIn: number;
 }
 
 /** 验证码响应 */
diff --git a/src/enums/ResultEnum.ts b/src/enums/ResultEnum.ts
index 2dff7c9a..349a6289 100644
--- a/src/enums/ResultEnum.ts
+++ b/src/enums/ResultEnum.ts
@@ -12,7 +12,12 @@ export const enum ResultEnum {
   ERROR = "B0001",
 
   /**
-   * 令牌无效或过期
+   * 访问令牌无效或过期
    */
-  TOKEN_INVALID = "A0230",
+  ACCESS_TOKEN_INVALID = "A0230",
+
+  /**
+   * 刷新令牌无效或过期
+   */
+  REFRESH_TOKEN_INVALID = "A0231",
 }
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index b206dfa5..273e4fcb 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -5,7 +5,7 @@ import { useDictStoreHook } from "@/store/modules/dict";
 import AuthAPI, { type LoginData } from "@/api/auth";
 import UserAPI, { type UserInfo } from "@/api/system/user";
 
-import { setToken, clearToken } from "@/utils/auth";
+import { setToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
 
 export const useUserStore = defineStore("user", () => {
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
@@ -20,8 +20,9 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.login(loginData)
         .then((data) => {
-          const { tokenType, accessToken } = data;
+          const { tokenType, accessToken, refreshToken } = data;
           setToken(tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
+          setRefreshToken(refreshToken);
           resolve();
         })
         .catch((error) => {
@@ -69,7 +70,27 @@ export const useUserStore = defineStore("user", () => {
   }
 
   /**
-   * 清理用户会话
+   * 刷新 token
+   */
+  function refreshToken() {
+    const refreshToken = getRefreshToken();
+    return new Promise<void>((resolve, reject) => {
+      AuthAPI.refreshToken(refreshToken)
+        .then((data) => {
+          const { tokenType, accessToken, refreshToken } = data;
+          setToken(tokenType + " " + accessToken);
+          setRefreshToken(refreshToken);
+          resolve();
+        })
+        .catch((error) => {
+          console.log(" refreshToken  刷新失败", error);
+          reject(error);
+        });
+    });
+  }
+
+  /**
+   * 清理用户数据
    *
    * @returns
    */
@@ -88,6 +109,7 @@ export const useUserStore = defineStore("user", () => {
     login,
     logout,
     clearUserData,
+    refreshToken,
   };
 });
 
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index de588e96..bd3e9b3e 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,15 +1,27 @@
-const TOKEN_KEY = "admin-token";
+// 访问 token 缓存的 key
+const ACCESS_TOKEN_KEY = "access_token";
+// 刷新 token 缓存的 key
+const REFRESH_TOKEN_KEY = "refresh_token";
 
 function getToken(): string {
-  return localStorage.getItem(TOKEN_KEY) || "";
+  return localStorage.getItem(ACCESS_TOKEN_KEY) || "";
 }
 
 function setToken(token: string) {
-  return localStorage.setItem(TOKEN_KEY, token);
+  localStorage.setItem(ACCESS_TOKEN_KEY, token);
+}
+
+function getRefreshToken(): string {
+  return localStorage.getItem(REFRESH_TOKEN_KEY) || "";
+}
+
+function setRefreshToken(token: string) {
+  localStorage.setItem(REFRESH_TOKEN_KEY, token);
 }
 
 function clearToken() {
-  return localStorage.removeItem(TOKEN_KEY);
+  localStorage.removeItem(ACCESS_TOKEN_KEY);
+  localStorage.removeItem(REFRESH_TOKEN_KEY);
 }
 
-export { getToken, setToken, clearToken };
+export { getToken, setToken, clearToken, getRefreshToken, setRefreshToken };
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 6ed449b5..36ef0754 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -3,43 +3,36 @@ import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user";
 import { ResultEnum } from "@/enums/ResultEnum";
 import { getToken } from "@/utils/auth";
+import router from "@/router";
 
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
   timeout: 50000,
   headers: { "Content-Type": "application/json;charset=utf-8" },
-  paramsSerializer: (params) => {
-    return qs.stringify(params);
-  },
+  paramsSerializer: (params) => qs.stringify(params),
 });
 
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    // 如果设置了 "no-auth"，则不携带 Authorization 头，用于登录、刷新 token 等接口
-    if (config.headers.Authorization === "no-auth") {
-      delete config.headers.Authorization;
+    const accessToken = getToken();
+    // 如果 Authorization 设置为 no-auth，则不携带 Token，用于登录、刷新 Token 等接口
+    if (config.headers.Authorization !== "no-auth" && accessToken) {
+      config.headers.Authorization = accessToken;
     } else {
-      const accessToken = getToken();
-      if (accessToken) {
-        config.headers.Authorization = accessToken;
-      }
+      delete config.headers.Authorization;
     }
     return config;
   },
-  (error: any) => {
-    return Promise.reject(error);
-  }
+  (error) => Promise.reject(error)
 );
 
 // 响应拦截器
 service.interceptors.response.use(
   (response: AxiosResponse) => {
-    const { responseType } = response.config;
-
-    // 如果响应类型是二进制数据（文件导出场景）, 则直接返回 response
-    if (responseType === "blob") {
+    // 如果响应是二进制流，则直接返回，用于下载文件、Excel 导出等
+    if (response.config.responseType === "blob") {
       return response;
     }
 
@@ -51,21 +44,15 @@ service.interceptors.response.use(
     ElMessage.error(msg || "系统出错");
     return Promise.reject(new Error(msg || "Error"));
   },
-  (error: any) => {
-    // 异常处理 非 2xx 状态码 会进入这里
-    if (error.response.data) {
-      const { code, msg } = error.response.data;
-      if (code === ResultEnum.TOKEN_INVALID) {
-        ElNotification({
-          title: "提示",
-          message: "您的会话已过期，请重新登录",
-          type: "info",
-        });
-        useUserStoreHook()
-          .clearUserData()
-          .then(() => {
-            location.reload();
-          });
+  async (error: any) => {
+    const { config, response } = error;
+    if (response) {
+      const { code, msg } = response.data;
+      if (code === ResultEnum.ACCESS_TOKEN_INVALID) {
+        // Token 过期，刷新 Token
+        return handleTokenRefresh(config);
+      } else if (code === ResultEnum.REFRESH_TOKEN_INVALID) {
+        return Promise.reject(new Error(msg || "Error"));
       } else {
         ElMessage.error(msg || "系统出错");
       }
@@ -75,3 +62,50 @@ service.interceptors.response.use(
 );
 
 export default service;
+
+// 刷新 Token 的锁
+let isRefreshing = false;
+// 因 Token 过期导致失败的请求队列
+let requestsQueue: Array<() => void> = [];
+
+// 刷新 Token 处理
+async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
+  return new Promise((resolve) => {
+    const requestCallback = () => {
+      config.headers.Authorization = getToken();
+      resolve(service(config));
+    };
+
+    requestsQueue.push(requestCallback);
+
+    if (!isRefreshing) {
+      isRefreshing = true;
+
+      // 刷新 Token
+      useUserStoreHook()
+        .refreshToken()
+        .then(() => {
+          // Token 刷新成功，执行请求队列
+          requestsQueue.forEach((callback) => callback());
+          requestsQueue = [];
+        })
+        .catch((error) => {
+          console.log("handleTokenRefresh error", error);
+          // Token 刷新失败，清除用户数据并跳转到登录
+          ElNotification({
+            title: "提示",
+            message: "您的会话已过期，请重新登录",
+            type: "info",
+          });
+          useUserStoreHook()
+            .clearUserData()
+            .then(() => {
+              router.push("/login");
+            });
+        })
+        .finally(() => {
+          isRefreshing = false;
+        });
+    }
+  });
+}

From d1fbe44a1988328bef578645cd88d141ded17d18 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 14 Nov 2024 18:36:18 +0800
Subject: [PATCH 061/497] chore: :hammer: bump version to 2.19.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 676262d8..d74f460b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.18.6",
+  "version": "2.19.0",
   "private": true,
   "type": "module",
   "scripts": {

From b6b2dc41cfc2e189a92e215f9fc6c0c94ab1cbb1 Mon Sep 17 00:00:00 2001
From: Ky10 <7703482+ky10_code@user.noreply.gitee.com>
Date: Sat, 16 Nov 2024 20:15:00 +0800
Subject: [PATCH 062/497] =?UTF-8?q?refactor(system):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=BC=93=E5=AD=98=E5=88=B7=E6=96=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将缓存刷新接口的 URL 从 CONFIG_BASE_URL 改为 CONFIG_BASE_URL + "/refresh"
- 将请求方法从 PATCH 改为 PUT
---
 src/api/system/config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/system/config.ts b/src/api/system/config.ts
index 2eb1c87e..95c1bb84 100644
--- a/src/api/system/config.ts
+++ b/src/api/system/config.ts
@@ -61,8 +61,8 @@ const ConfigAPI = {
 
   refreshCache() {
     return request({
-      url: `${CONFIG_BASE_URL}`,
-      method: "patch",
+      url: `${CONFIG_BASE_URL}/refresh`,
+      method: "PUT",
     });
   },
 };

From 9291e17c7fd7054751e4bf026a9ca72594d55487 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 16 Nov 2024 21:54:21 +0800
Subject: [PATCH 063/497] =?UTF-8?q?fix:=20:bug:=20=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96=E8=BE=91=E9=A1=B6=E7=BA=A7?=
 =?UTF-8?q?=E9=83=A8=E9=97=A8=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dept.ts          |  6 ++--
 src/views/system/dept/index.vue | 54 ++++++++++++++-------------------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/src/api/system/dept.ts b/src/api/system/dept.ts
index ea0d2fa9..e3e7530f 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.ts
@@ -59,7 +59,7 @@ const DeptAPI = {
    * @param data 部门表单数据
    * @returns 请求结果
    */
-  update(id: number, data: DeptForm) {
+  update(id: string, data: DeptForm) {
     return request({
       url: `${DEPT_BASE_URL}/${id}`,
       method: "put",
@@ -116,13 +116,13 @@ export interface DeptVO {
 /** 部门表单类型 */
 export interface DeptForm {
   /** 部门ID(新增不填) */
-  id?: number;
+  id?: string;
   /** 部门名称 */
   name?: string;
   /** 部门编号 */
   code?: string;
   /** 父部门ID */
-  parentId: number;
+  parentId: string;
   /** 排序 */
   sort?: number;
   /** 状态(1:启用；0：禁用) */
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index f53def24..d8594f1d 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -11,12 +11,7 @@
         </el-form-item>
 
         <el-form-item label="部门状态" prop="status">
-          <el-select
-            v-model="queryParams.status"
-            placeholder="全部"
-            clearable
-            class="!w-[100px]"
-          >
+          <el-select v-model="queryParams.status" placeholder="全部" clearable class="!w-[100px]">
             <el-option :value="1" label="正常" />
             <el-option :value="0" label="禁用" />
           </el-select>
@@ -132,12 +127,7 @@
       width="600px"
       @closed="handleCloseDialog"
     >
-      <el-form
-        ref="deptFormRef"
-        :model="formData"
-        :rules="rules"
-        label-width="80px"
-      >
+      <el-form ref="deptFormRef" :model="formData" :rules="rules" label-width="80px">
         <el-form-item label="上级部门" prop="parentId">
           <el-tree-select
             v-model="formData.parentId"
@@ -164,8 +154,8 @@
         </el-form-item>
         <el-form-item label="部门状态">
           <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">禁用</el-radio>
+            <el-radio :value="1">正常</el-radio>
+            <el-radio :value="0">禁用</el-radio>
           </el-radio-group>
         </el-form-item>
       </el-form>
@@ -205,20 +195,18 @@ const deptOptions = ref<OptionType[]>();
 
 const formData = reactive<DeptForm>({
   status: 1,
-  parentId: 0,
+  parentId: "0",
   sort: 1,
 });
 
 const rules = reactive({
-  parentId: [
-    { required: true, message: "上级部门不能为空", trigger: "change" },
-  ],
+  parentId: [{ required: true, message: "上级部门不能为空", trigger: "change" }],
   name: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
   code: [{ required: true, message: "部门编号不能为空", trigger: "blur" }],
   sort: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
 });
 
-/** 查询部门 */
+// 查询部门
 function handleQuery() {
   loading.value = true;
   DeptAPI.getList(queryParams).then((data) => {
@@ -227,13 +215,13 @@ function handleQuery() {
   });
 }
 
-/** 重置查询 */
+// 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   handleQuery();
 }
 
-/** 行复选框选中记录选中ID集合 */
+// 行复选框选中记录选中ID集合
 function handleSelectionChange(selection: any) {
   ids.value = selection.map((item: any) => item.id);
 }
@@ -244,12 +232,12 @@ function handleSelectionChange(selection: any) {
  * @param parentId 父部门ID
  * @param deptId 部门ID
  */
-async function handleOpenDialog(parentId?: number, deptId?: number) {
+async function handleOpenDialog(parentId?: string, deptId?: number) {
   // 加载部门下拉数据
   const data = await DeptAPI.getOptions();
   deptOptions.value = [
     {
-      value: 0,
+      value: "0",
       label: "顶级部门",
       children: data,
     },
@@ -263,11 +251,11 @@ async function handleOpenDialog(parentId?: number, deptId?: number) {
     });
   } else {
     dialog.title = "新增部门";
-    formData.parentId = parentId ?? 0;
+    formData.parentId = parentId || "0";
   }
 }
 
-/** 提交部门表单 */
+// 提交部门表单
 function handleSubmit() {
   deptFormRef.value.validate((valid: any) => {
     if (valid) {
@@ -294,7 +282,7 @@ function handleSubmit() {
   });
 }
 
-/** 删除部门 */
+// 删除部门
 function handleDelete(deptId?: number) {
   const deptIds = [deptId || ids.value].join(",");
 
@@ -323,19 +311,23 @@ function handleDelete(deptId?: number) {
   );
 }
 
-/** 关闭弹窗 */
-function handleCloseDialog() {
-  dialog.visible = false;
-
+// 重置表单
+function resetForm() {
   deptFormRef.value.resetFields();
   deptFormRef.value.clearValidate();
 
   formData.id = undefined;
-  formData.parentId = 0;
+  formData.parentId = "0";
   formData.status = 1;
   formData.sort = 1;
 }
 
+// 关闭弹窗
+function handleCloseDialog() {
+  dialog.visible = false;
+  resetForm();
+}
+
 onMounted(() => {
   handleQuery();
 });

From 9eadfe2983f72c93c793a4485fe431ebc4656f10 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 16 Nov 2024 22:09:52 +0800
Subject: [PATCH 064/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=88=97=E8=A1=A8=E7=A7=BB=E9=99=A4=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?ID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 076a7419..484b24d1 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -97,11 +97,11 @@
 
           <el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange">
             <el-table-column type="selection" width="50" align="center" />
-            <el-table-column label="编号" align="center" prop="id" width="60" />
-            <el-table-column label="用户名" align="center" prop="username" />
-            <el-table-column label="昵称" width="100" align="center" prop="nickname" />
+            <el-table-column label="用户名" prop="username" />
+            <el-table-column label="昵称" width="150" align="center" prop="nickname" />
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
+                <!-- 性别字典翻译 -->
                 <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>

From 711e3ba5f4923e9dd7e2366bc575d2e8cea999fc Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 16 Nov 2024 23:00:30 +0800
Subject: [PATCH 065/497] =?UTF-8?q?chore:=20:hammer:=20=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |   4 +-
 src/components/Breadcrumb/index.vue           |  21 +---
 src/components/CURD/PageContent.vue           |  94 +++------------
 src/components/CURD/PageForm.vue              |  28 +----
 src/components/CURD/PageModal.vue             | 110 ++++--------------
 src/components/CURD/PageSearch.vue            |  18 +--
 src/components/CURD/usePage.ts                |   7 +-
 src/components/Dict/DictLabel.vue             |  17 +--
 src/components/Dict/index.vue                 |   7 +-
 src/components/Hamburger/index.vue            |   5 +-
 src/components/IconSelect/index.vue           |  28 +----
 src/components/MenuSearch/index.vue           |  21 +---
 src/components/SizeSelect/index.vue           |   6 +-
 src/components/SvgIcon/index.vue              |   6 +-
 src/components/TableSelect/index.vue          |  24 +---
 src/components/Upload/FileUpload.vue          |  10 +-
 src/components/Upload/MultiImageUpload.vue    |  15 +--
 src/components/Upload/SingleImageUpload.vue   |   6 +-
 src/directive/permission/index.ts             |   4 +-
 src/layout/components/AppMain/index.vue       |   5 +-
 .../NavBar/components/Notification.vue        |  45 ++-----
 .../NavBar/components/UserProfile.vue         |  10 +-
 src/layout/components/Settings/index.vue      |  23 +---
 .../Sidebar/components/SidebarMenu.vue        |   4 +-
 .../Sidebar/components/SidebarMixTopMenu.vue  |  15 +--
 src/layout/components/TagsView/index.vue      |  13 +--
 src/router/index.ts                           |   9 +-
 src/store/modules/app.ts                      |   4 +-
 src/store/modules/settings.ts                 |  23 +---
 src/store/modules/tags-view.ts                |   8 +-
 src/utils/websocket.ts                        |   7 +-
 src/views/codegen/index.vue                   |  83 +++----------
 src/views/dashboard/components/VisitTrend.vue |  10 +-
 src/views/dashboard/index.vue                 |  60 ++--------
 src/views/demo/api/knife4j.vue                |   7 +-
 src/views/demo/curd/config/content2.ts        |   6 +-
 src/views/demo/curd/index.vue                 |  16 +--
 src/views/demo/icons.vue                      |  12 +-
 src/views/demo/table-select/index.vue         |   6 +-
 src/views/demo/wang-editor.vue                |   5 +-
 src/views/demo/websocket.vue                  |  33 ++----
 src/views/error/401.vue                       |  14 +--
 src/views/error/404.vue                       |  38 ++----
 src/views/login/index.vue                     |  43 ++-----
 src/views/profile/index.vue                   |  54 ++-------
 src/views/system/dept/index.vue               |   2 +-
 .../system/notice/components/NoticeDetail.vue |   8 +-
 .../system/user/components/UserImport.vue     |   4 +-
 48 files changed, 207 insertions(+), 791 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index b1d99d1a..79cfba87 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -30,8 +30,6 @@ const watermarkEnabled = computed(() => settingsStore.watermarkEnabled);
 
 // 明亮/暗黑主题水印字体颜色适配
 const fontColor = computed(() => {
-  return settingsStore.theme === ThemeEnum.DARK
-    ? "rgba(255, 255, 255, .15)"
-    : "rgba(0, 0, 0, .15)";
+  return settingsStore.theme === ThemeEnum.DARK ? "rgba(255, 255, 255, .15)" : "rgba(0, 0, 0, .15)";
 });
 </script>
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index dba072f6..06e16ec9 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,13 +1,9 @@
 <template>
   <el-breadcrumb class="flex-y-center">
-    <transition-group
-      enter-active-class="animate__animated animate__fadeInRight"
-    >
+    <transition-group enter-active-class="animate__animated animate__fadeInRight">
       <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
         <span
-          v-if="
-            item.redirect === 'noredirect' || index === breadcrumbs.length - 1
-          "
+          v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1"
           class="color-gray-400"
         >
           {{ translateRouteTitle(item.meta.title) }}
@@ -36,14 +32,10 @@ const pathCompile = (path: string) => {
 const breadcrumbs = ref<Array<RouteLocationMatched>>([]);
 
 function getBreadcrumb() {
-  let matched = currentRoute.matched.filter(
-    (item) => item.meta && item.meta.title
-  );
+  let matched = currentRoute.matched.filter((item) => item.meta && item.meta.title);
   const first = matched[0];
   if (!isDashboard(first)) {
-    matched = [
-      { path: "/dashboard", meta: { title: "dashboard" } } as any,
-    ].concat(matched);
+    matched = [{ path: "/dashboard", meta: { title: "dashboard" } } as any].concat(matched);
   }
   breadcrumbs.value = matched.filter((item) => {
     return item.meta && item.meta.title && item.meta.breadcrumb !== false;
@@ -55,10 +47,7 @@ function isDashboard(route: RouteLocationMatched) {
   if (!name) {
     return false;
   }
-  return (
-    name.toString().trim().toLocaleLowerCase() ===
-    "Dashboard".toLocaleLowerCase()
-  );
+  return name.toString().trim().toLocaleLowerCase() === "Dashboard".toLocaleLowerCase();
 }
 
 function handleLink(item: any) {
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index ba1e1414..5e420119 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -71,12 +71,7 @@
           <template v-if="typeof item === 'string'">
             <!-- 刷新 -->
             <template v-if="item === 'refresh'">
-              <el-button
-                icon="refresh"
-                circle
-                title="刷新"
-                @click="handleToolbar(item)"
-              />
+              <el-button icon="refresh" circle title="刷新" @click="handleToolbar(item)" />
             </template>
             <!-- 筛选列 -->
             <template v-else-if="item === 'filter'">
@@ -86,11 +81,7 @@
                 </template>
                 <el-scrollbar max-height="350px">
                   <template v-for="col in cols" :key="col">
-                    <el-checkbox
-                      v-if="col.prop"
-                      v-model="col.show"
-                      :label="col.label"
-                    />
+                    <el-checkbox v-if="col.prop" v-model="col.show" :label="col.label" />
                   </template>
                 </el-scrollbar>
               </el-popover>
@@ -166,10 +157,7 @@
             <template v-if="col.templet === 'image'">
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
-                  <template
-                    v-for="(item, index) in scope.row[col.prop]"
-                    :key="item"
-                  >
+                  <template v-for="(item, index) in scope.row[col.prop]" :key="item">
                     <el-image
                       :src="http://github.com/item"
                       :preview-src-list="scope.row[col.prop]"
@@ -198,11 +186,7 @@
             <!-- 格式化显示链接 -->
             <template v-else-if="col.templet === 'url'">
               <template v-if="col.prop">
-                <el-link
-                  type="primary"
-                  :href="http://github.com/scope.row[col.prop]"
-                  target="_blank"
-                >
+                <el-link type="primary" :href="http://github.com/scope.row[col.prop]" target="_blank">
                   {{ scope.row[col.prop] }}
                 </el-link>
               </template>
@@ -221,8 +205,7 @@
                   :validate-event="false"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
                   @change="
-                    pageData.length > 0 &&
-                      handleModify(col.prop, scope.row[col.prop], scope.row)
+                    pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
                   "
                 />
               </template>
@@ -253,9 +236,7 @@
               <template v-if="col.prop">
                 <template v-if="scope.row[col.prop].startsWith('el-icon-')">
                   <el-icon>
-                    <component
-                      :is="scope.row[col.prop].replace('el-icon-', '')"
-                    />
+                    <component :is="scope.row[col.prop].replace('el-icon-', '')" />
                   </el-icon>
                 </template>
                 <template v-else>
@@ -268,20 +249,15 @@
               <template v-if="col.prop">
                 {{
                   scope.row[col.prop]
-                    ? useDateFormat(
-                        scope.row[col.prop],
-                        col.dateFormat ?? "YYYY-MM-DD HH:mm:ss"
-                      ).value
+                    ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
+                        .value
                     : ""
                 }}
               </template>
             </template>
             <!-- 列操作栏 -->
             <template v-else-if="col.templet === 'tool'">
-              <template
-                v-for="item in col.operat ?? ['edit', 'delete']"
-                :key="item"
-              >
+              <template v-for="item in col.operat ?? ['edit', 'delete']" :key="item">
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
@@ -329,11 +305,7 @@
             </template>
             <!-- 自定义 -->
             <template v-else-if="col.templet === 'custom'">
-              <slot
-                :name="col.slotName ?? col.prop"
-                :prop="col.prop"
-                v-bind="scope"
-              />
+              <slot :name="col.slotName ?? col.prop" :prop="col.prop" v-bind="scope" />
             </template>
           </template>
         </el-table-column>
@@ -378,10 +350,7 @@
           </el-form-item>
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
-              <el-option
-                label="当前数据 (当前页的数据)"
-                :value="ExportsOriginEnum.CURRENT"
-              />
+              <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
               <el-option
                 label="选中数据 (所有选中的数据)"
                 :value="ExportsOriginEnum.SELECTED"
@@ -397,11 +366,7 @@
           <el-form-item label="字段" prop="fields">
             <el-checkbox-group v-model="exportsFormData.fields">
               <template v-for="col in cols" :key="col">
-                <el-checkbox
-                  v-if="col.prop"
-                  :value="col.prop"
-                  :label="col.label"
-                />
+                <el-checkbox v-if="col.prop" :value="col.prop" :label="col.label" />
               </template>
             </el-checkbox-group>
           </el-form-item>
@@ -410,9 +375,7 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" @click="handleExportsSubmit">
-            确 定
-          </el-button>
+          <el-button type="primary" @click="handleExportsSubmit">确 定</el-button>
           <el-button @click="handleCloseExportsModal">取 消</el-button>
         </div>
       </template>
@@ -524,10 +487,7 @@ const pk = props.contentConfig.pk ?? "id";
 // 表格左侧工具栏
 const toolbar = props.contentConfig.toolbar ?? ["add", "delete"];
 // 表格右侧工具栏
-const defaultToolbar = props.contentConfig.defaultToolbar ?? [
-  "refresh",
-  "filter",
-];
+const defaultToolbar = props.contentConfig.defaultToolbar ?? ["refresh", "filter"];
 // 表格列
 const cols = ref(
   props.contentConfig.cols.map((col) => {
@@ -535,11 +495,7 @@ const cols = ref(
     if (col.show === undefined) {
       col.show = true;
     }
-    if (
-      col.prop !== undefined &&
-      col.columnKey === undefined &&
-      col["column-key"] === undefined
-    ) {
+    if (col.prop !== undefined && col.columnKey === undefined && col["column-key"] === undefined) {
       col.columnKey = col.prop;
     }
     if (
@@ -672,9 +628,7 @@ function handleExports() {
   const filename = exportsFormData.filename
     ? exportsFormData.filename
     : props.contentConfig.pageName;
-  const sheetname = exportsFormData.sheetname
-    ? exportsFormData.sheetname
-    : "sheet";
+  const sheetname = exportsFormData.sheetname ? exportsFormData.sheetname : "sheet";
   const workbook = new ExcelJS.Workbook();
   const worksheet = workbook.addWorksheet(sheetname);
   const columns: Partial<ExcelJS.Column>[] = [];
@@ -700,9 +654,7 @@ function handleExports() {
     }
   } else {
     worksheet.addRows(
-      exportsFormData.origin === ExportsOriginEnum.SELECTED
-        ? selectionData.value
-        : pageData.value
+      exportsFormData.origin === ExportsOriginEnum.SELECTED ? selectionData.value : pageData.value
     );
     workbook.xlsx
       .writeBuffer()
@@ -821,11 +773,7 @@ function handleImports() {
               fields.push(cell.value);
             });
             // 遍历工作表的每一行（从第二行开始，因为第一行通常是标题行）
-            for (
-              let rowNumber = 2;
-              rowNumber <= worksheet.rowCount;
-              rowNumber++
-            ) {
+            for (let rowNumber = 2; rowNumber <= worksheet.rowCount; rowNumber++) {
               const rowData: IObject = {};
               const row = worksheet.getRow(rowNumber);
               // 遍历当前行的每个单元格
@@ -903,11 +851,7 @@ function handleOperat(data: IOperatData) {
 }
 
 // 属性修改
-function handleModify(
-  field: string,
-  value: boolean | string | number,
-  row: Record<string, any>
-) {
+function handleModify(field: string, value: boolean | string | number, row: Record<string, any>) {
   if (props.contentConfig.modifyAction) {
     props.contentConfig.modifyAction({
       [pk]: row[pk],
diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
index 26f3f008..199f4041 100644
--- a/src/components/CURD/PageForm.vue
+++ b/src/components/CURD/PageForm.vue
@@ -1,11 +1,5 @@
 <template>
-  <el-form
-    ref="formRef"
-    label-width="auto"
-    v-bind="form"
-    :model="formData"
-    :rules="formRules"
-  >
+  <el-form ref="formRef" label-width="auto" v-bind="form" :model="formData" :rules="formRules">
     <el-row :gutter="20">
       <template v-for="item in formItems" :key="item.prop">
         <el-col v-show="!item.hidden" v-bind="item.col">
@@ -48,10 +42,7 @@
             </template>
             <!-- Checkbox 多选框 -->
             <template v-else-if="item.type === 'checkbox'">
-              <el-checkbox-group
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              >
+              <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
                 <template v-for="option in item.options" :key="option.value">
                   <el-checkbox v-bind="option" />
                 </template>
@@ -59,24 +50,15 @@
             </template>
             <!-- Input Number 数字输入框 -->
             <template v-else-if="item.type === 'input-number'">
-              <el-input-number
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- TreeSelect 树形选择 -->
             <template v-else-if="item.type === 'tree-select'">
-              <el-tree-select
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- DatePicker 日期选择器 -->
             <template v-else-if="item.type === 'date-picker'">
-              <el-date-picker
-                v-model="formData[item.prop]"
-                v-bind="item.attrs"
-              />
+              <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
             </template>
             <!-- Text 文本 -->
             <template v-else-if="item.type === 'text'">
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index 30c26daf..da5a2daf 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -36,78 +36,48 @@
                   </span>
                 </template>
                 <!-- Input 输入框 -->
-                <template
-                  v-if="item.type === 'input' || item.type === undefined"
-                >
+                <template v-if="item.type === 'input' || item.type === undefined">
                   <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
                 <!-- Select 选择器 -->
                 <template v-else-if="item.type === 'select'">
                   <el-select v-model="formData[item.prop]" v-bind="item.attrs">
-                    <template
-                      v-for="option in item.options"
-                      :key="option.value"
-                    >
+                    <template v-for="option in item.options" :key="option.value">
                       <el-option v-bind="option" />
                     </template>
                   </el-select>
                 </template>
                 <!-- Radio 单选框 -->
                 <template v-else-if="item.type === 'radio'">
-                  <el-radio-group
-                    v-model="formData[item.prop]"
-                    v-bind="item.attrs"
-                  >
-                    <template
-                      v-for="option in item.options"
-                      :key="option.value"
-                    >
+                  <el-radio-group v-model="formData[item.prop]" v-bind="item.attrs">
+                    <template v-for="option in item.options" :key="option.value">
                       <el-radio v-bind="option" />
                     </template>
                   </el-radio-group>
                 </template>
                 <!-- switch 开关 -->
                 <template v-else-if="item.type === 'switch'">
-                  <el-switch
-                    v-model="formData[item.prop]"
-                    inline-prompt
-                    v-bind="item.attrs"
-                  />
+                  <el-switch v-model="formData[item.prop]" inline-prompt v-bind="item.attrs" />
                 </template>
                 <!-- Checkbox 多选框 -->
                 <template v-else-if="item.type === 'checkbox'">
-                  <el-checkbox-group
-                    v-model="formData[item.prop]"
-                    v-bind="item.attrs"
-                  >
-                    <template
-                      v-for="option in item.options"
-                      :key="option.value"
-                    >
+                  <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
+                    <template v-for="option in item.options" :key="option.value">
                       <el-checkbox v-bind="option" />
                     </template>
                   </el-checkbox-group>
                 </template>
                 <!-- Input Number 数字输入框 -->
                 <template v-else-if="item.type === 'input-number'">
-                  <el-input-number
-                    v-model="formData[item.prop]"
-                    v-bind="item.attrs"
-                  />
+                  <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
                 <!-- TreeSelect 树形选择 -->
                 <template v-else-if="item.type === 'tree-select'">
-                  <el-tree-select
-                    v-model="formData[item.prop]"
-                    v-bind="item.attrs"
-                  />
+                  <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
                 <!-- DatePicker 日期选择器 -->
                 <template v-else-if="item.type === 'date-picker'">
-                  <el-date-picker
-                    v-model="formData[item.prop]"
-                    v-bind="item.attrs"
-                  />
+                  <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
                 <!-- Text 文本 -->
                 <template v-else-if="item.type === 'text'">
@@ -181,84 +151,48 @@
                     </span>
                   </template>
                   <!-- Input 输入框 -->
-                  <template
-                    v-if="item.type === 'input' || item.type === undefined"
-                  >
-                    <el-input
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    />
+                  <template v-if="item.type === 'input' || item.type === undefined">
+                    <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
                   </template>
                   <!-- Select 选择器 -->
                   <template v-else-if="item.type === 'select'">
-                    <el-select
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    >
-                      <template
-                        v-for="option in item.options"
-                        :key="option.value"
-                      >
+                    <el-select v-model="formData[item.prop]" v-bind="item.attrs">
+                      <template v-for="option in item.options" :key="option.value">
                         <el-option v-bind="option" />
                       </template>
                     </el-select>
                   </template>
                   <!-- Radio 单选框 -->
                   <template v-else-if="item.type === 'radio'">
-                    <el-radio-group
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    >
-                      <template
-                        v-for="option in item.options"
-                        :key="option.value"
-                      >
+                    <el-radio-group v-model="formData[item.prop]" v-bind="item.attrs">
+                      <template v-for="option in item.options" :key="option.value">
                         <el-radio v-bind="option" />
                       </template>
                     </el-radio-group>
                   </template>
                   <!-- switch 开关 -->
                   <template v-else-if="item.type === 'switch'">
-                    <el-switch
-                      v-model="formData[item.prop]"
-                      inline-prompt
-                      v-bind="item.attrs"
-                    />
+                    <el-switch v-model="formData[item.prop]" inline-prompt v-bind="item.attrs" />
                   </template>
                   <!-- Checkbox 多选框 -->
                   <template v-else-if="item.type === 'checkbox'">
-                    <el-checkbox-group
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    >
-                      <template
-                        v-for="option in item.options"
-                        :key="option.value"
-                      >
+                    <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
+                      <template v-for="option in item.options" :key="option.value">
                         <el-checkbox v-bind="option" />
                       </template>
                     </el-checkbox-group>
                   </template>
                   <!-- Input Number 数字输入框 -->
                   <template v-else-if="item.type === 'input-number'">
-                    <el-input-number
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    />
+                    <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
                   </template>
                   <!-- TreeSelect 树形选择 -->
                   <template v-else-if="item.type === 'tree-select'">
-                    <el-tree-select
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    />
+                    <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
                   </template>
                   <!-- DatePicker 日期选择器 -->
                   <template v-else-if="item.type === 'date-picker'">
-                    <el-date-picker
-                      v-model="formData[item.prop]"
-                      v-bind="item.attrs"
-                    />
+                    <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
                   </template>
                   <!-- Text 文本 -->
                   <template v-else-if="item.type === 'text'">
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 00df235d..3b218dec 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -51,9 +51,7 @@
               </el-tag>
               <template v-if="inputTagMap[item.prop].inputVisible">
                 <el-input
-                  :ref="
-                    (el: HTMLElement) => (inputTagMap[item.prop].inputRef = el)
-                  "
+                  :ref="(el: HTMLElement) => (inputTagMap[item.prop].inputRef = el)"
                   v-model="inputTagMap[item.prop].inputValue"
                   v-bind="inputTagMap[item.prop].inputAttrs"
                   @keyup.enter="handleInputConfirm(item.prop)"
@@ -80,24 +78,16 @@
           </template>
           <!-- TreeSelect 树形选择 -->
           <template v-else-if="item.type === 'tree-select'">
-            <el-tree-select
-              v-model="queryParams[item.prop]"
-              v-bind="item.attrs"
-            />
+            <el-tree-select v-model="queryParams[item.prop]" v-bind="item.attrs" />
           </template>
           <!-- DatePicker 日期选择器 -->
           <template v-else-if="item.type === 'date-picker'">
-            <el-date-picker
-              v-model="queryParams[item.prop]"
-              v-bind="item.attrs"
-            />
+            <el-date-picker v-model="queryParams[item.prop]" v-bind="item.attrs" />
           </template>
         </el-form-item>
       </template>
       <el-form-item>
-        <el-button type="primary" icon="search" @click="handleQuery">
-          搜索
-        </el-button>
+        <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
         <el-button icon="refresh" @click="handleReset">重置</el-button>
         <!-- 展开/收起 -->
         <el-link
diff --git a/src/components/CURD/usePage.ts b/src/components/CURD/usePage.ts
index 4d410ced..d0fa0090 100644
--- a/src/components/CURD/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -1,10 +1,5 @@
 import { ref } from "vue";
-import type {
-  IObject,
-  PageContentInstance,
-  PageModalInstance,
-  PageSearchInstance,
-} from "./types";
+import type { IObject, PageContentInstance, PageModalInstance, PageSearchInstance } from "./types";
 
 function usePage() {
   const searchRef = ref<PageSearchInstance>();
diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index e3862cc9..fd051314 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -21,9 +21,7 @@ const props = defineProps({
 });
 
 const label = ref("");
-const tagType = ref<
-  "success" | "warning" | "info" | "primary" | "danger" | undefined
->();
+const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>();
 
 const tagSize = ref(props.size as "default" | "large" | "small");
 
@@ -41,18 +39,9 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
 
 // 监听 props 的变化，获取并更新 label 和 tag
 const fetchLabelAndTag = async () => {
-  const result = await getLabelAndTagByValue(
-    props.code as string,
-    props.modelValue
-  );
+  const result = await getLabelAndTagByValue(props.code as string, props.modelValue);
   label.value = result.label;
-  tagType.value = result.tag as
-    | "success"
-    | "warning"
-    | "info"
-    | "primary"
-    | "danger"
-    | undefined;
+  tagType.value = result.tag as "success" | "warning" | "info" | "primary" | "danger" | undefined;
 };
 
 // 首次挂载时获取字典数据
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 743ae2b9..f17b38a7 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -68,8 +68,7 @@ const props = defineProps({
   type: {
     type: String,
     default: "select",
-    validator: (value: string) =>
-      ["select", "radio", "checkbox"].includes(value),
+    validator: (value: string) => ["select", "radio", "checkbox"].includes(value),
   },
   placeholder: {
     type: String,
@@ -120,9 +119,7 @@ watch(
   (newOptions) => {
     // options 加载后，确保 selectedValue 可以正确匹配到 options
     if (newOptions.length > 0 && selectedValue.value !== undefined) {
-      const matchedOption = newOptions.find(
-        (option) => option.value === selectedValue.value
-      );
+      const matchedOption = newOptions.find((option) => option.value === selectedValue.value);
       if (!matchedOption && props.type !== "checkbox") {
         // 如果找不到匹配项，清空选中
         selectedValue.value = "";
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index c43073a2..1c0642a4 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -4,10 +4,7 @@
     class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
     @click="toggleClick"
   >
-    <svg-icon
-      icon-class="collapse"
-      :class="{ hamburger: true, 'is-active': isActive }"
-    />
+    <svg-icon icon-class="collapse" :class="{ hamburger: true, 'is-active': isActive }" />
   </div>
 </template>
 
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 1052e700..44a4a8ba 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -1,19 +1,10 @@
 <template>
   <div ref="iconSelectRef" :style="{ width: props.width }">
-    <el-popover
-      :visible="popoverVisible"
-      :width="props.width"
-      placement="bottom-end"
-    >
+    <el-popover :visible="popoverVisible" :width="props.width" placement="bottom-end">
       <template #reference>
         <div @click="popoverVisible = !popoverVisible">
           <slot>
-            <el-input
-              v-model="selectedIcon"
-              readonly
-              placeholder="点击选择图标"
-              class="reference"
-            >
+            <el-input v-model="selectedIcon" readonly placeholder="点击选择图标" class="reference">
               <template #prepend>
                 <!-- 根据图标类型展示 -->
                 <el-icon v-if="isElementIcon">
@@ -49,12 +40,7 @@
 
       <!-- 图标选择弹窗 -->
       <div ref="popoverContentRef">
-        <el-input
-          v-model="filterText"
-          placeholder="搜索图标"
-          clearable
-          @input="filterIcons"
-        />
+        <el-input v-model="filterText" placeholder="搜索图标" clearable @input="filterIcons" />
         <el-tabs v-model="activeTab" @tab-click="handleTabClick">
           <el-tab-pane label="SVG 图标" name="svg">
             <el-scrollbar height="300px">
@@ -147,9 +133,7 @@ function handleTabClick(tabPane: any) {
 function filterIcons() {
   if (activeTab.value === "svg") {
     filteredSvgIcons.value = filterText.value
-      ? svgIcons.value.filter((icon) =>
-          icon.toLowerCase().includes(filterText.value.toLowerCase())
-        )
+      ? svgIcons.value.filter((icon) => icon.toLowerCase().includes(filterText.value.toLowerCase()))
       : svgIcons.value;
   } else {
     filteredElementIcons.value = filterText.value
@@ -184,9 +168,7 @@ function clearSelectedIcon() {
 onMounted(() => {
   loadIcons();
   if (selectedIcon.value) {
-    if (
-      elementIcons.value.includes(selectedIcon.value.replace("el-icon-", ""))
-    ) {
+    if (elementIcons.value.includes(selectedIcon.value.replace("el-icon-", ""))) {
       activeTab.value = "element";
     } else {
       activeTab.value = "svg";
diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 5491b5c3..7c2787a1 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -130,14 +130,10 @@ function navigateResults(direction: string) {
 
   if (direction === "up") {
     activeIndex.value =
-      activeIndex.value <= 0
-        ? displayResults.value.length - 1
-        : activeIndex.value - 1;
+      activeIndex.value <= 0 ? displayResults.value.length - 1 : activeIndex.value - 1;
   } else if (direction === "down") {
     activeIndex.value =
-      activeIndex.value >= displayResults.value.length - 1
-        ? 0
-        : activeIndex.value + 1;
+      activeIndex.value >= displayResults.value.length - 1 ? 0 : activeIndex.value + 1;
   }
 }
 
@@ -153,24 +149,19 @@ function navigateToRoute(item: SearchItem) {
 
 function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
   routes.forEach((route) => {
-    const path = route.path.startsWith("/")
-      ? route.path
-      : `${parentPath}/${route.path}`;
-    if (excludedRoutes.value.includes(route.path) || isExternal(route.path))
-      return;
+    const path = route.path.startsWith("/") ? route.path : `${parentPath}/${route.path}`;
+    if (excludedRoutes.value.includes(route.path) || isExternal(route.path)) return;
 
     if (route.children) {
       loadRoutes(route.children, path);
     } else if (route.meta?.title) {
-      const title =
-        route.meta.title === "dashboard" ? "首页" : route.meta.title;
+      const title = route.meta.title === "dashboard" ? "首页" : route.meta.title;
       menuItems.value.push({
         title,
         path,
         name: typeof route.name === "string" ? route.name : undefined,
         icon: route.meta.icon,
-        redirect:
-          typeof route.redirect === "string" ? route.redirect : undefined,
+        redirect: typeof route.redirect === "string" ? route.redirect : undefined,
       });
     }
   });
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 8c0f538c..6ab38f7c 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,10 +1,6 @@
 <template>
   <!-- 布局大小 -->
-  <el-tooltip
-    :content="$t('sizeSelect.tooltip')"
-    effect="dark"
-    placement="bottom"
-  >
+  <el-tooltip :content="$t('sizeSelect.tooltip')" effect="dark" placement="bottom">
     <el-dropdown trigger="click" @command="handleSizeChange">
       <div>
         <svg-icon icon-class="size" />
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
index 07b65e8d..0fdd7357 100644
--- a/src/components/SvgIcon/index.vue
+++ b/src/components/SvgIcon/index.vue
@@ -1,9 +1,5 @@
 <template>
-  <svg
-    aria-hidden="true"
-    class="svg-icon"
-    :style="'width:' + size + ';height:' + size"
-  >
+  <svg aria-hidden="true" class="svg-icon" :style="'width:' + size + ';height:' + size">
     <use :xlink:href="http://github.com/symbolId" :fill="color" />
   </svg>
 </template>
diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue
index 73300ec3..54fc7630 100644
--- a/src/components/TableSelect/index.vue
+++ b/src/components/TableSelect/index.vue
@@ -63,17 +63,11 @@
               </template>
               <!-- TreeSelect 树形选择 -->
               <template v-else-if="item.type === 'tree-select'">
-                <el-tree-select
-                  v-model="queryParams[item.prop]"
-                  v-bind="item.attrs"
-                />
+                <el-tree-select v-model="queryParams[item.prop]" v-bind="item.attrs" />
               </template>
               <!-- DatePicker 日期选择器 -->
               <template v-else-if="item.type === 'date-picker'">
-                <el-date-picker
-                  v-model="queryParams[item.prop]"
-                  v-bind="item.attrs"
-                />
+                <el-date-picker v-model="queryParams[item.prop]" v-bind="item.attrs" />
               </template>
               <!-- Input 输入框 -->
               <template v-else>
@@ -95,9 +89,7 @@
             </el-form-item>
           </template>
           <el-form-item>
-            <el-button type="primary" icon="search" @click="handleQuery">
-              搜索
-            </el-button>
+            <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
             <el-button icon="refresh" @click="handleReset">重置</el-button>
           </el-form-item>
         </el-form>
@@ -119,11 +111,7 @@
             <template v-if="col.templet === 'custom'">
               <el-table-column v-bind="col">
                 <template #default="scope">
-                  <slot
-                    :name="col.slotName ?? col.prop"
-                    :prop="col.prop"
-                    v-bind="scope"
-                  />
+                  <slot :name="col.slotName ?? col.prop" :prop="col.prop" v-bind="scope" />
                 </template>
               </el-table-column>
             </template>
@@ -294,9 +282,7 @@ for (const item of props.selectConfig.tableColumns) {
 // 选择
 const selectedItems = ref<IObject[]>([]);
 const confirmText = computed(() => {
-  return selectedItems.value.length > 0
-    ? `已选(${selectedItems.value.length})`
-    : "确 定";
+  return selectedItems.value.length > 0 ? `已选(${selectedItems.value.length})` : "确 定";
 });
 function handleSelect(selection: any[], row: any) {
   if (isMultiple || selection.length === 0) {
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index b847eff1..2dd485fb 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -35,11 +35,7 @@
           <a class="el-upload-list__item-name" @click="downloadFile(file)">
             <el-icon><Document /></el-icon>
             <span class="el-upload-list__item-file-name">{{ file.name }}</span>
-            <span
-              v-if="props.showDelBtn"
-              class="el-icon--close"
-              @click.stop="handleRemove(file)"
-            >
+            <span v-if="props.showDelBtn" class="el-icon--close" @click.stop="handleRemove(file)">
               <el-icon><Close /></el-icon>
             </span>
           </a>
@@ -278,9 +274,7 @@ function handleRemove(removeFile: UploadUserFile) {
   if (filePath) {
     FileAPI.deleteByPath(filePath).then(() => {
       // 删除成功回调
-      valFileList.value = valFileList.value.filter(
-        (file) => file.url !== filePath
-      );
+      valFileList.value = valFileList.value.filter((file) => file.url !== filePath);
       emit("update:modelValue", valFileList.value);
     });
   }
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index dfd63d8c..5e2c0db1 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -3,9 +3,7 @@
   <el-upload
     v-model:file-list="fileList"
     list-type="picture-card"
-    :class="
-      fileList.length >= props.limit || !props.showUploadBtn ? 'hide' : 'show'
-    "
+    :class="fileList.length >= props.limit || !props.showUploadBtn ? 'hide' : 'show'"
     :before-upload="handleBeforeUpload"
     :action="http://github.com/props.action"
     :headers="props.headers"
@@ -45,12 +43,7 @@
   />
 </template>
 <script setup lang="ts">
-import {
-  UploadRawFile,
-  UploadUserFile,
-  UploadFile,
-  UploadProps,
-} from "element-plus";
+import { UploadRawFile, UploadUserFile, UploadFile, UploadProps } from "element-plus";
 import FileAPI from "@/api/file";
 import { getToken } from "@/utils/auth";
 import { ResultEnum } from "@/enums/ResultEnum";
@@ -224,9 +217,7 @@ function handleBeforeUpload(file: UploadRawFile) {
  */
 const previewImg: UploadProps["onPreview"] = (uploadFile: UploadFile) => {
   viewFileList.value = fileList.value.map((file) => file.url!);
-  initialIndex.value = fileList.value.findIndex(
-    (file) => file.url === uploadFile.url
-  );
+  initialIndex.value = fileList.value.findIndex((file) => file.url === uploadFile.url);
   viewVisible.value = true;
 };
 
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index 3ba6b17a..93dde7be 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -30,11 +30,7 @@
 </template>
 
 <script setup lang="ts">
-import {
-  ElImageViewer,
-  UploadRawFile,
-  UploadRequestOptions,
-} from "element-plus";
+import { ElImageViewer, UploadRawFile, UploadRequestOptions } from "element-plus";
 import FileAPI from "@/api/file";
 
 const props = defineProps({
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 3a6736b5..f9051dde 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -15,9 +15,7 @@ export const hasPerm: Directive = {
         }
       }
     } else {
-      throw new Error(
-        "need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\""
-      );
+      throw new Error("need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\"");
     }
   },
 };
diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index 3445407a..398ee216 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -2,10 +2,7 @@
   <section class="app-main" :style="{ height: appMainHeight }">
     <router-view>
       <template #default="{ Component, route }">
-        <transition
-          enter-active-class="animate__animated animate__fadeIn"
-          mode="out-in"
-        >
+        <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
           <keep-alive :include="cachedViews">
             <component :is="Component" :key="route.path" />
           </keep-alive>
diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index e0a3b271..0fa69a48 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -31,12 +31,7 @@
                   class="w400px flex-x-between p-1"
                 >
                   <div class="flex-center">
-                    <DictLabel
-                      v-model="item.type"
-                      code="notice_type"
-                      size="small"
-                      class="mr-1"
-                    />
+                    <DictLabel v-model="item.type" code="notice_type" size="small" class="mr-1" />
                     <el-text
                       type="primary"
                       size="small"
@@ -83,16 +78,8 @@
                   class="w400px flex-x-between p-1"
                 >
                   <div>
-                    <DictLabel
-                      v-model="item.type"
-                      code="notice_type"
-                      size="small"
-                    />
-                    <el-link
-                      type="primary"
-                      class="ml-1"
-                      @click="readNotice(item.id)"
-                    >
+                    <DictLabel v-model="item.type" code="notice_type" size="small" />
+                    <el-link type="primary" class="ml-1" @click="readNotice(item.id)">
                       {{ item.title }}
                     </el-link>
                   </div>
@@ -127,22 +114,10 @@
 
             <el-tab-pane label="待办" name="task">
               <template v-if="tasks.length > 0">
-                <div
-                  v-for="(item, index) in tasks"
-                  :key="index"
-                  class="w400px flex-x-between p-1"
-                >
+                <div v-for="(item, index) in tasks" :key="index" class="w400px flex-x-between p-1">
                   <div>
-                    <DictLabel
-                      v-model="item.type"
-                      code="notice_type"
-                      size="small"
-                    />
-                    <el-link
-                      type="primary"
-                      class="ml-1"
-                      @click="readNotice(item.id)"
-                    >
+                    <DictLabel v-model="item.type" code="notice_type" size="small" />
+                    <el-link type="primary" class="ml-1" @click="readNotice(item.id)">
                       {{ item.title }}
                     </el-link>
                   </div>
@@ -196,11 +171,9 @@ const noticeDetailRef = ref();
 
 // 获取未读消息列表并连接 WebSocket
 onMounted(() => {
-  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then(
-    (data) => {
-      notices.value = data.list;
-    }
-  );
+  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
+    notices.value = data.list;
+  });
 
   WebSocketManager.subscribeToTopic("/user/queue/message", (message) => {
     console.log("收到消息：", message);
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
index ccf8911b..28dbb40e 100644
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -1,10 +1,7 @@
 <template>
   <el-dropdown trigger="click">
     <div class="flex-center h100% p13px">
-      <img
-        :src="http://github.com/userStore.userInfo.avatar"
-        class="rounded-full mr-10px w24px h24px"
-      />
+      <img :src="http://github.com/userStore.userInfo.avatar" class="rounded-full mr-10px w24px h24px" />
       <span>{{ userStore.userInfo.username }}</span>
     </div>
     <template #dropdown>
@@ -12,10 +9,7 @@
         <el-dropdown-item @click="handleOpenUserProfile">
           {{ $t("navbar.profile") }}
         </el-dropdown-item>
-        <a
-          target="_blank"
-          href="https://gitee.com/youlaiorg/vue3-element-admin"
-        >
+        <a target="_blank" href="https://gitee.com/youlaiorg/vue3-element-admin">
           <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
         </a>
         <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 7255c45d..86ec1538 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,28 +1,16 @@
 <template>
-  <el-drawer
-    v-model="settingsVisible"
-    size="300"
-    :title="$t('settings.project')"
-  >
+  <el-drawer v-model="settingsVisible" size="300" :title="$t('settings.project')">
     <el-divider>{{ $t("settings.theme") }}</el-divider>
 
     <div class="flex-center">
-      <el-switch
-        v-model="isDark"
-        active-icon="Moon"
-        inactive-icon="Sunny"
-        @change="changeTheme"
-      />
+      <el-switch v-model="isDark" active-icon="Moon" inactive-icon="Sunny" @change="changeTheme" />
     </div>
 
     <el-divider>{{ $t("settings.interface") }}</el-divider>
 
     <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.themeColor") }}</span>
-      <ThemeColorPicker
-        v-model="settingsStore.themeColor"
-        @update:model-value="changeThemeColor"
-      />
+      <ThemeColorPicker v-model="settingsStore.themeColor" @update:model-value="changeThemeColor" />
     </div>
 
     <div class="py-1 flex-x-between">
@@ -47,10 +35,7 @@
 
     <el-divider>{{ $t("settings.navigation") }}</el-divider>
 
-    <LayoutSelect
-      v-model="settingsStore.layout"
-      @update:model-value="changeLayout"
-    />
+    <LayoutSelect v-model="settingsStore.layout" @update:model-value="changeLayout" />
   </el-drawer>
 </template>
 
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 7907041a..828e7bb2 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -92,9 +92,7 @@ const onMenuOpen = (index: string) => {
  * @param index 当前收起的菜单项索引
  */
 const onMenuClose = (index: string) => {
-  expandedMenuIndexes.value = expandedMenuIndexes.value.filter(
-    (item) => item !== index
-  );
+  expandedMenuIndexes.value = expandedMenuIndexes.value.filter((item) => item !== index);
 };
 
 /**
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 4ed35a12..be2097ca 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -9,17 +9,10 @@
       :active-text-color="variables['menu-active-text']"
       @select="handleMenuSelect"
     >
-      <el-menu-item
-        v-for="route in topMenus"
-        :key="route.path"
-        :index="route.path"
-      >
+      <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
         <template #title>
           <template v-if="route.meta && route.meta.icon">
-            <el-icon
-              v-if="route.meta.icon.startsWith('el-icon')"
-              class="sub-el-icon"
-            >
+            <el-icon v-if="route.meta.icon.startsWith('el-icon')" class="sub-el-icon">
               <component :is="route.meta.icon.replace('el-icon-', '')" />
             </el-icon>
             <svg-icon v-else :icon-class="route.meta.icon" />
@@ -99,8 +92,6 @@ const navigateToFirstLeftMenu = (menus: RouteRecordRaw[]) => {
 };
 
 onMounted(() => {
-  topMenus.value = permissionStore.routes.filter(
-    (item) => !item.meta || !item.meta.hidden
-  );
+  topMenus.value = permissionStore.routes.filter((item) => !item.meta || !item.meta.hidden);
 });
 </script>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 22677b9f..0e1ce48f 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,10 +1,6 @@
 <template>
   <div class="tags-container">
-    <el-scrollbar
-      class="scroll-container"
-      :vertical="false"
-      @wheel.prevent="handleScroll"
-    >
+    <el-scrollbar class="scroll-container" :vertical="false" @wheel.prevent="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tagRef"
@@ -64,12 +60,7 @@ import { useRoute, useRouter, RouteRecordRaw } from "vue-router";
 import { resolve } from "path-browserify";
 import { translateRouteTitle } from "@/utils/i18n";
 
-import {
-  usePermissionStore,
-  useTagsViewStore,
-  useSettingsStore,
-  useAppStore,
-} from "@/store";
+import { usePermissionStore, useTagsViewStore, useSettingsStore, useAppStore } from "@/store";
 
 const { proxy } = getCurrentInstance()!;
 const router = useRouter();
diff --git a/src/router/index.ts b/src/router/index.ts
index fdc4bd2c..37c39b23 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,9 +1,5 @@
 import type { App } from "vue";
-import {
-  createRouter,
-  createWebHashHistory,
-  type RouteRecordRaw,
-} from "vue-router";
+import { createRouter, createWebHashHistory, type RouteRecordRaw } from "vue-router";
 
 export const Layout = () => import("@/layout/index.vue");
 
@@ -65,8 +61,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       {
         path: "myNotice",
         name: "MyNotice",
-        component: () =>
-          import("@/views/system/notice/components/MyNotice.vue"),
+        component: () => import("@/views/system/notice/components/MyNotice.vue"),
         meta: { title: "我的通知", icon: "user", hidden: true },
       },
     ],
diff --git a/src/store/modules/app.ts b/src/store/modules/app.ts
index 31db0e7b..6bf9a60d 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.ts
@@ -38,9 +38,7 @@ export const useAppStore = defineStore("app", () => {
   // 切换侧边栏
   function toggleSidebar() {
     sidebar.opened = !sidebar.opened;
-    sidebarStatus.value = sidebar.opened
-      ? SidebarStatusEnum.OPENED
-      : SidebarStatusEnum.CLOSED;
+    sidebarStatus.value = sidebar.opened ? SidebarStatusEnum.OPENED : SidebarStatusEnum.CLOSED;
   }
 
   // 关闭侧边栏
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 9a2eee6a..9dd56638 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -10,15 +10,9 @@ export const useSettingsStore = defineStore("setting", () => {
   // 标签
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
-  const sidebarLogo = useStorage<boolean>(
-    "sidebarLogo",
-    defaultSettings.sidebarLogo
-  );
+  const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
   // 固定头部
-  const fixedHeader = useStorage<boolean>(
-    "fixedHeader",
-    defaultSettings.fixedHeader
-  );
+  const fixedHeader = useStorage<boolean>("fixedHeader", defaultSettings.fixedHeader);
   // 布局
   const layout = useStorage<string>("layout", defaultSettings.layout);
   // 水印
@@ -28,10 +22,7 @@ export const useSettingsStore = defineStore("setting", () => {
   );
 
   // 主题
-  const themeColor = useStorage<string>(
-    "themeColor",
-    defaultSettings.themeColor
-  );
+  const themeColor = useStorage<string>("themeColor", defaultSettings.themeColor);
   const theme = useStorage<string>("theme", defaultSettings.theme);
 
   // 监听主题变化
@@ -53,13 +44,7 @@ export const useSettingsStore = defineStore("setting", () => {
     watermarkEnabled,
   };
 
-  function changeSetting({
-    key,
-    value,
-  }: {
-    key: string;
-    value: SettingsValue;
-  }) {
+  function changeSetting({ key, value }: { key: string; value: SettingsValue }) {
     const setting = settingsMap[key];
     if (setting) setting.value = value;
   }
diff --git a/src/store/modules/tags-view.ts b/src/store/modules/tags-view.ts
index cfdd7724..82fb50be 100644
--- a/src/store/modules/tags-view.ts
+++ b/src/store/modules/tags-view.ts
@@ -124,9 +124,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
 
   function delLeftViews(view: TagView) {
     return new Promise((resolve) => {
-      const currIndex = visitedViews.value.findIndex(
-        (v) => v.path === view.path
-      );
+      const currIndex = visitedViews.value.findIndex((v) => v.path === view.path);
       if (currIndex === -1) {
         return;
       }
@@ -149,9 +147,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
 
   function delRightViews(view: TagView) {
     return new Promise((resolve) => {
-      const currIndex = visitedViews.value.findIndex(
-        (v) => v.path === view.path
-      );
+      const currIndex = visitedViews.value.findIndex((v) => v.path === view.path);
       if (currIndex === -1) {
         return;
       }
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index b0da4efa..bd8fadb6 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -3,8 +3,7 @@ import { getToken } from "@/utils/auth";
 
 class WebSocketManager {
   private client: Client | null = null;
-  private messageHandlers: Map<string, ((message: string) => void)[]> =
-    new Map();
+  private messageHandlers: Map<string, ((message: string) => void)[]> = new Map();
   private reconnectAttempts = 0;
   private maxReconnectAttempts = 3; // 自定义最大重试次数
   private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
@@ -15,9 +14,7 @@ class WebSocketManager {
 
     // 如果没有配置 WebSocket 端点或显式关闭，直接返回
     if (!endpoint) {
-      console.log(
-        "WebSocket 已被禁用，如需打开请在配置文件中配置 VITE_APP_WS_ENDPOINT"
-      );
+      console.log("WebSocket 已被禁用，如需打开请在配置文件中配置 VITE_APP_WS_ENDPOINT");
       return;
     }
 
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index c15cd043..f7f24f19 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -42,11 +42,7 @@
 
         <el-table-column label="存储引擎" align="center" prop="engine" />
 
-        <el-table-column
-          label="排序规则"
-          align="center"
-          prop="tableCollation"
-        />
+        <el-table-column label="排序规则" align="center" prop="tableCollation" />
         <el-table-column label="创建时间" align="center" prop="createTime" />
 
         <el-table-column fixed="right" label="操作" width="200">
@@ -115,10 +111,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="业务名" prop="businessName">
-                <el-input
-                  v-model="genConfigFormData.businessName"
-                  placeholder="用户"
-                />
+                <el-input v-model="genConfigFormData.businessName" placeholder="用户" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -126,18 +119,12 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="包名" prop="packageName">
-                <el-input
-                  v-model="genConfigFormData.packageName"
-                  placeholder="com.youlai.boot"
-                />
+                <el-input v-model="genConfigFormData.packageName" placeholder="com.youlai.boot" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="模块名" prop="moduleName">
-                <el-input
-                  v-model="genConfigFormData.moduleName"
-                  placeholder="system"
-                />
+                <el-input v-model="genConfigFormData.moduleName" placeholder="system" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -145,18 +132,12 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="实体名" prop="entityName">
-                <el-input
-                  v-model="genConfigFormData.entityName"
-                  placeholder="User"
-                />
+                <el-input v-model="genConfigFormData.entityName" placeholder="User" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="作者">
-                <el-input
-                  v-model="genConfigFormData.author"
-                  placeholder="youlai"
-                />
+                <el-input v-model="genConfigFormData.author" placeholder="youlai" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -256,11 +237,7 @@
                 </div>
               </template>
               <template #default="scope">
-                <el-checkbox
-                  v-model="scope.row.isShowInQuery"
-                  :true-value="1"
-                  :false-value="0"
-                />
+                <el-checkbox v-model="scope.row.isShowInQuery" :true-value="1" :false-value="0" />
               </template>
             </el-table-column>
 
@@ -277,11 +254,7 @@
               </template>
 
               <template #default="scope">
-                <el-checkbox
-                  v-model="scope.row.isShowInList"
-                  :true-value="1"
-                  :false-value="0"
-                />
+                <el-checkbox v-model="scope.row.isShowInList" :true-value="1" :false-value="0" />
               </template>
             </el-table-column>
 
@@ -298,11 +271,7 @@
               </template>
 
               <template #default="scope">
-                <el-checkbox
-                  v-model="scope.row.isShowInForm"
-                  :true-value="1"
-                  :false-value="0"
-                />
+                <el-checkbox v-model="scope.row.isShowInForm" :true-value="1" :false-value="0" />
               </template>
             </el-table-column>
 
@@ -339,10 +308,7 @@
             <el-table-column label="表单类型" min-width="120">
               <template #default="scope">
                 <el-select
-                  v-if="
-                    scope.row.isShowInQuery === 1 ||
-                    scope.row.isShowInForm === 1
-                  "
+                  v-if="scope.row.isShowInQuery === 1 || scope.row.isShowInForm === 1"
                   v-model="scope.row.formType"
                   placeholder="请选择"
                 >
@@ -562,9 +528,7 @@ const initSort = () => {
   if (sortFlag.value) {
     return;
   }
-  const table = document.querySelector(
-    ".elTableCustom .el-table__body-wrapper tbody"
-  );
+  const table = document.querySelector(".elTableCustom .el-table__body-wrapper tbody");
   sortFlag.value = Sortable.create(<HTMLElement>table, {
     group: "shared",
     animation: 150,
@@ -622,13 +586,7 @@ function handleNextClick() {
     //这里需要校验基础配置
     const { tableName, packageName, businessName, moduleName, entityName } =
       genConfigFormData.value;
-    if (
-      !tableName ||
-      !packageName ||
-      !businessName ||
-      !moduleName ||
-      !entityName
-    ) {
+    if (!tableName || !packageName || !businessName || !moduleName || !entityName) {
       ElMessage.error("表名、业务名、包名、模块名、实体名不能为空");
       return;
     }
@@ -755,9 +713,7 @@ const toggleCheckAll = (key: FieldConfigKey, value: boolean) => {
 
 const checkAllSelected = (key: keyof FieldConfig, isCheckAllRef: any) => {
   const fieldConfigs = genConfigFormData.value?.fieldConfigs || [];
-  isCheckAllRef.value = fieldConfigs.every(
-    (row: FieldConfig) => row[key] === 1
-  );
+  isCheckAllRef.value = fieldConfigs.every((row: FieldConfig) => row[key] === 1);
 };
 
 /** 获取生成预览 */
@@ -787,9 +743,7 @@ function handlePreview(tableName: string) {
  * @param data - 数据数组
  * @returns 树形结构根节点
  */
-function buildTree(
-  data: { path: string; fileName: string; content: string }[]
-): TreeNode {
+function buildTree(data: { path: string; fileName: string; content: string }[]): TreeNode {
   // 动态获取根节点
   const root: TreeNode = { label: "前后端代码", children: [] };
 
@@ -804,11 +758,10 @@ function buildTree(
       "java",
       genConfigFormData.value.backendAppName,
       genConfigFormData.value.frontendAppName,
-      (
-        genConfigFormData.value.packageName +
-        "." +
-        genConfigFormData.value.moduleName
-      ).replace(/\./g, separator),
+      (genConfigFormData.value.packageName + "." + genConfigFormData.value.moduleName).replace(
+        /\./g,
+        separator
+      ),
     ];
 
     // 检查路径中的特殊部分并合并它们
diff --git a/src/views/dashboard/components/VisitTrend.vue b/src/views/dashboard/components/VisitTrend.vue
index 384ef807..6c243088 100644
--- a/src/views/dashboard/components/VisitTrend.vue
+++ b/src/views/dashboard/components/VisitTrend.vue
@@ -16,11 +16,7 @@
           </el-tooltip>
         </div>
 
-        <el-radio-group
-          v-model="dataRange"
-          size="small"
-          @change="handleDateRangeChange"
-        >
+        <el-radio-group v-model="dataRange" size="small" @change="handleDateRangeChange">
           <el-radio-button label="近7天" :value="1" />
           <el-radio-button label="近30天" :value="2" />
         </el-radio-group>
@@ -209,9 +205,7 @@ const handleResize = () => {
 };
 /** 初始化图表  */
 onMounted(() => {
-  chart.value = markRaw(
-    echarts.init(document.getElementById(props.id) as HTMLDivElement)
-  );
+  chart.value = markRaw(echarts.init(document.getElementById(props.id) as HTMLDivElement));
   loadData();
 
   window.addEventListener("resize", handleResize);
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 0453b9ab..512c23d5 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -12,20 +12,14 @@
             />
             <div>
               <p>{{ greetings }}</p>
-              <p class="text-sm text-gray">
-                今日天气晴朗，气温在15℃至25℃之间，东南风。
-              </p>
+              <p class="text-sm text-gray">今日天气晴朗，气温在15℃至25℃之间，东南风。</p>
             </div>
           </div>
         </el-col>
 
         <el-col :span="6" :xs="24">
           <div class="flex h-full items-center justify-around">
-            <el-statistic
-              v-for="item in statisticData"
-              :key="item.key"
-              :value="item.value"
-            >
+            <el-statistic v-for="item in statisticData" :key="item.key" :value="item.value">
               <template #title>
                 <div class="flex items-center">
                   <svg-icon :icon-class="item.iconClass" size="20px" />
@@ -45,9 +39,7 @@
         <el-card shadow="never">
           <template #header>
             <div class="flex-x-between">
-              <span class="text-[var(--el-text-color-secondary)]">
-                在线用户
-              </span>
+              <span class="text-[var(--el-text-color-secondary)]">在线用户</span>
               <el-tag type="success" size="small">-</el-tag>
             </div>
           </template>
@@ -56,41 +48,27 @@
             <span class="text-lg">{{ onlineUserCount }}</span>
             <svg-icon icon-class="user" size="2em" />
           </div>
-          <div
-            class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]"
-          >
+          <div class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]">
             <span>总用户数</span>
             <span>5</span>
           </div>
         </el-card>
       </el-col>
 
-      <el-col
-        v-for="(item, index) in visitStatsList"
-        :key="index"
-        :xs="24"
-        :sm="12"
-        :lg="6"
-      >
+      <el-col v-for="(item, index) in visitStatsList" :key="index" :xs="24" :sm="12" :lg="6">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
               <template #header>
                 <div>
                   <el-skeleton-item variant="h3" style="width: 40%" />
-                  <el-skeleton-item
-                    variant="rect"
-                    style="float: right; width: 1em; height: 1em"
-                  />
+                  <el-skeleton-item variant="rect" style="float: right; width: 1em; height: 1em" />
                 </div>
               </template>
 
               <div class="flex-x-between">
                 <el-skeleton-item variant="text" style="width: 30%" />
-                <el-skeleton-item
-                  variant="circle"
-                  style="width: 2em; height: 2em"
-                />
+                <el-skeleton-item variant="circle" style="width: 2em; height: 2em" />
               </div>
               <div class="mt-5 flex-x-between">
                 <el-skeleton-item variant="text" style="width: 50%" />
@@ -114,13 +92,7 @@
               <div class="flex-x-between mt-2">
                 <div class="flex-y-center">
                   <span class="text-lg">{{ item.todayCount }}</span>
-                  <span
-                    :class="[
-                      'text-xs',
-                      'ml-2',
-                      getGrowthRateClass(item.growthRate),
-                    ]"
-                  >
+                  <span :class="['text-xs', 'ml-2', getGrowthRateClass(item.growthRate)]">
                     <el-icon>
                       <Top v-if="item.growthRate > 0" />
                       <Bottom v-else-if="item.growthRate < 0" />
@@ -131,9 +103,7 @@
                 <svg-icon :icon-class="item.icon" size="2em" />
               </div>
 
-              <div
-                class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]"
-              >
+              <div class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]">
                 <span>总{{ item.title }}</span>
                 <span>{{ item.totalCount }}</span>
               </div>
@@ -161,11 +131,7 @@
           </template>
 
           <el-scrollbar height="400px">
-            <div
-              v-for="(item, index) in notices"
-              :key="index"
-              class="flex-y-center py-3"
-            >
+            <div v-for="(item, index) in notices" :key="index" class="flex-y-center py-3">
               <DictLabel v-model="item.type" code="notice_type" size="small" />
               <el-text
                 truncated
@@ -263,11 +229,7 @@ const loadVisitStatsData = async () => {
   const list: VisitStatsVO[] = await StatsAPI.getVisitStats();
 
   if (list) {
-    const tagTypes: ("primary" | "success" | "warning")[] = [
-      "primary",
-      "success",
-      "warning",
-    ];
+    const tagTypes: ("primary" | "success" | "warning")[] = ["primary", "success", "warning"];
     const transformedList: VisitStats[] = list.map((item, index) => ({
       title: item.title,
       icon: getVisitStatsIcon(item.type),
diff --git a/src/views/demo/api/knife4j.vue b/src/views/demo/api/knife4j.vue
index 4c5047db..9238b726 100644
--- a/src/views/demo/api/knife4j.vue
+++ b/src/views/demo/api/knife4j.vue
@@ -1,12 +1,7 @@
 <!-- 接口文档 -->
 <template>
   <div class="app-container">
-    <iframe
-      src="http://vapi.youlai.tech/doc.html"
-      width="100%"
-      height="100%"
-      frameborder="0"
-    />
+    <iframe src="http://vapi.youlai.tech/doc.html" width="100%" height="100%" frameborder="0" />
   </div>
 </template>
 
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index 4d124d94..3da3999d 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -15,8 +15,7 @@ const contentConfig: IContentConfig = {
         {
           id: 1,
           username: "tom",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
           percent: 99,
           price: 10,
           url: "https://www.baidu.com/",
@@ -30,8 +29,7 @@ const contentConfig: IContentConfig = {
         {
           id: 2,
           username: "jerry",
-          avatar:
-            "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+          avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
           percent: 88,
           price: 999,
           url: "https://www.google.com/",
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index daa61fbb..495ae850 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -8,9 +8,7 @@
       >
         示例源码 请点击>>>>
       </el-link>
-      <el-button type="primary" plain round size="small" @click="isA = !isA">
-        切换示例
-      </el-button>
+      <el-button type="primary" plain round size="small" @click="isA = !isA">切换示例</el-button>
     </div>
 
     <!-- 列表 -->
@@ -146,14 +144,10 @@ function handleOperatClick(data: IOperatData) {
   console.log(data);
   // 重置密码
   if (data.name === "reset_pwd") {
-    ElMessageBox.prompt(
-      "请输入用户「" + data.row.username + "」的新密码",
-      "重置密码",
-      {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-      }
-    ).then(({ value }) => {
+    ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    }).then(({ value }) => {
       if (!value || value.length < 6) {
         ElMessage.warning("密码至少需要6位字符，请重新输入");
         return false;
diff --git a/src/views/demo/icons.vue b/src/views/demo/icons.vue
index 457483a7..73a7aef4 100644
--- a/src/views/demo/icons.vue
+++ b/src/views/demo/icons.vue
@@ -5,11 +5,7 @@
         <div class="grid">
           <div v-for="item of svg_icons" :key="item">
             <copy-button :text="generateIconCode(item)">
-              <el-tooltip
-                effect="dark"
-                :content="generateIconCode(item)"
-                placement="top"
-              >
+              <el-tooltip effect="dark" :content="generateIconCode(item)" placement="top">
                 <div class="icon-item">
                   <svg-icon :icon-class="item" />
                   <span>{{ item }}</span>
@@ -23,11 +19,7 @@
         <div class="grid">
           <div v-for="(icon, name) of icons" :key="name">
             <copy-button :text="generateElementIconCode(name)">
-              <el-tooltip
-                effect="dark"
-                :content="generateElementIconCode(name)"
-                placement="top"
-              >
+              <el-tooltip effect="dark" :content="generateElementIconCode(name)" placement="top">
                 <div class="icon-item">
                   <el-icon :size="20">
                     <component :is="icon" />
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index f3d62757..79240293 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -36,11 +36,7 @@ const text = computed(() => {
     >
       示例源码 请点击>>>>
     </el-link>
-    <table-select
-      :text="text"
-      :select-config="selectConfig"
-      @confirm-click="handleConfirm"
-    >
+    <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
       <template #status="scope">
         <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
diff --git a/src/views/demo/wang-editor.vue b/src/views/demo/wang-editor.vue
index 55fa00b9..67db92d0 100644
--- a/src/views/demo/wang-editor.vue
+++ b/src/views/demo/wang-editor.vue
@@ -15,9 +15,6 @@ const value = ref("初始内容");
     >
       示例源码 请点击>>>>
     </el-link>
-    <editor
-      v-model="value"
-      style="z-index: 99999; height: calc(100vh - 180px)"
-    />
+    <editor v-model="value" style="z-index: 99999; height: calc(100vh - 180px)" />
   </div>
 </template>
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 75bf366b..1550a169 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -22,19 +22,13 @@
               >
                 连接
               </el-button>
-              <el-button
-                type="danger"
-                :disabled="!isConnected"
-                @click="disconnectWebSocket"
-              >
+              <el-button type="danger" :disabled="!isConnected" @click="disconnectWebSocket">
                 断开
               </el-button>
             </el-col>
             <el-col :span="8" class="text-right">
               连接状态：
-              <el-tag v-if="isConnected" class="ml-2" type="success">
-                已连接
-              </el-tag>
+              <el-tag v-if="isConnected" class="ml-2" type="success">已连接</el-tag>
               <el-tag v-else class="ml-2" type="info">已断开</el-tag>
             </el-col>
           </el-row>
@@ -60,9 +54,7 @@
               <el-input v-model="receiver" />
             </el-form-item>
             <el-form-item>
-              <el-button type="primary" @click="sendToUser">
-                发送点对点消息
-              </el-button>
+              <el-button type="primary" @click="sendToUser">发送点对点消息</el-button>
             </el-form-item>
           </el-form>
         </el-card>
@@ -78,17 +70,14 @@
                 'tip-message': message.type === 'tip',
                 message: message.type !== 'tip',
                 'message--sent': message.sender === userStore.userInfo.username,
-                'message--received':
-                  message.sender !== userStore.userInfo.username,
+                'message--received': message.sender !== userStore.userInfo.username,
               }"
             >
               <div v-if="message.type != 'tip'" class="message-content">
                 <div
                   :class="{
-                    'message-sender':
-                      message.sender === userStore.userInfo.username,
-                    'message-receiver':
-                      message.sender !== userStore.userInfo.username,
+                    'message-sender': message.sender === userStore.userInfo.username,
+                    'message-receiver': message.sender !== userStore.userInfo.username,
                   }"
                 >
                   {{ message.sender }}
@@ -124,16 +113,10 @@ interface MessageType {
 
 const messages = ref<MessageType[]>([]);
 
-const topicMessage = ref(
-  "亲爱的大冤种们，由于一只史诗级的BUG，系统版本已经被迫回退到了0.0.1。"
-); // 广播消息
+const topicMessage = ref("亲爱的大冤种们，由于一只史诗级的BUG，系统版本已经被迫回退到了0.0.1。"); // 广播消息
 
 const queneMessage = ref(
-  "hi , " +
-    receiver.value +
-    " , 我是" +
-    userStore.userInfo.username +
-    " , 想和你交个朋友 ! "
+  "hi , " + receiver.value + " , 我是" + userStore.userInfo.username + " , 想和你交个朋友 ! "
 );
 
 let stompClient: Client;
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index 40db680b..c379ff00 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -8,8 +8,7 @@ defineOptions({
 
 const state = reactive({
   errGif: new URL("../../assets/images/401.gif", import.meta.url).href,
-  ewizardClap:
-    "https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",
+  ewizardClap: "https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",
   dialogVisible: false,
 });
 
@@ -24,9 +23,7 @@ function back() {
 
 <template>
   <div class="page-container">
-    <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">
-      返回
-    </el-button>
+    <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">返回</el-button>
     <el-row>
       <el-col :span="12">
         <h1 class="text-jumbo text-ginormous">Oops!</h1>
@@ -49,12 +46,7 @@ function back() {
         </ul>
       </el-col>
       <el-col :span="12">
-        <img
-          :src="http://github.com/errGif"
-          width="313"
-          height="428"
-          alt="Girl has dropped her ice cream."
-        />
+        <img :src="http://github.com/errGif" width="313" height="428" alt="Girl has dropped her ice cream." />
       </el-col>
     </el-row>
     <el-dialog v-model="dialogVisible" title="随便看">
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index e26d6340..33345074 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -16,44 +16,22 @@ function back() {
   <div class="page-container">
     <div class="pic-404">
       <img class="pic-404__parent" src="http://github.com/@/assets/images/404.png" alt="404" />
-      <img
-        class="pic-404__child left"
-        src="http://github.com/@/assets/images/404_cloud.png"
-        alt="404"
-      />
-      <img
-        class="pic-404__child mid"
-        src="http://github.com/@/assets/images/404_cloud.png"
-        alt="404"
-      />
-      <img
-        class="pic-404__child right"
-        src="http://github.com/@/assets/images/404_cloud.png"
-        alt="404"
-      />
+      <img class="pic-404__child left" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
+      <img class="pic-404__child mid" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
+      <img class="pic-404__child right" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
     </div>
     <div class="bullshit">
       <div class="bullshit__oops">OOPS!</div>
       <div class="bullshit__info">
         All rights reserved
-        <a
-          style="color: #20a0ff"
-          href="https://wallstreetcn.com/"
-          target="_blank"
-        >
-          wallstreetcn
-        </a>
-      </div>
-      <div class="bullshit__headline">
-        The webmaster said that you can not enter this page...
+        <a style="color: #20a0ff" href="https://wallstreetcn.com/" target="_blank">wallstreetcn</a>
       </div>
+      <div class="bullshit__headline">The webmaster said that you can not enter this page...</div>
       <div class="bullshit__info">
-        Please check that the URL you entered is correct, or click the button
-        below to return to the homepage.
+        Please check that the URL you entered is correct, or click the button below to return to the
+        homepage.
       </div>
-      <a href="#" class="bullshit__return-home" @click.prevent="back">
-        Back to home
-      </a>
+      <a href="#" class="bullshit__return-home" @click.prevent="back">Back to home</a>
     </div>
   </div>
 </template>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 0804c5ea..6818c459 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -38,19 +38,13 @@
                     </el-tag>
                   </el-dropdown-item>
 
-                  <el-dropdown-item
-                    @click="setLoginCredentials('root', '123456')"
-                  >
+                  <el-dropdown-item @click="setLoginCredentials('root', '123456')">
                     超级管理员：root/123456
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    @click="setLoginCredentials('admin', '123456')"
-                  >
+                  <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
                     系统管理员：admin/123456
                   </el-dropdown-item>
-                  <el-dropdown-item
-                    @click="setLoginCredentials('test', '123456')"
-                  >
+                  <el-dropdown-item @click="setLoginCredentials('test', '123456')">
                     测试小游客：test/123456
                   </el-dropdown-item>
                 </el-dropdown-menu>
@@ -76,11 +70,7 @@
           </el-form-item>
 
           <!-- 密码 -->
-          <el-tooltip
-            :visible="isCapslock"
-            :content="$t('login.capsLock')"
-            placement="right"
-          >
+          <el-tooltip :visible="isCapslock" :content="$t('login.capsLock')" placement="right">
             <el-form-item prop="password">
               <div class="input-wrapper">
                 <el-icon class="mx-2">
@@ -114,11 +104,7 @@
                 @keyup.enter="handleLoginSubmit"
               />
 
-              <el-image
-                :src="http://github.com/captchaBase64"
-                class="captcha-img"
-                @click="getCaptcha"
-              />
+              <el-image :src="http://github.com/captchaBase64" class="captcha-img" @click="getCaptcha" />
             </div>
           </el-form-item>
 
@@ -161,11 +147,7 @@
     <div class="login-footer">
       <el-text size="small">
         Copyright © 2021 - 2024 youlai.tech All Rights Reserved.
-        <el-link
-          :underline="false"
-          href="http://beian.miit.gov.cn/"
-          target="_blank"
-        >
+        <el-link :underline="false" href="http://beian.miit.gov.cn/" target="_blank">
           皖ICP备20006496号-2
         </el-link>
       </el-text>
@@ -200,9 +182,7 @@ const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 
 const logo = ref(new URL("../../assets/logo.png", import.meta.url).href);
-const loginImage = ref(
-  new URL("../../assets/images/login-image.svg", import.meta.url).href
-);
+const loginImage = ref(new URL("../../assets/images/login-image.svg", import.meta.url).href);
 
 const loginData = ref<LoginData>({
   username: "admin",
@@ -300,8 +280,7 @@ function parseRedirect(): {
 
 // 主题切换
 const toggleTheme = () => {
-  const newTheme =
-    settingsStore.theme === ThemeEnum.DARK ? ThemeEnum.LIGHT : ThemeEnum.DARK;
+  const newTheme = settingsStore.theme === ThemeEnum.DARK ? ThemeEnum.LIGHT : ThemeEnum.DARK;
   settingsStore.changeTheme(newTheme);
 };
 
@@ -332,8 +311,7 @@ onMounted(() => {
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  background: url("http://github.com/@/assets/images/login-background-light.jpg") no-repeat center
-    right;
+  background: url("http://github.com/@/assets/images/login-background-light.jpg") no-repeat center right;
 
   .login-header {
     position: absolute;
@@ -471,8 +449,7 @@ onMounted(() => {
 
 html.dark {
   .login {
-    background: url("http://github.com/@/assets/images/login-background-dark.jpg") no-repeat
-      center right;
+    background: url("http://github.com/@/assets/images/login-background-dark.jpg") no-repeat center right;
 
     .login-content {
       background: transparent;
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 0fbc29aa..a231e051 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -16,12 +16,7 @@
                 size="small"
                 @click="triggerFileUpload"
               />
-              <input
-                ref="fileInput"
-                type="file"
-                style="display: none"
-                @change="handleFileChange"
-              />
+              <input ref="fileInput" type="file" style="display: none" @change="handleFileChange" />
             </div>
             <div class="mt-5">
               {{ userProfile.nickname }}
@@ -41,10 +36,7 @@
                   用户名
                 </template>
                 {{ userProfile.username }}
-                <el-icon
-                  v-if="userProfile.gender === 1"
-                  class="align-middle color-blue"
-                >
+                <el-icon v-if="userProfile.gender === 1" class="align-middle color-blue">
                   <Male />
                 </el-icon>
                 <el-icon v-else class="align-middle color-pink">
@@ -117,9 +109,7 @@
           <div class="mt-5">
             <div class="font-bold">绑定手机</div>
             <div class="text-14px mt-2">
-              <span v-if="userProfile.mobile">
-                已绑定手机号：{{ userProfile.mobile }}
-              </span>
+              <span v-if="userProfile.mobile">已绑定手机号：{{ userProfile.mobile }}</span>
               <span v-else>未绑定手机</span>
               <el-button
                 v-if="userProfile.mobile"
@@ -147,9 +137,7 @@
           <div class="mt-5">
             <div class="font-bold">绑定邮箱</div>
             <div class="text-14px mt-2">
-              <span v-if="userProfile.email">
-                已绑定邮箱：{{ userProfile.email }}
-              </span>
+              <span v-if="userProfile.email">已绑定邮箱：{{ userProfile.email }}</span>
               <span v-else>未绑定邮箱</span>
               <el-button
                 v-if="userProfile.email"
@@ -203,25 +191,13 @@
         :label-width="100"
       >
         <el-form-item label="原密码" prop="oldPassword">
-          <el-input
-            v-model="passwordChangeForm.oldPassword"
-            type="password"
-            show-password
-          />
+          <el-input v-model="passwordChangeForm.oldPassword" type="password" show-password />
         </el-form-item>
         <el-form-item label="新密码" prop="newPassword">
-          <el-input
-            v-model="passwordChangeForm.newPassword"
-            type="password"
-            show-password
-          />
+          <el-input v-model="passwordChangeForm.newPassword" type="password" show-password />
         </el-form-item>
         <el-form-item label="确认密码" prop="confirmPassword">
-          <el-input
-            v-model="passwordChangeForm.confirmPassword"
-            type="password"
-            show-password
-          />
+          <el-input v-model="passwordChangeForm.confirmPassword" type="password" show-password />
         </el-form-item>
       </el-form>
       <!-- 绑定手机 -->
@@ -243,11 +219,7 @@
                 :disabled="mobileCountdown > 0"
                 @click="handleSendVerificationCode('MOBILE')"
               >
-                {{
-                  mobileCountdown > 0
-                    ? `${mobileCountdown}s后重新发送`
-                    : "发送验证码"
-                }}
+                {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
           </el-input>
@@ -273,11 +245,7 @@
                 :disabled="emailCountdown > 0"
                 @click="handleSendVerificationCode('EMAIL')"
               >
-                {{
-                  emailCountdown > 0
-                    ? `${emailCountdown}s后重新发送`
-                    : "发送验证码"
-                }}
+                {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
           </el-input>
@@ -336,9 +304,7 @@ const emailTimer = ref<NodeJS.Timeout | null>(null);
 const passwordChangeRules = {
   oldPassword: [{ required: true, message: "请输入原密码", trigger: "blur" }],
   newPassword: [{ required: true, message: "请输入新密码", trigger: "blur" }],
-  confirmPassword: [
-    { required: true, message: "请再次输入新密码", trigger: "blur" },
-  ],
+  confirmPassword: [{ required: true, message: "请再次输入新密码", trigger: "blur" }],
 };
 
 // 手机号校验规则
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index a5c87239..9ecc354a 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -31,7 +31,7 @@
           v-hasPerm="['sys:dept:add']"
           type="success"
           icon="plus"
-          @click="handleOpenDialog(0, undefined)"
+          @click="handleOpenDialog()"
         >
           新增
         </el-button>
diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue
index fdb2339e..f07a88fb 100644
--- a/src/views/system/notice/components/NoticeDetail.vue
+++ b/src/views/system/notice/components/NoticeDetail.vue
@@ -32,12 +32,8 @@
       </el-descriptions-item>
       <el-descriptions-item label="发布状态：">
         <el-tag v-if="notice.publishStatus == 0" type="info">未发布</el-tag>
-        <el-tag v-else-if="notice.publishStatus == 1" type="success">
-          已发布
-        </el-tag>
-        <el-tag v-else-if="notice.publishStatus == -1" type="warning">
-          已撤回
-        </el-tag>
+        <el-tag v-else-if="notice.publishStatus == 1" type="success">已发布</el-tag>
+        <el-tag v-else-if="notice.publishStatus == -1" type="warning">已撤回</el-tag>
       </el-descriptions-item>
       <el-descriptions-item label="发布人：">
         {{ notice.publisherName }}
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index f04a47df..bfe37fd7 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -95,9 +95,7 @@ const handleFileExceed = () => {
 const handleDownloadTemplate = () => {
   UserAPI.downloadTemplate().then((response: any) => {
     const fileData = response.data;
-    const fileName = decodeURI(
-      response.headers["content-disposition"].split(";")[1].split("=")[1]
-    );
+    const fileName = decodeURI(response.headers["content-disposition"].split(";")[1].split("=")[1]);
     const fileType =
       "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 

From 2d4a79a89b69621bb9bffab17e756b2020aa2333 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 19 Nov 2024 22:51:51 +0800
Subject: [PATCH 066/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E7=A0=81=E8=AF=B4=E6=98=8E=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/utils/request.ts b/src/utils/request.ts
index 36ef0754..1a8211dc 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -45,6 +45,7 @@ service.interceptors.response.use(
     return Promise.reject(new Error(msg || "Error"));
   },
   async (error: any) => {
+    // 非 2xx 状态码处理 401、403、500 等
     const { config, response } = error;
     if (response) {
       const { code, msg } = response.data;

From d2cc6fddc0d4480e5f6919b867a44093e91538aa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 19 Nov 2024 23:06:17 +0800
Subject: [PATCH 067/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=9D=83=E9=99=90=E6=8C=87=E4=BB=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/directive/permission/index.ts | 68 +++++++++++++++++++++----------
 src/plugins/permission.ts         | 17 +-------
 src/views/system/user/index.vue   | 16 +++-----
 3 files changed, 52 insertions(+), 49 deletions(-)

diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index f9051dde..6dd29950 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,40 +1,64 @@
-import { hasAuth } from "@/plugins/permission";
 import type { Directive, DirectiveBinding } from "vue";
 
+import { useUserStore } from "@/store";
+
 /**
  * 按钮权限
  */
 export const hasPerm: Directive = {
   mounted(el: HTMLElement, binding: DirectiveBinding) {
-    // DOM绑定需要的按钮权限标识
-    const { value: requiredPerms } = binding;
-    if (requiredPerms) {
-      if (!hasAuth(requiredPerms)) {
-        if (el.parentNode) {
-          el.parentNode.removeChild(el);
-        }
-      }
-    } else {
-      throw new Error("need perms! Like v-has-perm=\"['sys:user:add','sys:user:edit']\"");
+    const requiredPerms = binding.value;
+
+    // 校验传入的权限值是否合法
+    if (!requiredPerms || (typeof requiredPerms !== "string" && !Array.isArray(requiredPerms))) {
+      throw new Error(
+        "需要提供权限标识！例如：v-has-perm=\"'sys:user:add'\" 或 v-has-perm=\"['sys:user:add', 'sys:user:edit']\""
+      );
+    }
+
+    const { roles, perms } = useUserStore().userInfo;
+
+    // 超级管理员拥有所有权限
+    if (roles.includes("ROOT")) {
+      return;
+    }
+
+    // 检查权限
+    const hasAuth = Array.isArray(requiredPerms)
+      ? requiredPerms.some((perm) => perms.includes(perm))
+      : perms.includes(requiredPerms);
+
+    // 如果没有权限，移除该元素
+    if (!hasAuth && el.parentNode) {
+      el.parentNode.removeChild(el);
     }
   },
 };
 
 /**
- * 角色权限
+ * 角色权限指令
  */
 export const hasRole: Directive = {
   mounted(el: HTMLElement, binding: DirectiveBinding) {
-    // DOM绑定需要的角色编码
-    const { value: requiredRoles } = binding;
-    if (requiredRoles) {
-      if (!hasAuth(requiredRoles, "role")) {
-        if (el.parentNode) {
-          el.parentNode.removeChild(el);
-        }
-      }
-    } else {
-      throw new Error("need roles! Like v-has-role=\"['admin','test']\"");
+    const requiredRoles = binding.value;
+
+    // 校验传入的角色值是否合法
+    if (!requiredRoles || (typeof requiredRoles !== "string" && !Array.isArray(requiredRoles))) {
+      throw new Error(
+        "需要提供角色标识！例如：v-has-role=\"'ADMIN'\" 或 v-has-role=\"['ADMIN', 'TEST']\""
+      );
+    }
+
+    const { roles } = useUserStore().userInfo;
+
+    // 检查是否有对应角色权限
+    const hasAuth = Array.isArray(requiredRoles)
+      ? requiredRoles.some((role) => roles.includes(role))
+      : roles.includes(requiredRoles);
+
+    // 如果没有权限，移除元素
+    if (!hasAuth && el.parentNode) {
+      el.parentNode.removeChild(el);
     }
   },
 };
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 2922cb09..43e04b69 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -64,25 +64,10 @@ export function setupPermission() {
   });
 }
 
-/** 重定向到登录页 */
+// 重定向到登录页
 function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext) {
   const params = new URLSearchParams(to.query as Record<string, string>);
   const queryString = params.toString();
   const redirect = queryString ? `${to.path}?${queryString}` : to.path;
   next(`/login?redirect=${encodeURIComponent(redirect)}`);
 }
-
-/** 判断是否有权限 */
-export function hasAuth(value: string | string[], type: "button" | "role" = "button") {
-  const { roles, perms } = useUserStore().userInfo;
-
-  // 超级管理员 拥有所有权限
-  if (type === "button" && roles.includes("ROOT")) {
-    return true;
-  }
-
-  const auths = type === "button" ? perms : roles;
-  return typeof value === "string"
-    ? auths.includes(value)
-    : value.some((perm) => auths.includes(perm));
-}
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 484b24d1..8650b900 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -65,7 +65,7 @@
                 新增
               </el-button>
               <el-button
-                v-hasPerm="['sys:user:delete']"
+                v-hasPerm="'sys:user:delete'"
                 type="danger"
                 icon="delete"
                 :disabled="selectIds.length === 0"
@@ -76,20 +76,14 @@
             </div>
             <div>
               <el-button
-                v-hasPerm="['sys:user:import']"
-                type="default"
+                v-hasPerm="'sys:user:import'"
                 icon="upload"
                 @click="handleOpenImportDialog"
               >
                 导入
               </el-button>
 
-              <el-button
-                v-hasPerm="['sys:user:export']"
-                type="default"
-                icon="download"
-                @click="handleExport"
-              >
+              <el-button v-hasPerm="'sys:user:export'" icon="download" @click="handleExport">
                 导出
               </el-button>
             </div>
@@ -118,7 +112,7 @@
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
-                  v-hasPerm="['sys:user:password:reset']"
+                  v-hasPerm="'sys:user:password:reset'"
                   type="primary"
                   icon="RefreshLeft"
                   size="small"
@@ -128,7 +122,7 @@
                   重置密码
                 </el-button>
                 <el-button
-                  v-hasPerm="['sys:user:edit']"
+                  v-hasPerm="'sys:user:edit'"
                   type="primary"
                   icon="edit"
                   link

From 09bbcfb386a2c97b1a56ce5613cd4f49cc1ecb07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Wed, 20 Nov 2024 09:57:06 +0800
Subject: [PATCH 068/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=E6=9F=A5=E7=BB=84=E4=BB=B6=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复增删改查组件报错的bug
---
 src/plugins/permission.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 43e04b69..09096cef 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -71,3 +71,18 @@ function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext)
   const redirect = queryString ? `${to.path}?${queryString}` : to.path;
   next(`/login?redirect=${encodeURIComponent(redirect)}`);
 }
+
+/** 判断是否有权限 */
+export function hasAuth(value: string | string[], type: "button" | "role" = "button") {
+  const { roles, perms } = useUserStore().userInfo;
+
+  // 超级管理员 拥有所有权限
+  if (type === "button" && roles.includes("ROOT")) {
+    return true;
+  }
+
+  const auths = type === "button" ? perms : roles;
+  return typeof value === "string"
+    ? auths.includes(value)
+    : value.some((perm) => auths.includes(perm));
+}

From e1a635bbbc2ea72c6d4282bfb08d865498bea9f9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 20 Nov 2024 12:29:48 +0800
Subject: [PATCH 069/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 8650b900..38bcb3a5 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -108,7 +108,7 @@
                 </el-tag>
               </template>
             </el-table-column>
-            <el-table-column label="创建时间" align="center" prop="createTime" width="120" />
+            <el-table-column label="创建时间" align="center" prop="createTime" width="150" />
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
@@ -132,7 +132,7 @@
                   编辑
                 </el-button>
                 <el-button
-                  v-hasPerm="['sys:user:delete']"
+                  v-hasPerm="'sys:user:delete'"
                   type="danger"
                   icon="delete"
                   link

From 12f54db612b6b3d220b4a553ee6a9ee9cbfff0d9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 21 Nov 2024 02:47:03 +0800
Subject: [PATCH 070/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E7=94=A8=E6=88=B7=E6=A8=A1=E6=9D=BF=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index c9fe47a6..998c94a4 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -99,7 +99,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/template`,
       method: "get",
-      responseType: "arraybuffer",
+      responseType: "blob",
     });
   },
 

From ce5c842a020de004919dbd652513fa61ebb16f5e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 21 Nov 2024 02:48:43 +0800
Subject: [PATCH 071/497] chore: :hammer: bump version to 2.19.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d74f460b..3f948eb9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.19.0",
+  "version": "2.19.1",
   "private": true,
   "type": "module",
   "scripts": {

From 6abffac85834f3081422abdc8bead55f86a4e210 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 22 Nov 2024 12:46:50 +0800
Subject: [PATCH 072/497] =?UTF-8?q?docs:=20:memo:=20router=20=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A3=B0=E6=98=8E=E6=B3=A8=E9=87=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/router.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/types/router.d.ts b/src/types/router.d.ts
index a175ea18..17a3cb46 100644
--- a/src/types/router.d.ts
+++ b/src/types/router.d.ts
@@ -17,7 +17,7 @@ declare module "vue-router" {
     icon?: string;
 
     /**
-     * 是否隐藏菜单项
+     * 是否隐藏菜单
      * true 隐藏, false 显示
      * @default false
      */

From ef73f257b6b505792511f35a6f8dc565d90822c9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 22 Nov 2024 12:50:53 +0800
Subject: [PATCH 073/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=AE=BF=E9=97=AE=E8=B6=8B=E5=8A=BF=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=8C=83=E5=9B=B4=E8=AE=A1=E7=AE=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/components/VisitTrend.vue | 61 ++++++++-----------
 1 file changed, 24 insertions(+), 37 deletions(-)

diff --git a/src/views/dashboard/components/VisitTrend.vue b/src/views/dashboard/components/VisitTrend.vue
index 6c243088..24fef6ad 100644
--- a/src/views/dashboard/components/VisitTrend.vue
+++ b/src/views/dashboard/components/VisitTrend.vue
@@ -16,9 +16,9 @@
           </el-tooltip>
         </div>
 
-        <el-radio-group v-model="dataRange" size="small" @change="handleDateRangeChange">
-          <el-radio-button label="近7天" :value="1" />
-          <el-radio-button label="近30天" :value="2" />
+        <el-radio-group v-model="recentDaysRange" size="small" @change="handleDateRangeChange">
+          <el-radio-button label="近7天" :value="7" />
+          <el-radio-button label="近30天" :value="30" />
         </el-radio-group>
       </div>
     </template>
@@ -29,9 +29,12 @@
 
 <script setup lang="ts">
 import * as echarts from "echarts";
-import LogAPI, { VisitTrendVO, VisitTrendQuery } from "@/api/system/log";
+import LogAPI, { VisitTrendVO } from "@/api/system/log";
+import { dayjs } from "element-plus";
 
-const dataRange = ref(1);
+// 日期范围
+const recentDaysRange = ref(7);
+// 图表对象
 const chart: Ref<echarts.ECharts | null> = ref(null);
 
 const props = defineProps({
@@ -125,46 +128,29 @@ const setChartOptions = (data: VisitTrendVO) => {
   chart.value.setOption(options);
 };
 
-/** 计算起止时间范围 */
-const calculateDateRange = () => {
-  const now = new Date();
-
-  const endDate = new Date(now.getFullYear(), now.getMonth(), now.getDate());
-
-  const days = dataRange.value === 1 ? 7 : 30;
-  const startDate = new Date(endDate);
-  startDate.setDate(startDate.getDate() - days);
-
-  // 手动调整日期为当地时间的 23:59:59
-  const adjustDateToLocal = (date: Date) => {
-    date.setHours(23, 59, 59, 999);
-    return date;
+// 加载数据
+const loadData = () => {
+  const endDate = new Date();
+  const startDate = dayjs()
+    .subtract(recentDaysRange.value - 1, "day")
+    .toDate();
+
+  const visitTrendQuery = {
+    startDate: dayjs(startDate).format("YYYY-MM-DD"),
+    endDate: dayjs(endDate).format("YYYY-MM-DD"),
   };
 
-  const adjustedEndDate = adjustDateToLocal(new Date(endDate));
-  const adjustedStartDate = adjustDateToLocal(new Date(startDate));
-  const formattedStartDate = adjustedStartDate.toISOString().split("T")[0];
-  const formattedEndDate = adjustedEndDate.toISOString().split("T")[0];
-
-  return { startDate: formattedStartDate, endDate: formattedEndDate };
-};
-
-/** 加载数据 */
-const loadData = () => {
-  const { startDate, endDate } = calculateDateRange();
-  LogAPI.getVisitTrend({
-    startDate,
-    endDate,
-  } as VisitTrendQuery).then((data) => {
+  LogAPI.getVisitTrend(visitTrendQuery).then((data) => {
     setChartOptions(data);
   });
 };
 
+// 日期范围变化
 const handleDateRangeChange = () => {
   loadData();
 };
 
-/** 下载图表 */
+// 下载图表
 const handleDownloadChart = () => {
   if (!chart.value) {
     return;
@@ -195,7 +181,7 @@ const handleDownloadChart = () => {
   };
 };
 
-/** 窗口大小变化时，重置图表大小 */
+// 窗口大小变化时，重置图表大小
 const handleResize = () => {
   setTimeout(() => {
     if (chart.value) {
@@ -203,7 +189,8 @@ const handleResize = () => {
     }
   }, 100);
 };
-/** 初始化图表  */
+
+// 初始化图表
 onMounted(() => {
   chart.value = markRaw(echarts.init(document.getElementById(props.id) as HTMLDivElement));
   loadData();

From 4528d83a811727fd66e04d2548c1b1ae5bb037b5 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Sat, 23 Nov 2024 00:28:42 +0800
Subject: [PATCH 074/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E9=85=8D=E7=BD=AE=E5=88=B7=E6=96=B0=E9=98=B2=E6=8A=96?=
 =?UTF-8?q?=E5=92=8C=E6=94=AF=E6=8C=81patch=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

系统配置刷新防抖和支持patch请求
---
 src/api/system/config.ts          |  2 +-
 src/utils/index.ts                | 29 +++++++++++++++++++++++++++++
 src/views/system/config/index.vue | 10 ++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/api/system/config.ts b/src/api/system/config.ts
index 95c1bb84..368cdd7d 100644
--- a/src/api/system/config.ts
+++ b/src/api/system/config.ts
@@ -62,7 +62,7 @@ const ConfigAPI = {
   refreshCache() {
     return request({
       url: `${CONFIG_BASE_URL}/refresh`,
-      method: "PUT",
+      method: "PATCH",
     });
   },
 };
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 44bb588b..f8880d2b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -39,3 +39,32 @@ export function isExternal(path: string) {
   const isExternal = /^(https?:|http?:|mailto:|tel:)/.test(path);
   return isExternal;
 }
+
+/**
+ * 防抖函数
+ *
+ * @param {Function} fn 需要防抖的函数
+ * @param {number} delay 防抖时间
+ * @returns {Function}
+ */
+export const debounce = <T extends (...args: any[]) => any>(
+  fn: T,
+  delay: number,
+  immediate = false
+) => {
+  let timer: NodeJS.Timeout | null = null;
+  return function (this: any, ...args: Parameters<T>) {
+    if (timer) clearTimeout(timer);
+
+    if (immediate && !timer) {
+      fn.apply(this, args);
+    }
+
+    timer = setTimeout(() => {
+      if (!immediate) {
+        fn.apply(this, args);
+      }
+      timer = null;
+    }, delay);
+  };
+};
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 15bbb16e..8fb6e2cc 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -136,6 +136,7 @@ defineOptions({
 });
 
 import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
+import { debounce } from "@/utils";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -211,11 +212,16 @@ function handleOpenDialog(id?: number) {
   }
 }
 
-// 刷新缓存
-function handleRefreshCache() {
+// 防抖刷新缓存
+const debouncedRefresh = debounce(() => {
   ConfigAPI.refreshCache().then(() => {
     ElMessage.success("刷新成功");
   });
+}, 1000);
+
+// 刷新缓存
+function handleRefreshCache() {
+  debouncedRefresh();
 }
 
 // 系统配置表单提交

From 687eca10a22ba1e6c1daf1a7255ac2e9c6833c00 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 23 Nov 2024 17:17:37 +0800
Subject: [PATCH 075/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=87=8D=E5=A4=8D=E7=9A=84=E9=98=B2=E6=8A=96=E5=87=BD?=
 =?UTF-8?q?=E6=95=B0=E5=AE=9A=E4=B9=89=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20vueuse=20=E9=98=B2=E6=8A=96=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/index.ts                | 29 -----------------------------
 src/views/system/config/index.vue |  5 ++---
 src/views/system/user/index.vue   |  8 ++++----
 3 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/src/utils/index.ts b/src/utils/index.ts
index f8880d2b..44bb588b 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -39,32 +39,3 @@ export function isExternal(path: string) {
   const isExternal = /^(https?:|http?:|mailto:|tel:)/.test(path);
   return isExternal;
 }
-
-/**
- * 防抖函数
- *
- * @param {Function} fn 需要防抖的函数
- * @param {number} delay 防抖时间
- * @returns {Function}
- */
-export const debounce = <T extends (...args: any[]) => any>(
-  fn: T,
-  delay: number,
-  immediate = false
-) => {
-  let timer: NodeJS.Timeout | null = null;
-  return function (this: any, ...args: Parameters<T>) {
-    if (timer) clearTimeout(timer);
-
-    if (immediate && !timer) {
-      fn.apply(this, args);
-    }
-
-    timer = setTimeout(() => {
-      if (!immediate) {
-        fn.apply(this, args);
-      }
-      timer = null;
-    }, delay);
-  };
-};
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 8fb6e2cc..ed4397dc 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -136,7 +136,6 @@ defineOptions({
 });
 
 import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
-import { debounce } from "@/utils";
 
 const queryFormRef = ref(ElForm);
 const dataFormRef = ref(ElForm);
@@ -212,8 +211,8 @@ function handleOpenDialog(id?: number) {
   }
 }
 
-// 防抖刷新缓存
-const debouncedRefresh = debounce(() => {
+// 刷新缓存(防抖)
+const debouncedRefresh = useDebounceFn(() => {
   ConfigAPI.refreshCache().then(() => {
     ElMessage.success("刷新成功");
   });
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 38bcb3a5..51113d70 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -380,9 +380,9 @@ function handleCloseDialog() {
   formData.status = 1;
 }
 
-// 提交用户表单（防抖处理）
-const handleSubmit = useThrottleFn(() => {
-  userFormRef.value.validate((valid: any) => {
+// 提交用户表单（防抖）
+const handleSubmit = useDebounceFn(() => {
+  userFormRef.value.validate((valid: boolean) => {
     if (valid) {
       const userId = formData.id;
       loading.value = true;
@@ -405,7 +405,7 @@ const handleSubmit = useThrottleFn(() => {
       }
     }
   });
-}, 3000);
+}, 1000);
 
 /**
  * 删除用户

From 1ea9e439941c8a65986d3fc3a0e89c1b18126119 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 23 Nov 2024 17:20:37 +0800
Subject: [PATCH 076/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/index.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ed4397dc..0955806f 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -212,17 +212,12 @@ function handleOpenDialog(id?: number) {
 }
 
 // 刷新缓存(防抖)
-const debouncedRefresh = useDebounceFn(() => {
+const handleRefreshCache = useDebounceFn(() => {
   ConfigAPI.refreshCache().then(() => {
     ElMessage.success("刷新成功");
   });
 }, 1000);
 
-// 刷新缓存
-function handleRefreshCache() {
-  debouncedRefresh();
-}
-
 // 系统配置表单提交
 function handleSubmit() {
   dataFormRef.value.validate((valid: any) => {

From 0f4f996b04627719468415a81e17f2346f925a51 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Sun, 24 Nov 2024 01:32:14 +0800
Subject: [PATCH 077/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=8D?=
 =?UTF-8?q?=E5=9C=A8=E6=94=AF=E6=8C=81=E4=B8=A4=E7=A7=8D=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

不在支持两种请求类型
---
 src/api/system/config.ts | 2 +-
 src/api/system/notice.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/system/config.ts b/src/api/system/config.ts
index 368cdd7d..95c1bb84 100644
--- a/src/api/system/config.ts
+++ b/src/api/system/config.ts
@@ -62,7 +62,7 @@ const ConfigAPI = {
   refreshCache() {
     return request({
       url: `${CONFIG_BASE_URL}/refresh`,
-      method: "PATCH",
+      method: "PUT",
     });
   },
 };
diff --git a/src/api/system/notice.ts b/src/api/system/notice.ts
index df3c8b74..17bb1ef1 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.ts
@@ -74,7 +74,7 @@ const NoticeAPI = {
   publish(id: number) {
     return request({
       url: `${NOTICE_BASE_URL}/${id}/publish`,
-      method: "patch",
+      method: "put",
     });
   },
 
@@ -87,7 +87,7 @@ const NoticeAPI = {
   revoke(id: number) {
     return request({
       url: `${NOTICE_BASE_URL}/${id}/revoke`,
-      method: "patch",
+      method: "put",
     });
   },
   /**

From bbc1c1f66dd85373711ac81f11e3a0bd9ee12998 Mon Sep 17 00:00:00 2001
From: songhengyu <924666475@qq,com>
Date: Tue, 26 Nov 2024 17:31:10 +0800
Subject: [PATCH 078/497] =?UTF-8?q?feat(UPLOAD):=20:sparkles:=20add=20?=
 =?UTF-8?q?=E5=8D=95=E5=9B=BE=E7=89=87=E8=A3=81=E5=89=AA=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |    1 +
 pnpm-lock.yaml                              | 9778 ++++++++++---------
 src/components/ImgCorpper/compressUtil.js   |   92 +
 src/components/ImgCorpper/corpperDialog.vue |  205 +
 src/components/ImgCorpper/index.vue         |  211 +
 src/types/components.d.ts                   |    1 +
 src/views/demo/upload.vue                   |   39 +
 7 files changed, 5976 insertions(+), 4351 deletions(-)
 create mode 100644 src/components/ImgCorpper/compressUtil.js
 create mode 100644 src/components/ImgCorpper/corpperDialog.vue
 create mode 100644 src/components/ImgCorpper/index.vue

diff --git a/package.json b/package.json
index 3f948eb9..cfe4a8b2 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "sortablejs": "^1.15.3",
     "vue": "^3.5.12",
     "vue-i18n": "9.9.1",
+    "vue-picture-cropper": "^0.7.0",
     "vue-router": "^4.4.5"
   },
   "devDependencies": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4c8e171c..fb7eb6cf 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1,1305 +1,867 @@
-lockfileVersion: '6.0'
+lockfileVersion: '9.0'
 
 settings:
   autoInstallPeers: true
   excludeLinksFromLockfile: false
 
-dependencies:
-  '@element-plus/icons-vue':
-    specifier: ^2.3.1
-    version: 2.3.1(vue@3.5.12)
-  '@stomp/stompjs':
-    specifier: ^7.0.0
-    version: 7.0.0
-  '@vueuse/core':
-    specifier: ^10.11.1
-    version: 10.11.1(vue@3.5.12)
-  '@wangeditor/editor':
-    specifier: ^5.1.23
-    version: 5.1.23
-  '@wangeditor/editor-for-vue':
-    specifier: 5.1.10
-    version: 5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12)
-  animate.css:
-    specifier: ^4.1.1
-    version: 4.1.1
-  axios:
-    specifier: ^1.7.7
-    version: 1.7.7
-  codemirror:
-    specifier: ^5.65.18
-    version: 5.65.18
-  codemirror-editor-vue3:
-    specifier: ^2.8.0
-    version: 2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12)
-  echarts:
-    specifier: ^5.5.1
-    version: 5.5.1
-  element-plus:
-    specifier: ^2.8.7
-    version: 2.8.7(vue@3.5.12)
-  exceljs:
-    specifier: ^4.4.0
-    version: 4.4.0
-  lodash-es:
-    specifier: ^4.17.21
-    version: 4.17.21
-  nprogress:
-    specifier: ^0.2.0
-    version: 0.2.0
-  path-browserify:
-    specifier: ^1.0.1
-    version: 1.0.1
-  path-to-regexp:
-    specifier: ^6.3.0
-    version: 6.3.0
-  pinia:
-    specifier: ^2.2.6
-    version: 2.2.6(typescript@5.5.4)(vue@3.5.12)
-  qs:
-    specifier: ^6.13.0
-    version: 6.13.0
-  sortablejs:
-    specifier: ^1.15.3
-    version: 1.15.3
-  vue:
-    specifier: ^3.5.12
-    version: 3.5.12(typescript@5.5.4)
-  vue-i18n:
-    specifier: 9.9.1
-    version: 9.9.1(vue@3.5.12)
-  vue-router:
-    specifier: ^4.4.5
-    version: 4.4.5(vue@3.5.12)
-
-devDependencies:
-  '@commitlint/cli':
-    specifier: ^19.5.0
-    version: 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
-  '@commitlint/config-conventional':
-    specifier: ^19.5.0
-    version: 19.5.0
-  '@eslint/js':
-    specifier: ^9.14.0
-    version: 9.14.0
-  '@types/codemirror':
-    specifier: ^5.60.15
-    version: 5.60.15
-  '@types/lodash':
-    specifier: ^4.17.13
-    version: 4.17.13
-  '@types/node':
-    specifier: ^22.9.0
-    version: 22.9.0
-  '@types/nprogress':
-    specifier: ^0.2.3
-    version: 0.2.3
-  '@types/path-browserify':
-    specifier: ^1.0.3
-    version: 1.0.3
-  '@types/qs':
-    specifier: ^6.9.17
-    version: 6.9.17
-  '@types/sortablejs':
-    specifier: ^1.15.8
-    version: 1.15.8
-  '@typescript-eslint/eslint-plugin':
-    specifier: ^8.14.0
-    version: 8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4)
-  '@typescript-eslint/parser':
-    specifier: ^8.14.0
-    version: 8.14.0(eslint@9.14.0)(typescript@5.5.4)
-  '@vitejs/plugin-vue':
-    specifier: ^5.1.5
-    version: 5.1.5(vite@5.4.11)(vue@3.5.12)
-  autoprefixer:
-    specifier: ^10.4.20
-    version: 10.4.20(postcss@8.4.49)
-  commitizen:
-    specifier: ^4.3.1
-    version: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
-  cz-git:
-    specifier: 1.9.4
-    version: 1.9.4
-  eslint:
-    specifier: ^9.14.0
-    version: 9.14.0
-  eslint-config-prettier:
-    specifier: ^9.1.0
-    version: 9.1.0(eslint@9.14.0)
-  eslint-plugin-prettier:
-    specifier: ^5.2.1
-    version: 5.2.1(eslint-config-prettier@9.1.0)(eslint@9.14.0)(prettier@3.3.3)
-  eslint-plugin-vue:
-    specifier: ^9.31.0
-    version: 9.31.0(eslint@9.14.0)
-  globals:
-    specifier: ^15.12.0
-    version: 15.12.0
-  husky:
-    specifier: ^9.1.6
-    version: 9.1.6
-  lint-staged:
-    specifier: ^15.2.10
-    version: 15.2.10
-  postcss:
-    specifier: ^8.4.49
-    version: 8.4.49
-  postcss-html:
-    specifier: ^1.7.0
-    version: 1.7.0
-  postcss-scss:
-    specifier: ^4.0.9
-    version: 4.0.9(postcss@8.4.49)
-  prettier:
-    specifier: ^3.3.3
-    version: 3.3.3
-  sass:
-    specifier: ^1.80.6
-    version: 1.80.6
-  stylelint:
-    specifier: ^16.10.0
-    version: 16.10.0(typescript@5.5.4)
-  stylelint-config-html:
-    specifier: ^1.1.0
-    version: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0)
-  stylelint-config-recess-order:
-    specifier: ^5.1.1
-    version: 5.1.1(stylelint@16.10.0)
-  stylelint-config-recommended-scss:
-    specifier: ^14.1.0
-    version: 14.1.0(postcss@8.4.49)(stylelint@16.10.0)
-  stylelint-config-recommended-vue:
-    specifier: ^1.5.0
-    version: 1.5.0(postcss-html@1.7.0)(stylelint@16.10.0)
-  stylelint-config-standard:
-    specifier: ^36.0.1
-    version: 36.0.1(stylelint@16.10.0)
-  terser:
-    specifier: ^5.36.0
-    version: 5.36.0
-  typescript:
-    specifier: 5.5.4
-    version: 5.5.4
-  typescript-eslint:
-    specifier: ^8.14.0
-    version: 8.14.0(eslint@9.14.0)(typescript@5.5.4)
-  unocss:
-    specifier: ^0.63.6
-    version: 0.63.6(postcss@8.4.49)(typescript@5.5.4)(vite@5.4.11)
-  unplugin-auto-import:
-    specifier: ^0.18.3
-    version: 0.18.3(@vueuse/core@10.11.1)
-  unplugin-vue-components:
-    specifier: ^0.27.4
-    version: 0.27.4(vue@3.5.12)
-  vite:
-    specifier: ^5.4.11
-    version: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-  vite-plugin-mock-dev-server:
-    specifier: ^1.8.0
-    version: 1.8.0(esbuild@0.23.1)(vite@5.4.11)
-  vite-plugin-svg-icons:
-    specifier: ^2.0.1
-    version: 2.0.1(vite@5.4.11)
-  vue-eslint-parser:
-    specifier: ^9.4.3
-    version: 9.4.3(eslint@9.14.0)
-  vue-tsc:
-    specifier: ^2.1.10
-    version: 2.1.10(typescript@5.5.4)
+importers:
+
+  .:
+    dependencies:
+      '@element-plus/icons-vue':
+        specifier: ^2.3.1
+        version: 2.3.1(vue@3.5.12(typescript@5.5.4))
+      '@stomp/stompjs':
+        specifier: ^7.0.0
+        version: 7.0.0
+      '@vueuse/core':
+        specifier: ^10.11.1
+        version: 10.11.1(vue@3.5.12(typescript@5.5.4))
+      '@wangeditor/editor':
+        specifier: ^5.1.23
+        version: 5.1.23
+      '@wangeditor/editor-for-vue':
+        specifier: 5.1.10
+        version: 5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12(typescript@5.5.4))
+      animate.css:
+        specifier: ^4.1.1
+        version: 4.1.1
+      axios:
+        specifier: ^1.7.7
+        version: 1.7.7
+      codemirror:
+        specifier: ^5.65.18
+        version: 5.65.18
+      codemirror-editor-vue3:
+        specifier: ^2.8.0
+        version: 2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12(typescript@5.5.4))
+      echarts:
+        specifier: ^5.5.1
+        version: 5.5.1
+      element-plus:
+        specifier: ^2.8.7
+        version: 2.8.7(vue@3.5.12(typescript@5.5.4))
+      exceljs:
+        specifier: ^4.4.0
+        version: 4.4.0
+      lodash-es:
+        specifier: ^4.17.21
+        version: 4.17.21
+      nprogress:
+        specifier: ^0.2.0
+        version: 0.2.0
+      path-browserify:
+        specifier: ^1.0.1
+        version: 1.0.1
+      path-to-regexp:
+        specifier: ^6.3.0
+        version: 6.3.0
+      pinia:
+        specifier: ^2.2.6
+        version: 2.2.6(typescript@5.5.4)(vue@3.5.12(typescript@5.5.4))
+      qs:
+        specifier: ^6.13.0
+        version: 6.13.0
+      sortablejs:
+        specifier: ^1.15.3
+        version: 1.15.3
+      vue:
+        specifier: ^3.5.12
+        version: 3.5.12(typescript@5.5.4)
+      vue-i18n:
+        specifier: 9.9.1
+        version: 9.9.1(vue@3.5.12(typescript@5.5.4))
+      vue-picture-cropper:
+        specifier: ^0.7.0
+        version: 0.7.0(vue@3.5.12(typescript@5.5.4))
+      vue-router:
+        specifier: ^4.4.5
+        version: 4.4.5(vue@3.5.12(typescript@5.5.4))
+    devDependencies:
+      '@commitlint/cli':
+        specifier: ^19.5.0
+        version: 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
+      '@commitlint/config-conventional':
+        specifier: ^19.5.0
+        version: 19.5.0
+      '@eslint/js':
+        specifier: ^9.14.0
+        version: 9.14.0
+      '@types/codemirror':
+        specifier: ^5.60.15
+        version: 5.60.15
+      '@types/lodash':
+        specifier: ^4.17.13
+        version: 4.17.13
+      '@types/node':
+        specifier: ^22.9.0
+        version: 22.9.0
+      '@types/nprogress':
+        specifier: ^0.2.3
+        version: 0.2.3
+      '@types/path-browserify':
+        specifier: ^1.0.3
+        version: 1.0.3
+      '@types/qs':
+        specifier: ^6.9.17
+        version: 6.9.17
+      '@types/sortablejs':
+        specifier: ^1.15.8
+        version: 1.15.8
+      '@typescript-eslint/eslint-plugin':
+        specifier: ^8.14.0
+        version: 8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      '@typescript-eslint/parser':
+        specifier: ^8.14.0
+        version: 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      '@vitejs/plugin-vue':
+        specifier: ^5.1.5
+        version: 5.1.5(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))(vue@3.5.12(typescript@5.5.4))
+      autoprefixer:
+        specifier: ^10.4.20
+        version: 10.4.20(postcss@8.4.49)
+      commitizen:
+        specifier: ^4.3.1
+        version: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
+      cz-git:
+        specifier: 1.9.4
+        version: 1.9.4
+      eslint:
+        specifier: ^9.14.0
+        version: 9.14.0(jiti@1.21.6)
+      eslint-config-prettier:
+        specifier: ^9.1.0
+        version: 9.1.0(eslint@9.14.0(jiti@1.21.6))
+      eslint-plugin-prettier:
+        specifier: ^5.2.1
+        version: 5.2.1(eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)))(eslint@9.14.0(jiti@1.21.6))(prettier@3.3.3)
+      eslint-plugin-vue:
+        specifier: ^9.31.0
+        version: 9.31.0(eslint@9.14.0(jiti@1.21.6))
+      globals:
+        specifier: ^15.12.0
+        version: 15.12.0
+      husky:
+        specifier: ^9.1.6
+        version: 9.1.6
+      lint-staged:
+        specifier: ^15.2.10
+        version: 15.2.10
+      postcss:
+        specifier: ^8.4.49
+        version: 8.4.49
+      postcss-html:
+        specifier: ^1.7.0
+        version: 1.7.0
+      postcss-scss:
+        specifier: ^4.0.9
+        version: 4.0.9(postcss@8.4.49)
+      prettier:
+        specifier: ^3.3.3
+        version: 3.3.3
+      sass:
+        specifier: ^1.80.6
+        version: 1.80.6
+      stylelint:
+        specifier: ^16.10.0
+        version: 16.10.0(typescript@5.5.4)
+      stylelint-config-html:
+        specifier: ^1.1.0
+        version: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-config-recess-order:
+        specifier: ^5.1.1
+        version: 5.1.1(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-config-recommended-scss:
+        specifier: ^14.1.0
+        version: 14.1.0(postcss@8.4.49)(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-config-recommended-vue:
+        specifier: ^1.5.0
+        version: 1.5.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-config-standard:
+        specifier: ^36.0.1
+        version: 36.0.1(stylelint@16.10.0(typescript@5.5.4))
+      terser:
+        specifier: ^5.36.0
+        version: 5.36.0
+      typescript:
+        specifier: 5.5.4
+        version: 5.5.4
+      typescript-eslint:
+        specifier: ^8.14.0
+        version: 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      unocss:
+        specifier: ^0.63.6
+        version: 0.63.6(postcss@8.4.49)(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+      unplugin-auto-import:
+        specifier: ^0.18.3
+        version: 0.18.3(@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4)))(rollup@4.25.0)
+      unplugin-vue-components:
+        specifier: ^0.27.4
+        version: 0.27.4(@babel/parser@7.26.2)(rollup@4.25.0)(vue@3.5.12(typescript@5.5.4))
+      vite:
+        specifier: ^5.4.11
+        version: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
+      vite-plugin-mock-dev-server:
+        specifier: ^1.8.0
+        version: 1.8.0(esbuild@0.23.1)(rollup@4.25.0)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+      vite-plugin-svg-icons:
+        specifier: ^2.0.1
+        version: 2.0.1(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+      vue-eslint-parser:
+        specifier: ^9.4.3
+        version: 9.4.3(eslint@9.14.0(jiti@1.21.6))
+      vue-tsc:
+        specifier: ^2.1.10
+        version: 2.1.10(typescript@5.5.4)
 
 packages:
 
-  /@ampproject/remapping@2.3.0:
+  '@ampproject/remapping@2.3.0':
     resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
     engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: true
 
-  /@antfu/install-pkg@0.4.1:
+  '@antfu/install-pkg@0.4.1':
     resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==}
-    dependencies:
-      package-manager-detector: 0.2.2
-      tinyexec: 0.3.1
-    dev: true
 
-  /@antfu/utils@0.7.10:
+  '@antfu/utils@0.7.10':
     resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
-    dev: true
 
-  /@babel/code-frame@7.26.2:
+  '@babel/code-frame@7.26.2':
     resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-validator-identifier': 7.25.9
-      js-tokens: 4.0.0
-      picocolors: 1.1.1
-    dev: true
 
-  /@babel/helper-string-parser@7.25.9:
+  '@babel/helper-string-parser@7.25.9':
     resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/helper-validator-identifier@7.25.9:
+  '@babel/helper-validator-identifier@7.25.9':
     resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
     engines: {node: '>=6.9.0'}
 
-  /@babel/parser@7.26.2:
+  '@babel/parser@7.26.2':
     resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
     engines: {node: '>=6.0.0'}
     hasBin: true
-    dependencies:
-      '@babel/types': 7.26.0
 
-  /@babel/runtime@7.26.0:
+  '@babel/runtime@7.26.0':
     resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      regenerator-runtime: 0.14.1
-    dev: false
 
-  /@babel/types@7.26.0:
+  '@babel/types@7.26.0':
     resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
     engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
 
-  /@commitlint/cli@19.5.0(@types/node@22.9.0)(typescript@5.5.4):
+  '@bassist/utils@0.4.0':
+    resolution: {integrity: sha512-aoFTl0jUjm8/tDZodP41wnEkvB+C5O9NFCuYN/ztL6jSUSsuBkXq90/1ifBm1XhV/zySHgLYlU1+tgo3XtQ+nA==}
+
+  '@commitlint/cli@19.5.0':
     resolution: {integrity: sha512-gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ==}
     engines: {node: '>=v18'}
     hasBin: true
-    dependencies:
-      '@commitlint/format': 19.5.0
-      '@commitlint/lint': 19.5.0
-      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
-      '@commitlint/read': 19.5.0
-      '@commitlint/types': 19.5.0
-      tinyexec: 0.3.1
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-    dev: true
 
-  /@commitlint/config-conventional@19.5.0:
+  '@commitlint/config-conventional@19.5.0':
     resolution: {integrity: sha512-OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      conventional-changelog-conventionalcommits: 7.0.2
-    dev: true
 
-  /@commitlint/config-validator@19.5.0:
+  '@commitlint/config-validator@19.5.0':
     resolution: {integrity: sha512-CHtj92H5rdhKt17RmgALhfQt95VayrUo2tSqY9g2w+laAXyk7K/Ef6uPm9tn5qSIwSmrLjKaXK9eiNuxmQrDBw==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      ajv: 8.17.1
-    dev: true
 
-  /@commitlint/ensure@19.5.0:
+  '@commitlint/ensure@19.5.0':
     resolution: {integrity: sha512-Kv0pYZeMrdg48bHFEU5KKcccRfKmISSm9MvgIgkpI6m+ohFTB55qZlBW6eYqh/XDfRuIO0x4zSmvBjmOwWTwkg==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      lodash.camelcase: 4.3.0
-      lodash.kebabcase: 4.1.1
-      lodash.snakecase: 4.1.1
-      lodash.startcase: 4.4.0
-      lodash.upperfirst: 4.3.1
-    dev: true
 
-  /@commitlint/execute-rule@19.5.0:
+  '@commitlint/execute-rule@19.5.0':
     resolution: {integrity: sha512-aqyGgytXhl2ejlk+/rfgtwpPexYyri4t8/n4ku6rRJoRhGZpLFMqrZ+YaubeGysCP6oz4mMA34YSTaSOKEeNrg==}
     engines: {node: '>=v18'}
-    dev: true
 
-  /@commitlint/format@19.5.0:
+  '@commitlint/format@19.5.0':
     resolution: {integrity: sha512-yNy088miE52stCI3dhG/vvxFo9e4jFkU1Mj3xECfzp/bIS/JUay4491huAlVcffOoMK1cd296q0W92NlER6r3A==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      chalk: 5.3.0
-    dev: true
 
-  /@commitlint/is-ignored@19.5.0:
+  '@commitlint/is-ignored@19.5.0':
     resolution: {integrity: sha512-0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      semver: 7.6.3
-    dev: true
 
-  /@commitlint/lint@19.5.0:
+  '@commitlint/lint@19.5.0':
     resolution: {integrity: sha512-cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/is-ignored': 19.5.0
-      '@commitlint/parse': 19.5.0
-      '@commitlint/rules': 19.5.0
-      '@commitlint/types': 19.5.0
-    dev: true
 
-  /@commitlint/load@19.5.0(@types/node@22.9.0)(typescript@5.5.4):
+  '@commitlint/load@19.5.0':
     resolution: {integrity: sha512-INOUhkL/qaKqwcTUvCE8iIUf5XHsEPCLY9looJ/ipzi7jtGhgmtH7OOFiNvwYgH7mA8osUWOUDV8t4E2HAi4xA==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/config-validator': 19.5.0
-      '@commitlint/execute-rule': 19.5.0
-      '@commitlint/resolve-extends': 19.5.0
-      '@commitlint/types': 19.5.0
-      chalk: 5.3.0
-      cosmiconfig: 9.0.0(typescript@5.5.4)
-      cosmiconfig-typescript-loader: 5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0)(typescript@5.5.4)
-      lodash.isplainobject: 4.0.6
-      lodash.merge: 4.6.2
-      lodash.uniq: 4.5.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-    dev: true
 
-  /@commitlint/message@19.5.0:
+  '@commitlint/message@19.5.0':
     resolution: {integrity: sha512-R7AM4YnbxN1Joj1tMfCyBryOC5aNJBdxadTZkuqtWi3Xj0kMdutq16XQwuoGbIzL2Pk62TALV1fZDCv36+JhTQ==}
     engines: {node: '>=v18'}
-    dev: true
 
-  /@commitlint/parse@19.5.0:
+  '@commitlint/parse@19.5.0':
     resolution: {integrity: sha512-cZ/IxfAlfWYhAQV0TwcbdR1Oc0/r0Ik1GEessDJ3Lbuma/MRO8FRQX76eurcXtmhJC//rj52ZSZuXUg0oIX0Fw==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/types': 19.5.0
-      conventional-changelog-angular: 7.0.0
-      conventional-commits-parser: 5.0.0
-    dev: true
 
-  /@commitlint/read@19.5.0:
+  '@commitlint/read@19.5.0':
     resolution: {integrity: sha512-TjS3HLPsLsxFPQj6jou8/CZFAmOP2y+6V4PGYt3ihbQKTY1Jnv0QG28WRKl/d1ha6zLODPZqsxLEov52dhR9BQ==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/top-level': 19.5.0
-      '@commitlint/types': 19.5.0
-      git-raw-commits: 4.0.0
-      minimist: 1.2.8
-      tinyexec: 0.3.1
-    dev: true
 
-  /@commitlint/resolve-extends@19.5.0:
+  '@commitlint/resolve-extends@19.5.0':
     resolution: {integrity: sha512-CU/GscZhCUsJwcKTJS9Ndh3AKGZTNFIOoQB2n8CmFnizE0VnEuJoum+COW+C1lNABEeqk6ssfc1Kkalm4bDklA==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/config-validator': 19.5.0
-      '@commitlint/types': 19.5.0
-      global-directory: 4.0.1
-      import-meta-resolve: 4.1.0
-      lodash.mergewith: 4.6.2
-      resolve-from: 5.0.0
-    dev: true
 
-  /@commitlint/rules@19.5.0:
+  '@commitlint/rules@19.5.0':
     resolution: {integrity: sha512-hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@commitlint/ensure': 19.5.0
-      '@commitlint/message': 19.5.0
-      '@commitlint/to-lines': 19.5.0
-      '@commitlint/types': 19.5.0
-    dev: true
 
-  /@commitlint/to-lines@19.5.0:
+  '@commitlint/to-lines@19.5.0':
     resolution: {integrity: sha512-R772oj3NHPkodOSRZ9bBVNq224DOxQtNef5Pl8l2M8ZnkkzQfeSTr4uxawV2Sd3ui05dUVzvLNnzenDBO1KBeQ==}
     engines: {node: '>=v18'}
-    dev: true
 
-  /@commitlint/top-level@19.5.0:
+  '@commitlint/top-level@19.5.0':
     resolution: {integrity: sha512-IP1YLmGAk0yWrImPRRc578I3dDUI5A2UBJx9FbSOjxe9sTlzFiwVJ+zeMLgAtHMtGZsC8LUnzmW1qRemkFU4ng==}
     engines: {node: '>=v18'}
-    dependencies:
-      find-up: 7.0.0
-    dev: true
 
-  /@commitlint/types@19.5.0:
+  '@commitlint/types@19.5.0':
     resolution: {integrity: sha512-DSHae2obMSMkAtTBSOulg5X7/z+rGLxcXQIkg3OmWvY6wifojge5uVMydfhUvs7yQj+V7jNmRZ2Xzl8GJyqRgg==}
     engines: {node: '>=v18'}
-    dependencies:
-      '@types/conventional-commits-parser': 5.0.0
-      chalk: 5.3.0
-    dev: true
 
-  /@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3):
+  '@csstools/css-parser-algorithms@3.0.4':
     resolution: {integrity: sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==}
     engines: {node: '>=18'}
     peerDependencies:
       '@csstools/css-tokenizer': ^3.0.3
-    dependencies:
-      '@csstools/css-tokenizer': 3.0.3
-    dev: true
 
-  /@csstools/css-tokenizer@3.0.3:
+  '@csstools/css-tokenizer@3.0.3':
     resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==}
     engines: {node: '>=18'}
-    dev: true
 
-  /@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.4)(@csstools/css-tokenizer@3.0.3):
+  '@csstools/media-query-list-parser@3.0.1':
     resolution: {integrity: sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==}
     engines: {node: '>=18'}
     peerDependencies:
       '@csstools/css-parser-algorithms': ^3.0.1
       '@csstools/css-tokenizer': ^3.0.1
-    dependencies:
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
-    dev: true
 
-  /@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.2):
+  '@csstools/selector-specificity@4.0.0':
     resolution: {integrity: sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==}
     engines: {node: '>=18'}
     peerDependencies:
       postcss-selector-parser: ^6.1.0
-    dependencies:
-      postcss-selector-parser: 6.1.2
-    dev: true
 
-  /@ctrl/tinycolor@3.6.1:
+  '@ctrl/tinycolor@3.6.1':
     resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==}
     engines: {node: '>=10'}
-    dev: false
 
-  /@dual-bundle/import-meta-resolve@4.1.0:
+  '@dual-bundle/import-meta-resolve@4.1.0':
     resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==}
-    dev: true
 
-  /@element-plus/icons-vue@2.3.1(vue@3.5.12):
+  '@element-plus/icons-vue@2.3.1':
     resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
     peerDependencies:
       vue: ^3.2.0
-    dependencies:
-      vue: 3.5.12(typescript@5.5.4)
-    dev: false
 
-  /@esbuild/aix-ppc64@0.21.5:
+  '@esbuild/aix-ppc64@0.21.5':
     resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [aix]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/aix-ppc64@0.23.1:
+  '@esbuild/aix-ppc64@0.23.1':
     resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [aix]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm64@0.21.5:
+  '@esbuild/android-arm64@0.21.5':
     resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm64@0.23.1:
+  '@esbuild/android-arm64@0.23.1':
     resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm@0.21.5:
+  '@esbuild/android-arm@0.21.5':
     resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-arm@0.23.1:
+  '@esbuild/android-arm@0.23.1':
     resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-x64@0.21.5:
+  '@esbuild/android-x64@0.21.5':
     resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/android-x64@0.23.1:
+  '@esbuild/android-x64@0.23.1':
     resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-arm64@0.21.5:
+  '@esbuild/darwin-arm64@0.21.5':
     resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-arm64@0.23.1:
+  '@esbuild/darwin-arm64@0.23.1':
     resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-x64@0.21.5:
+  '@esbuild/darwin-x64@0.21.5':
     resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/darwin-x64@0.23.1:
+  '@esbuild/darwin-x64@0.23.1':
     resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-arm64@0.21.5:
+  '@esbuild/freebsd-arm64@0.21.5':
     resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-arm64@0.23.1:
+  '@esbuild/freebsd-arm64@0.23.1':
     resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-x64@0.21.5:
+  '@esbuild/freebsd-x64@0.21.5':
     resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/freebsd-x64@0.23.1:
+  '@esbuild/freebsd-x64@0.23.1':
     resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm64@0.21.5:
+  '@esbuild/linux-arm64@0.21.5':
     resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm64@0.23.1:
+  '@esbuild/linux-arm64@0.23.1':
     resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm@0.21.5:
+  '@esbuild/linux-arm@0.21.5':
     resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
     engines: {node: '>=12'}
     cpu: [arm]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-arm@0.23.1:
+  '@esbuild/linux-arm@0.23.1':
     resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==}
     engines: {node: '>=18'}
     cpu: [arm]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ia32@0.21.5:
+  '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ia32@0.23.1:
+  '@esbuild/linux-ia32@0.23.1':
     resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-loong64@0.21.5:
+  '@esbuild/linux-loong64@0.21.5':
     resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
     engines: {node: '>=12'}
     cpu: [loong64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-loong64@0.23.1:
+  '@esbuild/linux-loong64@0.23.1':
     resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==}
     engines: {node: '>=18'}
     cpu: [loong64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-mips64el@0.21.5:
+  '@esbuild/linux-mips64el@0.21.5':
     resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
     engines: {node: '>=12'}
     cpu: [mips64el]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-mips64el@0.23.1:
+  '@esbuild/linux-mips64el@0.23.1':
     resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==}
     engines: {node: '>=18'}
     cpu: [mips64el]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ppc64@0.21.5:
+  '@esbuild/linux-ppc64@0.21.5':
     resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
     engines: {node: '>=12'}
     cpu: [ppc64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-ppc64@0.23.1:
+  '@esbuild/linux-ppc64@0.23.1':
     resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==}
     engines: {node: '>=18'}
     cpu: [ppc64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-riscv64@0.21.5:
+  '@esbuild/linux-riscv64@0.21.5':
     resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
     engines: {node: '>=12'}
     cpu: [riscv64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-riscv64@0.23.1:
+  '@esbuild/linux-riscv64@0.23.1':
     resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==}
     engines: {node: '>=18'}
     cpu: [riscv64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-s390x@0.21.5:
+  '@esbuild/linux-s390x@0.21.5':
     resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
     engines: {node: '>=12'}
     cpu: [s390x]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-s390x@0.23.1:
+  '@esbuild/linux-s390x@0.23.1':
     resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==}
     engines: {node: '>=18'}
     cpu: [s390x]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-x64@0.21.5:
+  '@esbuild/linux-x64@0.21.5':
     resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/linux-x64@0.23.1:
+  '@esbuild/linux-x64@0.23.1':
     resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [linux]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/netbsd-x64@0.21.5:
+  '@esbuild/netbsd-x64@0.21.5':
     resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/netbsd-x64@0.23.1:
+  '@esbuild/netbsd-x64@0.23.1':
     resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [netbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/openbsd-arm64@0.23.1:
+  '@esbuild/openbsd-arm64@0.23.1':
     resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/openbsd-x64@0.21.5:
+  '@esbuild/openbsd-x64@0.21.5':
     resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/openbsd-x64@0.23.1:
+  '@esbuild/openbsd-x64@0.23.1':
     resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [openbsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/sunos-x64@0.21.5:
+  '@esbuild/sunos-x64@0.21.5':
     resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/sunos-x64@0.23.1:
+  '@esbuild/sunos-x64@0.23.1':
     resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [sunos]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-arm64@0.21.5:
+  '@esbuild/win32-arm64@0.21.5':
     resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
     engines: {node: '>=12'}
     cpu: [arm64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-arm64@0.23.1:
+  '@esbuild/win32-arm64@0.23.1':
     resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==}
     engines: {node: '>=18'}
     cpu: [arm64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-ia32@0.21.5:
+  '@esbuild/win32-ia32@0.21.5':
     resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
     engines: {node: '>=12'}
     cpu: [ia32]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-ia32@0.23.1:
+  '@esbuild/win32-ia32@0.23.1':
     resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==}
     engines: {node: '>=18'}
     cpu: [ia32]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-x64@0.21.5:
+  '@esbuild/win32-x64@0.21.5':
     resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
     engines: {node: '>=12'}
     cpu: [x64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@esbuild/win32-x64@0.23.1:
+  '@esbuild/win32-x64@0.23.1':
     resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==}
     engines: {node: '>=18'}
     cpu: [x64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@eslint-community/eslint-utils@4.4.1(eslint@9.14.0):
+  '@eslint-community/eslint-utils@4.4.1':
     resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
       eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-    dependencies:
-      eslint: 9.14.0
-      eslint-visitor-keys: 3.4.3
-    dev: true
 
-  /@eslint-community/regexpp@4.12.1:
+  '@eslint-community/regexpp@4.12.1':
     resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
     engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-    dev: true
 
-  /@eslint/config-array@0.18.0:
+  '@eslint/config-array@0.18.0':
     resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dependencies:
-      '@eslint/object-schema': 2.1.4
-      debug: 4.3.7
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
 
-  /@eslint/core@0.7.0:
+  '@eslint/core@0.7.0':
     resolution: {integrity: sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dev: true
 
-  /@eslint/eslintrc@3.1.0:
+  '@eslint/eslintrc@3.1.0':
     resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.3.7
-      espree: 10.3.0
-      globals: 14.0.0
-      ignore: 5.3.2
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
 
-  /@eslint/js@9.14.0:
+  '@eslint/js@9.14.0':
     resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dev: true
 
-  /@eslint/object-schema@2.1.4:
+  '@eslint/object-schema@2.1.4':
     resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dev: true
 
-  /@eslint/plugin-kit@0.2.2:
+  '@eslint/plugin-kit@0.2.2':
     resolution: {integrity: sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==}
     engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dependencies:
-      levn: 0.4.1
-    dev: true
 
-  /@fast-csv/format@4.3.5:
+  '@fast-csv/format@4.3.5':
     resolution: {integrity: sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==}
-    dependencies:
-      '@types/node': 14.18.63
-      lodash.escaperegexp: 4.1.2
-      lodash.isboolean: 3.0.3
-      lodash.isequal: 4.5.0
-      lodash.isfunction: 3.0.9
-      lodash.isnil: 4.0.0
-    dev: false
 
-  /@fast-csv/parse@4.3.6:
+  '@fast-csv/parse@4.3.6':
     resolution: {integrity: sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==}
-    dependencies:
-      '@types/node': 14.18.63
-      lodash.escaperegexp: 4.1.2
-      lodash.groupby: 4.6.0
-      lodash.isfunction: 3.0.9
-      lodash.isnil: 4.0.0
-      lodash.isundefined: 3.0.1
-      lodash.uniq: 4.5.0
-    dev: false
 
-  /@floating-ui/core@1.6.8:
+  '@floating-ui/core@1.6.8':
     resolution: {integrity: sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==}
-    dependencies:
-      '@floating-ui/utils': 0.2.8
-    dev: false
 
-  /@floating-ui/dom@1.6.12:
+  '@floating-ui/dom@1.6.12':
     resolution: {integrity: sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==}
-    dependencies:
-      '@floating-ui/core': 1.6.8
-      '@floating-ui/utils': 0.2.8
-    dev: false
 
-  /@floating-ui/utils@0.2.8:
+  '@floating-ui/utils@0.2.8':
     resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}
-    dev: false
 
-  /@hapi/bourne@3.0.0:
+  '@hapi/bourne@3.0.0':
     resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
-    dev: true
 
-  /@humanfs/core@0.19.1:
+  '@humanfs/core@0.19.1':
     resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
     engines: {node: '>=18.18.0'}
-    dev: true
 
-  /@humanfs/node@0.16.6:
+  '@humanfs/node@0.16.6':
     resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==}
     engines: {node: '>=18.18.0'}
-    dependencies:
-      '@humanfs/core': 0.19.1
-      '@humanwhocodes/retry': 0.3.1
-    dev: true
 
-  /@humanwhocodes/module-importer@1.0.1:
+  '@humanwhocodes/module-importer@1.0.1':
     resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
     engines: {node: '>=12.22'}
-    dev: true
 
-  /@humanwhocodes/retry@0.3.1:
+  '@humanwhocodes/retry@0.3.1':
     resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
     engines: {node: '>=18.18'}
-    dev: true
 
-  /@humanwhocodes/retry@0.4.1:
+  '@humanwhocodes/retry@0.4.1':
     resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==}
     engines: {node: '>=18.18'}
-    dev: true
 
-  /@iconify/types@2.0.0:
+  '@iconify/types@2.0.0':
     resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
-    dev: true
 
-  /@iconify/utils@2.1.33:
+  '@iconify/utils@2.1.33':
     resolution: {integrity: sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==}
-    dependencies:
-      '@antfu/install-pkg': 0.4.1
-      '@antfu/utils': 0.7.10
-      '@iconify/types': 2.0.0
-      debug: 4.3.7
-      kolorist: 1.8.0
-      local-pkg: 0.5.0
-      mlly: 1.7.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
 
-  /@intlify/core-base@9.9.1:
+  '@intlify/core-base@9.9.1':
     resolution: {integrity: sha512-qsV15dg7jNX2faBRyKMgZS8UcFJViWEUPLdzZ9UR0kQZpFVeIpc0AG7ZOfeP7pX2T9SQ5jSiorq/tii9nkkafA==}
     engines: {node: '>= 16'}
-    dependencies:
-      '@intlify/message-compiler': 9.9.1
-      '@intlify/shared': 9.9.1
-    dev: false
 
-  /@intlify/message-compiler@9.9.1:
+  '@intlify/message-compiler@9.9.1':
     resolution: {integrity: sha512-zTvP6X6HeumHOXuAE1CMMsV6tTX+opKMOxO1OHTCg5N5Sm/F7d8o2jdT6W6L5oHUsJ/vvkGefHIs7Q3hfowmsA==}
     engines: {node: '>= 16'}
-    dependencies:
-      '@intlify/shared': 9.9.1
-      source-map-js: 1.2.1
-    dev: false
 
-  /@intlify/shared@9.9.1:
+  '@intlify/shared@9.9.1':
     resolution: {integrity: sha512-b3Pta1nwkz5rGq434v0psHwEwHGy1pYCttfcM22IE//K9owbpkEvFptx9VcuRAxjQdrO2If249cmDDjBu5wMDA==}
     engines: {node: '>= 16'}
-    dev: false
 
-  /@jridgewell/gen-mapping@0.3.5:
+  '@jridgewell/gen-mapping@0.3.5':
     resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
     engines: {node: '>=6.0.0'}
-    dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: true
 
-  /@jridgewell/resolve-uri@3.1.2:
+  '@jridgewell/resolve-uri@3.1.2':
     resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
     engines: {node: '>=6.0.0'}
-    dev: true
 
-  /@jridgewell/set-array@1.2.1:
+  '@jridgewell/set-array@1.2.1':
     resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
     engines: {node: '>=6.0.0'}
-    dev: true
 
-  /@jridgewell/source-map@0.3.6:
+  '@jridgewell/source-map@0.3.6':
     resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-    dev: true
 
-  /@jridgewell/sourcemap-codec@1.5.0:
+  '@jridgewell/sourcemap-codec@1.5.0':
     resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
 
-  /@jridgewell/trace-mapping@0.3.25:
+  '@jridgewell/trace-mapping@0.3.25':
     resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.0
-    dev: true
 
-  /@nodelib/fs.scandir@2.1.5:
+  '@nodelib/fs.scandir@2.1.5':
     resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
     engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-    dev: true
 
-  /@nodelib/fs.stat@2.0.5:
+  '@nodelib/fs.stat@2.0.5':
     resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
     engines: {node: '>= 8'}
-    dev: true
 
-  /@nodelib/fs.walk@1.2.8:
+  '@nodelib/fs.walk@1.2.8':
     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
     engines: {node: '>= 8'}
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.17.1
-    dev: true
 
-  /@parcel/watcher-android-arm64@2.5.0:
+  '@parcel/watcher-android-arm64@2.5.0':
     resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-darwin-arm64@2.5.0:
+  '@parcel/watcher-darwin-arm64@2.5.0':
     resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-darwin-x64@2.5.0:
+  '@parcel/watcher-darwin-x64@2.5.0':
     resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-freebsd-x64@2.5.0:
+  '@parcel/watcher-freebsd-x64@2.5.0':
     resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-arm-glibc@2.5.0:
+  '@parcel/watcher-linux-arm-glibc@2.5.0':
     resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-arm-musl@2.5.0:
+  '@parcel/watcher-linux-arm-musl@2.5.0':
     resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
     libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-arm64-glibc@2.5.0:
+  '@parcel/watcher-linux-arm64-glibc@2.5.0':
     resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-arm64-musl@2.5.0:
+  '@parcel/watcher-linux-arm64-musl@2.5.0':
     resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-x64-glibc@2.5.0:
+  '@parcel/watcher-linux-x64-glibc@2.5.0':
     resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-linux-x64-musl@2.5.0:
+  '@parcel/watcher-linux-x64-musl@2.5.0':
     resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
     libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-win32-arm64@2.5.0:
+  '@parcel/watcher-win32-arm64@2.5.0':
     resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-win32-ia32@2.5.0:
+  '@parcel/watcher-win32-ia32@2.5.0':
     resolution: {integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==}
     engines: {node: '>= 10.0.0'}
     cpu: [ia32]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher-win32-x64@2.5.0:
+  '@parcel/watcher-win32-x64@2.5.0':
     resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [win32]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@parcel/watcher@2.5.0:
+  '@parcel/watcher@2.5.0':
     resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
     engines: {node: '>= 10.0.0'}
-    requiresBuild: true
-    dependencies:
-      detect-libc: 1.0.3
-      is-glob: 4.0.3
-      micromatch: 4.0.8
-      node-addon-api: 7.1.1
-    optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.0
-      '@parcel/watcher-darwin-arm64': 2.5.0
-      '@parcel/watcher-darwin-x64': 2.5.0
-      '@parcel/watcher-freebsd-x64': 2.5.0
-      '@parcel/watcher-linux-arm-glibc': 2.5.0
-      '@parcel/watcher-linux-arm-musl': 2.5.0
-      '@parcel/watcher-linux-arm64-glibc': 2.5.0
-      '@parcel/watcher-linux-arm64-musl': 2.5.0
-      '@parcel/watcher-linux-x64-glibc': 2.5.0
-      '@parcel/watcher-linux-x64-musl': 2.5.0
-      '@parcel/watcher-win32-arm64': 2.5.0
-      '@parcel/watcher-win32-ia32': 2.5.0
-      '@parcel/watcher-win32-x64': 2.5.0
-    dev: true
-    optional: true
 
-  /@pengzhanbo/utils@1.1.2:
+  '@pengzhanbo/utils@1.1.2':
     resolution: {integrity: sha512-geM6O5jEs2Hvg3LxwffjxrhZVftqysM6VDFvGHm+XMf2ZwunZIehPkd/W2mwbJBbFoqVqACl+c1/y48MffMiDg==}
-    dev: true
 
-  /@pkgr/core@0.1.1:
+  '@pkgr/core@0.1.1':
     resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
-    dev: true
 
-  /@polka/url@1.0.0-next.28:
+  '@polka/url@1.0.0-next.28':
     resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
-    dev: true
 
-  /@rollup/pluginutils@5.1.3:
+  '@rollup/pluginutils@5.1.3':
     resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
     engines: {node: '>=14.0.0'}
     peerDependencies:
@@ -1307,348 +869,4290 @@ packages:
     peerDependenciesMeta:
       rollup:
         optional: true
-    dependencies:
-      '@types/estree': 1.0.6
-      estree-walker: 2.0.2
-      picomatch: 4.0.2
-    dev: true
 
-  /@rollup/rollup-android-arm-eabi@4.25.0:
+  '@rollup/rollup-android-arm-eabi@4.25.0':
     resolution: {integrity: sha512-CC/ZqFZwlAIbU1wUPisHyV/XRc5RydFrNLtgl3dGYskdwPZdt4HERtKm50a/+DtTlKeCq9IXFEWR+P6blwjqBA==}
     cpu: [arm]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-android-arm64@4.25.0:
+  '@rollup/rollup-android-arm64@4.25.0':
     resolution: {integrity: sha512-/Y76tmLGUJqVBXXCfVS8Q8FJqYGhgH4wl4qTA24E9v/IJM0XvJCGQVSW1QZ4J+VURO9h8YCa28sTFacZXwK7Rg==}
     cpu: [arm64]
     os: [android]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-darwin-arm64@4.25.0:
+  '@rollup/rollup-darwin-arm64@4.25.0':
     resolution: {integrity: sha512-YVT6L3UrKTlC0FpCZd0MGA7NVdp7YNaEqkENbWQ7AOVOqd/7VzyHpgIpc1mIaxRAo1ZsJRH45fq8j4N63I/vvg==}
     cpu: [arm64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-darwin-x64@4.25.0:
+  '@rollup/rollup-darwin-x64@4.25.0':
     resolution: {integrity: sha512-ZRL+gexs3+ZmmWmGKEU43Bdn67kWnMeWXLFhcVv5Un8FQcx38yulHBA7XR2+KQdYIOtD0yZDWBCudmfj6lQJoA==}
     cpu: [x64]
     os: [darwin]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-freebsd-arm64@4.25.0:
+  '@rollup/rollup-freebsd-arm64@4.25.0':
     resolution: {integrity: sha512-xpEIXhiP27EAylEpreCozozsxWQ2TJbOLSivGfXhU4G1TBVEYtUPi2pOZBnvGXHyOdLAUUhPnJzH3ah5cqF01g==}
     cpu: [arm64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-freebsd-x64@4.25.0:
+  '@rollup/rollup-freebsd-x64@4.25.0':
     resolution: {integrity: sha512-sC5FsmZGlJv5dOcURrsnIK7ngc3Kirnx3as2XU9uER+zjfyqIjdcMVgzy4cOawhsssqzoAX19qmxgJ8a14Qrqw==}
     cpu: [x64]
     os: [freebsd]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-arm-gnueabihf@4.25.0:
+  '@rollup/rollup-linux-arm-gnueabihf@4.25.0':
     resolution: {integrity: sha512-uD/dbLSs1BEPzg564TpRAQ/YvTnCds2XxyOndAO8nJhaQcqQGFgv/DAVko/ZHap3boCvxnzYMa3mTkV/B/3SWA==}
     cpu: [arm]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-arm-musleabihf@4.25.0:
+  '@rollup/rollup-linux-arm-musleabihf@4.25.0':
     resolution: {integrity: sha512-ZVt/XkrDlQWegDWrwyC3l0OfAF7yeJUF4fq5RMS07YM72BlSfn2fQQ6lPyBNjt+YbczMguPiJoCfaQC2dnflpQ==}
     cpu: [arm]
     os: [linux]
     libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-arm64-gnu@4.25.0:
+  '@rollup/rollup-linux-arm64-gnu@4.25.0':
     resolution: {integrity: sha512-qboZ+T0gHAW2kkSDPHxu7quaFaaBlynODXpBVnPxUgvWYaE84xgCKAPEYE+fSMd3Zv5PyFZR+L0tCdYCMAtG0A==}
     cpu: [arm64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-arm64-musl@4.25.0:
+  '@rollup/rollup-linux-arm64-musl@4.25.0':
     resolution: {integrity: sha512-ndWTSEmAaKr88dBuogGH2NZaxe7u2rDoArsejNslugHZ+r44NfWiwjzizVS1nUOHo+n1Z6qV3X60rqE/HlISgw==}
     cpu: [arm64]
     os: [linux]
     libc: [musl]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-powerpc64le-gnu@4.25.0:
+  '@rollup/rollup-linux-powerpc64le-gnu@4.25.0':
     resolution: {integrity: sha512-BVSQvVa2v5hKwJSy6X7W1fjDex6yZnNKy3Kx1JGimccHft6HV0THTwNtC2zawtNXKUu+S5CjXslilYdKBAadzA==}
     cpu: [ppc64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-riscv64-gnu@4.25.0:
+  '@rollup/rollup-linux-riscv64-gnu@4.25.0':
     resolution: {integrity: sha512-G4hTREQrIdeV0PE2JruzI+vXdRnaK1pg64hemHq2v5fhv8C7WjVaeXc9P5i4Q5UC06d/L+zA0mszYIKl+wY8oA==}
     cpu: [riscv64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-s390x-gnu@4.25.0:
+  '@rollup/rollup-linux-s390x-gnu@4.25.0':
     resolution: {integrity: sha512-9T/w0kQ+upxdkFL9zPVB6zy9vWW1deA3g8IauJxojN4bnz5FwSsUAD034KpXIVX5j5p/rn6XqumBMxfRkcHapQ==}
     cpu: [s390x]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
-    optional: true
 
-  /@rollup/rollup-linux-x64-gnu@4.25.0:
+  '@rollup/rollup-linux-x64-gnu@4.25.0':
     resolution: {integrity: sha512-ThcnU0EcMDn+J4B9LD++OgBYxZusuA7iemIIiz5yzEcFg04VZFzdFjuwPdlURmYPZw+fgVrFzj4CA64jSTG4Ig==}
     cpu: [x64]
     os: [linux]
     libc: [glibc]
-    requiresBuild: true
-    dev: true
+
+  '@rollup/rollup-linux-x64-musl@4.25.0':
+    resolution: {integrity: sha512-zx71aY2oQxGxAT1JShfhNG79PnjYhMC6voAjzpu/xmMjDnKNf6Nl/xv7YaB/9SIa9jDYf8RBPWEnjcdlhlv1rQ==}
+    cpu: [x64]
+    os: [linux]
+    libc: [musl]
+
+  '@rollup/rollup-win32-arm64-msvc@4.25.0':
+    resolution: {integrity: sha512-JT8tcjNocMs4CylWY/CxVLnv8e1lE7ff1fi6kbGocWwxDq9pj30IJ28Peb+Y8yiPNSF28oad42ApJB8oUkwGww==}
+    cpu: [arm64]
+    os: [win32]
+
+  '@rollup/rollup-win32-ia32-msvc@4.25.0':
+    resolution: {integrity: sha512-dRLjLsO3dNOfSN6tjyVlG+Msm4IiZnGkuZ7G5NmpzwF9oOc582FZG05+UdfTbz5Jd4buK/wMb6UeHFhG18+OEg==}
+    cpu: [ia32]
+    os: [win32]
+
+  '@rollup/rollup-win32-x64-msvc@4.25.0':
+    resolution: {integrity: sha512-/RqrIFtLB926frMhZD0a5oDa4eFIbyNEwLLloMTEjmqfwZWXywwVVOVmwTsuyhC9HKkVEZcOOi+KV4U9wmOdlg==}
+    cpu: [x64]
+    os: [win32]
+
+  '@stomp/stompjs@7.0.0':
+    resolution: {integrity: sha512-fGdq4wPDnSV/KyOsjq4P+zLc8MFWC3lMmP5FBgLWKPJTYcuCbAIrnRGjB7q2jHZdYCOD5vxLuFoKIYLy5/u8Pw==}
+
+  '@sxzz/popperjs-es@2.11.7':
+    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
+
+  '@transloadit/prettier-bytes@0.0.7':
+    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
+
+  '@trysound/sax@0.2.0':
+    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
+    engines: {node: '>=10.13.0'}
+
+  '@types/codemirror@5.60.15':
+    resolution: {integrity: sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==}
+
+  '@types/conventional-commits-parser@5.0.0':
+    resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==}
+
+  '@types/estree@1.0.6':
+    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
+
+  '@types/event-emitter@0.3.5':
+    resolution: {integrity: sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ==}
+
+  '@types/json-schema@7.0.15':
+    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
+
+  '@types/lodash-es@4.17.12':
+    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
+
+  '@types/lodash@4.17.13':
+    resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
+
+  '@types/node@14.18.63':
+    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
+
+  '@types/node@22.9.0':
+    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
+
+  '@types/nprogress@0.2.3':
+    resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==}
+
+  '@types/path-browserify@1.0.3':
+    resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
+
+  '@types/qs@6.9.17':
+    resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==}
+
+  '@types/sortablejs@1.15.8':
+    resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==}
+
+  '@types/svgo@2.6.4':
+    resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
+
+  '@types/tern@0.23.9':
+    resolution: {integrity: sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==}
+
+  '@types/web-bluetooth@0.0.16':
+    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
+
+  '@types/web-bluetooth@0.0.20':
+    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
+
+  '@typescript-eslint/eslint-plugin@8.14.0':
+    resolution: {integrity: sha512-tqp8H7UWFaZj0yNO6bycd5YjMwxa6wIHOLZvWPkidwbgLCsBMetQoGj7DPuAlWa2yGO3H48xmPwjhsSPPCGU5w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/parser@8.14.0':
+    resolution: {integrity: sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/scope-manager@8.14.0':
+    resolution: {integrity: sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/type-utils@8.14.0':
+    resolution: {integrity: sha512-Xcz9qOtZuGusVOH5Uk07NGs39wrKkf3AxlkK79RBK6aJC1l03CobXjJbwBPSidetAOV+5rEVuiT1VSBUOAsanQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/types@8.14.0':
+    resolution: {integrity: sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@typescript-eslint/typescript-estree@8.14.0':
+    resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@typescript-eslint/utils@8.14.0':
+    resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: ^8.57.0 || ^9.0.0
+
+  '@typescript-eslint/visitor-keys@8.14.0':
+    resolution: {integrity: sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  '@unocss/astro@0.63.6':
+    resolution: {integrity: sha512-5Fjlv6dpQo6o2PUAcEv8p24G8rn8Op79xLFofq2V+iA/Q32G9/UsxTLOpj+yc+q0YdJrFfDCT2X/3pvVY8Db5g==}
+    peerDependencies:
+      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
+    peerDependenciesMeta:
+      vite:
+        optional: true
+
+  '@unocss/cli@0.63.6':
+    resolution: {integrity: sha512-OZb8hO0x4nCJjFd3Gq3km78YnyMAdq282D+BLiDE6IhQ5WHCVL7fyhfgIVL6xwxISDVxiyITwNb72ky0MEutPg==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  '@unocss/config@0.63.6':
+    resolution: {integrity: sha512-+4Lt5uTwRgu1z7vhOUzDf+mL+BQYdaa/Z8NMT2Fiqb37tcjEKvmwaUHdfE22Vif1luDgC6xqFsn6qqFtOxhoWQ==}
+    engines: {node: '>=14'}
+
+  '@unocss/core@0.63.6':
+    resolution: {integrity: sha512-Q4QPgJ271Up89+vIqqOKgtdCKkFpHqvHN8W1LUlKPqtYnOvVYaOIVNAZowaIdEhPuc83yLc6Tg2+7riK18QKEw==}
+
+  '@unocss/extractor-arbitrary-variants@0.63.6':
+    resolution: {integrity: sha512-HJX0oAa9uzwKYoU8CoJdP1gxjuqFmOLxyZmITjStAmZNZpIxlz2wz4VrHmqml2dkvx/mifGGGc/GxZpQ36D12Q==}
+
+  '@unocss/inspector@0.63.6':
+    resolution: {integrity: sha512-DQDJnhtzdHIQXD2vCdj5ytFnHfQCWJGPmrHJHXxzkTYn8nIovV1roVl1ITLxkDIIYK9bdYneg2imQN5JCZhHmQ==}
+
+  '@unocss/postcss@0.63.6':
+    resolution: {integrity: sha512-XI6U1jMwbQoSHVWpZZu3Cxp3t1PVj5VOj+IYtz7xmcWP9GVK+eyETo/xyB0l4muD4emXfSrhNDrFYzSyIyF5cg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      postcss: ^8.4.21
+
+  '@unocss/preset-attributify@0.63.6':
+    resolution: {integrity: sha512-sHH17mfl/THHLxCLAHqPdUniCNMFjAxBHFDZYgGi83azuarF2evI5Mtc3Qsj3nzoSQwTPmK2VY3XYUUrpPDGWQ==}
+
+  '@unocss/preset-icons@0.63.6':
+    resolution: {integrity: sha512-fRU44wXABnMPT/9zhKBNSUeDJlOxJhUJP9W3FSRnc+ktjAifJIj0xpUKtEqxL46QMq825Bsj2yDSquzP+XYGnQ==}
+
+  '@unocss/preset-mini@0.63.6':
+    resolution: {integrity: sha512-pZDZbSuxabHSwPIy3zCgQ4MNdVCSHvOvZecreH+v96R1oOhquiwU8WiSbkxvZiKiLQJd7JUVW87E1pAzr5ZGGQ==}
+
+  '@unocss/preset-tagify@0.63.6':
+    resolution: {integrity: sha512-3lKhk4MW3RqJBwIvBXHj0H0/kHkFlKtCIBQFiBcCJh8TXOID8IZ0iVjuGwdlk63VTizI/wnsNDOVpj6YcjRRlw==}
+
+  '@unocss/preset-typography@0.63.6':
+    resolution: {integrity: sha512-AXmBVnbV54gUIv5kbywjZek9ZlKRwJfBDVMtWOcLOjN3AHirGx1W2oq2UzNkfYZ2leof/Y2BocxeTwGCCRhqDQ==}
+
+  '@unocss/preset-uno@0.63.6':
+    resolution: {integrity: sha512-67PbHyVgAe9Rz0Rhyl3zBibFuGmqQMRPMkRjNYrwmmtNydpQYsXbfnDs0p8mZFp6uO2o3Jkh7urqEtixHHvq0Q==}
+
+  '@unocss/preset-web-fonts@0.63.6':
+    resolution: {integrity: sha512-ko1aHDax0u5CQi1BXggv6uW5Vq/LQRWwzOxqBFTh1JlGHPZTw4CdVJkYnlpt3WEW+FPUzZYjhKmMmQY7KtOTng==}
+
+  '@unocss/preset-wind@0.63.6':
+    resolution: {integrity: sha512-W3oZ2TXSqStNE+X++kcspRTF2Szu2ej6NW5Kiyy6WQn/+ZD77AF4VtvzHtzFVZ2QKpEIovGBpU5tywooHbB7hw==}
+
+  '@unocss/reset@0.63.6':
+    resolution: {integrity: sha512-gq73RSZj54MOloqrivkoMPXCqNG2WpIyBT1AYlF76uKxEEbUD41E8uBUhLSKs7gFgF01yQJLRaIuyN1yw09pbQ==}
+
+  '@unocss/rule-utils@0.63.6':
+    resolution: {integrity: sha512-moeDEq5d9mB8gSYeoqHMkXWWekaFFdhg7QCuwwCbxCc+NPMOgGkmfAoafz+y2tdvK7pEuT191RWOiHQ0MkA5oQ==}
+    engines: {node: '>=14'}
+
+  '@unocss/transformer-attributify-jsx@0.63.6':
+    resolution: {integrity: sha512-/RU09MF+hJK7cFbLJ+8vloCGyhn6Oys8R6gey0auB0+nw/ucUXoLQKWgUqo9taQlLuYOiehdkYjQSdWn5lyA/Q==}
+
+  '@unocss/transformer-compile-class@0.63.6':
+    resolution: {integrity: sha512-zzAqs8adnTUOLA88RgcToadcrz9gjxrZk6IrcmMqMmWqk0MOWNQHIN0RzKa/yaw4QhO2xuGyIz4/WHyXuCXMQg==}
+
+  '@unocss/transformer-directives@0.63.6':
+    resolution: {integrity: sha512-XcNOwLRbfrJSU6YXyLgiMzAigSzjIdvHwS3lLCZ2n6DWuLmTuXBfvVtRxeJ+aflNkhpQNKONCClC4s6I2r53uw==}
+
+  '@unocss/transformer-variant-group@0.63.6':
+    resolution: {integrity: sha512-ebYSjZnZrtcJYjmAEDwGVwPuaQ9EVWKNDDJFFSusP8k/6PjJoHDh0qkj+hdPPDhYn81yzJQalU1eSUSlfC30VA==}
+
+  '@unocss/vite@0.63.6':
+    resolution: {integrity: sha512-gxK3gtvYQH5S/qtuvsY4M0S+KJPZnYrOQI/Gopufx+b2qgmwZ/TSAe66gWeKYfe3DfQsmA3PPh/GXpkK+/FnHg==}
+    peerDependencies:
+      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
+
+  '@uppy/companion-client@2.2.2':
+    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+
+  '@uppy/core@2.3.4':
+    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+
+  '@uppy/store-default@2.1.1':
+    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
+
+  '@uppy/utils@4.1.3':
+    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+
+  '@uppy/xhr-upload@2.1.3':
+    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
+    peerDependencies:
+      '@uppy/core': ^2.3.3
+
+  '@vitejs/plugin-vue@5.1.5':
+    resolution: {integrity: sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==}
+    engines: {node: ^18.0.0 || >=20.0.0}
+    peerDependencies:
+      vite: ^5.0.0
+      vue: ^3.2.25
+
+  '@volar/language-core@2.4.10':
+    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
+
+  '@volar/source-map@2.4.10':
+    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
+
+  '@volar/typescript@2.4.10':
+    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
+
+  '@vue/compiler-core@3.5.12':
+    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
+
+  '@vue/compiler-dom@3.5.12':
+    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
+
+  '@vue/compiler-sfc@3.5.12':
+    resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
+
+  '@vue/compiler-ssr@3.5.12':
+    resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
+
+  '@vue/compiler-vue2@2.7.16':
+    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
+
+  '@vue/devtools-api@6.6.4':
+    resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
+
+  '@vue/language-core@2.1.10':
+    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  '@vue/reactivity@3.5.12':
+    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
+
+  '@vue/runtime-core@3.5.12':
+    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
+
+  '@vue/runtime-dom@3.5.12':
+    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
+
+  '@vue/server-renderer@3.5.12':
+    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
+    peerDependencies:
+      vue: 3.5.12
+
+  '@vue/shared@3.5.12':
+    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
+
+  '@vueuse/core@10.11.1':
+    resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
+
+  '@vueuse/core@9.13.0':
+    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
+
+  '@vueuse/metadata@10.11.1':
+    resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
+
+  '@vueuse/metadata@9.13.0':
+    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
+
+  '@vueuse/shared@10.11.1':
+    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
+
+  '@vueuse/shared@9.13.0':
+    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
+
+  '@wangeditor/basic-modules@1.1.7':
+    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/code-highlight@1.0.3':
+    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/core@1.1.19':
+    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
+    peerDependencies:
+      '@uppy/core': ^2.1.1
+      '@uppy/xhr-upload': ^2.0.3
+      dom7: ^3.0.0
+      is-hotkey: ^0.2.0
+      lodash.camelcase: ^4.3.0
+      lodash.clonedeep: ^4.5.0
+      lodash.debounce: ^4.0.8
+      lodash.foreach: ^4.5.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      lodash.toarray: ^4.4.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/editor-for-vue@5.1.10':
+    resolution: {integrity: sha512-OdtMnMt0HpYriY1+Efo3KHviUB5zwlZIaHypNw5MPRn8uFq3MFLET5u8pbB/PiEF5Ff88YAp7T9Xw1dvJzT8sA==}
+    peerDependencies:
+      '@wangeditor/editor': '>=5.0.0'
+      vue: ^3.0.5
+
+  '@wangeditor/editor@5.1.23':
+    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+
+  '@wangeditor/list-module@1.0.5':
+    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/table-module@1.1.4':
+    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
+    peerDependencies:
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.isequal: ^4.5.0
+      lodash.throttle: ^4.1.1
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/upload-image-module@1.0.2':
+    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
+    peerDependencies:
+      '@uppy/core': ^2.0.3
+      '@uppy/xhr-upload': ^2.0.3
+      '@wangeditor/basic-modules': 1.x
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      lodash.foreach: ^4.5.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@wangeditor/video-module@1.1.4':
+    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
+    peerDependencies:
+      '@uppy/core': ^2.1.4
+      '@uppy/xhr-upload': ^2.0.7
+      '@wangeditor/core': 1.x
+      dom7: ^3.0.0
+      nanoid: ^3.2.0
+      slate: ^0.72.0
+      snabbdom: ^3.1.0
+
+  '@withtypes/mime@0.1.2':
+    resolution: {integrity: sha512-PB9BfZGzwblUONJY0LiOwsHCA6uV3DIPj/w9ReekdHxPOl0VdUFgI5s4avKycuuq9Gf5Nz2ZPA2O36GAUzlMPA==}
+
+  JSONStream@1.3.5:
+    resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
+    hasBin: true
+
+  acorn-jsx@5.3.2:
+    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
+    peerDependencies:
+      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+
+  acorn@8.14.0:
+    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
+    engines: {node: '>=0.4.0'}
+    hasBin: true
+
+  ajv@6.12.6:
+    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+
+  ajv@8.17.1:
+    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+
+  alien-signals@0.2.1:
+    resolution: {integrity: sha512-FlEQrDJe9r2RI4cDlnK2zYqJezvx1uJaWEuwxsnlFqnPwvJbgitNBRumWrLDv8lA+7cCikpMxfJD2TTHiaTklA==}
+
+  animate.css@4.1.1:
+    resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
+
+  ansi-escapes@4.3.2:
+    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
+    engines: {node: '>=8'}
+
+  ansi-escapes@7.0.0:
+    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
+    engines: {node: '>=18'}
+
+  ansi-regex@2.1.1:
+    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
+    engines: {node: '>=0.10.0'}
+
+  ansi-regex@5.0.1:
+    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
+    engines: {node: '>=8'}
+
+  ansi-regex@6.1.0:
+    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
+    engines: {node: '>=12'}
+
+  ansi-styles@2.2.1:
+    resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
+    engines: {node: '>=0.10.0'}
+
+  ansi-styles@3.2.1:
+    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
+    engines: {node: '>=4'}
+
+  ansi-styles@4.3.0:
+    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
+    engines: {node: '>=8'}
+
+  ansi-styles@6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+
+  anymatch@3.1.3:
+    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
+    engines: {node: '>= 8'}
+
+  archiver-utils@2.1.0:
+    resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
+    engines: {node: '>= 6'}
+
+  archiver-utils@3.0.4:
+    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
+    engines: {node: '>= 10'}
+
+  archiver@5.3.2:
+    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
+    engines: {node: '>= 10'}
+
+  argparse@2.0.1:
+    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
+
+  arr-diff@4.0.0:
+    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
+    engines: {node: '>=0.10.0'}
+
+  arr-flatten@1.1.0:
+    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
+    engines: {node: '>=0.10.0'}
+
+  arr-union@3.1.0:
+    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
+    engines: {node: '>=0.10.0'}
+
+  array-buffer-byte-length@1.0.1:
+    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
+    engines: {node: '>= 0.4'}
+
+  array-ify@1.0.0:
+    resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
+
+  array-union@2.1.0:
+    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
+    engines: {node: '>=8'}
+
+  array-unique@0.3.2:
+    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
+    engines: {node: '>=0.10.0'}
+
+  arraybuffer.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
+    engines: {node: '>= 0.4'}
+
+  asap@2.0.6:
+    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
+
+  assign-symbols@1.0.0:
+    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
+    engines: {node: '>=0.10.0'}
+
+  astral-regex@2.0.0:
+    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
+    engines: {node: '>=8'}
+
+  async-validator@4.2.5:
+    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
+
+  async@3.2.6:
+    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
+
+  asynckit@0.4.0:
+    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
+
+  at-least-node@1.0.0:
+    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
+    engines: {node: '>= 4.0.0'}
+
+  atob@2.1.2:
+    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
+    engines: {node: '>= 4.5.0'}
+    hasBin: true
+
+  autoprefixer@10.4.20:
+    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
+    engines: {node: ^10 || ^12 || >=14}
+    hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
+
+  available-typed-arrays@1.0.7:
+    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
+    engines: {node: '>= 0.4'}
+
+  axios@1.7.7:
+    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+
+  balanced-match@1.0.2:
+    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+
+  balanced-match@2.0.0:
+    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
+
+  base64-js@1.5.1:
+    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+
+  base@0.11.2:
+    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
+    engines: {node: '>=0.10.0'}
+
+  big-integer@1.6.52:
+    resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
+    engines: {node: '>=0.6'}
+
+  big.js@5.2.2:
+    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
+
+  binary-extensions@2.3.0:
+    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
+    engines: {node: '>=8'}
+
+  binary@0.3.0:
+    resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==}
+
+  bl@4.1.0:
+    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+
+  bluebird@3.4.7:
+    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
+
+  bluebird@3.7.2:
+    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
+
+  boolbase@1.0.0:
+    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
+
+  brace-expansion@1.1.11:
+    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+
+  brace-expansion@2.0.1:
+    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+
+  braces@2.3.2:
+    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
+    engines: {node: '>=0.10.0'}
+
+  braces@3.0.3:
+    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
+    engines: {node: '>=8'}
+
+  browserslist@4.24.2:
+    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
+    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
+    hasBin: true
+
+  buffer-crc32@0.2.13:
+    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
+
+  buffer-from@1.1.2:
+    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
+
+  buffer-indexof-polyfill@1.0.2:
+    resolution: {integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==}
+    engines: {node: '>=0.10'}
+
+  buffer@5.7.1:
+    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+
+  buffers@0.1.1:
+    resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
+    engines: {node: '>=0.2.0'}
+
+  bundle-require@5.0.0:
+    resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    peerDependencies:
+      esbuild: '>=0.18'
+
+  bytes@3.1.2:
+    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
+    engines: {node: '>= 0.8'}
+
+  cac@6.7.14:
+    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
+    engines: {node: '>=8'}
+
+  cache-base@1.0.1:
+    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
+    engines: {node: '>=0.10.0'}
+
+  cachedir@2.3.0:
+    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
+    engines: {node: '>=6'}
+
+  call-bind@1.0.7:
+    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
+    engines: {node: '>= 0.4'}
+
+  callsites@3.1.0:
+    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
+    engines: {node: '>=6'}
+
+  caniuse-lite@1.0.30001680:
+    resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==}
+
+  chainsaw@0.1.0:
+    resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==}
+
+  chalk@1.1.3:
+    resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
+    engines: {node: '>=0.10.0'}
+
+  chalk@2.4.2:
+    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
+    engines: {node: '>=4'}
+
+  chalk@4.1.2:
+    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
+    engines: {node: '>=10'}
+
+  chalk@5.3.0:
+    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
+    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
+
+  chardet@0.7.0:
+    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
+
+  chokidar@3.6.0:
+    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
+    engines: {node: '>= 8.10.0'}
+
+  chokidar@4.0.1:
+    resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==}
+    engines: {node: '>= 14.16.0'}
+
+  class-utils@0.3.6:
+    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
+    engines: {node: '>=0.10.0'}
+
+  cli-cursor@3.1.0:
+    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
+    engines: {node: '>=8'}
+
+  cli-cursor@5.0.0:
+    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
+    engines: {node: '>=18'}
+
+  cli-spinners@2.9.2:
+    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
+    engines: {node: '>=6'}
+
+  cli-truncate@4.0.0:
+    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
+    engines: {node: '>=18'}
+
+  cli-width@3.0.0:
+    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
+    engines: {node: '>= 10'}
+
+  cliui@8.0.1:
+    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
+    engines: {node: '>=12'}
+
+  clone@1.0.4:
+    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
+    engines: {node: '>=0.8'}
+
+  clone@2.1.2:
+    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
+    engines: {node: '>=0.8'}
+
+  co-body@6.2.0:
+    resolution: {integrity: sha512-Kbpv2Yd1NdL1V/V4cwLVxraHDV6K8ayohr2rmH0J87Er8+zJjcTa6dAn9QMPC9CRgU8+aNajKbSf1TzDB1yKPA==}
+    engines: {node: '>=8.0.0'}
+
+  codemirror-editor-vue3@2.8.0:
+    resolution: {integrity: sha512-ebYGNhBpLmQNLguXzNyMMkn6K8v3lcS5/Ncvdn6YS4bLGEHE67MfsJIS/WV0L7I6WavUuFlY/Rs/AJKChIwSwg==}
+    peerDependencies:
+      codemirror: ^5
+      diff-match-patch: ^1.0.5
+      vue: ^3.x
+
+  codemirror@5.65.18:
+    resolution: {integrity: sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==}
+
+  collection-visit@1.0.0:
+    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
+    engines: {node: '>=0.10.0'}
+
+  color-convert@1.9.3:
+    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+
+  color-convert@2.0.1:
+    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
+    engines: {node: '>=7.0.0'}
+
+  color-name@1.1.3:
+    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
+
+  color-name@1.1.4:
+    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
+
+  colord@2.9.3:
+    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
+
+  colorette@2.0.20:
+    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
+
+  combined-stream@1.0.8:
+    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
+    engines: {node: '>= 0.8'}
+
+  commander@12.1.0:
+    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
+    engines: {node: '>=18'}
+
+  commander@2.20.3:
+    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
+
+  commander@7.2.0:
+    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
+    engines: {node: '>= 10'}
+
+  commitizen@4.3.1:
+    resolution: {integrity: sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==}
+    engines: {node: '>= 12'}
+    hasBin: true
+
+  compare-func@2.0.0:
+    resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
+
+  component-emitter@1.3.1:
+    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
+
+  compress-commons@4.1.2:
+    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
+    engines: {node: '>= 10'}
+
+  compute-scroll-into-view@1.0.20:
+    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
+
+  concat-map@0.0.1:
+    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+
+  confbox@0.1.8:
+    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
+
+  consola@3.2.3:
+    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
+    engines: {node: ^14.18.0 || >=16.10.0}
+
+  conventional-changelog-angular@7.0.0:
+    resolution: {integrity: sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==}
+    engines: {node: '>=16'}
+
+  conventional-changelog-conventionalcommits@7.0.2:
+    resolution: {integrity: sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==}
+    engines: {node: '>=16'}
+
+  conventional-commit-types@3.0.0:
+    resolution: {integrity: sha512-SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg==}
+
+  conventional-commits-parser@5.0.0:
+    resolution: {integrity: sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  cookies@0.9.1:
+    resolution: {integrity: sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==}
+    engines: {node: '>= 0.8'}
+
+  copy-descriptor@0.1.1:
+    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
+    engines: {node: '>=0.10.0'}
+
+  core-util-is@1.0.3:
+    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
+
+  cors@2.8.5:
+    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
+    engines: {node: '>= 0.10'}
+
+  cosmiconfig-typescript-loader@5.1.0:
+    resolution: {integrity: sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==}
+    engines: {node: '>=v16'}
+    peerDependencies:
+      '@types/node': '*'
+      cosmiconfig: '>=8.2'
+      typescript: '>=4'
+
+  cosmiconfig@9.0.0:
+    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      typescript: '>=4.9.5'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  crc-32@1.2.2:
+    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
+    engines: {node: '>=0.8'}
+    hasBin: true
+
+  crc32-stream@4.0.3:
+    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
+    engines: {node: '>= 10'}
+
+  cropperjs@1.6.2:
+    resolution: {integrity: sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA==}
+
+  cross-spawn@7.0.5:
+    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
+    engines: {node: '>= 8'}
+
+  css-functions-list@3.2.3:
+    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
+    engines: {node: '>=12 || >=16'}
+
+  css-select@4.3.0:
+    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+
+  css-tree@1.1.3:
+    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
+    engines: {node: '>=8.0.0'}
+
+  css-tree@3.0.1:
+    resolution: {integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==}
+    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+
+  css-what@6.1.0:
+    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
+    engines: {node: '>= 6'}
+
+  cssesc@3.0.0:
+    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
+    engines: {node: '>=4'}
+    hasBin: true
+
+  csso@4.2.0:
+    resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==}
+    engines: {node: '>=8.0.0'}
+
+  csstype@3.1.3:
+    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+
+  cz-conventional-changelog@3.3.0:
+    resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==}
+    engines: {node: '>= 10'}
+
+  cz-git@1.9.4:
+    resolution: {integrity: sha512-VntWcIEFfW8+7RgwYaRn1r10NhUkl8/8ZdJQRupEdqE7QXBCSjNP8hKSk9zhSLzYAsdXfGEAwiAYJM1T2Qsh8w==}
+    engines: {node: '>=v12.20.0'}
+
+  d@1.0.2:
+    resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==}
+    engines: {node: '>=0.12'}
+
+  dargs@8.1.0:
+    resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
+    engines: {node: '>=12'}
+
+  data-view-buffer@1.0.1:
+    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-length@1.0.1:
+    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
+    engines: {node: '>= 0.4'}
+
+  data-view-byte-offset@1.0.0:
+    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
+    engines: {node: '>= 0.4'}
+
+  dayjs@1.11.13:
+    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
+
+  de-indent@1.0.2:
+    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
+
+  debug@2.6.9:
+    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  debug@4.3.7:
+    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
+    engines: {node: '>=6.0'}
+    peerDependencies:
+      supports-color: '*'
+    peerDependenciesMeta:
+      supports-color:
+        optional: true
+
+  decode-uri-component@0.2.2:
+    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
+    engines: {node: '>=0.10'}
+
+  dedent@0.7.0:
+    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
+
+  deep-is@0.1.4:
+    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
+
+  defaults@1.0.4:
+    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+
+  define-data-property@1.1.4:
+    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
+    engines: {node: '>= 0.4'}
+
+  define-properties@1.2.1:
+    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
+    engines: {node: '>= 0.4'}
+
+  define-property@0.2.5:
+    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@1.0.0:
+    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
+    engines: {node: '>=0.10.0'}
+
+  define-property@2.0.2:
+    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
+    engines: {node: '>=0.10.0'}
+
+  defu@6.1.4:
+    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
+
+  delayed-stream@1.0.0:
+    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
+    engines: {node: '>=0.4.0'}
+
+  depd@2.0.0:
+    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
+    engines: {node: '>= 0.8'}
+
+  destr@2.0.3:
+    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
+
+  detect-file@1.0.0:
+    resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
+    engines: {node: '>=0.10.0'}
+
+  detect-indent@6.1.0:
+    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
+    engines: {node: '>=8'}
+
+  detect-libc@1.0.3:
+    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  dezalgo@1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+
+  diff-match-patch@1.0.5:
+    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
+
+  dir-glob@3.0.1:
+    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
+    engines: {node: '>=8'}
+
+  dom-serializer@0.2.2:
+    resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
+
+  dom-serializer@1.4.1:
+    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+
+  dom-serializer@2.0.0:
+    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+
+  dom7@3.0.0:
+    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+
+  domelementtype@1.3.1:
+    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
+
+  domelementtype@2.3.0:
+    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
+
+  domhandler@2.4.2:
+    resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
+
+  domhandler@4.3.1:
+    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
+    engines: {node: '>= 4'}
+
+  domhandler@5.0.3:
+    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
+    engines: {node: '>= 4'}
+
+  domutils@1.7.0:
+    resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
+
+  domutils@2.8.0:
+    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+
+  domutils@3.1.0:
+    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+
+  dot-prop@5.3.0:
+    resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
+    engines: {node: '>=8'}
+
+  duplexer2@0.1.4:
+    resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
+
+  duplexer@0.1.2:
+    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
+
+  echarts@5.5.1:
+    resolution: {integrity: sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==}
+
+  electron-to-chromium@1.5.56:
+    resolution: {integrity: sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==}
+
+  element-plus@2.8.7:
+    resolution: {integrity: sha512-oGQyFRufFOgjd872tZc+T4xQAYLlX4hj6d3ixeY13L4fFNUuc1N49JHAqJGPda0tdx3qCnjceZoh1kqqj2+tXQ==}
+    peerDependencies:
+      vue: ^3.2.0
+
+  emoji-regex@10.4.0:
+    resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
+
+  emoji-regex@8.0.0:
+    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
+
+  emojis-list@3.0.0:
+    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
+    engines: {node: '>= 4'}
+
+  end-of-stream@1.4.4:
+    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+
+  entities@1.1.2:
+    resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
+
+  entities@2.2.0:
+    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
+
+  entities@4.5.0:
+    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
+    engines: {node: '>=0.12'}
+
+  env-paths@2.2.1:
+    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
+    engines: {node: '>=6'}
+
+  environment@1.1.0:
+    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
+    engines: {node: '>=18'}
+
+  error-ex@1.3.2:
+    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+
+  es-abstract@1.23.3:
+    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
+    engines: {node: '>= 0.4'}
+
+  es-define-property@1.0.0:
+    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
+    engines: {node: '>= 0.4'}
+
+  es-errors@1.3.0:
+    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
+    engines: {node: '>= 0.4'}
+
+  es-object-atoms@1.0.0:
+    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
+    engines: {node: '>= 0.4'}
+
+  es-set-tostringtag@2.0.3:
+    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
+    engines: {node: '>= 0.4'}
+
+  es-to-primitive@1.2.1:
+    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
+    engines: {node: '>= 0.4'}
+
+  es5-ext@0.10.64:
+    resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==}
+    engines: {node: '>=0.10'}
+
+  es6-iterator@2.0.3:
+    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+
+  es6-symbol@3.1.4:
+    resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==}
+    engines: {node: '>=0.12'}
+
+  esbuild@0.21.5:
+    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
+    engines: {node: '>=12'}
+    hasBin: true
+
+  esbuild@0.23.1:
+    resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  escalade@3.2.0:
+    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
+    engines: {node: '>=6'}
+
+  escape-html@1.0.3:
+    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
+
+  escape-string-regexp@1.0.5:
+    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
+    engines: {node: '>=0.8.0'}
+
+  escape-string-regexp@4.0.0:
+    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
+    engines: {node: '>=10'}
+
+  escape-string-regexp@5.0.0:
+    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
+    engines: {node: '>=12'}
+
+  eslint-config-prettier@9.1.0:
+    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
+    hasBin: true
+    peerDependencies:
+      eslint: '>=7.0.0'
+
+  eslint-plugin-prettier@5.2.1:
+    resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+    peerDependencies:
+      '@types/eslint': '>=8.0.0'
+      eslint: '>=8.0.0'
+      eslint-config-prettier: '*'
+      prettier: '>=3.0.0'
+    peerDependenciesMeta:
+      '@types/eslint':
+        optional: true
+      eslint-config-prettier:
+        optional: true
+
+  eslint-plugin-vue@9.31.0:
+    resolution: {integrity: sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+
+  eslint-scope@7.2.2:
+    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-scope@8.2.0:
+    resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint-visitor-keys@3.4.3:
+    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  eslint-visitor-keys@4.2.0:
+    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  eslint@9.14.0:
+    resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    hasBin: true
+    peerDependencies:
+      jiti: '*'
+    peerDependenciesMeta:
+      jiti:
+        optional: true
+
+  esniff@2.0.1:
+    resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==}
+    engines: {node: '>=0.10'}
+
+  espree@10.3.0:
+    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
+  espree@9.6.1:
+    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
+    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+
+  esquery@1.6.0:
+    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
+    engines: {node: '>=0.10'}
+
+  esrecurse@4.3.0:
+    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
+    engines: {node: '>=4.0'}
+
+  estraverse@5.3.0:
+    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
+    engines: {node: '>=4.0'}
+
+  estree-walker@2.0.2:
+    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+
+  estree-walker@3.0.3:
+    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+
+  esutils@2.0.3:
+    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
+    engines: {node: '>=0.10.0'}
+
+  etag@1.8.1:
+    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
+    engines: {node: '>= 0.6'}
+
+  event-emitter@0.3.5:
+    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+
+  eventemitter3@5.0.1:
+    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
+
+  exceljs@4.4.0:
+    resolution: {integrity: sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==}
+    engines: {node: '>=8.3.0'}
+
+  execa@8.0.1:
+    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
+    engines: {node: '>=16.17'}
+
+  expand-brackets@2.1.4:
+    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
+    engines: {node: '>=0.10.0'}
+
+  expand-tilde@2.0.2:
+    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
+    engines: {node: '>=0.10.0'}
+
+  ext@1.7.0:
+    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+
+  extend-shallow@2.0.1:
+    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
+    engines: {node: '>=0.10.0'}
+
+  extend-shallow@3.0.2:
+    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
+    engines: {node: '>=0.10.0'}
+
+  external-editor@3.1.0:
+    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
+    engines: {node: '>=4'}
+
+  extglob@2.0.4:
+    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
+    engines: {node: '>=0.10.0'}
+
+  fast-csv@4.3.6:
+    resolution: {integrity: sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==}
+    engines: {node: '>=10.0.0'}
+
+  fast-deep-equal@3.1.3:
+    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
+
+  fast-diff@1.3.0:
+    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
+
+  fast-glob@3.3.2:
+    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
+    engines: {node: '>=8.6.0'}
+
+  fast-json-stable-stringify@2.1.0:
+    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
+
+  fast-levenshtein@2.0.6:
+    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
+
+  fast-uri@3.0.3:
+    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
+
+  fastest-levenshtein@1.0.16:
+    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
+    engines: {node: '>= 4.9.1'}
+
+  fastq@1.17.1:
+    resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
+
+  fdir@6.4.2:
+    resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
+    peerDependencies:
+      picomatch: ^3 || ^4
+    peerDependenciesMeta:
+      picomatch:
+        optional: true
+
+  figures@3.2.0:
+    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
+    engines: {node: '>=8'}
+
+  file-entry-cache@8.0.0:
+    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
+    engines: {node: '>=16.0.0'}
+
+  file-entry-cache@9.1.0:
+    resolution: {integrity: sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==}
+    engines: {node: '>=18'}
+
+  fill-range@4.0.0:
+    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
+    engines: {node: '>=0.10.0'}
+
+  fill-range@7.1.1:
+    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
+    engines: {node: '>=8'}
+
+  find-node-modules@2.1.3:
+    resolution: {integrity: sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==}
+
+  find-root@1.1.0:
+    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
+
+  find-up@5.0.0:
+    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
+    engines: {node: '>=10'}
+
+  find-up@7.0.0:
+    resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}
+    engines: {node: '>=18'}
+
+  findup-sync@4.0.0:
+    resolution: {integrity: sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==}
+    engines: {node: '>= 8'}
+
+  flat-cache@4.0.1:
+    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
+    engines: {node: '>=16'}
+
+  flat-cache@5.0.0:
+    resolution: {integrity: sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==}
+    engines: {node: '>=18'}
+
+  flatted@3.3.1:
+    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
+
+  follow-redirects@1.15.9:
+    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
+    engines: {node: '>=4.0'}
+    peerDependencies:
+      debug: '*'
+    peerDependenciesMeta:
+      debug:
+        optional: true
+
+  for-each@0.3.3:
+    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+
+  for-in@1.0.2:
+    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
+    engines: {node: '>=0.10.0'}
+
+  form-data@4.0.1:
+    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
+    engines: {node: '>= 6'}
+
+  formidable@2.1.2:
+    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
+
+  fraction.js@4.3.7:
+    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
+
+  fragment-cache@0.2.1:
+    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
+    engines: {node: '>=0.10.0'}
+
+  fs-constants@1.0.0:
+    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
+
+  fs-extra@10.1.0:
+    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
+    engines: {node: '>=12'}
+
+  fs-extra@9.1.0:
+    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
+    engines: {node: '>=10'}
+
+  fs.realpath@1.0.0:
+    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+
+  fsevents@2.3.3:
+    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
+    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
+    os: [darwin]
+
+  fstream@1.0.12:
+    resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==}
+    engines: {node: '>=0.6'}
+    deprecated: This package is no longer supported.
+
+  function-bind@1.1.2:
+    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+
+  function.prototype.name@1.1.6:
+    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
+    engines: {node: '>= 0.4'}
+
+  functions-have-names@1.2.3:
+    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
+
+  get-caller-file@2.0.5:
+    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
+    engines: {node: 6.* || 8.* || >= 10.*}
+
+  get-east-asian-width@1.3.0:
+    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
+    engines: {node: '>=18'}
+
+  get-intrinsic@1.2.4:
+    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
+    engines: {node: '>= 0.4'}
+
+  get-stream@8.0.1:
+    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
+    engines: {node: '>=16'}
+
+  get-symbol-description@1.0.2:
+    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
+    engines: {node: '>= 0.4'}
+
+  get-tsconfig@4.8.1:
+    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+
+  get-value@2.0.6:
+    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
+    engines: {node: '>=0.10.0'}
+
+  git-raw-commits@4.0.0:
+    resolution: {integrity: sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==}
+    engines: {node: '>=16'}
+    hasBin: true
+
+  glob-parent@5.1.2:
+    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
+    engines: {node: '>= 6'}
+
+  glob-parent@6.0.2:
+    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
+    engines: {node: '>=10.13.0'}
+
+  glob@7.2.3:
+    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
+    deprecated: Glob versions prior to v9 are no longer supported
+
+  global-directory@4.0.1:
+    resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
+    engines: {node: '>=18'}
+
+  global-modules@1.0.0:
+    resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
+    engines: {node: '>=0.10.0'}
+
+  global-modules@2.0.0:
+    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
+    engines: {node: '>=6'}
+
+  global-prefix@1.0.2:
+    resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
+    engines: {node: '>=0.10.0'}
+
+  global-prefix@3.0.0:
+    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
+    engines: {node: '>=6'}
+
+  globals@13.24.0:
+    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
+    engines: {node: '>=8'}
+
+  globals@14.0.0:
+    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
+    engines: {node: '>=18'}
+
+  globals@15.12.0:
+    resolution: {integrity: sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==}
+    engines: {node: '>=18'}
+
+  globalthis@1.0.4:
+    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
+    engines: {node: '>= 0.4'}
+
+  globby@11.1.0:
+    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
+    engines: {node: '>=10'}
+
+  globjoin@0.1.4:
+    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
+
+  gopd@1.0.1:
+    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+
+  graceful-fs@4.2.11:
+    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+
+  graphemer@1.4.0:
+    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
+
+  gzip-size@6.0.0:
+    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
+    engines: {node: '>=10'}
+
+  has-ansi@2.0.0:
+    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
+    engines: {node: '>=0.10.0'}
+
+  has-bigints@1.0.2:
+    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
+
+  has-flag@1.0.0:
+    resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==}
+    engines: {node: '>=0.10.0'}
+
+  has-flag@3.0.0:
+    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
+    engines: {node: '>=4'}
+
+  has-flag@4.0.0:
+    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
+    engines: {node: '>=8'}
+
+  has-property-descriptors@1.0.2:
+    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+
+  has-proto@1.0.3:
+    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
+    engines: {node: '>= 0.4'}
+
+  has-symbols@1.0.3:
+    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
+    engines: {node: '>= 0.4'}
+
+  has-tostringtag@1.0.2:
+    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
+    engines: {node: '>= 0.4'}
+
+  has-value@0.3.1:
+    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
+    engines: {node: '>=0.10.0'}
+
+  has-value@1.0.0:
+    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@0.1.4:
+    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
+    engines: {node: '>=0.10.0'}
+
+  has-values@1.0.0:
+    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
+    engines: {node: '>=0.10.0'}
+
+  hasown@2.0.2:
+    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
+    engines: {node: '>= 0.4'}
+
+  he@1.2.0:
+    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
+    hasBin: true
+
+  hexoid@1.0.0:
+    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
+    engines: {node: '>=8'}
+
+  homedir-polyfill@1.0.3:
+    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
+    engines: {node: '>=0.10.0'}
+
+  html-tags@3.3.1:
+    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
+    engines: {node: '>=8'}
+
+  html-void-elements@2.0.1:
+    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
+
+  htmlparser2@3.10.1:
+    resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
+
+  htmlparser2@8.0.2:
+    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
+
+  http-errors@2.0.0:
+    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
+    engines: {node: '>= 0.8'}
+
+  http-status@1.8.1:
+    resolution: {integrity: sha512-YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==}
+    engines: {node: '>= 0.4.0'}
+
+  human-signals@5.0.0:
+    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
+    engines: {node: '>=16.17.0'}
+
+  husky@9.1.6:
+    resolution: {integrity: sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==}
+    engines: {node: '>=18'}
+    hasBin: true
+
+  i18next@20.6.1:
+    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+
+  iconv-lite@0.4.24:
+    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
+    engines: {node: '>=0.10.0'}
+
+  ieee754@1.2.1:
+    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+
+  ignore@5.3.2:
+    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
+    engines: {node: '>= 4'}
+
+  ignore@6.0.2:
+    resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
+    engines: {node: '>= 4'}
+
+  image-size@0.5.5:
+    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
+    engines: {node: '>=0.10.0'}
+    hasBin: true
+
+  immediate@3.0.6:
+    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
+
+  immer@9.0.21:
+    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
+
+  immutable@4.3.7:
+    resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==}
+
+  import-fresh@3.3.0:
+    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
+    engines: {node: '>=6'}
+
+  import-meta-resolve@4.1.0:
+    resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==}
+
+  importx@0.4.4:
+    resolution: {integrity: sha512-Lo1pukzAREqrBnnHC+tj+lreMTAvyxtkKsMxLY8H15M/bvLl54p3YuoTI70Tz7Il0AsgSlD7Lrk/FaApRcBL7w==}
+
+  imurmurhash@0.1.4:
+    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
+    engines: {node: '>=0.8.19'}
+
+  inflation@2.1.0:
+    resolution: {integrity: sha512-t54PPJHG1Pp7VQvxyVCJ9mBbjG3Hqryges9bXoOO6GExCPa+//i/d5GSuFtpx3ALLd7lgIAur6zrIlBQyJuMlQ==}
+    engines: {node: '>= 0.8.0'}
+
+  inflight@1.0.6:
+    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
+    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+
+  inherits@2.0.4:
+    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+
+  ini@1.3.8:
+    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
+
+  ini@4.1.1:
+    resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  inquirer@8.2.5:
+    resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
+    engines: {node: '>=12.0.0'}
+
+  internal-slot@1.0.7:
+    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
+    engines: {node: '>= 0.4'}
+
+  is-accessor-descriptor@1.0.1:
+    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
+    engines: {node: '>= 0.10'}
+
+  is-array-buffer@3.0.4:
+    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
+    engines: {node: '>= 0.4'}
+
+  is-arrayish@0.2.1:
+    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
+
+  is-bigint@1.0.4:
+    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+
+  is-binary-path@2.1.0:
+    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
+    engines: {node: '>=8'}
+
+  is-boolean-object@1.1.2:
+    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
+    engines: {node: '>= 0.4'}
+
+  is-buffer@1.1.6:
+    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
+
+  is-callable@1.2.7:
+    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
+    engines: {node: '>= 0.4'}
+
+  is-core-module@2.15.1:
+    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
+    engines: {node: '>= 0.4'}
+
+  is-data-descriptor@1.0.1:
+    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
+    engines: {node: '>= 0.4'}
+
+  is-data-view@1.0.1:
+    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
+    engines: {node: '>= 0.4'}
+
+  is-date-object@1.0.5:
+    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@0.1.7:
+    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
+    engines: {node: '>= 0.4'}
+
+  is-descriptor@1.0.3:
+    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
+    engines: {node: '>= 0.4'}
+
+  is-extendable@0.1.1:
+    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
+    engines: {node: '>=0.10.0'}
+
+  is-extendable@1.0.1:
+    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
+    engines: {node: '>=0.10.0'}
+
+  is-extglob@2.1.1:
+    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
+    engines: {node: '>=0.10.0'}
+
+  is-fullwidth-code-point@3.0.0:
+    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
+    engines: {node: '>=8'}
+
+  is-fullwidth-code-point@4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+
+  is-fullwidth-code-point@5.0.0:
+    resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
+    engines: {node: '>=18'}
+
+  is-glob@4.0.3:
+    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
+    engines: {node: '>=0.10.0'}
+
+  is-hotkey@0.2.0:
+    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
+
+  is-interactive@1.0.0:
+    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
+    engines: {node: '>=8'}
+
+  is-negative-zero@2.0.3:
+    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
+    engines: {node: '>= 0.4'}
+
+  is-number-object@1.0.7:
+    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
+    engines: {node: '>= 0.4'}
+
+  is-number@3.0.0:
+    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
+    engines: {node: '>=0.10.0'}
+
+  is-number@7.0.0:
+    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
+    engines: {node: '>=0.12.0'}
+
+  is-obj@2.0.0:
+    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
+    engines: {node: '>=8'}
+
+  is-plain-obj@1.1.0:
+    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-object@2.0.4:
+    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
+    engines: {node: '>=0.10.0'}
+
+  is-plain-object@5.0.0:
+    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
+    engines: {node: '>=0.10.0'}
+
+  is-regex@1.1.4:
+    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
+    engines: {node: '>= 0.4'}
+
+  is-shared-array-buffer@1.0.3:
+    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
+    engines: {node: '>= 0.4'}
+
+  is-stream@3.0.0:
+    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  is-string@1.0.7:
+    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
+    engines: {node: '>= 0.4'}
+
+  is-symbol@1.0.4:
+    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
+    engines: {node: '>= 0.4'}
+
+  is-text-path@2.0.0:
+    resolution: {integrity: sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==}
+    engines: {node: '>=8'}
+
+  is-typed-array@1.1.13:
+    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
+    engines: {node: '>= 0.4'}
+
+  is-unicode-supported@0.1.0:
+    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
+    engines: {node: '>=10'}
+
+  is-url@1.2.4:
+    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
+
+  is-utf8@0.2.1:
+    resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
+
+  is-weakref@1.0.2:
+    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+
+  is-windows@1.0.2:
+    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
+    engines: {node: '>=0.10.0'}
+
+  isarray@1.0.0:
+    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+
+  isarray@2.0.5:
+    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
+
+  isexe@2.0.0:
+    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
+
+  isobject@2.1.0:
+    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
+    engines: {node: '>=0.10.0'}
+
+  isobject@3.0.1:
+    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
+    engines: {node: '>=0.10.0'}
+
+  jiti@1.21.6:
+    resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
+    hasBin: true
+
+  jiti@2.0.0-beta.3:
+    resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==}
+    hasBin: true
+
+  js-base64@2.6.4:
+    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
+
+  js-tokens@4.0.0:
+    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
+
+  js-tokens@9.0.0:
+    resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}
+
+  js-yaml@4.1.0:
+    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
+    hasBin: true
+
+  json-buffer@3.0.1:
+    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
+
+  json-parse-even-better-errors@2.3.1:
+    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
+
+  json-schema-traverse@0.4.1:
+    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
+
+  json-schema-traverse@1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+
+  json-stable-stringify-without-jsonify@1.0.1:
+    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
+
+  json5@1.0.2:
+    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
+    hasBin: true
+
+  json5@2.2.3:
+    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
+    engines: {node: '>=6'}
+    hasBin: true
+
+  jsonfile@6.1.0:
+    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+
+  jsonparse@1.3.1:
+    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
+    engines: {'0': node >= 0.2.0}
+
+  jszip@3.10.1:
+    resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
+
+  keygrip@1.1.0:
+    resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
+    engines: {node: '>= 0.6'}
+
+  keyv@4.5.4:
+    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+
+  kind-of@3.2.2:
+    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@4.0.0:
+    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@5.1.0:
+    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
+    engines: {node: '>=0.10.0'}
+
+  kind-of@6.0.3:
+    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
+    engines: {node: '>=0.10.0'}
+
+  known-css-properties@0.34.0:
+    resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
+
+  known-css-properties@0.35.0:
+    resolution: {integrity: sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==}
+
+  kolorist@1.8.0:
+    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
+
+  lazystream@1.0.1:
+    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
+    engines: {node: '>= 0.6.3'}
+
+  levn@0.4.1:
+    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
+    engines: {node: '>= 0.8.0'}
+
+  lie@3.3.0:
+    resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
+
+  lilconfig@3.1.2:
+    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
+    engines: {node: '>=14'}
+
+  lines-and-columns@1.2.4:
+    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
+
+  lint-staged@15.2.10:
+    resolution: {integrity: sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==}
+    engines: {node: '>=18.12.0'}
+    hasBin: true
+
+  listenercount@1.0.1:
+    resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
+
+  listr2@8.2.5:
+    resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==}
+    engines: {node: '>=18.0.0'}
+
+  load-tsconfig@0.2.5:
+    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  loader-utils@1.4.2:
+    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
+    engines: {node: '>=4.0.0'}
+
+  local-pkg@0.5.0:
+    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
+    engines: {node: '>=14'}
+
+  locate-path@6.0.0:
+    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
+    engines: {node: '>=10'}
+
+  locate-path@7.2.0:
+    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  lodash-es@4.17.21:
+    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
+
+  lodash-unified@1.0.3:
+    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
+    peerDependencies:
+      '@types/lodash-es': '*'
+      lodash: '*'
+      lodash-es: '*'
+
+  lodash.camelcase@4.3.0:
+    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+
+  lodash.clonedeep@4.5.0:
+    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
+
+  lodash.debounce@4.0.8:
+    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+
+  lodash.defaults@4.2.0:
+    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
+
+  lodash.difference@4.5.0:
+    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
+
+  lodash.escaperegexp@4.1.2:
+    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
+
+  lodash.flatten@4.4.0:
+    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
+
+  lodash.foreach@4.5.0:
+    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
+
+  lodash.groupby@4.6.0:
+    resolution: {integrity: sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==}
+
+  lodash.isboolean@3.0.3:
+    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
+
+  lodash.isequal@4.5.0:
+    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
+
+  lodash.isfunction@3.0.9:
+    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
+
+  lodash.isnil@4.0.0:
+    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
+
+  lodash.isplainobject@4.0.6:
+    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+
+  lodash.isundefined@3.0.1:
+    resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==}
+
+  lodash.kebabcase@4.1.1:
+    resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}
+
+  lodash.map@4.6.0:
+    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
+
+  lodash.merge@4.6.2:
+    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
+
+  lodash.mergewith@4.6.2:
+    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
+
+  lodash.snakecase@4.1.1:
+    resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
+
+  lodash.startcase@4.4.0:
+    resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
+
+  lodash.throttle@4.1.1:
+    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
+
+  lodash.toarray@4.4.0:
+    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
+
+  lodash.truncate@4.4.2:
+    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
+
+  lodash.union@4.6.0:
+    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
+
+  lodash.uniq@4.5.0:
+    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+
+  lodash.upperfirst@4.3.1:
+    resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
+
+  lodash@4.17.21:
+    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+
+  log-symbols@4.1.0:
+    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
+    engines: {node: '>=10'}
+
+  log-update@6.1.0:
+    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
+    engines: {node: '>=18'}
+
+  longest@2.0.1:
+    resolution: {integrity: sha512-Ajzxb8CM6WAnFjgiloPsI3bF+WCxcvhdIG3KNA2KN962+tdBsHcuQ4k4qX/EcS/2CRkcc0iAkR956Nib6aXU/Q==}
+    engines: {node: '>=0.10.0'}
+
+  magic-string@0.30.12:
+    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
+
+  map-cache@0.2.2:
+    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
+    engines: {node: '>=0.10.0'}
+
+  map-visit@1.0.0:
+    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
+    engines: {node: '>=0.10.0'}
+
+  mathml-tag-names@2.1.3:
+    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
+
+  mdn-data@2.0.14:
+    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
+
+  mdn-data@2.12.1:
+    resolution: {integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==}
+
+  mdn-data@2.12.2:
+    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
+
+  media-typer@0.3.0:
+    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
+    engines: {node: '>= 0.6'}
+
+  memoize-one@6.0.0:
+    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
+
+  meow@12.1.1:
+    resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
+    engines: {node: '>=16.10'}
+
+  meow@13.2.0:
+    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
+    engines: {node: '>=18'}
+
+  merge-options@1.0.1:
+    resolution: {integrity: sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==}
+    engines: {node: '>=4'}
+
+  merge-stream@2.0.0:
+    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
+
+  merge2@1.4.1:
+    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
+    engines: {node: '>= 8'}
+
+  merge@2.1.1:
+    resolution: {integrity: sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==}
+
+  micromatch@3.1.0:
+    resolution: {integrity: sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==}
+    engines: {node: '>=0.10.0'}
+
+  micromatch@4.0.8:
+    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
+    engines: {node: '>=8.6'}
+
+  mime-db@1.52.0:
+    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
+    engines: {node: '>= 0.6'}
+
+  mime-match@1.0.2:
+    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+
+  mime-types@2.1.35:
+    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
+    engines: {node: '>= 0.6'}
+
+  mime@3.0.0:
+    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
+    engines: {node: '>=10.0.0'}
+    hasBin: true
+
+  mimic-fn@2.1.0:
+    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
+    engines: {node: '>=6'}
+
+  mimic-fn@4.0.0:
+    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
+    engines: {node: '>=12'}
+
+  mimic-function@5.0.1:
+    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
+    engines: {node: '>=18'}
+
+  minimatch@3.1.2:
+    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+
+  minimatch@5.1.6:
+    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
+    engines: {node: '>=10'}
+
+  minimatch@9.0.5:
+    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
+  minimist@1.2.7:
+    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
+
+  minimist@1.2.8:
+    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+
+  mixin-deep@1.3.2:
+    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
+    engines: {node: '>=0.10.0'}
+
+  mkdirp@0.5.6:
+    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
+    hasBin: true
+
+  mlly@1.7.2:
+    resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
+
+  mrmime@2.0.0:
+    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
+    engines: {node: '>=10'}
+
+  ms@2.0.0:
+    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
+
+  ms@2.1.3:
+    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
+
+  muggle-string@0.4.1:
+    resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
+
+  mute-stream@0.0.8:
+    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
+
+  namespace-emitter@2.0.1:
+    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
+
+  nanoid@3.3.7:
+    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
+    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
+    hasBin: true
+
+  nanomatch@1.2.13:
+    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
+    engines: {node: '>=0.10.0'}
+
+  natural-compare@1.4.0:
+    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
+
+  next-tick@1.1.0:
+    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
+
+  node-addon-api@7.1.1:
+    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
+
+  node-fetch-native@1.6.4:
+    resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
+
+  node-releases@2.0.18:
+    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
+
+  normalize-path@3.0.0:
+    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-range@0.1.2:
+    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
+    engines: {node: '>=0.10.0'}
+
+  normalize-wheel-es@1.2.0:
+    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
+
+  npm-run-path@5.3.0:
+    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  nprogress@0.2.0:
+    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==}
+
+  nth-check@2.1.1:
+    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+
+  object-assign@4.1.1:
+    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
+    engines: {node: '>=0.10.0'}
+
+  object-copy@0.1.0:
+    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
+    engines: {node: '>=0.10.0'}
+
+  object-inspect@1.13.3:
+    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
+    engines: {node: '>= 0.4'}
+
+  object-keys@1.1.1:
+    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
+    engines: {node: '>= 0.4'}
+
+  object-visit@1.0.1:
+    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
+    engines: {node: '>=0.10.0'}
+
+  object.assign@4.1.5:
+    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
+    engines: {node: '>= 0.4'}
+
+  object.pick@1.3.0:
+    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
+    engines: {node: '>=0.10.0'}
+
+  ofetch@1.4.1:
+    resolution: {integrity: sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==}
+
+  once@1.4.0:
+    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+
+  onetime@5.1.2:
+    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
+    engines: {node: '>=6'}
+
+  onetime@6.0.0:
+    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
+    engines: {node: '>=12'}
+
+  onetime@7.0.0:
+    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
+    engines: {node: '>=18'}
+
+  optionator@0.9.4:
+    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
+    engines: {node: '>= 0.8.0'}
+
+  ora@5.4.1:
+    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
+    engines: {node: '>=10'}
+
+  os-tmpdir@1.0.2:
+    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
+    engines: {node: '>=0.10.0'}
+
+  p-limit@3.1.0:
+    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
+    engines: {node: '>=10'}
+
+  p-limit@4.0.0:
+    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  p-locate@5.0.0:
+    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
+    engines: {node: '>=10'}
+
+  p-locate@6.0.0:
+    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  package-manager-detector@0.2.2:
+    resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==}
+
+  pako@1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+
+  parent-module@1.0.1:
+    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
+    engines: {node: '>=6'}
+
+  parse-json@5.2.0:
+    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
+    engines: {node: '>=8'}
+
+  parse-passwd@1.0.0:
+    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
+    engines: {node: '>=0.10.0'}
+
+  pascalcase@0.1.1:
+    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
+    engines: {node: '>=0.10.0'}
+
+  path-browserify@1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+
+  path-exists@4.0.0:
+    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
+    engines: {node: '>=8'}
+
+  path-exists@5.0.0:
+    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+
+  path-is-absolute@1.0.1:
+    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
+    engines: {node: '>=0.10.0'}
+
+  path-key@3.1.1:
+    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
+    engines: {node: '>=8'}
+
+  path-key@4.0.0:
+    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
+    engines: {node: '>=12'}
+
+  path-to-regexp@6.2.2:
+    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
+
+  path-to-regexp@6.3.0:
+    resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
+
+  path-type@4.0.0:
+    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
+    engines: {node: '>=8'}
+
+  pathe@0.2.0:
+    resolution: {integrity: sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==}
+
+  pathe@1.1.2:
+    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
+
+  perfect-debounce@1.0.0:
+    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
+
+  picocolors@1.1.1:
+    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+
+  picomatch@2.3.1:
+    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
+    engines: {node: '>=8.6'}
+
+  picomatch@4.0.2:
+    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
+    engines: {node: '>=12'}
+
+  pidtree@0.6.0:
+    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
+    engines: {node: '>=0.10'}
+    hasBin: true
+
+  pinia@2.2.6:
+    resolution: {integrity: sha512-vIsR8JkDN5Ga2vAxqOE2cJj4VtsHnzpR1Fz30kClxlh0yCHfec6uoMeM3e/ddqmwFUejK3NlrcQa/shnpyT4hA==}
+    peerDependencies:
+      '@vue/composition-api': ^1.4.0
+      typescript: '>=4.4.4'
+      vue: ^2.6.14 || ^3.5.11
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+      typescript:
+        optional: true
+
+  pkg-types@1.2.1:
+    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
+
+  posix-character-classes@0.1.1:
+    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
+    engines: {node: '>=0.10.0'}
+
+  possible-typed-array-names@1.0.0:
+    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
+    engines: {node: '>= 0.4'}
+
+  postcss-html@1.7.0:
+    resolution: {integrity: sha512-MfcMpSUIaR/nNgeVS8AyvyDugXlADjN9AcV7e5rDfrF1wduIAGSkL4q2+wgrZgA3sHVAHLDO9FuauHhZYW2nBw==}
+    engines: {node: ^12 || >=14}
+
+  postcss-media-query-parser@0.2.3:
+    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
+
+  postcss-prefix-selector@1.16.1:
+    resolution: {integrity: sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==}
+    peerDependencies:
+      postcss: '>4 <9'
+
+  postcss-resolve-nested-selector@0.1.6:
+    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
+
+  postcss-safe-parser@6.0.0:
+    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+
+  postcss-safe-parser@7.0.1:
+    resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==}
+    engines: {node: '>=18.0'}
+    peerDependencies:
+      postcss: ^8.4.31
+
+  postcss-scss@4.0.9:
+    resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==}
+    engines: {node: '>=12.0'}
+    peerDependencies:
+      postcss: ^8.4.29
+
+  postcss-selector-parser@6.1.2:
+    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
+    engines: {node: '>=4'}
+
+  postcss-sorting@8.0.2:
+    resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
+    peerDependencies:
+      postcss: ^8.4.20
+
+  postcss-value-parser@4.2.0:
+    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
+
+  postcss@5.2.18:
+    resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
+    engines: {node: '>=0.12'}
+
+  postcss@8.4.49:
+    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
+    engines: {node: ^10 || ^12 || >=14}
+
+  posthtml-parser@0.2.1:
+    resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==}
+
+  posthtml-rename-id@1.0.12:
+    resolution: {integrity: sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==}
+
+  posthtml-render@1.4.0:
+    resolution: {integrity: sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==}
+    engines: {node: '>=10'}
+
+  posthtml-svg-mode@1.0.3:
+    resolution: {integrity: sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==}
+
+  posthtml@0.9.2:
+    resolution: {integrity: sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==}
+    engines: {node: '>=0.10.0'}
+
+  preact@10.24.3:
+    resolution: {integrity: sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==}
+
+  prelude-ls@1.2.1:
+    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
+    engines: {node: '>= 0.8.0'}
+
+  prettier-linter-helpers@1.0.0:
+    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
+    engines: {node: '>=6.0.0'}
+
+  prettier@3.3.3:
+    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
+    engines: {node: '>=14'}
+    hasBin: true
+
+  prismjs@1.29.0:
+    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
+    engines: {node: '>=6'}
+
+  process-nextick-args@2.0.1:
+    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
+
+  proxy-from-env@1.1.0:
+    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
+
+  punycode@2.3.1:
+    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
+    engines: {node: '>=6'}
+
+  qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+    engines: {node: '>=0.6'}
+
+  query-string@4.3.4:
+    resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
+    engines: {node: '>=0.10.0'}
+
+  queue-microtask@1.2.3:
+    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
+
+  raw-body@2.5.2:
+    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
+    engines: {node: '>= 0.8'}
+
+  readable-stream@2.3.8:
+    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+
+  readable-stream@3.6.2:
+    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
+    engines: {node: '>= 6'}
+
+  readdir-glob@1.1.3:
+    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
+
+  readdirp@3.6.0:
+    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
+    engines: {node: '>=8.10.0'}
+
+  readdirp@4.0.2:
+    resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==}
+    engines: {node: '>= 14.16.0'}
+
+  regenerator-runtime@0.14.1:
+    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
+
+  regex-not@1.0.2:
+    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
+    engines: {node: '>=0.10.0'}
+
+  regexp.prototype.flags@1.5.3:
+    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
+    engines: {node: '>= 0.4'}
+
+  repeat-element@1.1.4:
+    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
+    engines: {node: '>=0.10.0'}
+
+  repeat-string@1.6.1:
+    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
+    engines: {node: '>=0.10'}
+
+  require-directory@2.1.1:
+    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
+    engines: {node: '>=0.10.0'}
+
+  require-from-string@2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+
+  resolve-dir@1.0.1:
+    resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
+    engines: {node: '>=0.10.0'}
+
+  resolve-from@4.0.0:
+    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
+    engines: {node: '>=4'}
+
+  resolve-from@5.0.0:
+    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
+    engines: {node: '>=8'}
+
+  resolve-pkg-maps@1.0.0:
+    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
+
+  resolve-url@0.2.1:
+    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
+    deprecated: https://github.com/lydell/resolve-url#deprecated
+
+  restore-cursor@3.1.0:
+    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
+    engines: {node: '>=8'}
+
+  restore-cursor@5.1.0:
+    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
+    engines: {node: '>=18'}
+
+  ret@0.1.15:
+    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
+    engines: {node: '>=0.12'}
+
+  reusify@1.0.4:
+    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
+    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
+
+  rfdc@1.4.1:
+    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
+
+  rimraf@2.7.1:
+    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rollup@4.25.0:
+    resolution: {integrity: sha512-uVbClXmR6wvx5R1M3Od4utyLUxrmOcEm3pAtMphn73Apq19PDtHpgZoEvqH2YnnaNUuvKmg2DgRd2Sqv+odyqg==}
+    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
+    hasBin: true
+
+  run-async@2.4.1:
+    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
+    engines: {node: '>=0.12.0'}
+
+  run-parallel@1.2.0:
+    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+
+  rxjs@7.8.1:
+    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
+
+  safe-array-concat@1.1.2:
+    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
+    engines: {node: '>=0.4'}
+
+  safe-buffer@5.1.2:
+    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
+
+  safe-buffer@5.2.1:
+    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+
+  safe-regex-test@1.0.3:
+    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
+    engines: {node: '>= 0.4'}
+
+  safe-regex@1.1.0:
+    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+
+  safer-buffer@2.1.2:
+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
+
+  sass@1.80.6:
+    resolution: {integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==}
+    engines: {node: '>=14.0.0'}
+    hasBin: true
+
+  saxes@5.0.1:
+    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
+    engines: {node: '>=10'}
+
+  scroll-into-view-if-needed@2.2.31:
+    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+
+  scule@1.3.0:
+    resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}
+
+  semver@7.6.3:
+    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  set-function-length@1.2.2:
+    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
+    engines: {node: '>= 0.4'}
+
+  set-function-name@2.0.2:
+    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
+    engines: {node: '>= 0.4'}
+
+  set-value@2.0.1:
+    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
+    engines: {node: '>=0.10.0'}
+
+  setimmediate@1.0.5:
+    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
+
+  setprototypeof@1.2.0:
+    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
+
+  shebang-command@2.0.0:
+    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
+    engines: {node: '>=8'}
+
+  shebang-regex@3.0.0:
+    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
+    engines: {node: '>=8'}
+
+  side-channel@1.0.6:
+    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
+    engines: {node: '>= 0.4'}
+
+  signal-exit@3.0.7:
+    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
+
+  signal-exit@4.1.0:
+    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
+    engines: {node: '>=14'}
+
+  sirv@2.0.4:
+    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
+    engines: {node: '>= 10'}
+
+  slash@3.0.0:
+    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
+    engines: {node: '>=8'}
+
+  slate-history@0.66.0:
+    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
+    peerDependencies:
+      slate: '>=0.65.3'
+
+  slate@0.72.8:
+    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+
+  slice-ansi@4.0.0:
+    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
+    engines: {node: '>=10'}
+
+  slice-ansi@5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+
+  slice-ansi@7.1.0:
+    resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
+    engines: {node: '>=18'}
+
+  snabbdom@3.6.2:
+    resolution: {integrity: sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==}
+    engines: {node: '>=12.17.0'}
+
+  snapdragon-node@2.1.1:
+    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon-util@3.0.1:
+    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
+    engines: {node: '>=0.10.0'}
+
+  snapdragon@0.8.2:
+    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
+    engines: {node: '>=0.10.0'}
+
+  sortablejs@1.15.3:
+    resolution: {integrity: sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==}
+
+  source-map-js@1.2.1:
+    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
+    engines: {node: '>=0.10.0'}
+
+  source-map-resolve@0.5.3:
+    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
+    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+
+  source-map-support@0.5.21:
+    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+
+  source-map-url@0.4.1:
+    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
+    deprecated: See https://github.com/lydell/source-map-url#deprecated
+
+  source-map@0.5.7:
+    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
+    engines: {node: '>=0.10.0'}
+
+  source-map@0.6.1:
+    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
+    engines: {node: '>=0.10.0'}
+
+  split-string@3.1.0:
+    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
+    engines: {node: '>=0.10.0'}
+
+  split2@4.2.0:
+    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
+    engines: {node: '>= 10.x'}
+
+  ssr-window@3.0.0:
+    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
+
+  stable@0.1.8:
+    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
+    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
+
+  static-extend@0.1.2:
+    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
+    engines: {node: '>=0.10.0'}
+
+  statuses@2.0.1:
+    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
+    engines: {node: '>= 0.8'}
+
+  strict-uri-encode@1.1.0:
+    resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
+    engines: {node: '>=0.10.0'}
+
+  string-argv@0.3.2:
+    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
+    engines: {node: '>=0.6.19'}
+
+  string-width@4.2.3:
+    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
+    engines: {node: '>=8'}
+
+  string-width@7.2.0:
+    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
+    engines: {node: '>=18'}
+
+  string.prototype.trim@1.2.9:
+    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
+    engines: {node: '>= 0.4'}
+
+  string.prototype.trimend@1.0.8:
+    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+
+  string.prototype.trimstart@1.0.8:
+    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
+    engines: {node: '>= 0.4'}
+
+  string_decoder@1.1.1:
+    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+
+  string_decoder@1.3.0:
+    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+
+  strip-ansi@3.0.1:
+    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
+    engines: {node: '>=0.10.0'}
+
+  strip-ansi@6.0.1:
+    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
+    engines: {node: '>=8'}
+
+  strip-ansi@7.1.0:
+    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
+    engines: {node: '>=12'}
+
+  strip-bom@4.0.0:
+    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
+    engines: {node: '>=8'}
+
+  strip-final-newline@3.0.0:
+    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
+    engines: {node: '>=12'}
+
+  strip-json-comments@3.1.1:
+    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
+    engines: {node: '>=8'}
+
+  strip-literal@2.1.0:
+    resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}
+
+  stylelint-config-html@1.1.0:
+    resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==}
+    engines: {node: ^12 || >=14}
+    peerDependencies:
+      postcss-html: ^1.0.0
+      stylelint: '>=14.0.0'
+
+  stylelint-config-recess-order@5.1.1:
+    resolution: {integrity: sha512-eDAHWVBelzDbMbdMj15pSw0Ycykv5eLeriJdbGCp0zd44yvhgZLI+wyVHegzXp5NrstxTPSxl0fuOVKdMm0XLA==}
+    peerDependencies:
+      stylelint: '>=16'
+
+  stylelint-config-recommended-scss@14.1.0:
+    resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      postcss: ^8.3.3
+      stylelint: ^16.6.1
+    peerDependenciesMeta:
+      postcss:
+        optional: true
+
+  stylelint-config-recommended-vue@1.5.0:
+    resolution: {integrity: sha512-65TAK/clUqkNtkZLcuytoxU0URQYlml+30Nhop7sRkCZ/mtWdXt7T+spPSB3KMKlb+82aEVJ4OrcstyDBdbosg==}
+    engines: {node: ^12 || >=14}
+    peerDependencies:
+      postcss-html: ^1.0.0
+      stylelint: '>=14.0.0'
+
+  stylelint-config-recommended@14.0.1:
+    resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.1.0
+
+  stylelint-config-standard@36.0.1:
+    resolution: {integrity: sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.1.0
+
+  stylelint-order@6.0.4:
+    resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
+    peerDependencies:
+      stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
+
+  stylelint-scss@6.9.0:
+    resolution: {integrity: sha512-oWOR+g6ccagfrENecImGmorWWjVyWpt2R8bmkhOW8FkNNPGStZPQMqb8QWMW4Lwu9TyPqmyjHkkAsy3weqsnNw==}
+    engines: {node: '>=18.12.0'}
+    peerDependencies:
+      stylelint: ^16.0.2
+
+  stylelint@16.10.0:
+    resolution: {integrity: sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==}
+    engines: {node: '>=18.12.0'}
+    hasBin: true
+
+  supports-color@2.0.0:
+    resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
+    engines: {node: '>=0.8.0'}
+
+  supports-color@3.2.3:
+    resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==}
+    engines: {node: '>=0.8.0'}
+
+  supports-color@5.5.0:
+    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
+    engines: {node: '>=4'}
+
+  supports-color@7.2.0:
+    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
+    engines: {node: '>=8'}
+
+  supports-hyperlinks@3.1.0:
+    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
+    engines: {node: '>=14.18'}
+
+  svg-baker@1.7.0:
+    resolution: {integrity: sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==}
+
+  svg-tags@1.0.0:
+    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
+
+  svgo@2.8.0:
+    resolution: {integrity: sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+
+  synckit@0.9.2:
+    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
+    engines: {node: ^14.18.0 || >=16.0.0}
+
+  table@6.8.2:
+    resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
+    engines: {node: '>=10.0.0'}
+
+  tar-stream@2.2.0:
+    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
+    engines: {node: '>=6'}
+
+  terser@5.36.0:
+    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
+    engines: {node: '>=10'}
+    hasBin: true
+
+  text-extensions@2.4.0:
+    resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
+    engines: {node: '>=8'}
+
+  text-table@0.2.0:
+    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
+
+  through@2.3.8:
+    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
+
+  tiny-warning@1.0.3:
+    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
+
+  tinyexec@0.3.1:
+    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
+
+  tinyglobby@0.2.10:
+    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
+    engines: {node: '>=12.0.0'}
+
+  tmp@0.0.33:
+    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
+    engines: {node: '>=0.6.0'}
+
+  tmp@0.2.3:
+    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
+    engines: {node: '>=14.14'}
+
+  to-object-path@0.3.0:
+    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@2.1.1:
+    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
+    engines: {node: '>=0.10.0'}
+
+  to-regex-range@5.0.1:
+    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
+    engines: {node: '>=8.0'}
+
+  to-regex@3.0.2:
+    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
+    engines: {node: '>=0.10.0'}
+
+  toidentifier@1.0.1:
+    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
+    engines: {node: '>=0.6'}
+
+  totalist@3.0.1:
+    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
+    engines: {node: '>=6'}
+
+  traverse@0.3.9:
+    resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
+
+  traverse@0.6.10:
+    resolution: {integrity: sha512-hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA==}
+    engines: {node: '>= 0.4'}
+
+  ts-api-utils@1.4.0:
+    resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==}
+    engines: {node: '>=16'}
+    peerDependencies:
+      typescript: '>=4.2.0'
+
+  tslib@2.3.0:
+    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
+
+  tslib@2.8.1:
+    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
+
+  tsscmp@1.0.6:
+    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
+    engines: {node: '>=0.6.x'}
+
+  tsx@4.19.2:
+    resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
+    engines: {node: '>=18.0.0'}
+    hasBin: true
+
+  type-check@0.4.0:
+    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
+    engines: {node: '>= 0.8.0'}
+
+  type-fest@0.20.2:
+    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
+    engines: {node: '>=10'}
+
+  type-fest@0.21.3:
+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
+    engines: {node: '>=10'}
+
+  type-is@1.6.18:
+    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
+    engines: {node: '>= 0.6'}
+
+  type@2.7.3:
+    resolution: {integrity: sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==}
+
+  typed-array-buffer@1.0.2:
+    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-length@1.0.1:
+    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-byte-offset@1.0.2:
+    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
+    engines: {node: '>= 0.4'}
+
+  typed-array-length@1.0.6:
+    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
+    engines: {node: '>= 0.4'}
+
+  typedarray.prototype.slice@1.0.3:
+    resolution: {integrity: sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==}
+    engines: {node: '>= 0.4'}
+
+  typescript-eslint@8.14.0:
+    resolution: {integrity: sha512-K8fBJHxVL3kxMmwByvz8hNdBJ8a0YqKzKDX6jRlrjMuNXyd5T2V02HIq37+OiWXvUUOXgOOGiSSOh26Mh8pC3w==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  typescript@5.5.4:
+    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
+    engines: {node: '>=14.17'}
+    hasBin: true
+
+  ufo@1.5.4:
+    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
+
+  unbox-primitive@1.0.2:
+    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+
+  unconfig@0.5.5:
+    resolution: {integrity: sha512-VQZ5PT9HDX+qag0XdgQi8tJepPhXiR/yVOkn707gJDKo31lGjRilPREiQJ9Z6zd/Ugpv6ZvO5VxVIcatldYcNQ==}
+
+  undici-types@6.19.8:
+    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
+
+  unicorn-magic@0.1.0:
+    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
+    engines: {node: '>=18'}
+
+  unimport@3.13.1:
+    resolution: {integrity: sha512-nNrVzcs93yrZQOW77qnyOVHtb68LegvhYFwxFMfuuWScmwQmyVCG/NBuN8tYsaGzgQUVYv34E/af+Cc9u4og4A==}
+
+  union-value@1.0.1:
+    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
+    engines: {node: '>=0.10.0'}
+
+  universalify@2.0.1:
+    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
+    engines: {node: '>= 10.0.0'}
+
+  unocss@0.63.6:
+    resolution: {integrity: sha512-OKJJKEFWVz+Lsf3JdOgRiRtL+QOUQRBov89taUcCPFPZtrhP6pPVFCZHD9qMvY4IChMX7dzalQax3ZXJ3hbtkQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@unocss/webpack': 0.63.6
+      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
+    peerDependenciesMeta:
+      '@unocss/webpack':
+        optional: true
+      vite:
+        optional: true
+
+  unpipe@1.0.0:
+    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
+    engines: {node: '>= 0.8'}
+
+  unplugin-auto-import@0.18.3:
+    resolution: {integrity: sha512-q3FUtGQjYA2e+kb1WumyiQMjHM27MrTQ05QfVwtLRVhyYe+KF6TblBYaEX9L6Z0EibsqaXAiW+RFfkcQpfaXzg==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@nuxt/kit': ^3.2.2
+      '@vueuse/core': '*'
+    peerDependenciesMeta:
+      '@nuxt/kit':
+        optional: true
+      '@vueuse/core':
+        optional: true
+
+  unplugin-vue-components@0.27.4:
+    resolution: {integrity: sha512-1XVl5iXG7P1UrOMnaj2ogYa5YTq8aoh5jwDPQhemwO/OrXW+lPQKDXd1hMz15qxQPxgb/XXlbgo3HQ2rLEbmXQ==}
+    engines: {node: '>=14'}
+    peerDependencies:
+      '@babel/parser': ^7.15.8
+      '@nuxt/kit': ^3.2.2
+      vue: 2 || 3
+    peerDependenciesMeta:
+      '@babel/parser':
+        optional: true
+      '@nuxt/kit':
+        optional: true
+
+  unplugin@1.15.0:
+    resolution: {integrity: sha512-jTPIs63W+DUEDW207ztbaoO7cQ4p5aVaB823LSlxpsFEU3Mykwxf3ZGC/wzxFJeZlASZYgVrWeo7LgOrqJZ8RA==}
+    engines: {node: '>=14.0.0'}
+    peerDependencies:
+      webpack-sources: ^3
+    peerDependenciesMeta:
+      webpack-sources:
+        optional: true
+
+  unset-value@1.0.0:
+    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
+    engines: {node: '>=0.10.0'}
+
+  unzipper@0.10.14:
+    resolution: {integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==}
+
+  update-browserslist-db@1.1.1:
+    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
+    hasBin: true
+    peerDependencies:
+      browserslist: '>= 4.21.0'
+
+  uri-js@4.4.1:
+    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+
+  urix@0.1.0:
+    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
+    deprecated: Please see https://github.com/lydell/urix#deprecated
+
+  use@3.1.1:
+    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
+    engines: {node: '>=0.10.0'}
+
+  util-deprecate@1.0.2:
+    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+
+  uuid@8.3.2:
+    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
+    hasBin: true
+
+  vary@1.1.2:
+    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
+    engines: {node: '>= 0.8'}
+
+  vite-plugin-mock-dev-server@1.8.0:
+    resolution: {integrity: sha512-YAf0MZbBX/RYyr75kcTfjyCV9ybGoJZNN6FS6nMwKswoB/6uVQOcnjPc3bJBTwEsKord3TaYiuXkHk6e12pv6A==}
+    engines: {node: ^18 || >= 20}
+    peerDependencies:
+      esbuild: '>=0.21.0'
+      vite: '>=4.0.0'
+    peerDependenciesMeta:
+      esbuild:
+        optional: true
+
+  vite-plugin-svg-icons@2.0.1:
+    resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
+    peerDependencies:
+      vite: '>=2.0.0'
+
+  vite@5.4.11:
+    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
+    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
+
+  vscode-uri@3.0.8:
+    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
+
+  vue-demi@0.14.10:
+    resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
+    engines: {node: '>=12'}
+    hasBin: true
+    peerDependencies:
+      '@vue/composition-api': ^1.0.0-rc.1
+      vue: ^3.0.0-0 || ^2.6.0
+    peerDependenciesMeta:
+      '@vue/composition-api':
+        optional: true
+
+  vue-eslint-parser@9.4.3:
+    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
+    engines: {node: ^14.17.0 || >=16.0.0}
+    peerDependencies:
+      eslint: '>=6.0.0'
+
+  vue-flow-layout@0.0.5:
+    resolution: {integrity: sha512-lZlqQ/Se1trGMtBMneZDWaiQiQBuxU8ivZ+KpJMem5zKROFpzuPq9KqyWABbSYbxq0qhqZs1I4DBwrY041rtOA==}
+
+  vue-i18n@9.9.1:
+    resolution: {integrity: sha512-xyQ4VspLdNSPTKBFBPWa1tvtj+9HuockZwgFeD2OhxxXuC2CWeNvV4seu2o9+vbQOyQbhAM5Ez56oxUrrnTWdw==}
+    engines: {node: '>= 16'}
+    peerDependencies:
+      vue: ^3.0.0
+
+  vue-picture-cropper@0.7.0:
+    resolution: {integrity: sha512-NF7+Dgso6d0GB16E5d/BbrcTIHm1VWz8dS3IjLhoBl+ZeC+yDA46CyJphQuO32SisaPmrKHN8VbiE2LgAfhnkQ==}
+    peerDependencies:
+      vue: '>=3.2.13'
+
+  vue-router@4.4.5:
+    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
+    peerDependencies:
+      vue: ^3.2.0
+
+  vue-tsc@2.1.10:
+    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
+    hasBin: true
+    peerDependencies:
+      typescript: '>=5.0.0'
+
+  vue@3.5.12:
+    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
+    peerDependencies:
+      typescript: '*'
+    peerDependenciesMeta:
+      typescript:
+        optional: true
+
+  wcwidth@1.0.1:
+    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+
+  webpack-virtual-modules@0.6.2:
+    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
+
+  which-boxed-primitive@1.0.2:
+    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+
+  which-typed-array@1.1.15:
+    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
+    engines: {node: '>= 0.4'}
+
+  which@1.3.1:
+    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
+    hasBin: true
+
+  which@2.0.2:
+    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
+    engines: {node: '>= 8'}
+    hasBin: true
+
+  wildcard@1.1.2:
+    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
+
+  word-wrap@1.2.5:
+    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
+    engines: {node: '>=0.10.0'}
+
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@9.0.0:
+    resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
+    engines: {node: '>=18'}
+
+  wrappy@1.0.2:
+    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+
+  write-file-atomic@5.0.1:
+    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
+    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+
+  ws@8.18.0:
+    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
+    engines: {node: '>=10.0.0'}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: '>=5.0.2'
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+
+  xml-name-validator@4.0.0:
+    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
+    engines: {node: '>=12'}
+
+  xmlchars@2.2.0:
+    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
+
+  y18n@5.0.8:
+    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
+    engines: {node: '>=10'}
+
+  yaml@2.5.1:
+    resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}
+    engines: {node: '>= 14'}
+    hasBin: true
+
+  yargs-parser@21.1.1:
+    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
+    engines: {node: '>=12'}
+
+  yargs@17.7.2:
+    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
+    engines: {node: '>=12'}
+
+  yocto-queue@0.1.0:
+    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
+    engines: {node: '>=10'}
+
+  yocto-queue@1.1.1:
+    resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
+    engines: {node: '>=12.20'}
+
+  zip-stream@4.1.1:
+    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
+    engines: {node: '>= 10'}
+
+  zrender@5.6.0:
+    resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
+
+snapshots:
+
+  '@ampproject/remapping@2.3.0':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@antfu/install-pkg@0.4.1':
+    dependencies:
+      package-manager-detector: 0.2.2
+      tinyexec: 0.3.1
+
+  '@antfu/utils@0.7.10': {}
+
+  '@babel/code-frame@7.26.2':
+    dependencies:
+      '@babel/helper-validator-identifier': 7.25.9
+      js-tokens: 4.0.0
+      picocolors: 1.1.1
+
+  '@babel/helper-string-parser@7.25.9': {}
+
+  '@babel/helper-validator-identifier@7.25.9': {}
+
+  '@babel/parser@7.26.2':
+    dependencies:
+      '@babel/types': 7.26.0
+
+  '@babel/runtime@7.26.0':
+    dependencies:
+      regenerator-runtime: 0.14.1
+
+  '@babel/types@7.26.0':
+    dependencies:
+      '@babel/helper-string-parser': 7.25.9
+      '@babel/helper-validator-identifier': 7.25.9
+
+  '@bassist/utils@0.4.0':
+    dependencies:
+      '@withtypes/mime': 0.1.2
+
+  '@commitlint/cli@19.5.0(@types/node@22.9.0)(typescript@5.5.4)':
+    dependencies:
+      '@commitlint/format': 19.5.0
+      '@commitlint/lint': 19.5.0
+      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
+      '@commitlint/read': 19.5.0
+      '@commitlint/types': 19.5.0
+      tinyexec: 0.3.1
+      yargs: 17.7.2
+    transitivePeerDependencies:
+      - '@types/node'
+      - typescript
+
+  '@commitlint/config-conventional@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      conventional-changelog-conventionalcommits: 7.0.2
+
+  '@commitlint/config-validator@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      ajv: 8.17.1
+
+  '@commitlint/ensure@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      lodash.camelcase: 4.3.0
+      lodash.kebabcase: 4.1.1
+      lodash.snakecase: 4.1.1
+      lodash.startcase: 4.4.0
+      lodash.upperfirst: 4.3.1
+
+  '@commitlint/execute-rule@19.5.0': {}
+
+  '@commitlint/format@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      chalk: 5.3.0
+
+  '@commitlint/is-ignored@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      semver: 7.6.3
+
+  '@commitlint/lint@19.5.0':
+    dependencies:
+      '@commitlint/is-ignored': 19.5.0
+      '@commitlint/parse': 19.5.0
+      '@commitlint/rules': 19.5.0
+      '@commitlint/types': 19.5.0
+
+  '@commitlint/load@19.5.0(@types/node@22.9.0)(typescript@5.5.4)':
+    dependencies:
+      '@commitlint/config-validator': 19.5.0
+      '@commitlint/execute-rule': 19.5.0
+      '@commitlint/resolve-extends': 19.5.0
+      '@commitlint/types': 19.5.0
+      chalk: 5.3.0
+      cosmiconfig: 9.0.0(typescript@5.5.4)
+      cosmiconfig-typescript-loader: 5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0(typescript@5.5.4))(typescript@5.5.4)
+      lodash.isplainobject: 4.0.6
+      lodash.merge: 4.6.2
+      lodash.uniq: 4.5.0
+    transitivePeerDependencies:
+      - '@types/node'
+      - typescript
+
+  '@commitlint/message@19.5.0': {}
+
+  '@commitlint/parse@19.5.0':
+    dependencies:
+      '@commitlint/types': 19.5.0
+      conventional-changelog-angular: 7.0.0
+      conventional-commits-parser: 5.0.0
+
+  '@commitlint/read@19.5.0':
+    dependencies:
+      '@commitlint/top-level': 19.5.0
+      '@commitlint/types': 19.5.0
+      git-raw-commits: 4.0.0
+      minimist: 1.2.8
+      tinyexec: 0.3.1
+
+  '@commitlint/resolve-extends@19.5.0':
+    dependencies:
+      '@commitlint/config-validator': 19.5.0
+      '@commitlint/types': 19.5.0
+      global-directory: 4.0.1
+      import-meta-resolve: 4.1.0
+      lodash.mergewith: 4.6.2
+      resolve-from: 5.0.0
+
+  '@commitlint/rules@19.5.0':
+    dependencies:
+      '@commitlint/ensure': 19.5.0
+      '@commitlint/message': 19.5.0
+      '@commitlint/to-lines': 19.5.0
+      '@commitlint/types': 19.5.0
+
+  '@commitlint/to-lines@19.5.0': {}
+
+  '@commitlint/top-level@19.5.0':
+    dependencies:
+      find-up: 7.0.0
+
+  '@commitlint/types@19.5.0':
+    dependencies:
+      '@types/conventional-commits-parser': 5.0.0
+      chalk: 5.3.0
+
+  '@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3)':
+    dependencies:
+      '@csstools/css-tokenizer': 3.0.3
+
+  '@csstools/css-tokenizer@3.0.3': {}
+
+  '@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)':
+    dependencies:
+      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
+      '@csstools/css-tokenizer': 3.0.3
+
+  '@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.2)':
+    dependencies:
+      postcss-selector-parser: 6.1.2
+
+  '@ctrl/tinycolor@3.6.1': {}
+
+  '@dual-bundle/import-meta-resolve@4.1.0': {}
+
+  '@element-plus/icons-vue@2.3.1(vue@3.5.12(typescript@5.5.4))':
+    dependencies:
+      vue: 3.5.12(typescript@5.5.4)
+
+  '@esbuild/aix-ppc64@0.21.5':
+    optional: true
+
+  '@esbuild/aix-ppc64@0.23.1':
+    optional: true
+
+  '@esbuild/android-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/android-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/android-arm@0.21.5':
+    optional: true
+
+  '@esbuild/android-arm@0.23.1':
+    optional: true
+
+  '@esbuild/android-x64@0.21.5':
+    optional: true
+
+  '@esbuild/android-x64@0.23.1':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/darwin-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/darwin-x64@0.21.5':
+    optional: true
+
+  '@esbuild/darwin-x64@0.23.1':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/freebsd-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/freebsd-x64@0.23.1':
+    optional: true
+
+  '@esbuild/linux-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/linux-arm@0.21.5':
+    optional: true
+
+  '@esbuild/linux-arm@0.23.1':
+    optional: true
+
+  '@esbuild/linux-ia32@0.21.5':
+    optional: true
+
+  '@esbuild/linux-ia32@0.23.1':
+    optional: true
+
+  '@esbuild/linux-loong64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-loong64@0.23.1':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.21.5':
+    optional: true
+
+  '@esbuild/linux-mips64el@0.23.1':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-ppc64@0.23.1':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-riscv64@0.23.1':
+    optional: true
+
+  '@esbuild/linux-s390x@0.21.5':
+    optional: true
+
+  '@esbuild/linux-s390x@0.23.1':
+    optional: true
+
+  '@esbuild/linux-x64@0.21.5':
+    optional: true
+
+  '@esbuild/linux-x64@0.23.1':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/netbsd-x64@0.23.1':
+    optional: true
+
+  '@esbuild/openbsd-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.21.5':
+    optional: true
+
+  '@esbuild/openbsd-x64@0.23.1':
+    optional: true
+
+  '@esbuild/sunos-x64@0.21.5':
+    optional: true
+
+  '@esbuild/sunos-x64@0.23.1':
+    optional: true
+
+  '@esbuild/win32-arm64@0.21.5':
+    optional: true
+
+  '@esbuild/win32-arm64@0.23.1':
+    optional: true
+
+  '@esbuild/win32-ia32@0.21.5':
+    optional: true
+
+  '@esbuild/win32-ia32@0.23.1':
+    optional: true
+
+  '@esbuild/win32-x64@0.21.5':
+    optional: true
+
+  '@esbuild/win32-x64@0.23.1':
+    optional: true
+
+  '@eslint-community/eslint-utils@4.4.1(eslint@9.14.0(jiti@1.21.6))':
+    dependencies:
+      eslint: 9.14.0(jiti@1.21.6)
+      eslint-visitor-keys: 3.4.3
+
+  '@eslint-community/regexpp@4.12.1': {}
+
+  '@eslint/config-array@0.18.0':
+    dependencies:
+      '@eslint/object-schema': 2.1.4
+      debug: 4.3.7
+      minimatch: 3.1.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/core@0.7.0': {}
+
+  '@eslint/eslintrc@3.1.0':
+    dependencies:
+      ajv: 6.12.6
+      debug: 4.3.7
+      espree: 10.3.0
+      globals: 14.0.0
+      ignore: 5.3.2
+      import-fresh: 3.3.0
+      js-yaml: 4.1.0
+      minimatch: 3.1.2
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+
+  '@eslint/js@9.14.0': {}
+
+  '@eslint/object-schema@2.1.4': {}
+
+  '@eslint/plugin-kit@0.2.2':
+    dependencies:
+      levn: 0.4.1
+
+  '@fast-csv/format@4.3.5':
+    dependencies:
+      '@types/node': 14.18.63
+      lodash.escaperegexp: 4.1.2
+      lodash.isboolean: 3.0.3
+      lodash.isequal: 4.5.0
+      lodash.isfunction: 3.0.9
+      lodash.isnil: 4.0.0
+
+  '@fast-csv/parse@4.3.6':
+    dependencies:
+      '@types/node': 14.18.63
+      lodash.escaperegexp: 4.1.2
+      lodash.groupby: 4.6.0
+      lodash.isfunction: 3.0.9
+      lodash.isnil: 4.0.0
+      lodash.isundefined: 3.0.1
+      lodash.uniq: 4.5.0
+
+  '@floating-ui/core@1.6.8':
+    dependencies:
+      '@floating-ui/utils': 0.2.8
+
+  '@floating-ui/dom@1.6.12':
+    dependencies:
+      '@floating-ui/core': 1.6.8
+      '@floating-ui/utils': 0.2.8
+
+  '@floating-ui/utils@0.2.8': {}
+
+  '@hapi/bourne@3.0.0': {}
+
+  '@humanfs/core@0.19.1': {}
+
+  '@humanfs/node@0.16.6':
+    dependencies:
+      '@humanfs/core': 0.19.1
+      '@humanwhocodes/retry': 0.3.1
+
+  '@humanwhocodes/module-importer@1.0.1': {}
+
+  '@humanwhocodes/retry@0.3.1': {}
+
+  '@humanwhocodes/retry@0.4.1': {}
+
+  '@iconify/types@2.0.0': {}
+
+  '@iconify/utils@2.1.33':
+    dependencies:
+      '@antfu/install-pkg': 0.4.1
+      '@antfu/utils': 0.7.10
+      '@iconify/types': 2.0.0
+      debug: 4.3.7
+      kolorist: 1.8.0
+      local-pkg: 0.5.0
+      mlly: 1.7.2
+    transitivePeerDependencies:
+      - supports-color
+
+  '@intlify/core-base@9.9.1':
+    dependencies:
+      '@intlify/message-compiler': 9.9.1
+      '@intlify/shared': 9.9.1
+
+  '@intlify/message-compiler@9.9.1':
+    dependencies:
+      '@intlify/shared': 9.9.1
+      source-map-js: 1.2.1
+
+  '@intlify/shared@9.9.1': {}
+
+  '@jridgewell/gen-mapping@0.3.5':
+    dependencies:
+      '@jridgewell/set-array': 1.2.1
+      '@jridgewell/sourcemap-codec': 1.5.0
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/resolve-uri@3.1.2': {}
+
+  '@jridgewell/set-array@1.2.1': {}
+
+  '@jridgewell/source-map@0.3.6':
+    dependencies:
+      '@jridgewell/gen-mapping': 0.3.5
+      '@jridgewell/trace-mapping': 0.3.25
+
+  '@jridgewell/sourcemap-codec@1.5.0': {}
+
+  '@jridgewell/trace-mapping@0.3.25':
+    dependencies:
+      '@jridgewell/resolve-uri': 3.1.2
+      '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@nodelib/fs.scandir@2.1.5':
+    dependencies:
+      '@nodelib/fs.stat': 2.0.5
+      run-parallel: 1.2.0
+
+  '@nodelib/fs.stat@2.0.5': {}
+
+  '@nodelib/fs.walk@1.2.8':
+    dependencies:
+      '@nodelib/fs.scandir': 2.1.5
+      fastq: 1.17.1
+
+  '@parcel/watcher-android-arm64@2.5.0':
+    optional: true
+
+  '@parcel/watcher-darwin-arm64@2.5.0':
+    optional: true
+
+  '@parcel/watcher-darwin-x64@2.5.0':
+    optional: true
+
+  '@parcel/watcher-freebsd-x64@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm-glibc@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm-musl@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-glibc@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-arm64-musl@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-x64-glibc@2.5.0':
+    optional: true
+
+  '@parcel/watcher-linux-x64-musl@2.5.0':
+    optional: true
+
+  '@parcel/watcher-win32-arm64@2.5.0':
+    optional: true
+
+  '@parcel/watcher-win32-ia32@2.5.0':
+    optional: true
+
+  '@parcel/watcher-win32-x64@2.5.0':
+    optional: true
+
+  '@parcel/watcher@2.5.0':
+    dependencies:
+      detect-libc: 1.0.3
+      is-glob: 4.0.3
+      micromatch: 4.0.8
+      node-addon-api: 7.1.1
+    optionalDependencies:
+      '@parcel/watcher-android-arm64': 2.5.0
+      '@parcel/watcher-darwin-arm64': 2.5.0
+      '@parcel/watcher-darwin-x64': 2.5.0
+      '@parcel/watcher-freebsd-x64': 2.5.0
+      '@parcel/watcher-linux-arm-glibc': 2.5.0
+      '@parcel/watcher-linux-arm-musl': 2.5.0
+      '@parcel/watcher-linux-arm64-glibc': 2.5.0
+      '@parcel/watcher-linux-arm64-musl': 2.5.0
+      '@parcel/watcher-linux-x64-glibc': 2.5.0
+      '@parcel/watcher-linux-x64-musl': 2.5.0
+      '@parcel/watcher-win32-arm64': 2.5.0
+      '@parcel/watcher-win32-ia32': 2.5.0
+      '@parcel/watcher-win32-x64': 2.5.0
+    optional: true
+
+  '@pengzhanbo/utils@1.1.2': {}
+
+  '@pkgr/core@0.1.1': {}
+
+  '@polka/url@1.0.0-next.28': {}
+
+  '@rollup/pluginutils@5.1.3(rollup@4.25.0)':
+    dependencies:
+      '@types/estree': 1.0.6
+      estree-walker: 2.0.2
+      picomatch: 4.0.2
+    optionalDependencies:
+      rollup: 4.25.0
+
+  '@rollup/rollup-android-arm-eabi@4.25.0':
+    optional: true
+
+  '@rollup/rollup-android-arm64@4.25.0':
+    optional: true
+
+  '@rollup/rollup-darwin-arm64@4.25.0':
+    optional: true
+
+  '@rollup/rollup-darwin-x64@4.25.0':
+    optional: true
+
+  '@rollup/rollup-freebsd-arm64@4.25.0':
+    optional: true
+
+  '@rollup/rollup-freebsd-x64@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-arm-gnueabihf@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-arm-musleabihf@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-gnu@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-arm64-musl@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-powerpc64le-gnu@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-riscv64-gnu@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-s390x-gnu@4.25.0':
+    optional: true
+
+  '@rollup/rollup-linux-x64-gnu@4.25.0':
     optional: true
 
-  /@rollup/rollup-linux-x64-musl@4.25.0:
-    resolution: {integrity: sha512-zx71aY2oQxGxAT1JShfhNG79PnjYhMC6voAjzpu/xmMjDnKNf6Nl/xv7YaB/9SIa9jDYf8RBPWEnjcdlhlv1rQ==}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-linux-x64-musl@4.25.0':
     optional: true
 
-  /@rollup/rollup-win32-arm64-msvc@4.25.0:
-    resolution: {integrity: sha512-JT8tcjNocMs4CylWY/CxVLnv8e1lE7ff1fi6kbGocWwxDq9pj30IJ28Peb+Y8yiPNSF28oad42ApJB8oUkwGww==}
-    cpu: [arm64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-win32-arm64-msvc@4.25.0':
     optional: true
 
-  /@rollup/rollup-win32-ia32-msvc@4.25.0:
-    resolution: {integrity: sha512-dRLjLsO3dNOfSN6tjyVlG+Msm4IiZnGkuZ7G5NmpzwF9oOc582FZG05+UdfTbz5Jd4buK/wMb6UeHFhG18+OEg==}
-    cpu: [ia32]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-win32-ia32-msvc@4.25.0':
     optional: true
 
-  /@rollup/rollup-win32-x64-msvc@4.25.0:
-    resolution: {integrity: sha512-/RqrIFtLB926frMhZD0a5oDa4eFIbyNEwLLloMTEjmqfwZWXywwVVOVmwTsuyhC9HKkVEZcOOi+KV4U9wmOdlg==}
-    cpu: [x64]
-    os: [win32]
-    requiresBuild: true
-    dev: true
+  '@rollup/rollup-win32-x64-msvc@4.25.0':
     optional: true
 
-  /@stomp/stompjs@7.0.0:
-    resolution: {integrity: sha512-fGdq4wPDnSV/KyOsjq4P+zLc8MFWC3lMmP5FBgLWKPJTYcuCbAIrnRGjB7q2jHZdYCOD5vxLuFoKIYLy5/u8Pw==}
-    dev: false
+  '@stomp/stompjs@7.0.0': {}
 
-  /@sxzz/popperjs-es@2.11.7:
-    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
-    dev: false
+  '@sxzz/popperjs-es@2.11.7': {}
 
-  /@transloadit/prettier-bytes@0.0.7:
-    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
-    dev: false
+  '@transloadit/prettier-bytes@0.0.7': {}
 
-  /@trysound/sax@0.2.0:
-    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
-    engines: {node: '>=10.13.0'}
-    dev: true
+  '@trysound/sax@0.2.0': {}
 
-  /@types/codemirror@5.60.15:
-    resolution: {integrity: sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==}
+  '@types/codemirror@5.60.15':
     dependencies:
       '@types/tern': 0.23.9
-    dev: true
 
-  /@types/conventional-commits-parser@5.0.0:
-    resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==}
+  '@types/conventional-commits-parser@5.0.0':
     dependencies:
       '@types/node': 22.9.0
-    dev: true
 
-  /@types/estree@1.0.6:
-    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
-    dev: true
+  '@types/estree@1.0.6': {}
 
-  /@types/event-emitter@0.3.5:
-    resolution: {integrity: sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ==}
-    dev: false
+  '@types/event-emitter@0.3.5': {}
 
-  /@types/json-schema@7.0.15:
-    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
-    dev: true
+  '@types/json-schema@7.0.15': {}
 
-  /@types/lodash-es@4.17.12:
-    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
+  '@types/lodash-es@4.17.12':
     dependencies:
       '@types/lodash': 4.17.13
-    dev: false
 
-  /@types/lodash@4.17.13:
-    resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
+  '@types/lodash@4.17.13': {}
 
-  /@types/node@14.18.63:
-    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
-    dev: false
+  '@types/node@14.18.63': {}
 
-  /@types/node@22.9.0:
-    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
+  '@types/node@22.9.0':
     dependencies:
       undici-types: 6.19.8
-    dev: true
 
-  /@types/nprogress@0.2.3:
-    resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==}
-    dev: true
+  '@types/nprogress@0.2.3': {}
 
-  /@types/path-browserify@1.0.3:
-    resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
-    dev: true
+  '@types/path-browserify@1.0.3': {}
 
-  /@types/qs@6.9.17:
-    resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==}
-    dev: true
+  '@types/qs@6.9.17': {}
 
-  /@types/sortablejs@1.15.8:
-    resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==}
-    dev: true
+  '@types/sortablejs@1.15.8': {}
 
-  /@types/svgo@2.6.4:
-    resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
+  '@types/svgo@2.6.4':
     dependencies:
       '@types/node': 22.9.0
-    dev: true
 
-  /@types/tern@0.23.9:
-    resolution: {integrity: sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==}
+  '@types/tern@0.23.9':
     dependencies:
       '@types/estree': 1.0.6
-    dev: true
 
-  /@types/web-bluetooth@0.0.16:
-    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
-    dev: false
+  '@types/web-bluetooth@0.0.16': {}
 
-  /@types/web-bluetooth@0.0.20:
-    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
+  '@types/web-bluetooth@0.0.20': {}
 
-  /@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-tqp8H7UWFaZj0yNO6bycd5YjMwxa6wIHOLZvWPkidwbgLCsBMetQoGj7DPuAlWa2yGO3H48xmPwjhsSPPCGU5w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
     dependencies:
       '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
       '@typescript-eslint/scope-manager': 8.14.0
-      '@typescript-eslint/type-utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/type-utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 8.14.0
-      eslint: 9.14.0
+      eslint: 9.14.0(jiti@1.21.6)
       graphemer: 1.4.0
       ignore: 5.3.2
       natural-compare: 1.4.0
       ts-api-utils: 1.4.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/parser@8.14.0(eslint@9.14.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/scope-manager': 8.14.0
       '@typescript-eslint/types': 8.14.0
       '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
       '@typescript-eslint/visitor-keys': 8.14.0
       debug: 4.3.7
-      eslint: 9.14.0
+      eslint: 9.14.0(jiti@1.21.6)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/scope-manager@8.14.0:
-    resolution: {integrity: sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@typescript-eslint/scope-manager@8.14.0':
     dependencies:
       '@typescript-eslint/types': 8.14.0
       '@typescript-eslint/visitor-keys': 8.14.0
-    dev: true
 
-  /@typescript-eslint/type-utils@8.14.0(eslint@9.14.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-Xcz9qOtZuGusVOH5Uk07NGs39wrKkf3AxlkK79RBK6aJC1l03CobXjJbwBPSidetAOV+5rEVuiT1VSBUOAsanQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/type-utils@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
       debug: 4.3.7
       ts-api-utils: 1.4.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint
       - supports-color
-    dev: true
 
-  /@typescript-eslint/types@8.14.0:
-    resolution: {integrity: sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dev: true
+  '@typescript-eslint/types@8.14.0': {}
 
-  /@typescript-eslint/typescript-estree@8.14.0(typescript@5.5.4):
-    resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@typescript-eslint/typescript-estree@8.14.0(typescript@5.5.4)':
     dependencies:
       '@typescript-eslint/types': 8.14.0
       '@typescript-eslint/visitor-keys': 8.14.0
@@ -1658,60 +5162,43 @@ packages:
       minimatch: 9.0.5
       semver: 7.6.3
       ts-api-utils: 1.4.0(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@typescript-eslint/utils@8.14.0(eslint@9.14.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
+  '@typescript-eslint/utils@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
       '@typescript-eslint/scope-manager': 8.14.0
       '@typescript-eslint/types': 8.14.0
       '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
-      eslint: 9.14.0
+      eslint: 9.14.0(jiti@1.21.6)
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /@typescript-eslint/visitor-keys@8.14.0:
-    resolution: {integrity: sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  '@typescript-eslint/visitor-keys@8.14.0':
     dependencies:
       '@typescript-eslint/types': 8.14.0
       eslint-visitor-keys: 3.4.3
-    dev: true
 
-  /@unocss/astro@0.63.6(typescript@5.5.4)(vite@5.4.11):
-    resolution: {integrity: sha512-5Fjlv6dpQo6o2PUAcEv8p24G8rn8Op79xLFofq2V+iA/Q32G9/UsxTLOpj+yc+q0YdJrFfDCT2X/3pvVY8Db5g==}
-    peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
-    peerDependenciesMeta:
-      vite:
-        optional: true
+  '@unocss/astro@0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/reset': 0.63.6
-      '@unocss/vite': 0.63.6(typescript@5.5.4)(vite@5.4.11)
+      '@unocss/vite': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+    optionalDependencies:
       vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
       - typescript
-    dev: true
 
-  /@unocss/cli@0.63.6:
-    resolution: {integrity: sha512-OZb8hO0x4nCJjFd3Gq3km78YnyMAdq282D+BLiDE6IhQ5WHCVL7fyhfgIVL6xwxISDVxiyITwNb72ky0MEutPg==}
-    engines: {node: '>=14'}
-    hasBin: true
+  '@unocss/cli@0.63.6(rollup@4.25.0)':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.3
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       '@unocss/config': 0.63.6
       '@unocss/core': 0.63.6
       '@unocss/preset-uno': 0.63.6
@@ -1726,30 +5213,21 @@ packages:
     transitivePeerDependencies:
       - rollup
       - supports-color
-    dev: true
 
-  /@unocss/config@0.63.6:
-    resolution: {integrity: sha512-+4Lt5uTwRgu1z7vhOUzDf+mL+BQYdaa/Z8NMT2Fiqb37tcjEKvmwaUHdfE22Vif1luDgC6xqFsn6qqFtOxhoWQ==}
-    engines: {node: '>=14'}
+  '@unocss/config@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       unconfig: 0.5.5
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@unocss/core@0.63.6:
-    resolution: {integrity: sha512-Q4QPgJ271Up89+vIqqOKgtdCKkFpHqvHN8W1LUlKPqtYnOvVYaOIVNAZowaIdEhPuc83yLc6Tg2+7riK18QKEw==}
-    dev: true
+  '@unocss/core@0.63.6': {}
 
-  /@unocss/extractor-arbitrary-variants@0.63.6:
-    resolution: {integrity: sha512-HJX0oAa9uzwKYoU8CoJdP1gxjuqFmOLxyZmITjStAmZNZpIxlz2wz4VrHmqml2dkvx/mifGGGc/GxZpQ36D12Q==}
+  '@unocss/extractor-arbitrary-variants@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/inspector@0.63.6(typescript@5.5.4):
-    resolution: {integrity: sha512-DQDJnhtzdHIQXD2vCdj5ytFnHfQCWJGPmrHJHXxzkTYn8nIovV1roVl1ITLxkDIIYK9bdYneg2imQN5JCZhHmQ==}
+  '@unocss/inspector@0.63.6(typescript@5.5.4)':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/rule-utils': 0.63.6
@@ -1758,13 +5236,8 @@ packages:
       vue-flow-layout: 0.0.5(typescript@5.5.4)
     transitivePeerDependencies:
       - typescript
-    dev: true
 
-  /@unocss/postcss@0.63.6(postcss@8.4.49):
-    resolution: {integrity: sha512-XI6U1jMwbQoSHVWpZZu3Cxp3t1PVj5VOj+IYtz7xmcWP9GVK+eyETo/xyB0l4muD4emXfSrhNDrFYzSyIyF5cg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      postcss: ^8.4.21
+  '@unocss/postcss@0.63.6(postcss@8.4.49)':
     dependencies:
       '@unocss/config': 0.63.6
       '@unocss/core': 0.63.6
@@ -1774,114 +5247,81 @@ packages:
       tinyglobby: 0.2.10
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@unocss/preset-attributify@0.63.6:
-    resolution: {integrity: sha512-sHH17mfl/THHLxCLAHqPdUniCNMFjAxBHFDZYgGi83azuarF2evI5Mtc3Qsj3nzoSQwTPmK2VY3XYUUrpPDGWQ==}
+  '@unocss/preset-attributify@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/preset-icons@0.63.6:
-    resolution: {integrity: sha512-fRU44wXABnMPT/9zhKBNSUeDJlOxJhUJP9W3FSRnc+ktjAifJIj0xpUKtEqxL46QMq825Bsj2yDSquzP+XYGnQ==}
+  '@unocss/preset-icons@0.63.6':
     dependencies:
       '@iconify/utils': 2.1.33
       '@unocss/core': 0.63.6
       ofetch: 1.4.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /@unocss/preset-mini@0.63.6:
-    resolution: {integrity: sha512-pZDZbSuxabHSwPIy3zCgQ4MNdVCSHvOvZecreH+v96R1oOhquiwU8WiSbkxvZiKiLQJd7JUVW87E1pAzr5ZGGQ==}
+  '@unocss/preset-mini@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/extractor-arbitrary-variants': 0.63.6
       '@unocss/rule-utils': 0.63.6
-    dev: true
 
-  /@unocss/preset-tagify@0.63.6:
-    resolution: {integrity: sha512-3lKhk4MW3RqJBwIvBXHj0H0/kHkFlKtCIBQFiBcCJh8TXOID8IZ0iVjuGwdlk63VTizI/wnsNDOVpj6YcjRRlw==}
+  '@unocss/preset-tagify@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/preset-typography@0.63.6:
-    resolution: {integrity: sha512-AXmBVnbV54gUIv5kbywjZek9ZlKRwJfBDVMtWOcLOjN3AHirGx1W2oq2UzNkfYZ2leof/Y2BocxeTwGCCRhqDQ==}
+  '@unocss/preset-typography@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/preset-mini': 0.63.6
-    dev: true
 
-  /@unocss/preset-uno@0.63.6:
-    resolution: {integrity: sha512-67PbHyVgAe9Rz0Rhyl3zBibFuGmqQMRPMkRjNYrwmmtNydpQYsXbfnDs0p8mZFp6uO2o3Jkh7urqEtixHHvq0Q==}
+  '@unocss/preset-uno@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/preset-mini': 0.63.6
       '@unocss/preset-wind': 0.63.6
       '@unocss/rule-utils': 0.63.6
-    dev: true
 
-  /@unocss/preset-web-fonts@0.63.6:
-    resolution: {integrity: sha512-ko1aHDax0u5CQi1BXggv6uW5Vq/LQRWwzOxqBFTh1JlGHPZTw4CdVJkYnlpt3WEW+FPUzZYjhKmMmQY7KtOTng==}
+  '@unocss/preset-web-fonts@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       ofetch: 1.4.1
-    dev: true
 
-  /@unocss/preset-wind@0.63.6:
-    resolution: {integrity: sha512-W3oZ2TXSqStNE+X++kcspRTF2Szu2ej6NW5Kiyy6WQn/+ZD77AF4VtvzHtzFVZ2QKpEIovGBpU5tywooHbB7hw==}
+  '@unocss/preset-wind@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/preset-mini': 0.63.6
       '@unocss/rule-utils': 0.63.6
-    dev: true
 
-  /@unocss/reset@0.63.6:
-    resolution: {integrity: sha512-gq73RSZj54MOloqrivkoMPXCqNG2WpIyBT1AYlF76uKxEEbUD41E8uBUhLSKs7gFgF01yQJLRaIuyN1yw09pbQ==}
-    dev: true
+  '@unocss/reset@0.63.6': {}
 
-  /@unocss/rule-utils@0.63.6:
-    resolution: {integrity: sha512-moeDEq5d9mB8gSYeoqHMkXWWekaFFdhg7QCuwwCbxCc+NPMOgGkmfAoafz+y2tdvK7pEuT191RWOiHQ0MkA5oQ==}
-    engines: {node: '>=14'}
+  '@unocss/rule-utils@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       magic-string: 0.30.12
-    dev: true
 
-  /@unocss/transformer-attributify-jsx@0.63.6:
-    resolution: {integrity: sha512-/RU09MF+hJK7cFbLJ+8vloCGyhn6Oys8R6gey0auB0+nw/ucUXoLQKWgUqo9taQlLuYOiehdkYjQSdWn5lyA/Q==}
+  '@unocss/transformer-attributify-jsx@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/transformer-compile-class@0.63.6:
-    resolution: {integrity: sha512-zzAqs8adnTUOLA88RgcToadcrz9gjxrZk6IrcmMqMmWqk0MOWNQHIN0RzKa/yaw4QhO2xuGyIz4/WHyXuCXMQg==}
+  '@unocss/transformer-compile-class@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/transformer-directives@0.63.6:
-    resolution: {integrity: sha512-XcNOwLRbfrJSU6YXyLgiMzAigSzjIdvHwS3lLCZ2n6DWuLmTuXBfvVtRxeJ+aflNkhpQNKONCClC4s6I2r53uw==}
+  '@unocss/transformer-directives@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
       '@unocss/rule-utils': 0.63.6
       css-tree: 3.0.1
-    dev: true
 
-  /@unocss/transformer-variant-group@0.63.6:
-    resolution: {integrity: sha512-ebYSjZnZrtcJYjmAEDwGVwPuaQ9EVWKNDDJFFSusP8k/6PjJoHDh0qkj+hdPPDhYn81yzJQalU1eSUSlfC30VA==}
+  '@unocss/transformer-variant-group@0.63.6':
     dependencies:
       '@unocss/core': 0.63.6
-    dev: true
 
-  /@unocss/vite@0.63.6(typescript@5.5.4)(vite@5.4.11):
-    resolution: {integrity: sha512-gxK3gtvYQH5S/qtuvsY4M0S+KJPZnYrOQI/Gopufx+b2qgmwZ/TSAe66gWeKYfe3DfQsmA3PPh/GXpkK+/FnHg==}
-    peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
+  '@unocss/vite@0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))':
     dependencies:
       '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.3
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       '@unocss/config': 0.63.6
       '@unocss/core': 0.63.6
       '@unocss/inspector': 0.63.6(typescript@5.5.4)
@@ -1893,17 +5333,13 @@ packages:
       - rollup
       - supports-color
       - typescript
-    dev: true
 
-  /@uppy/companion-client@2.2.2:
-    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
+  '@uppy/companion-client@2.2.2':
     dependencies:
       '@uppy/utils': 4.1.3
       namespace-emitter: 2.0.1
-    dev: false
 
-  /@uppy/core@2.3.4:
-    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
+  '@uppy/core@2.3.4':
     dependencies:
       '@transloadit/prettier-bytes': 0.0.7
       '@uppy/store-default': 2.1.1
@@ -1913,60 +5349,38 @@ packages:
       namespace-emitter: 2.0.1
       nanoid: 3.3.7
       preact: 10.24.3
-    dev: false
 
-  /@uppy/store-default@2.1.1:
-    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
-    dev: false
+  '@uppy/store-default@2.1.1': {}
 
-  /@uppy/utils@4.1.3:
-    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
+  '@uppy/utils@4.1.3':
     dependencies:
       lodash.throttle: 4.1.1
-    dev: false
 
-  /@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4):
-    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
-    peerDependencies:
-      '@uppy/core': ^2.3.3
+  '@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4)':
     dependencies:
       '@uppy/companion-client': 2.2.2
       '@uppy/core': 2.3.4
       '@uppy/utils': 4.1.3
       nanoid: 3.3.7
-    dev: false
 
-  /@vitejs/plugin-vue@5.1.5(vite@5.4.11)(vue@3.5.12):
-    resolution: {integrity: sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    peerDependencies:
-      vite: ^5.0.0
-      vue: ^3.2.25
+  '@vitejs/plugin-vue@5.1.5(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))(vue@3.5.12(typescript@5.5.4))':
     dependencies:
       vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
       vue: 3.5.12(typescript@5.5.4)
-    dev: true
 
-  /@volar/language-core@2.4.10:
-    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
+  '@volar/language-core@2.4.10':
     dependencies:
       '@volar/source-map': 2.4.10
-    dev: true
 
-  /@volar/source-map@2.4.10:
-    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
-    dev: true
+  '@volar/source-map@2.4.10': {}
 
-  /@volar/typescript@2.4.10:
-    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
+  '@volar/typescript@2.4.10':
     dependencies:
       '@volar/language-core': 2.4.10
       path-browserify: 1.0.1
       vscode-uri: 3.0.8
-    dev: true
 
-  /@vue/compiler-core@3.5.12:
-    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
+  '@vue/compiler-core@3.5.12':
     dependencies:
       '@babel/parser': 7.26.2
       '@vue/shared': 3.5.12
@@ -1974,14 +5388,12 @@ packages:
       estree-walker: 2.0.2
       source-map-js: 1.2.1
 
-  /@vue/compiler-dom@3.5.12:
-    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
+  '@vue/compiler-dom@3.5.12':
     dependencies:
       '@vue/compiler-core': 3.5.12
       '@vue/shared': 3.5.12
 
-  /@vue/compiler-sfc@3.5.12:
-    resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
+  '@vue/compiler-sfc@3.5.12':
     dependencies:
       '@babel/parser': 7.26.2
       '@vue/compiler-core': 3.5.12
@@ -1993,30 +5405,19 @@ packages:
       postcss: 8.4.49
       source-map-js: 1.2.1
 
-  /@vue/compiler-ssr@3.5.12:
-    resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
+  '@vue/compiler-ssr@3.5.12':
     dependencies:
       '@vue/compiler-dom': 3.5.12
       '@vue/shared': 3.5.12
 
-  /@vue/compiler-vue2@2.7.16:
-    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
+  '@vue/compiler-vue2@2.7.16':
     dependencies:
       de-indent: 1.0.2
       he: 1.2.0
-    dev: true
 
-  /@vue/devtools-api@6.6.4:
-    resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
-    dev: false
+  '@vue/devtools-api@6.6.4': {}
 
-  /@vue/language-core@2.1.10(typescript@5.5.4):
-    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  '@vue/language-core@2.1.10(typescript@5.5.4)':
     dependencies:
       '@volar/language-core': 2.4.10
       '@vue/compiler-dom': 3.5.12
@@ -2026,138 +5427,90 @@ packages:
       minimatch: 9.0.5
       muggle-string: 0.4.1
       path-browserify: 1.0.1
+    optionalDependencies:
       typescript: 5.5.4
-    dev: true
 
-  /@vue/reactivity@3.5.12:
-    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
+  '@vue/reactivity@3.5.12':
     dependencies:
       '@vue/shared': 3.5.12
 
-  /@vue/runtime-core@3.5.12:
-    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
+  '@vue/runtime-core@3.5.12':
     dependencies:
       '@vue/reactivity': 3.5.12
       '@vue/shared': 3.5.12
 
-  /@vue/runtime-dom@3.5.12:
-    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
+  '@vue/runtime-dom@3.5.12':
     dependencies:
       '@vue/reactivity': 3.5.12
       '@vue/runtime-core': 3.5.12
       '@vue/shared': 3.5.12
       csstype: 3.1.3
 
-  /@vue/server-renderer@3.5.12(vue@3.5.12):
-    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
-    peerDependencies:
-      vue: 3.5.12
+  '@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.5.4))':
     dependencies:
       '@vue/compiler-ssr': 3.5.12
       '@vue/shared': 3.5.12
       vue: 3.5.12(typescript@5.5.4)
 
-  /@vue/shared@3.5.12:
-    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
+  '@vue/shared@3.5.12': {}
 
-  /@vueuse/core@10.11.1(vue@3.5.12):
-    resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
+  '@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4))':
     dependencies:
       '@types/web-bluetooth': 0.0.20
       '@vueuse/metadata': 10.11.1
-      '@vueuse/shared': 10.11.1(vue@3.5.12)
-      vue-demi: 0.14.10(vue@3.5.12)
+      '@vueuse/shared': 10.11.1(vue@3.5.12(typescript@5.5.4))
+      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  /@vueuse/core@9.13.0(vue@3.5.12):
-    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
+  '@vueuse/core@9.13.0(vue@3.5.12(typescript@5.5.4))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
       '@vueuse/metadata': 9.13.0
-      '@vueuse/shared': 9.13.0(vue@3.5.12)
-      vue-demi: 0.14.10(vue@3.5.12)
+      '@vueuse/shared': 9.13.0(vue@3.5.12(typescript@5.5.4))
+      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
-    dev: false
 
-  /@vueuse/metadata@10.11.1:
-    resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
+  '@vueuse/metadata@10.11.1': {}
 
-  /@vueuse/metadata@9.13.0:
-    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
-    dev: false
+  '@vueuse/metadata@9.13.0': {}
 
-  /@vueuse/shared@10.11.1(vue@3.5.12):
-    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
+  '@vueuse/shared@10.11.1(vue@3.5.12(typescript@5.5.4))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.12)
+      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
 
-  /@vueuse/shared@9.13.0(vue@3.5.12):
-    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
+  '@vueuse/shared@9.13.0(vue@3.5.12(typescript@5.5.4))':
     dependencies:
-      vue-demi: 0.14.10(vue@3.5.12)
+      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
     transitivePeerDependencies:
       - '@vue/composition-api'
       - vue
-    dev: false
 
-  /@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.throttle: ^4.1.1
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       is-url: 1.2.4
       lodash.throttle: 4.1.1
       nanoid: 3.3.7
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       prismjs: 1.29.0
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
-    peerDependencies:
-      '@uppy/core': ^2.1.1
-      '@uppy/xhr-upload': ^2.0.3
-      dom7: ^3.0.0
-      is-hotkey: ^0.2.0
-      lodash.camelcase: ^4.3.0
-      lodash.clonedeep: ^4.5.0
-      lodash.debounce: ^4.0.8
-      lodash.foreach: ^4.5.0
-      lodash.isequal: ^4.5.0
-      lodash.throttle: ^4.1.1
-      lodash.toarray: ^4.4.0
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
       '@types/event-emitter': 0.3.5
       '@uppy/core': 2.3.4
@@ -2179,30 +5532,23 @@ packages:
       slate: 0.72.8
       slate-history: 0.66.0(slate@0.72.8)
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/editor-for-vue@5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12):
-    resolution: {integrity: sha512-OdtMnMt0HpYriY1+Efo3KHviUB5zwlZIaHypNw5MPRn8uFq3MFLET5u8pbB/PiEF5Ff88YAp7T9Xw1dvJzT8sA==}
-    peerDependencies:
-      '@wangeditor/editor': '>=5.0.0'
-      vue: ^3.0.5
+  '@wangeditor/editor-for-vue@5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12(typescript@5.5.4))':
     dependencies:
       '@wangeditor/editor': 5.1.23
       vue: 3.5.12(typescript@5.5.4)
-    dev: false
 
-  /@wangeditor/editor@5.1.23:
-    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
+  '@wangeditor/editor@5.1.23':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/basic-modules@1.1.7)(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/video-module': 1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/core@1.1.19)(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/video-module': 1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       is-hotkey: 0.2.0
       lodash.camelcase: 4.3.0
@@ -2215,196 +5561,110 @@ packages:
       nanoid: 3.3.7
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19)(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.isequal: ^4.5.0
-      lodash.throttle: ^4.1.1
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       lodash.isequal: 4.5.0
       lodash.throttle: 4.1.1
       nanoid: 3.3.7
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/basic-modules@1.1.7)(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
-    peerDependencies:
-      '@uppy/core': ^2.0.3
-      '@uppy/xhr-upload': ^2.0.3
-      '@wangeditor/basic-modules': 1.x
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.foreach: ^4.5.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19)(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       lodash.foreach: 4.5.0
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(@wangeditor/core@1.1.19)(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2):
-    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
-    peerDependencies:
-      '@uppy/core': ^2.1.4
-      '@uppy/xhr-upload': ^2.0.7
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
+  '@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
     dependencies:
       '@uppy/core': 2.3.4
       '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3)(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
+      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
       dom7: 3.0.0
       nanoid: 3.3.7
       slate: 0.72.8
       snabbdom: 3.6.2
-    dev: false
 
-  /JSONStream@1.3.5:
-    resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
-    hasBin: true
+  '@withtypes/mime@0.1.2':
+    dependencies:
+      mime: 3.0.0
+
+  JSONStream@1.3.5:
     dependencies:
       jsonparse: 1.3.1
       through: 2.3.8
-    dev: true
 
-  /acorn-jsx@5.3.2(acorn@8.14.0):
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
+  acorn-jsx@5.3.2(acorn@8.14.0):
     dependencies:
       acorn: 8.14.0
-    dev: true
 
-  /acorn@8.14.0:
-    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
+  acorn@8.14.0: {}
 
-  /ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
+  ajv@6.12.6:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-json-stable-stringify: 2.1.0
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
-    dev: true
 
-  /ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
+  ajv@8.17.1:
     dependencies:
       fast-deep-equal: 3.1.3
       fast-uri: 3.0.3
       json-schema-traverse: 1.0.0
       require-from-string: 2.0.2
-    dev: true
 
-  /alien-signals@0.2.1:
-    resolution: {integrity: sha512-FlEQrDJe9r2RI4cDlnK2zYqJezvx1uJaWEuwxsnlFqnPwvJbgitNBRumWrLDv8lA+7cCikpMxfJD2TTHiaTklA==}
-    dev: true
+  alien-signals@0.2.1: {}
 
-  /animate.css@4.1.1:
-    resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
-    dev: false
+  animate.css@4.1.1: {}
 
-  /ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
+  ansi-escapes@4.3.2:
     dependencies:
       type-fest: 0.21.3
-    dev: true
 
-  /ansi-escapes@7.0.0:
-    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
-    engines: {node: '>=18'}
+  ansi-escapes@7.0.0:
     dependencies:
       environment: 1.1.0
-    dev: true
-
-  /ansi-regex@2.1.1:
-    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
 
-  /ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
-    dev: true
+  ansi-regex@2.1.1: {}
 
-  /ansi-regex@6.1.0:
-    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
-    engines: {node: '>=12'}
-    dev: true
+  ansi-regex@5.0.1: {}
 
-  /ansi-styles@2.2.1:
-    resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  ansi-regex@6.1.0: {}
 
-  /ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
+  ansi-styles@2.2.1: {}
+
+  ansi-styles@3.2.1:
     dependencies:
       color-convert: 1.9.3
-    dev: true
 
-  /ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
+  ansi-styles@4.3.0:
     dependencies:
       color-convert: 2.0.1
-    dev: true
 
-  /ansi-styles@6.2.1:
-    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: '>=12'}
-    dev: true
+  ansi-styles@6.2.1: {}
 
-  /anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
+  anymatch@3.1.3:
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
-    dev: true
 
-  /archiver-utils@2.1.0:
-    resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
-    engines: {node: '>= 6'}
+  archiver-utils@2.1.0:
     dependencies:
       glob: 7.2.3
       graceful-fs: 4.2.11
@@ -2416,11 +5676,8 @@ packages:
       lodash.union: 4.6.0
       normalize-path: 3.0.0
       readable-stream: 2.3.8
-    dev: false
 
-  /archiver-utils@3.0.4:
-    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
-    engines: {node: '>= 10'}
+  archiver-utils@3.0.4:
     dependencies:
       glob: 7.2.3
       graceful-fs: 4.2.11
@@ -2432,11 +5689,8 @@ packages:
       lodash.union: 4.6.0
       normalize-path: 3.0.0
       readable-stream: 3.6.2
-    dev: false
 
-  /archiver@5.3.2:
-    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
-    engines: {node: '>= 10'}
+  archiver@5.3.2:
     dependencies:
       archiver-utils: 2.1.0
       async: 3.2.6
@@ -2445,52 +5699,27 @@ packages:
       readdir-glob: 1.1.3
       tar-stream: 2.2.0
       zip-stream: 4.1.1
-    dev: false
 
-  /argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-    dev: true
+  argparse@2.0.1: {}
 
-  /arr-diff@4.0.0:
-    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arr-diff@4.0.0: {}
 
-  /arr-flatten@1.1.0:
-    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arr-flatten@1.1.0: {}
 
-  /arr-union@3.1.0:
-    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  arr-union@3.1.0: {}
 
-  /array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
+  array-buffer-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
       is-array-buffer: 3.0.4
-    dev: true
 
-  /array-ify@1.0.0:
-    resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
-    dev: true
+  array-ify@1.0.0: {}
 
-  /array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-    dev: true
+  array-union@2.1.0: {}
 
-  /array-unique@0.3.2:
-    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  array-unique@0.3.2: {}
 
-  /arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
-    engines: {node: '>= 0.4'}
+  arraybuffer.prototype.slice@1.0.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
       call-bind: 1.0.7
@@ -2500,51 +5729,24 @@ packages:
       get-intrinsic: 1.2.4
       is-array-buffer: 3.0.4
       is-shared-array-buffer: 1.0.3
-    dev: true
 
-  /asap@2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-    dev: true
+  asap@2.0.6: {}
 
-  /assign-symbols@1.0.0:
-    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  assign-symbols@1.0.0: {}
 
-  /astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-    dev: true
+  astral-regex@2.0.0: {}
 
-  /async-validator@4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-    dev: false
+  async-validator@4.2.5: {}
 
-  /async@3.2.6:
-    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
-    dev: false
+  async@3.2.6: {}
 
-  /asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-    dev: false
+  asynckit@0.4.0: {}
 
-  /at-least-node@1.0.0:
-    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
-    engines: {node: '>= 4.0.0'}
-    dev: true
+  at-least-node@1.0.0: {}
 
-  /atob@2.1.2:
-    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
-    engines: {node: '>= 4.5.0'}
-    hasBin: true
-    dev: true
+  atob@2.1.2: {}
 
-  /autoprefixer@10.4.20(postcss@8.4.49):
-    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
+  autoprefixer@10.4.20(postcss@8.4.49):
     dependencies:
       browserslist: 4.24.2
       caniuse-lite: 1.0.30001680
@@ -2553,38 +5755,26 @@ packages:
       picocolors: 1.1.1
       postcss: 8.4.49
       postcss-value-parser: 4.2.0
-    dev: true
 
-  /available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
-    engines: {node: '>= 0.4'}
+  available-typed-arrays@1.0.7:
     dependencies:
       possible-typed-array-names: 1.0.0
-    dev: true
 
-  /axios@1.7.7:
-    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
+  axios@1.7.7:
     dependencies:
       follow-redirects: 1.15.9
       form-data: 4.0.1
       proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - debug
-    dev: false
 
-  /balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
+  balanced-match@1.0.2: {}
 
-  /balanced-match@2.0.0:
-    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
-    dev: true
+  balanced-match@2.0.0: {}
 
-  /base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
+  base64-js@1.5.1: {}
 
-  /base@0.11.2:
-    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
-    engines: {node: '>=0.10.0'}
+  base@0.11.2:
     dependencies:
       cache-base: 1.0.1
       class-utils: 0.3.6
@@ -2593,62 +5783,40 @@ packages:
       isobject: 3.0.1
       mixin-deep: 1.3.2
       pascalcase: 0.1.1
-    dev: true
 
-  /big-integer@1.6.52:
-    resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
-    engines: {node: '>=0.6'}
-    dev: false
+  big-integer@1.6.52: {}
 
-  /big.js@5.2.2:
-    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
-    dev: true
+  big.js@5.2.2: {}
 
-  /binary-extensions@2.3.0:
-    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
-    engines: {node: '>=8'}
-    dev: true
+  binary-extensions@2.3.0: {}
 
-  /binary@0.3.0:
-    resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==}
+  binary@0.3.0:
     dependencies:
       buffers: 0.1.1
       chainsaw: 0.1.0
-    dev: false
 
-  /bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
+  bl@4.1.0:
     dependencies:
       buffer: 5.7.1
       inherits: 2.0.4
       readable-stream: 3.6.2
 
-  /bluebird@3.4.7:
-    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
-    dev: false
+  bluebird@3.4.7: {}
 
-  /bluebird@3.7.2:
-    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-    dev: true
+  bluebird@3.7.2: {}
 
-  /boolbase@1.0.0:
-    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-    dev: true
+  boolbase@1.0.0: {}
 
-  /brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
+  brace-expansion@1.1.11:
     dependencies:
       balanced-match: 1.0.2
       concat-map: 0.0.1
 
-  /brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
+  brace-expansion@2.0.1:
     dependencies:
       balanced-match: 1.0.2
 
-  /braces@2.3.2:
-    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
-    engines: {node: '>=0.10.0'}
+  braces@2.3.2:
     dependencies:
       arr-flatten: 1.1.0
       array-unique: 0.3.2
@@ -2662,73 +5830,41 @@ packages:
       to-regex: 3.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /braces@3.0.3:
-    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
-    engines: {node: '>=8'}
+  braces@3.0.3:
     dependencies:
       fill-range: 7.1.1
-    dev: true
 
-  /browserslist@4.24.2:
-    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
+  browserslist@4.24.2:
     dependencies:
       caniuse-lite: 1.0.30001680
       electron-to-chromium: 1.5.56
       node-releases: 2.0.18
       update-browserslist-db: 1.1.1(browserslist@4.24.2)
-    dev: true
 
-  /buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-    dev: false
+  buffer-crc32@0.2.13: {}
 
-  /buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-    dev: true
+  buffer-from@1.1.2: {}
 
-  /buffer-indexof-polyfill@1.0.2:
-    resolution: {integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==}
-    engines: {node: '>=0.10'}
-    dev: false
+  buffer-indexof-polyfill@1.0.2: {}
 
-  /buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
+  buffer@5.7.1:
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
 
-  /buffers@0.1.1:
-    resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
-    engines: {node: '>=0.2.0'}
-    dev: false
+  buffers@0.1.1: {}
 
-  /bundle-require@5.0.0(esbuild@0.23.1):
-    resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    peerDependencies:
-      esbuild: '>=0.18'
+  bundle-require@5.0.0(esbuild@0.23.1):
     dependencies:
       esbuild: 0.23.1
       load-tsconfig: 0.2.5
-    dev: true
 
-  /bytes@3.1.2:
-    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  bytes@3.1.2: {}
 
-  /cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
-    dev: true
+  cac@6.7.14: {}
 
-  /cache-base@1.0.1:
-    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
-    engines: {node: '>=0.10.0'}
+  cache-base@1.0.1:
     dependencies:
       collection-visit: 1.0.0
       component-emitter: 1.3.1
@@ -2739,16 +5875,10 @@ packages:
       to-object-path: 0.3.0
       union-value: 1.0.1
       unset-value: 1.0.0
-    dev: true
 
-  /cachedir@2.3.0:
-    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
-    engines: {node: '>=6'}
-    dev: true
+  cachedir@2.3.0: {}
 
-  /call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
-    engines: {node: '>= 0.4'}
+  call-bind@1.0.7:
     dependencies:
       es-define-property: 1.0.0
       es-errors: 1.3.0
@@ -2756,61 +5886,38 @@ packages:
       get-intrinsic: 1.2.4
       set-function-length: 1.2.2
 
-  /callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
-    dev: true
+  callsites@3.1.0: {}
 
-  /caniuse-lite@1.0.30001680:
-    resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==}
-    dev: true
+  caniuse-lite@1.0.30001680: {}
 
-  /chainsaw@0.1.0:
-    resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==}
+  chainsaw@0.1.0:
     dependencies:
       traverse: 0.3.9
-    dev: false
 
-  /chalk@1.1.3:
-    resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
-    engines: {node: '>=0.10.0'}
+  chalk@1.1.3:
     dependencies:
       ansi-styles: 2.2.1
       escape-string-regexp: 1.0.5
       has-ansi: 2.0.0
       strip-ansi: 3.0.1
       supports-color: 2.0.0
-    dev: true
 
-  /chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
+  chalk@2.4.2:
     dependencies:
       ansi-styles: 3.2.1
       escape-string-regexp: 1.0.5
       supports-color: 5.5.0
-    dev: true
 
-  /chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
+  chalk@4.1.2:
     dependencies:
       ansi-styles: 4.3.0
       supports-color: 7.2.0
-    dev: true
 
-  /chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-    dev: true
+  chalk@5.3.0: {}
 
-  /chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
-    dev: true
+  chardet@0.7.0: {}
 
-  /chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
+  chokidar@3.6.0:
     dependencies:
       anymatch: 3.1.3
       braces: 3.0.3
@@ -2821,165 +5928,93 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /chokidar@4.0.1:
-    resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==}
-    engines: {node: '>= 14.16.0'}
+  chokidar@4.0.1:
     dependencies:
       readdirp: 4.0.2
-    dev: true
 
-  /class-utils@0.3.6:
-    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
-    engines: {node: '>=0.10.0'}
+  class-utils@0.3.6:
     dependencies:
       arr-union: 3.1.0
       define-property: 0.2.5
       isobject: 3.0.1
       static-extend: 0.1.2
-    dev: true
 
-  /cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
+  cli-cursor@3.1.0:
     dependencies:
       restore-cursor: 3.1.0
-    dev: true
 
-  /cli-cursor@5.0.0:
-    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
-    engines: {node: '>=18'}
+  cli-cursor@5.0.0:
     dependencies:
       restore-cursor: 5.1.0
-    dev: true
 
-  /cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
-    dev: true
+  cli-spinners@2.9.2: {}
 
-  /cli-truncate@4.0.0:
-    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
-    engines: {node: '>=18'}
+  cli-truncate@4.0.0:
     dependencies:
       slice-ansi: 5.0.0
       string-width: 7.2.0
-    dev: true
 
-  /cli-width@3.0.0:
-    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
-    engines: {node: '>= 10'}
-    dev: true
+  cli-width@3.0.0: {}
 
-  /cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
+  cliui@8.0.1:
     dependencies:
       string-width: 4.2.3
       strip-ansi: 6.0.1
       wrap-ansi: 7.0.0
-    dev: true
 
-  /clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
-    dev: true
+  clone@1.0.4: {}
 
-  /clone@2.1.2:
-    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: '>=0.8'}
-    dev: true
+  clone@2.1.2: {}
 
-  /co-body@6.2.0:
-    resolution: {integrity: sha512-Kbpv2Yd1NdL1V/V4cwLVxraHDV6K8ayohr2rmH0J87Er8+zJjcTa6dAn9QMPC9CRgU8+aNajKbSf1TzDB1yKPA==}
-    engines: {node: '>=8.0.0'}
+  co-body@6.2.0:
     dependencies:
       '@hapi/bourne': 3.0.0
       inflation: 2.1.0
       qs: 6.13.0
       raw-body: 2.5.2
       type-is: 1.6.18
-    dev: true
 
-  /codemirror-editor-vue3@2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12):
-    resolution: {integrity: sha512-ebYGNhBpLmQNLguXzNyMMkn6K8v3lcS5/Ncvdn6YS4bLGEHE67MfsJIS/WV0L7I6WavUuFlY/Rs/AJKChIwSwg==}
-    peerDependencies:
-      codemirror: ^5
-      diff-match-patch: ^1.0.5
-      vue: ^3.x
+  codemirror-editor-vue3@2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       codemirror: 5.65.18
       diff-match-patch: 1.0.5
       vue: 3.5.12(typescript@5.5.4)
-    dev: false
 
-  /codemirror@5.65.18:
-    resolution: {integrity: sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==}
-    dev: false
+  codemirror@5.65.18: {}
 
-  /collection-visit@1.0.0:
-    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
-    engines: {node: '>=0.10.0'}
+  collection-visit@1.0.0:
     dependencies:
       map-visit: 1.0.0
       object-visit: 1.0.1
-    dev: true
 
-  /color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
+  color-convert@1.9.3:
     dependencies:
       color-name: 1.1.3
-    dev: true
 
-  /color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
+  color-convert@2.0.1:
     dependencies:
       color-name: 1.1.4
-    dev: true
 
-  /color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-    dev: true
+  color-name@1.1.3: {}
 
-  /color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-    dev: true
+  color-name@1.1.4: {}
 
-  /colord@2.9.3:
-    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
-    dev: true
+  colord@2.9.3: {}
 
-  /colorette@2.0.20:
-    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
-    dev: true
+  colorette@2.0.20: {}
 
-  /combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
+  combined-stream@1.0.8:
     dependencies:
       delayed-stream: 1.0.0
-    dev: false
 
-  /commander@12.1.0:
-    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
-    engines: {node: '>=18'}
-    dev: true
+  commander@12.1.0: {}
 
-  /commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-    dev: true
+  commander@2.20.3: {}
 
-  /commander@7.2.0:
-    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
-    engines: {node: '>= 10'}
-    dev: true
+  commander@7.2.0: {}
 
-  /commitizen@4.3.1(@types/node@22.9.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==}
-    engines: {node: '>= 12'}
-    hasBin: true
+  commitizen@4.3.1(@types/node@22.9.0)(typescript@5.5.4):
     dependencies:
       cachedir: 2.3.0
       cz-conventional-changelog: 3.3.0(@types/node@22.9.0)(typescript@5.5.4)
@@ -2998,207 +6033,122 @@ packages:
     transitivePeerDependencies:
       - '@types/node'
       - typescript
-    dev: true
 
-  /compare-func@2.0.0:
-    resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
+  compare-func@2.0.0:
     dependencies:
       array-ify: 1.0.0
       dot-prop: 5.3.0
-    dev: true
 
-  /component-emitter@1.3.1:
-    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
-    dev: true
+  component-emitter@1.3.1: {}
 
-  /compress-commons@4.1.2:
-    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
-    engines: {node: '>= 10'}
+  compress-commons@4.1.2:
     dependencies:
       buffer-crc32: 0.2.13
       crc32-stream: 4.0.3
       normalize-path: 3.0.0
       readable-stream: 3.6.2
-    dev: false
 
-  /compute-scroll-into-view@1.0.20:
-    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
-    dev: false
+  compute-scroll-into-view@1.0.20: {}
 
-  /concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
+  concat-map@0.0.1: {}
 
-  /confbox@0.1.8:
-    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
-    dev: true
+  confbox@0.1.8: {}
 
-  /consola@3.2.3:
-    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
-    engines: {node: ^14.18.0 || >=16.10.0}
-    dev: true
+  consola@3.2.3: {}
 
-  /conventional-changelog-angular@7.0.0:
-    resolution: {integrity: sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==}
-    engines: {node: '>=16'}
+  conventional-changelog-angular@7.0.0:
     dependencies:
       compare-func: 2.0.0
-    dev: true
 
-  /conventional-changelog-conventionalcommits@7.0.2:
-    resolution: {integrity: sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==}
-    engines: {node: '>=16'}
+  conventional-changelog-conventionalcommits@7.0.2:
     dependencies:
       compare-func: 2.0.0
-    dev: true
 
-  /conventional-commit-types@3.0.0:
-    resolution: {integrity: sha512-SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg==}
-    dev: true
+  conventional-commit-types@3.0.0: {}
 
-  /conventional-commits-parser@5.0.0:
-    resolution: {integrity: sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==}
-    engines: {node: '>=16'}
-    hasBin: true
+  conventional-commits-parser@5.0.0:
     dependencies:
       JSONStream: 1.3.5
       is-text-path: 2.0.0
       meow: 12.1.1
       split2: 4.2.0
-    dev: true
 
-  /cookies@0.9.1:
-    resolution: {integrity: sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==}
-    engines: {node: '>= 0.8'}
+  cookies@0.9.1:
     dependencies:
       depd: 2.0.0
       keygrip: 1.1.0
-    dev: true
 
-  /copy-descriptor@0.1.1:
-    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  copy-descriptor@0.1.1: {}
 
-  /core-util-is@1.0.3:
-    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
-    dev: false
+  core-util-is@1.0.3: {}
 
-  /cors@2.8.5:
-    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: '>= 0.10'}
+  cors@2.8.5:
     dependencies:
       object-assign: 4.1.1
       vary: 1.1.2
-    dev: true
 
-  /cosmiconfig-typescript-loader@5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==}
-    engines: {node: '>=v16'}
-    peerDependencies:
-      '@types/node': '*'
-      cosmiconfig: '>=8.2'
-      typescript: '>=4'
+  cosmiconfig-typescript-loader@5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0(typescript@5.5.4))(typescript@5.5.4):
     dependencies:
       '@types/node': 22.9.0
       cosmiconfig: 9.0.0(typescript@5.5.4)
       jiti: 1.21.6
       typescript: 5.5.4
-    dev: true
 
-  /cosmiconfig@9.0.0(typescript@5.5.4):
-    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  cosmiconfig@9.0.0(typescript@5.5.4):
     dependencies:
       env-paths: 2.2.1
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       parse-json: 5.2.0
+    optionalDependencies:
       typescript: 5.5.4
-    dev: true
 
-  /crc-32@1.2.2:
-    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-    dev: false
+  crc-32@1.2.2: {}
 
-  /crc32-stream@4.0.3:
-    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
-    engines: {node: '>= 10'}
+  crc32-stream@4.0.3:
     dependencies:
       crc-32: 1.2.2
       readable-stream: 3.6.2
-    dev: false
 
-  /cross-spawn@7.0.5:
-    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
-    engines: {node: '>= 8'}
+  cropperjs@1.6.2: {}
+
+  cross-spawn@7.0.5:
     dependencies:
       path-key: 3.1.1
       shebang-command: 2.0.0
       which: 2.0.2
-    dev: true
 
-  /css-functions-list@3.2.3:
-    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
-    engines: {node: '>=12 || >=16'}
-    dev: true
+  css-functions-list@3.2.3: {}
 
-  /css-select@4.3.0:
-    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
+  css-select@4.3.0:
     dependencies:
       boolbase: 1.0.0
       css-what: 6.1.0
       domhandler: 4.3.1
       domutils: 2.8.0
       nth-check: 2.1.1
-    dev: true
 
-  /css-tree@1.1.3:
-    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
-    engines: {node: '>=8.0.0'}
+  css-tree@1.1.3:
     dependencies:
       mdn-data: 2.0.14
       source-map: 0.6.1
-    dev: true
 
-  /css-tree@3.0.1:
-    resolution: {integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
+  css-tree@3.0.1:
     dependencies:
       mdn-data: 2.12.1
       source-map-js: 1.2.1
-    dev: true
 
-  /css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
-    dev: true
+  css-what@6.1.0: {}
 
-  /cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-    dev: true
+  cssesc@3.0.0: {}
 
-  /csso@4.2.0:
-    resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==}
-    engines: {node: '>=8.0.0'}
+  csso@4.2.0:
     dependencies:
       css-tree: 1.1.3
-    dev: true
 
-  /csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
+  csstype@3.1.3: {}
 
-  /cz-conventional-changelog@3.3.0(@types/node@22.9.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==}
-    engines: {node: '>= 10'}
+  cz-conventional-changelog@3.3.0(@types/node@22.9.0)(typescript@5.5.4):
     dependencies:
       chalk: 2.4.2
       commitizen: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
@@ -3211,316 +6161,187 @@ packages:
     transitivePeerDependencies:
       - '@types/node'
       - typescript
-    dev: true
 
-  /cz-git@1.9.4:
-    resolution: {integrity: sha512-VntWcIEFfW8+7RgwYaRn1r10NhUkl8/8ZdJQRupEdqE7QXBCSjNP8hKSk9zhSLzYAsdXfGEAwiAYJM1T2Qsh8w==}
-    engines: {node: '>=v12.20.0'}
-    dev: true
+  cz-git@1.9.4: {}
 
-  /d@1.0.2:
-    resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==}
-    engines: {node: '>=0.12'}
+  d@1.0.2:
     dependencies:
       es5-ext: 0.10.64
       type: 2.7.3
-    dev: false
 
-  /dargs@8.1.0:
-    resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
-    engines: {node: '>=12'}
-    dev: true
+  dargs@8.1.0: {}
 
-  /data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
-    engines: {node: '>= 0.4'}
+  data-view-buffer@1.0.1:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
-    engines: {node: '>= 0.4'}
+  data-view-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
-    engines: {node: '>= 0.4'}
+  data-view-byte-offset@1.0.0:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-data-view: 1.0.1
-    dev: true
 
-  /dayjs@1.11.13:
-    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
-    dev: false
+  dayjs@1.11.13: {}
 
-  /de-indent@1.0.2:
-    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
-    dev: true
+  de-indent@1.0.2: {}
 
-  /debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@2.6.9:
     dependencies:
       ms: 2.0.0
-    dev: true
 
-  /debug@4.3.7:
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
+  debug@4.3.7:
     dependencies:
       ms: 2.1.3
-    dev: true
 
-  /decode-uri-component@0.2.2:
-    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
-    engines: {node: '>=0.10'}
-    dev: true
+  decode-uri-component@0.2.2: {}
 
-  /dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-    dev: true
+  dedent@0.7.0: {}
 
-  /deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-    dev: true
+  deep-is@0.1.4: {}
 
-  /defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
+  defaults@1.0.4:
     dependencies:
       clone: 1.0.4
-    dev: true
 
-  /define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
+  define-data-property@1.1.4:
     dependencies:
       es-define-property: 1.0.0
       es-errors: 1.3.0
       gopd: 1.0.1
 
-  /define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
+  define-properties@1.2.1:
     dependencies:
       define-data-property: 1.1.4
       has-property-descriptors: 1.0.2
       object-keys: 1.1.1
-    dev: true
 
-  /define-property@0.2.5:
-    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
-    engines: {node: '>=0.10.0'}
+  define-property@0.2.5:
     dependencies:
       is-descriptor: 0.1.7
-    dev: true
 
-  /define-property@1.0.0:
-    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
-    engines: {node: '>=0.10.0'}
+  define-property@1.0.0:
     dependencies:
       is-descriptor: 1.0.3
-    dev: true
 
-  /define-property@2.0.2:
-    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
-    engines: {node: '>=0.10.0'}
+  define-property@2.0.2:
     dependencies:
       is-descriptor: 1.0.3
       isobject: 3.0.1
-    dev: true
 
-  /defu@6.1.4:
-    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
-    dev: true
+  defu@6.1.4: {}
 
-  /delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-    dev: false
+  delayed-stream@1.0.0: {}
 
-  /depd@2.0.0:
-    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  depd@2.0.0: {}
 
-  /destr@2.0.3:
-    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
-    dev: true
+  destr@2.0.3: {}
 
-  /detect-file@1.0.0:
-    resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  detect-file@1.0.0: {}
 
-  /detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
-    dev: true
+  detect-indent@6.1.0: {}
 
-  /detect-libc@1.0.3:
-    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    requiresBuild: true
-    dev: true
+  detect-libc@1.0.3:
     optional: true
 
-  /dezalgo@1.0.4:
-    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
+  dezalgo@1.0.4:
     dependencies:
       asap: 2.0.6
       wrappy: 1.0.2
-    dev: true
 
-  /diff-match-patch@1.0.5:
-    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
-    dev: false
+  diff-match-patch@1.0.5: {}
 
-  /dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
+  dir-glob@3.0.1:
     dependencies:
       path-type: 4.0.0
-    dev: true
 
-  /dom-serializer@0.2.2:
-    resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
+  dom-serializer@0.2.2:
     dependencies:
       domelementtype: 2.3.0
       entities: 2.2.0
-    dev: true
 
-  /dom-serializer@1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
+  dom-serializer@1.4.1:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 4.3.1
       entities: 2.2.0
-    dev: true
 
-  /dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
+  dom-serializer@2.0.0:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       entities: 4.5.0
-    dev: true
 
-  /dom7@3.0.0:
-    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
+  dom7@3.0.0:
     dependencies:
       ssr-window: 3.0.0
-    dev: false
 
-  /domelementtype@1.3.1:
-    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
-    dev: true
+  domelementtype@1.3.1: {}
 
-  /domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
-    dev: true
+  domelementtype@2.3.0: {}
 
-  /domhandler@2.4.2:
-    resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
+  domhandler@2.4.2:
     dependencies:
       domelementtype: 1.3.1
-    dev: true
 
-  /domhandler@4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
-    engines: {node: '>= 4'}
+  domhandler@4.3.1:
     dependencies:
       domelementtype: 2.3.0
-    dev: true
 
-  /domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
+  domhandler@5.0.3:
     dependencies:
       domelementtype: 2.3.0
-    dev: true
 
-  /domutils@1.7.0:
-    resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
+  domutils@1.7.0:
     dependencies:
       dom-serializer: 0.2.2
       domelementtype: 1.3.1
-    dev: true
 
-  /domutils@2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
+  domutils@2.8.0:
     dependencies:
       dom-serializer: 1.4.1
       domelementtype: 2.3.0
       domhandler: 4.3.1
-    dev: true
 
-  /domutils@3.1.0:
-    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
+  domutils@3.1.0:
     dependencies:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-    dev: true
 
-  /dot-prop@5.3.0:
-    resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
-    engines: {node: '>=8'}
+  dot-prop@5.3.0:
     dependencies:
       is-obj: 2.0.0
-    dev: true
 
-  /duplexer2@0.1.4:
-    resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
+  duplexer2@0.1.4:
     dependencies:
       readable-stream: 2.3.8
-    dev: false
 
-  /duplexer@0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-    dev: true
+  duplexer@0.1.2: {}
 
-  /echarts@5.5.1:
-    resolution: {integrity: sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==}
+  echarts@5.5.1:
     dependencies:
       tslib: 2.3.0
       zrender: 5.6.0
-    dev: false
 
-  /electron-to-chromium@1.5.56:
-    resolution: {integrity: sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==}
-    dev: true
+  electron-to-chromium@1.5.56: {}
 
-  /element-plus@2.8.7(vue@3.5.12):
-    resolution: {integrity: sha512-oGQyFRufFOgjd872tZc+T4xQAYLlX4hj6d3ixeY13L4fFNUuc1N49JHAqJGPda0tdx3qCnjceZoh1kqqj2+tXQ==}
-    peerDependencies:
-      vue: ^3.2.0
+  element-plus@2.8.7(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       '@ctrl/tinycolor': 3.6.1
-      '@element-plus/icons-vue': 2.3.1(vue@3.5.12)
+      '@element-plus/icons-vue': 2.3.1(vue@3.5.12(typescript@5.5.4))
       '@floating-ui/dom': 1.6.12
-      '@popperjs/core': /@sxzz/popperjs-es@2.11.7
+      '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
       '@types/lodash': 4.17.13
       '@types/lodash-es': 4.17.12
-      '@vueuse/core': 9.13.0(vue@3.5.12)
+      '@vueuse/core': 9.13.0(vue@3.5.12(typescript@5.5.4))
       async-validator: 4.2.5
       dayjs: 1.11.13
       escape-html: 1.0.3
@@ -3532,58 +6353,32 @@ packages:
       vue: 3.5.12(typescript@5.5.4)
     transitivePeerDependencies:
       - '@vue/composition-api'
-    dev: false
 
-  /emoji-regex@10.4.0:
-    resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
-    dev: true
+  emoji-regex@10.4.0: {}
 
-  /emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
-    dev: true
+  emoji-regex@8.0.0: {}
 
-  /emojis-list@3.0.0:
-    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
-    engines: {node: '>= 4'}
-    dev: true
+  emojis-list@3.0.0: {}
 
-  /end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
+  end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
-    dev: false
 
-  /entities@1.1.2:
-    resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
-    dev: true
+  entities@1.1.2: {}
 
-  /entities@2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
-    dev: true
+  entities@2.2.0: {}
 
-  /entities@4.5.0:
-    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: '>=0.12'}
+  entities@4.5.0: {}
 
-  /env-paths@2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: '>=6'}
-    dev: true
+  env-paths@2.2.1: {}
 
-  /environment@1.1.0:
-    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
-    engines: {node: '>=18'}
-    dev: true
+  environment@1.1.0: {}
 
-  /error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
+  error-ex@1.3.2:
     dependencies:
       is-arrayish: 0.2.1
-    dev: true
 
-  /es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
-    engines: {node: '>= 0.4'}
+  es-abstract@1.23.3:
     dependencies:
       array-buffer-byte-length: 1.0.1
       arraybuffer.prototype.slice: 1.0.3
@@ -3631,75 +6426,48 @@ packages:
       typed-array-length: 1.0.6
       unbox-primitive: 1.0.2
       which-typed-array: 1.1.15
-    dev: true
 
-  /es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
+  es-define-property@1.0.0:
     dependencies:
       get-intrinsic: 1.2.4
 
-  /es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
+  es-errors@1.3.0: {}
 
-  /es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
-    engines: {node: '>= 0.4'}
+  es-object-atoms@1.0.0:
     dependencies:
       es-errors: 1.3.0
-    dev: true
 
-  /es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
-    engines: {node: '>= 0.4'}
+  es-set-tostringtag@2.0.3:
     dependencies:
       get-intrinsic: 1.2.4
       has-tostringtag: 1.0.2
       hasown: 2.0.2
-    dev: true
 
-  /es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
+  es-to-primitive@1.2.1:
     dependencies:
       is-callable: 1.2.7
       is-date-object: 1.0.5
       is-symbol: 1.0.4
-    dev: true
 
-  /es5-ext@0.10.64:
-    resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==}
-    engines: {node: '>=0.10'}
-    requiresBuild: true
+  es5-ext@0.10.64:
     dependencies:
       es6-iterator: 2.0.3
       es6-symbol: 3.1.4
       esniff: 2.0.1
       next-tick: 1.1.0
-    dev: false
 
-  /es6-iterator@2.0.3:
-    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
+  es6-iterator@2.0.3:
     dependencies:
       d: 1.0.2
       es5-ext: 0.10.64
       es6-symbol: 3.1.4
-    dev: false
 
-  /es6-symbol@3.1.4:
-    resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==}
-    engines: {node: '>=0.12'}
+  es6-symbol@3.1.4:
     dependencies:
       d: 1.0.2
       ext: 1.7.0
-    dev: false
 
-  /esbuild@0.21.5:
-    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.21.5:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.21.5
       '@esbuild/android-arm': 0.21.5
@@ -3724,13 +6492,8 @@ packages:
       '@esbuild/win32-arm64': 0.21.5
       '@esbuild/win32-ia32': 0.21.5
       '@esbuild/win32-x64': 0.21.5
-    dev: true
 
-  /esbuild@0.23.1:
-    resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}
-    engines: {node: '>=18'}
-    hasBin: true
-    requiresBuild: true
+  esbuild@0.23.1:
     optionalDependencies:
       '@esbuild/aix-ppc64': 0.23.1
       '@esbuild/android-arm': 0.23.1
@@ -3756,118 +6519,61 @@ packages:
       '@esbuild/win32-arm64': 0.23.1
       '@esbuild/win32-ia32': 0.23.1
       '@esbuild/win32-x64': 0.23.1
-    dev: true
 
-  /escalade@3.2.0:
-    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
-    engines: {node: '>=6'}
-    dev: true
+  escalade@3.2.0: {}
 
-  /escape-html@1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
-    dev: false
+  escape-html@1.0.3: {}
 
-  /escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-    dev: true
+  escape-string-regexp@1.0.5: {}
 
-  /escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
-    dev: true
+  escape-string-regexp@4.0.0: {}
 
-  /escape-string-regexp@5.0.0:
-    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
-    engines: {node: '>=12'}
-    dev: true
+  escape-string-regexp@5.0.0: {}
 
-  /eslint-config-prettier@9.1.0(eslint@9.14.0):
-    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
+  eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)):
     dependencies:
-      eslint: 9.14.0
-    dev: true
+      eslint: 9.14.0(jiti@1.21.6)
 
-  /eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0)(eslint@9.14.0)(prettier@3.3.3):
-    resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      '@types/eslint': '>=8.0.0'
-      eslint: '>=8.0.0'
-      eslint-config-prettier: '*'
-      prettier: '>=3.0.0'
-    peerDependenciesMeta:
-      '@types/eslint':
-        optional: true
-      eslint-config-prettier:
-        optional: true
+  eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)))(eslint@9.14.0(jiti@1.21.6))(prettier@3.3.3):
     dependencies:
-      eslint: 9.14.0
-      eslint-config-prettier: 9.1.0(eslint@9.14.0)
+      eslint: 9.14.0(jiti@1.21.6)
       prettier: 3.3.3
       prettier-linter-helpers: 1.0.0
       synckit: 0.9.2
-    dev: true
+    optionalDependencies:
+      eslint-config-prettier: 9.1.0(eslint@9.14.0(jiti@1.21.6))
 
-  /eslint-plugin-vue@9.31.0(eslint@9.14.0):
-    resolution: {integrity: sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
+  eslint-plugin-vue@9.31.0(eslint@9.14.0(jiti@1.21.6)):
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
-      eslint: 9.14.0
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
+      eslint: 9.14.0(jiti@1.21.6)
       globals: 13.24.0
       natural-compare: 1.4.0
       nth-check: 2.1.1
       postcss-selector-parser: 6.1.2
       semver: 7.6.3
-      vue-eslint-parser: 9.4.3(eslint@9.14.0)
+      vue-eslint-parser: 9.4.3(eslint@9.14.0(jiti@1.21.6))
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  eslint-scope@7.2.2:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
-    dev: true
 
-  /eslint-scope@8.2.0:
-    resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  eslint-scope@8.2.0:
     dependencies:
       esrecurse: 4.3.0
       estraverse: 5.3.0
-    dev: true
 
-  /eslint-visitor-keys@3.4.3:
-    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    dev: true
+  eslint-visitor-keys@3.4.3: {}
 
-  /eslint-visitor-keys@4.2.0:
-    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    dev: true
+  eslint-visitor-keys@4.2.0: {}
 
-  /eslint@9.14.0:
-    resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    hasBin: true
-    peerDependencies:
-      jiti: '*'
-    peerDependenciesMeta:
-      jiti:
-        optional: true
+  eslint@9.14.0(jiti@1.21.6):
     dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0)
+      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
       '@eslint-community/regexpp': 4.12.1
       '@eslint/config-array': 0.18.0
       '@eslint/core': 0.7.0
@@ -3902,90 +6608,58 @@ packages:
       natural-compare: 1.4.0
       optionator: 0.9.4
       text-table: 0.2.0
+    optionalDependencies:
+      jiti: 1.21.6
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /esniff@2.0.1:
-    resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==}
-    engines: {node: '>=0.10'}
+  esniff@2.0.1:
     dependencies:
       d: 1.0.2
       es5-ext: 0.10.64
       event-emitter: 0.3.5
       type: 2.7.3
-    dev: false
 
-  /espree@10.3.0:
-    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+  espree@10.3.0:
     dependencies:
       acorn: 8.14.0
       acorn-jsx: 5.3.2(acorn@8.14.0)
       eslint-visitor-keys: 4.2.0
-    dev: true
 
-  /espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
+  espree@9.6.1:
     dependencies:
       acorn: 8.14.0
       acorn-jsx: 5.3.2(acorn@8.14.0)
       eslint-visitor-keys: 3.4.3
-    dev: true
 
-  /esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
-    engines: {node: '>=0.10'}
+  esquery@1.6.0:
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
-  /esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
+  esrecurse@4.3.0:
     dependencies:
       estraverse: 5.3.0
-    dev: true
 
-  /estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
-    dev: true
+  estraverse@5.3.0: {}
 
-  /estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
+  estree-walker@2.0.2: {}
 
-  /estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
+  estree-walker@3.0.3:
     dependencies:
       '@types/estree': 1.0.6
-    dev: true
 
-  /esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  esutils@2.0.3: {}
 
-  /etag@1.8.1:
-    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
-    engines: {node: '>= 0.6'}
-    dev: true
+  etag@1.8.1: {}
 
-  /event-emitter@0.3.5:
-    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
+  event-emitter@0.3.5:
     dependencies:
       d: 1.0.2
       es5-ext: 0.10.64
-    dev: false
 
-  /eventemitter3@5.0.1:
-    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
-    dev: true
+  eventemitter3@5.0.1: {}
 
-  /exceljs@4.4.0:
-    resolution: {integrity: sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==}
-    engines: {node: '>=8.3.0'}
+  exceljs@4.4.0:
     dependencies:
       archiver: 5.3.2
       dayjs: 1.11.13
@@ -3996,11 +6670,8 @@ packages:
       tmp: 0.2.3
       unzipper: 0.10.14
       uuid: 8.3.2
-    dev: false
 
-  /execa@8.0.1:
-    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
-    engines: {node: '>=16.17'}
+  execa@8.0.1:
     dependencies:
       cross-spawn: 7.0.5
       get-stream: 8.0.1
@@ -4011,11 +6682,8 @@ packages:
       onetime: 6.0.0
       signal-exit: 4.1.0
       strip-final-newline: 3.0.0
-    dev: true
 
-  /expand-brackets@2.1.4:
-    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
-    engines: {node: '>=0.10.0'}
+  expand-brackets@2.1.4:
     dependencies:
       debug: 2.6.9
       define-property: 0.2.5
@@ -4026,48 +6694,31 @@ packages:
       to-regex: 3.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /expand-tilde@2.0.2:
-    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
-    engines: {node: '>=0.10.0'}
+  expand-tilde@2.0.2:
     dependencies:
       homedir-polyfill: 1.0.3
-    dev: true
 
-  /ext@1.7.0:
-    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
+  ext@1.7.0:
     dependencies:
       type: 2.7.3
-    dev: false
 
-  /extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
+  extend-shallow@2.0.1:
     dependencies:
       is-extendable: 0.1.1
-    dev: true
 
-  /extend-shallow@3.0.2:
-    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
-    engines: {node: '>=0.10.0'}
+  extend-shallow@3.0.2:
     dependencies:
       assign-symbols: 1.0.0
       is-extendable: 1.0.1
-    dev: true
 
-  /external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
+  external-editor@3.1.0:
     dependencies:
       chardet: 0.7.0
       iconv-lite: 0.4.24
       tmp: 0.0.33
-    dev: true
 
-  /extglob@2.0.4:
-    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
-    engines: {node: '>=0.10.0'}
+  extglob@2.0.4:
     dependencies:
       array-unique: 0.3.2
       define-property: 1.0.0
@@ -4079,290 +6730,170 @@ packages:
       to-regex: 3.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /fast-csv@4.3.6:
-    resolution: {integrity: sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==}
-    engines: {node: '>=10.0.0'}
+  fast-csv@4.3.6:
     dependencies:
       '@fast-csv/format': 4.3.5
       '@fast-csv/parse': 4.3.6
-    dev: false
 
-  /fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
-    dev: true
+  fast-deep-equal@3.1.3: {}
 
-  /fast-diff@1.3.0:
-    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
-    dev: true
+  fast-diff@1.3.0: {}
 
-  /fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
-    engines: {node: '>=8.6.0'}
+  fast-glob@3.3.2:
     dependencies:
       '@nodelib/fs.stat': 2.0.5
       '@nodelib/fs.walk': 1.2.8
       glob-parent: 5.1.2
       merge2: 1.4.1
       micromatch: 4.0.8
-    dev: true
 
-  /fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-    dev: true
+  fast-json-stable-stringify@2.1.0: {}
 
-  /fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-    dev: true
+  fast-levenshtein@2.0.6: {}
 
-  /fast-uri@3.0.3:
-    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
-    dev: true
+  fast-uri@3.0.3: {}
 
-  /fastest-levenshtein@1.0.16:
-    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
-    engines: {node: '>= 4.9.1'}
-    dev: true
+  fastest-levenshtein@1.0.16: {}
 
-  /fastq@1.17.1:
-    resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
+  fastq@1.17.1:
     dependencies:
       reusify: 1.0.4
-    dev: true
 
-  /fdir@6.4.2(picomatch@4.0.2):
-    resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-    dependencies:
+  fdir@6.4.2(picomatch@4.0.2):
+    optionalDependencies:
       picomatch: 4.0.2
-    dev: true
 
-  /figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
+  figures@3.2.0:
     dependencies:
       escape-string-regexp: 1.0.5
-    dev: true
 
-  /file-entry-cache@8.0.0:
-    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
-    engines: {node: '>=16.0.0'}
+  file-entry-cache@8.0.0:
     dependencies:
       flat-cache: 4.0.1
-    dev: true
 
-  /file-entry-cache@9.1.0:
-    resolution: {integrity: sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==}
-    engines: {node: '>=18'}
+  file-entry-cache@9.1.0:
     dependencies:
       flat-cache: 5.0.0
-    dev: true
 
-  /fill-range@4.0.0:
-    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
-    engines: {node: '>=0.10.0'}
+  fill-range@4.0.0:
     dependencies:
       extend-shallow: 2.0.1
       is-number: 3.0.0
       repeat-string: 1.6.1
       to-regex-range: 2.1.1
-    dev: true
 
-  /fill-range@7.1.1:
-    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
-    engines: {node: '>=8'}
+  fill-range@7.1.1:
     dependencies:
       to-regex-range: 5.0.1
-    dev: true
 
-  /find-node-modules@2.1.3:
-    resolution: {integrity: sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==}
+  find-node-modules@2.1.3:
     dependencies:
       findup-sync: 4.0.0
       merge: 2.1.1
-    dev: true
 
-  /find-root@1.1.0:
-    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
-    dev: true
+  find-root@1.1.0: {}
 
-  /find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
+  find-up@5.0.0:
     dependencies:
       locate-path: 6.0.0
       path-exists: 4.0.0
-    dev: true
 
-  /find-up@7.0.0:
-    resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}
-    engines: {node: '>=18'}
+  find-up@7.0.0:
     dependencies:
       locate-path: 7.2.0
       path-exists: 5.0.0
       unicorn-magic: 0.1.0
-    dev: true
 
-  /findup-sync@4.0.0:
-    resolution: {integrity: sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==}
-    engines: {node: '>= 8'}
+  findup-sync@4.0.0:
     dependencies:
       detect-file: 1.0.0
       is-glob: 4.0.3
       micromatch: 4.0.8
       resolve-dir: 1.0.1
-    dev: true
 
-  /flat-cache@4.0.1:
-    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
-    engines: {node: '>=16'}
+  flat-cache@4.0.1:
     dependencies:
       flatted: 3.3.1
       keyv: 4.5.4
-    dev: true
 
-  /flat-cache@5.0.0:
-    resolution: {integrity: sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==}
-    engines: {node: '>=18'}
+  flat-cache@5.0.0:
     dependencies:
       flatted: 3.3.1
       keyv: 4.5.4
-    dev: true
 
-  /flatted@3.3.1:
-    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
-    dev: true
+  flatted@3.3.1: {}
 
-  /follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dev: false
+  follow-redirects@1.15.9: {}
 
-  /for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
+  for-each@0.3.3:
     dependencies:
       is-callable: 1.2.7
-    dev: true
 
-  /for-in@1.0.2:
-    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  for-in@1.0.2: {}
 
-  /form-data@4.0.1:
-    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
-    engines: {node: '>= 6'}
+  form-data@4.0.1:
     dependencies:
       asynckit: 0.4.0
       combined-stream: 1.0.8
       mime-types: 2.1.35
-    dev: false
 
-  /formidable@2.1.2:
-    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
+  formidable@2.1.2:
     dependencies:
       dezalgo: 1.0.4
       hexoid: 1.0.0
       once: 1.4.0
       qs: 6.13.0
-    dev: true
 
-  /fraction.js@4.3.7:
-    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
-    dev: true
+  fraction.js@4.3.7: {}
 
-  /fragment-cache@0.2.1:
-    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
-    engines: {node: '>=0.10.0'}
+  fragment-cache@0.2.1:
     dependencies:
       map-cache: 0.2.2
-    dev: true
 
-  /fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-    dev: false
+  fs-constants@1.0.0: {}
 
-  /fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
+  fs-extra@10.1.0:
     dependencies:
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.1
-    dev: true
 
-  /fs-extra@9.1.0:
-    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
-    engines: {node: '>=10'}
+  fs-extra@9.1.0:
     dependencies:
       at-least-node: 1.0.0
       graceful-fs: 4.2.11
       jsonfile: 6.1.0
       universalify: 2.0.1
-    dev: true
 
-  /fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
+  fs.realpath@1.0.0: {}
 
-  /fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-    requiresBuild: true
-    dev: true
+  fsevents@2.3.3:
     optional: true
 
-  /fstream@1.0.12:
-    resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==}
-    engines: {node: '>=0.6'}
-    deprecated: This package is no longer supported.
+  fstream@1.0.12:
     dependencies:
       graceful-fs: 4.2.11
       inherits: 2.0.4
       mkdirp: 0.5.6
       rimraf: 2.7.1
-    dev: false
 
-  /function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
+  function-bind@1.1.2: {}
 
-  /function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: '>= 0.4'}
+  function.prototype.name@1.1.6:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
       functions-have-names: 1.2.3
-    dev: true
 
-  /functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-    dev: true
+  functions-have-names@1.2.3: {}
 
-  /get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-    dev: true
+  get-caller-file@2.0.5: {}
 
-  /get-east-asian-width@1.3.0:
-    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
-    engines: {node: '>=18'}
-    dev: true
+  get-east-asian-width@1.3.0: {}
 
-  /get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
+  get-intrinsic@1.2.4:
     dependencies:
       es-errors: 1.3.0
       function-bind: 1.1.2
@@ -4370,58 +6901,35 @@ packages:
       has-symbols: 1.0.3
       hasown: 2.0.2
 
-  /get-stream@8.0.1:
-    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
-    engines: {node: '>=16'}
-    dev: true
+  get-stream@8.0.1: {}
 
-  /get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
-    engines: {node: '>= 0.4'}
+  get-symbol-description@1.0.2:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
-    dev: true
 
-  /get-tsconfig@4.8.1:
-    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
+  get-tsconfig@4.8.1:
     dependencies:
       resolve-pkg-maps: 1.0.0
-    dev: true
 
-  /get-value@2.0.6:
-    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  get-value@2.0.6: {}
 
-  /git-raw-commits@4.0.0:
-    resolution: {integrity: sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==}
-    engines: {node: '>=16'}
-    hasBin: true
+  git-raw-commits@4.0.0:
     dependencies:
       dargs: 8.1.0
       meow: 12.1.1
       split2: 4.2.0
-    dev: true
 
-  /glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
+  glob-parent@5.1.2:
     dependencies:
       is-glob: 4.0.3
-    dev: true
 
-  /glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
+  glob-parent@6.0.2:
     dependencies:
       is-glob: 4.0.3
-    dev: true
 
-  /glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
+  glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
       inflight: 1.0.6
@@ -4430,77 +6938,48 @@ packages:
       once: 1.4.0
       path-is-absolute: 1.0.1
 
-  /global-directory@4.0.1:
-    resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
-    engines: {node: '>=18'}
+  global-directory@4.0.1:
     dependencies:
       ini: 4.1.1
-    dev: true
 
-  /global-modules@1.0.0:
-    resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
-    engines: {node: '>=0.10.0'}
+  global-modules@1.0.0:
     dependencies:
       global-prefix: 1.0.2
       is-windows: 1.0.2
       resolve-dir: 1.0.1
-    dev: true
 
-  /global-modules@2.0.0:
-    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
-    engines: {node: '>=6'}
+  global-modules@2.0.0:
     dependencies:
       global-prefix: 3.0.0
-    dev: true
 
-  /global-prefix@1.0.2:
-    resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
-    engines: {node: '>=0.10.0'}
+  global-prefix@1.0.2:
     dependencies:
       expand-tilde: 2.0.2
       homedir-polyfill: 1.0.3
       ini: 1.3.8
       is-windows: 1.0.2
       which: 1.3.1
-    dev: true
 
-  /global-prefix@3.0.0:
-    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
-    engines: {node: '>=6'}
+  global-prefix@3.0.0:
     dependencies:
       ini: 1.3.8
       kind-of: 6.0.3
       which: 1.3.1
-    dev: true
 
-  /globals@13.24.0:
-    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
-    engines: {node: '>=8'}
+  globals@13.24.0:
     dependencies:
       type-fest: 0.20.2
-    dev: true
 
-  /globals@14.0.0:
-    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
-    engines: {node: '>=18'}
-    dev: true
+  globals@14.0.0: {}
 
-  /globals@15.12.0:
-    resolution: {integrity: sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==}
-    engines: {node: '>=18'}
-    dev: true
+  globals@15.12.0: {}
 
-  /globalthis@1.0.4:
-    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
-    engines: {node: '>= 0.4'}
+  globalthis@1.0.4:
     dependencies:
       define-properties: 1.2.1
       gopd: 1.0.1
-    dev: true
 
-  /globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
+  globby@11.1.0:
     dependencies:
       array-union: 2.1.0
       dir-glob: 3.0.1
@@ -4508,142 +6987,81 @@ packages:
       ignore: 5.3.2
       merge2: 1.4.1
       slash: 3.0.0
-    dev: true
 
-  /globjoin@0.1.4:
-    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
-    dev: true
+  globjoin@0.1.4: {}
 
-  /gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
+  gopd@1.0.1:
     dependencies:
       get-intrinsic: 1.2.4
 
-  /graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
+  graceful-fs@4.2.11: {}
 
-  /graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-    dev: true
+  graphemer@1.4.0: {}
 
-  /gzip-size@6.0.0:
-    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
-    engines: {node: '>=10'}
+  gzip-size@6.0.0:
     dependencies:
       duplexer: 0.1.2
-    dev: true
 
-  /has-ansi@2.0.0:
-    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
-    engines: {node: '>=0.10.0'}
+  has-ansi@2.0.0:
     dependencies:
       ansi-regex: 2.1.1
-    dev: true
 
-  /has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-    dev: true
+  has-bigints@1.0.2: {}
 
-  /has-flag@1.0.0:
-    resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  has-flag@1.0.0: {}
 
-  /has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-    dev: true
+  has-flag@3.0.0: {}
 
-  /has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
-    dev: true
+  has-flag@4.0.0: {}
 
-  /has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
+  has-property-descriptors@1.0.2:
     dependencies:
       es-define-property: 1.0.0
 
-  /has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
-    engines: {node: '>= 0.4'}
+  has-proto@1.0.3: {}
 
-  /has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
+  has-symbols@1.0.3: {}
 
-  /has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
+  has-tostringtag@1.0.2:
     dependencies:
       has-symbols: 1.0.3
-    dev: true
 
-  /has-value@0.3.1:
-    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
-    engines: {node: '>=0.10.0'}
+  has-value@0.3.1:
     dependencies:
       get-value: 2.0.6
       has-values: 0.1.4
       isobject: 2.1.0
-    dev: true
 
-  /has-value@1.0.0:
-    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
-    engines: {node: '>=0.10.0'}
+  has-value@1.0.0:
     dependencies:
       get-value: 2.0.6
       has-values: 1.0.0
       isobject: 3.0.1
-    dev: true
 
-  /has-values@0.1.4:
-    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  has-values@0.1.4: {}
 
-  /has-values@1.0.0:
-    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
-    engines: {node: '>=0.10.0'}
+  has-values@1.0.0:
     dependencies:
       is-number: 3.0.0
       kind-of: 4.0.0
-    dev: true
 
-  /hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
-    engines: {node: '>= 0.4'}
+  hasown@2.0.2:
     dependencies:
       function-bind: 1.1.2
 
-  /he@1.2.0:
-    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
-    hasBin: true
-    dev: true
+  he@1.2.0: {}
 
-  /hexoid@1.0.0:
-    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
-    engines: {node: '>=8'}
-    dev: true
+  hexoid@1.0.0: {}
 
-  /homedir-polyfill@1.0.3:
-    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
-    engines: {node: '>=0.10.0'}
+  homedir-polyfill@1.0.3:
     dependencies:
       parse-passwd: 1.0.0
-    dev: true
 
-  /html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
-    dev: true
+  html-tags@3.3.1: {}
 
-  /html-void-elements@2.0.1:
-    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
-    dev: false
+  html-void-elements@2.0.1: {}
 
-  /htmlparser2@3.10.1:
-    resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
+  htmlparser2@3.10.1:
     dependencies:
       domelementtype: 1.3.1
       domhandler: 2.4.2
@@ -4651,146 +7069,85 @@ packages:
       entities: 1.1.2
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: true
 
-  /htmlparser2@8.0.2:
-    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
+  htmlparser2@8.0.2:
     dependencies:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       domutils: 3.1.0
       entities: 4.5.0
-    dev: true
 
-  /http-errors@2.0.0:
-    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
-    engines: {node: '>= 0.8'}
+  http-errors@2.0.0:
     dependencies:
       depd: 2.0.0
       inherits: 2.0.4
       setprototypeof: 1.2.0
       statuses: 2.0.1
       toidentifier: 1.0.1
-    dev: true
 
-  /http-status@1.8.1:
-    resolution: {integrity: sha512-YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==}
-    engines: {node: '>= 0.4.0'}
-    dev: true
+  http-status@1.8.1: {}
 
-  /human-signals@5.0.0:
-    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
-    engines: {node: '>=16.17.0'}
-    dev: true
+  human-signals@5.0.0: {}
 
-  /husky@9.1.6:
-    resolution: {integrity: sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==}
-    engines: {node: '>=18'}
-    hasBin: true
-    dev: true
+  husky@9.1.6: {}
 
-  /i18next@20.6.1:
-    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
+  i18next@20.6.1:
     dependencies:
       '@babel/runtime': 7.26.0
-    dev: false
 
-  /iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
+  iconv-lite@0.4.24:
     dependencies:
       safer-buffer: 2.1.2
-    dev: true
 
-  /ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
+  ieee754@1.2.1: {}
 
-  /ignore@5.3.2:
-    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
-    engines: {node: '>= 4'}
-    dev: true
+  ignore@5.3.2: {}
 
-  /ignore@6.0.2:
-    resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
-    engines: {node: '>= 4'}
-    dev: true
+  ignore@6.0.2: {}
 
-  /image-size@0.5.5:
-    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dev: true
+  image-size@0.5.5: {}
 
-  /immediate@3.0.6:
-    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
-    dev: false
+  immediate@3.0.6: {}
 
-  /immer@9.0.21:
-    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
-    dev: false
+  immer@9.0.21: {}
 
-  /immutable@4.3.7:
-    resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==}
-    dev: true
+  immutable@4.3.7: {}
 
-  /import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
+  import-fresh@3.3.0:
     dependencies:
       parent-module: 1.0.1
       resolve-from: 4.0.0
-    dev: true
 
-  /import-meta-resolve@4.1.0:
-    resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==}
-    dev: true
+  import-meta-resolve@4.1.0: {}
 
-  /importx@0.4.4:
-    resolution: {integrity: sha512-Lo1pukzAREqrBnnHC+tj+lreMTAvyxtkKsMxLY8H15M/bvLl54p3YuoTI70Tz7Il0AsgSlD7Lrk/FaApRcBL7w==}
+  importx@0.4.4:
     dependencies:
       bundle-require: 5.0.0(esbuild@0.23.1)
       debug: 4.3.7
       esbuild: 0.23.1
       jiti: 2.0.0-beta.3
-      jiti-v1: /jiti@1.21.6
+      jiti-v1: jiti@1.21.6
       pathe: 1.1.2
       tsx: 4.19.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
-    dev: true
+  imurmurhash@0.1.4: {}
 
-  /inflation@2.1.0:
-    resolution: {integrity: sha512-t54PPJHG1Pp7VQvxyVCJ9mBbjG3Hqryges9bXoOO6GExCPa+//i/d5GSuFtpx3ALLd7lgIAur6zrIlBQyJuMlQ==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
+  inflation@2.1.0: {}
 
-  /inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
+  inflight@1.0.6:
     dependencies:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
+  inherits@2.0.4: {}
 
-  /ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-    dev: true
+  ini@1.3.8: {}
 
-  /ini@4.1.1:
-    resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-    dev: true
+  ini@4.1.1: {}
 
-  /inquirer@8.2.5:
-    resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
-    engines: {node: '>=12.0.0'}
+  inquirer@8.2.5:
     dependencies:
       ansi-escapes: 4.3.2
       chalk: 4.1.2
@@ -4807,467 +7164,253 @@ packages:
       strip-ansi: 6.0.1
       through: 2.3.8
       wrap-ansi: 7.0.0
-    dev: true
 
-  /internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
-    engines: {node: '>= 0.4'}
+  internal-slot@1.0.7:
     dependencies:
       es-errors: 1.3.0
       hasown: 2.0.2
       side-channel: 1.0.6
-    dev: true
 
-  /is-accessor-descriptor@1.0.1:
-    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
-    engines: {node: '>= 0.10'}
+  is-accessor-descriptor@1.0.1:
     dependencies:
       hasown: 2.0.2
-    dev: true
 
-  /is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
+  is-array-buffer@3.0.4:
     dependencies:
       call-bind: 1.0.7
       get-intrinsic: 1.2.4
-    dev: true
 
-  /is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-    dev: true
+  is-arrayish@0.2.1: {}
 
-  /is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
+  is-bigint@1.0.4:
     dependencies:
       has-bigints: 1.0.2
-    dev: true
 
-  /is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
+  is-binary-path@2.1.0:
     dependencies:
       binary-extensions: 2.3.0
-    dev: true
 
-  /is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
+  is-boolean-object@1.1.2:
     dependencies:
       call-bind: 1.0.7
       has-tostringtag: 1.0.2
-    dev: true
 
-  /is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
-    dev: true
+  is-buffer@1.1.6: {}
 
-  /is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  is-callable@1.2.7: {}
 
-  /is-core-module@2.15.1:
-    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
-    engines: {node: '>= 0.4'}
+  is-core-module@2.15.1:
     dependencies:
       hasown: 2.0.2
-    dev: true
 
-  /is-data-descriptor@1.0.1:
-    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
-    engines: {node: '>= 0.4'}
+  is-data-descriptor@1.0.1:
     dependencies:
       hasown: 2.0.2
-    dev: true
 
-  /is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
-    engines: {node: '>= 0.4'}
+  is-data-view@1.0.1:
     dependencies:
       is-typed-array: 1.1.13
-    dev: true
 
-  /is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
+  is-date-object@1.0.5:
     dependencies:
       has-tostringtag: 1.0.2
-    dev: true
 
-  /is-descriptor@0.1.7:
-    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
-    engines: {node: '>= 0.4'}
+  is-descriptor@0.1.7:
     dependencies:
       is-accessor-descriptor: 1.0.1
       is-data-descriptor: 1.0.1
-    dev: true
 
-  /is-descriptor@1.0.3:
-    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
-    engines: {node: '>= 0.4'}
+  is-descriptor@1.0.3:
     dependencies:
       is-accessor-descriptor: 1.0.1
       is-data-descriptor: 1.0.1
-    dev: true
 
-  /is-extendable@0.1.1:
-    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-extendable@0.1.1: {}
 
-  /is-extendable@1.0.1:
-    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
-    engines: {node: '>=0.10.0'}
+  is-extendable@1.0.1:
     dependencies:
       is-plain-object: 2.0.4
-    dev: true
 
-  /is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-extglob@2.1.1: {}
 
-  /is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-    dev: true
+  is-fullwidth-code-point@3.0.0: {}
 
-  /is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-    dev: true
+  is-fullwidth-code-point@4.0.0: {}
 
-  /is-fullwidth-code-point@5.0.0:
-    resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
-    engines: {node: '>=18'}
+  is-fullwidth-code-point@5.0.0:
     dependencies:
       get-east-asian-width: 1.3.0
-    dev: true
 
-  /is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
+  is-glob@4.0.3:
     dependencies:
       is-extglob: 2.1.1
-    dev: true
 
-  /is-hotkey@0.2.0:
-    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
-    dev: false
+  is-hotkey@0.2.0: {}
 
-  /is-interactive@1.0.0:
-    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: '>=8'}
-    dev: true
+  is-interactive@1.0.0: {}
 
-  /is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  is-negative-zero@2.0.3: {}
 
-  /is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
+  is-number-object@1.0.7:
     dependencies:
       has-tostringtag: 1.0.2
-    dev: true
 
-  /is-number@3.0.0:
-    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
-    engines: {node: '>=0.10.0'}
+  is-number@3.0.0:
     dependencies:
       kind-of: 3.2.2
-    dev: true
 
-  /is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-    dev: true
+  is-number@7.0.0: {}
 
-  /is-obj@2.0.0:
-    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
-    engines: {node: '>=8'}
-    dev: true
+  is-obj@2.0.0: {}
 
-  /is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-plain-obj@1.1.0: {}
 
-  /is-plain-object@2.0.4:
-    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: '>=0.10.0'}
+  is-plain-object@2.0.4:
     dependencies:
       isobject: 3.0.1
-    dev: true
 
-  /is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
+  is-plain-object@5.0.0: {}
 
-  /is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
+  is-regex@1.1.4:
     dependencies:
       call-bind: 1.0.7
       has-tostringtag: 1.0.2
-    dev: true
 
-  /is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
+  is-shared-array-buffer@1.0.3:
     dependencies:
       call-bind: 1.0.7
-    dev: true
 
-  /is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+  is-stream@3.0.0: {}
 
-  /is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
+  is-string@1.0.7:
     dependencies:
       has-tostringtag: 1.0.2
-    dev: true
 
-  /is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
+  is-symbol@1.0.4:
     dependencies:
       has-symbols: 1.0.3
-    dev: true
 
-  /is-text-path@2.0.0:
-    resolution: {integrity: sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==}
-    engines: {node: '>=8'}
+  is-text-path@2.0.0:
     dependencies:
       text-extensions: 2.4.0
-    dev: true
 
-  /is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
-    engines: {node: '>= 0.4'}
+  is-typed-array@1.1.13:
     dependencies:
       which-typed-array: 1.1.15
-    dev: true
 
-  /is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
-    dev: true
+  is-unicode-supported@0.1.0: {}
 
-  /is-url@1.2.4:
-    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
-    dev: false
+  is-url@1.2.4: {}
 
-  /is-utf8@0.2.1:
-    resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
-    dev: true
+  is-utf8@0.2.1: {}
 
-  /is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
+  is-weakref@1.0.2:
     dependencies:
       call-bind: 1.0.7
-    dev: true
 
-  /is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  is-windows@1.0.2: {}
 
-  /isarray@1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
+  isarray@1.0.0: {}
 
-  /isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-    dev: true
+  isarray@2.0.5: {}
 
-  /isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-    dev: true
+  isexe@2.0.0: {}
 
-  /isobject@2.1.0:
-    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
-    engines: {node: '>=0.10.0'}
+  isobject@2.1.0:
     dependencies:
       isarray: 1.0.0
-    dev: true
 
-  /isobject@3.0.1:
-    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  isobject@3.0.1: {}
 
-  /jiti@1.21.6:
-    resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
-    hasBin: true
-    dev: true
+  jiti@1.21.6: {}
 
-  /jiti@2.0.0-beta.3:
-    resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==}
-    hasBin: true
-    dev: true
+  jiti@2.0.0-beta.3: {}
 
-  /js-base64@2.6.4:
-    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
-    dev: true
+  js-base64@2.6.4: {}
 
-  /js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-    dev: true
+  js-tokens@4.0.0: {}
 
-  /js-tokens@9.0.0:
-    resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}
-    dev: true
+  js-tokens@9.0.0: {}
 
-  /js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
+  js-yaml@4.1.0:
     dependencies:
       argparse: 2.0.1
-    dev: true
 
-  /json-buffer@3.0.1:
-    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-    dev: true
+  json-buffer@3.0.1: {}
 
-  /json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
-    dev: true
+  json-parse-even-better-errors@2.3.1: {}
 
-  /json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-    dev: true
+  json-schema-traverse@0.4.1: {}
 
-  /json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-    dev: true
+  json-schema-traverse@1.0.0: {}
 
-  /json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-    dev: true
+  json-stable-stringify-without-jsonify@1.0.1: {}
 
-  /json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
-    hasBin: true
+  json5@1.0.2:
     dependencies:
       minimist: 1.2.8
-    dev: true
 
-  /json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dev: true
+  json5@2.2.3: {}
 
-  /jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
+  jsonfile@6.1.0:
     dependencies:
       universalify: 2.0.1
     optionalDependencies:
       graceful-fs: 4.2.11
-    dev: true
 
-  /jsonparse@1.3.1:
-    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
-    engines: {'0': node >= 0.2.0}
-    dev: true
+  jsonparse@1.3.1: {}
 
-  /jszip@3.10.1:
-    resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
+  jszip@3.10.1:
     dependencies:
       lie: 3.3.0
       pako: 1.0.11
       readable-stream: 2.3.8
       setimmediate: 1.0.5
-    dev: false
 
-  /keygrip@1.1.0:
-    resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
-    engines: {node: '>= 0.6'}
+  keygrip@1.1.0:
     dependencies:
       tsscmp: 1.0.6
-    dev: true
 
-  /keyv@4.5.4:
-    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
+  keyv@4.5.4:
     dependencies:
       json-buffer: 3.0.1
-    dev: true
 
-  /kind-of@3.2.2:
-    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
-    engines: {node: '>=0.10.0'}
+  kind-of@3.2.2:
     dependencies:
       is-buffer: 1.1.6
-    dev: true
 
-  /kind-of@4.0.0:
-    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
-    engines: {node: '>=0.10.0'}
+  kind-of@4.0.0:
     dependencies:
       is-buffer: 1.1.6
-    dev: true
 
-  /kind-of@5.1.0:
-    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  kind-of@5.1.0: {}
 
-  /kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  kind-of@6.0.3: {}
 
-  /known-css-properties@0.34.0:
-    resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
-    dev: true
+  known-css-properties@0.34.0: {}
 
-  /known-css-properties@0.35.0:
-    resolution: {integrity: sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==}
-    dev: true
+  known-css-properties@0.35.0: {}
 
-  /kolorist@1.8.0:
-    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
-    dev: true
+  kolorist@1.8.0: {}
 
-  /lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
+  lazystream@1.0.1:
     dependencies:
       readable-stream: 2.3.8
-    dev: false
 
-  /levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
+  levn@0.4.1:
     dependencies:
       prelude-ls: 1.2.1
       type-check: 0.4.0
-    dev: true
 
-  /lie@3.3.0:
-    resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
+  lie@3.3.0:
     dependencies:
       immediate: 3.0.6
-    dev: false
 
-  /lilconfig@3.1.2:
-    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
-    engines: {node: '>=14'}
-    dev: true
+  lilconfig@3.1.2: {}
 
-  /lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-    dev: true
+  lines-and-columns@1.2.4: {}
 
-  /lint-staged@15.2.10:
-    resolution: {integrity: sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==}
-    engines: {node: '>=18.12.0'}
-    hasBin: true
+  lint-staged@15.2.10:
     dependencies:
       chalk: 5.3.0
       commander: 12.1.0
@@ -5281,15 +7424,10 @@ packages:
       yaml: 2.5.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /listenercount@1.0.1:
-    resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
-    dev: false
+  listenercount@1.0.1: {}
 
-  /listr2@8.2.5:
-    resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==}
-    engines: {node: '>=18.0.0'}
+  listr2@8.2.5:
     dependencies:
       cli-truncate: 4.0.0
       colorette: 2.0.20
@@ -5297,267 +7435,144 @@ packages:
       log-update: 6.1.0
       rfdc: 1.4.1
       wrap-ansi: 9.0.0
-    dev: true
 
-  /load-tsconfig@0.2.5:
-    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+  load-tsconfig@0.2.5: {}
 
-  /loader-utils@1.4.2:
-    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
-    engines: {node: '>=4.0.0'}
+  loader-utils@1.4.2:
     dependencies:
       big.js: 5.2.2
       emojis-list: 3.0.0
       json5: 1.0.2
-    dev: true
 
-  /local-pkg@0.5.0:
-    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
-    engines: {node: '>=14'}
+  local-pkg@0.5.0:
     dependencies:
       mlly: 1.7.2
       pkg-types: 1.2.1
-    dev: true
 
-  /locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
+  locate-path@6.0.0:
     dependencies:
       p-locate: 5.0.0
-    dev: true
 
-  /locate-path@7.2.0:
-    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  locate-path@7.2.0:
     dependencies:
       p-locate: 6.0.0
-    dev: true
 
-  /lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
-    dev: false
+  lodash-es@4.17.21: {}
 
-  /lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
-    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
-    peerDependencies:
-      '@types/lodash-es': '*'
-      lodash: '*'
-      lodash-es: '*'
+  lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
     dependencies:
       '@types/lodash-es': 4.17.12
       lodash: 4.17.21
       lodash-es: 4.17.21
-    dev: false
 
-  /lodash.camelcase@4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+  lodash.camelcase@4.3.0: {}
 
-  /lodash.clonedeep@4.5.0:
-    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
-    dev: false
+  lodash.clonedeep@4.5.0: {}
 
-  /lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
-    dev: false
+  lodash.debounce@4.0.8: {}
 
-  /lodash.defaults@4.2.0:
-    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
-    dev: false
+  lodash.defaults@4.2.0: {}
 
-  /lodash.difference@4.5.0:
-    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
-    dev: false
+  lodash.difference@4.5.0: {}
 
-  /lodash.escaperegexp@4.1.2:
-    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
-    dev: false
+  lodash.escaperegexp@4.1.2: {}
 
-  /lodash.flatten@4.4.0:
-    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
-    dev: false
+  lodash.flatten@4.4.0: {}
 
-  /lodash.foreach@4.5.0:
-    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
-    dev: false
+  lodash.foreach@4.5.0: {}
 
-  /lodash.groupby@4.6.0:
-    resolution: {integrity: sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==}
-    dev: false
+  lodash.groupby@4.6.0: {}
 
-  /lodash.isboolean@3.0.3:
-    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
-    dev: false
+  lodash.isboolean@3.0.3: {}
 
-  /lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-    dev: false
+  lodash.isequal@4.5.0: {}
 
-  /lodash.isfunction@3.0.9:
-    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
-    dev: false
+  lodash.isfunction@3.0.9: {}
 
-  /lodash.isnil@4.0.0:
-    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
-    dev: false
+  lodash.isnil@4.0.0: {}
 
-  /lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
+  lodash.isplainobject@4.0.6: {}
 
-  /lodash.isundefined@3.0.1:
-    resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==}
-    dev: false
+  lodash.isundefined@3.0.1: {}
 
-  /lodash.kebabcase@4.1.1:
-    resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}
-    dev: true
+  lodash.kebabcase@4.1.1: {}
 
-  /lodash.map@4.6.0:
-    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
-    dev: true
+  lodash.map@4.6.0: {}
 
-  /lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-    dev: true
+  lodash.merge@4.6.2: {}
 
-  /lodash.mergewith@4.6.2:
-    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
-    dev: true
+  lodash.mergewith@4.6.2: {}
 
-  /lodash.snakecase@4.1.1:
-    resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
-    dev: true
+  lodash.snakecase@4.1.1: {}
 
-  /lodash.startcase@4.4.0:
-    resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
-    dev: true
+  lodash.startcase@4.4.0: {}
 
-  /lodash.throttle@4.1.1:
-    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
-    dev: false
+  lodash.throttle@4.1.1: {}
 
-  /lodash.toarray@4.4.0:
-    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
-    dev: false
+  lodash.toarray@4.4.0: {}
 
-  /lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-    dev: true
+  lodash.truncate@4.4.2: {}
 
-  /lodash.union@4.6.0:
-    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
-    dev: false
+  lodash.union@4.6.0: {}
 
-  /lodash.uniq@4.5.0:
-    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+  lodash.uniq@4.5.0: {}
 
-  /lodash.upperfirst@4.3.1:
-    resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
-    dev: true
+  lodash.upperfirst@4.3.1: {}
 
-  /lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
+  lodash@4.17.21: {}
 
-  /log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
+  log-symbols@4.1.0:
     dependencies:
       chalk: 4.1.2
       is-unicode-supported: 0.1.0
-    dev: true
 
-  /log-update@6.1.0:
-    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
-    engines: {node: '>=18'}
+  log-update@6.1.0:
     dependencies:
       ansi-escapes: 7.0.0
       cli-cursor: 5.0.0
       slice-ansi: 7.1.0
       strip-ansi: 7.1.0
       wrap-ansi: 9.0.0
-    dev: true
 
-  /longest@2.0.1:
-    resolution: {integrity: sha512-Ajzxb8CM6WAnFjgiloPsI3bF+WCxcvhdIG3KNA2KN962+tdBsHcuQ4k4qX/EcS/2CRkcc0iAkR956Nib6aXU/Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  longest@2.0.1: {}
 
-  /magic-string@0.30.12:
-    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
+  magic-string@0.30.12:
     dependencies:
       '@jridgewell/sourcemap-codec': 1.5.0
 
-  /map-cache@0.2.2:
-    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  map-cache@0.2.2: {}
 
-  /map-visit@1.0.0:
-    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
-    engines: {node: '>=0.10.0'}
+  map-visit@1.0.0:
     dependencies:
       object-visit: 1.0.1
-    dev: true
 
-  /mathml-tag-names@2.1.3:
-    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
-    dev: true
+  mathml-tag-names@2.1.3: {}
 
-  /mdn-data@2.0.14:
-    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
-    dev: true
+  mdn-data@2.0.14: {}
 
-  /mdn-data@2.12.1:
-    resolution: {integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==}
-    dev: true
+  mdn-data@2.12.1: {}
 
-  /mdn-data@2.12.2:
-    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
-    dev: true
+  mdn-data@2.12.2: {}
 
-  /media-typer@0.3.0:
-    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
-    engines: {node: '>= 0.6'}
-    dev: true
+  media-typer@0.3.0: {}
 
-  /memoize-one@6.0.0:
-    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
-    dev: false
+  memoize-one@6.0.0: {}
 
-  /meow@12.1.1:
-    resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
-    engines: {node: '>=16.10'}
-    dev: true
+  meow@12.1.1: {}
 
-  /meow@13.2.0:
-    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
-    engines: {node: '>=18'}
-    dev: true
+  meow@13.2.0: {}
 
-  /merge-options@1.0.1:
-    resolution: {integrity: sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==}
-    engines: {node: '>=4'}
+  merge-options@1.0.1:
     dependencies:
       is-plain-obj: 1.1.0
-    dev: true
 
-  /merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-    dev: true
+  merge-stream@2.0.0: {}
 
-  /merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-    dev: true
+  merge2@1.4.1: {}
 
-  /merge@2.1.1:
-    resolution: {integrity: sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==}
-    dev: true
+  merge@2.1.1: {}
 
-  /micromatch@3.1.0:
-    resolution: {integrity: sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==}
-    engines: {node: '>=0.10.0'}
+  micromatch@3.1.0:
     dependencies:
       arr-diff: 4.0.0
       array-unique: 0.3.2
@@ -5574,130 +7589,77 @@ packages:
       to-regex: 3.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /micromatch@4.0.8:
-    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
-    engines: {node: '>=8.6'}
+  micromatch@4.0.8:
     dependencies:
       braces: 3.0.3
       picomatch: 2.3.1
-    dev: true
 
-  /mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
+  mime-db@1.52.0: {}
 
-  /mime-match@1.0.2:
-    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
+  mime-match@1.0.2:
     dependencies:
       wildcard: 1.1.2
-    dev: false
 
-  /mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
+  mime-types@2.1.35:
     dependencies:
       mime-db: 1.52.0
 
-  /mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-    dev: true
+  mime@3.0.0: {}
 
-  /mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-    dev: true
+  mimic-fn@2.1.0: {}
 
-  /mimic-function@5.0.1:
-    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
-    engines: {node: '>=18'}
-    dev: true
+  mimic-fn@4.0.0: {}
 
-  /minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
+  mimic-function@5.0.1: {}
+
+  minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch@5.1.6:
-    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: '>=10'}
+  minimatch@5.1.6:
     dependencies:
       brace-expansion: 2.0.1
-    dev: false
 
-  /minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
-    engines: {node: '>=16 || 14 >=14.17'}
+  minimatch@9.0.5:
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
-  /minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
-    dev: true
+  minimist@1.2.7: {}
 
-  /minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
+  minimist@1.2.8: {}
 
-  /mixin-deep@1.3.2:
-    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
-    engines: {node: '>=0.10.0'}
+  mixin-deep@1.3.2:
     dependencies:
       for-in: 1.0.2
       is-extendable: 1.0.1
-    dev: true
 
-  /mkdirp@0.5.6:
-    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
-    hasBin: true
+  mkdirp@0.5.6:
     dependencies:
       minimist: 1.2.8
-    dev: false
 
-  /mlly@1.7.2:
-    resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
+  mlly@1.7.2:
     dependencies:
       acorn: 8.14.0
       pathe: 1.1.2
       pkg-types: 1.2.1
       ufo: 1.5.4
-    dev: true
 
-  /mrmime@2.0.0:
-    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
-    engines: {node: '>=10'}
-    dev: true
+  mrmime@2.0.0: {}
 
-  /ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-    dev: true
+  ms@2.0.0: {}
 
-  /ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-    dev: true
+  ms@2.1.3: {}
 
-  /muggle-string@0.4.1:
-    resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
-    dev: true
+  muggle-string@0.4.1: {}
 
-  /mute-stream@0.0.8:
-    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
-    dev: true
+  mute-stream@0.0.8: {}
 
-  /namespace-emitter@2.0.1:
-    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
-    dev: false
+  namespace-emitter@2.0.1: {}
 
-  /nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
+  nanoid@3.3.7: {}
 
-  /nanomatch@1.2.13:
-    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
-    engines: {node: '>=0.10.0'}
+  nanomatch@1.2.13:
     dependencies:
       arr-diff: 4.0.0
       array-unique: 0.3.2
@@ -5712,144 +7674,84 @@ packages:
       to-regex: 3.0.2
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-    dev: true
+  natural-compare@1.4.0: {}
 
-  /next-tick@1.1.0:
-    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
-    dev: false
+  next-tick@1.1.0: {}
 
-  /node-addon-api@7.1.1:
-    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
-    requiresBuild: true
-    dev: true
+  node-addon-api@7.1.1:
     optional: true
 
-  /node-fetch-native@1.6.4:
-    resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
-    dev: true
+  node-fetch-native@1.6.4: {}
 
-  /node-releases@2.0.18:
-    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
-    dev: true
+  node-releases@2.0.18: {}
 
-  /normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
+  normalize-path@3.0.0: {}
 
-  /normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  normalize-range@0.1.2: {}
 
-  /normalize-wheel-es@1.2.0:
-    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
-    dev: false
+  normalize-wheel-es@1.2.0: {}
 
-  /npm-run-path@5.3.0:
-    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  npm-run-path@5.3.0:
     dependencies:
       path-key: 4.0.0
-    dev: true
 
-  /nprogress@0.2.0:
-    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==}
-    dev: false
+  nprogress@0.2.0: {}
 
-  /nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
+  nth-check@2.1.1:
     dependencies:
       boolbase: 1.0.0
-    dev: true
 
-  /object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  object-assign@4.1.1: {}
 
-  /object-copy@0.1.0:
-    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
-    engines: {node: '>=0.10.0'}
+  object-copy@0.1.0:
     dependencies:
       copy-descriptor: 0.1.1
       define-property: 0.2.5
       kind-of: 3.2.2
-    dev: true
 
-  /object-inspect@1.13.3:
-    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
-    engines: {node: '>= 0.4'}
+  object-inspect@1.13.3: {}
 
-  /object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  object-keys@1.1.1: {}
 
-  /object-visit@1.0.1:
-    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
-    engines: {node: '>=0.10.0'}
+  object-visit@1.0.1:
     dependencies:
       isobject: 3.0.1
-    dev: true
 
-  /object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
-    engines: {node: '>= 0.4'}
+  object.assign@4.1.5:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       has-symbols: 1.0.3
       object-keys: 1.1.1
-    dev: true
 
-  /object.pick@1.3.0:
-    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
-    engines: {node: '>=0.10.0'}
+  object.pick@1.3.0:
     dependencies:
       isobject: 3.0.1
-    dev: true
 
-  /ofetch@1.4.1:
-    resolution: {integrity: sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==}
+  ofetch@1.4.1:
     dependencies:
       destr: 2.0.3
       node-fetch-native: 1.6.4
       ufo: 1.5.4
-    dev: true
 
-  /once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
+  once@1.4.0:
     dependencies:
       wrappy: 1.0.2
 
-  /onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
+  onetime@5.1.2:
     dependencies:
       mimic-fn: 2.1.0
-    dev: true
 
-  /onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
+  onetime@6.0.0:
     dependencies:
       mimic-fn: 4.0.0
-    dev: true
 
-  /onetime@7.0.0:
-    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
-    engines: {node: '>=18'}
+  onetime@7.0.0:
     dependencies:
       mimic-function: 5.0.1
-    dev: true
 
-  /optionator@0.9.4:
-    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
-    engines: {node: '>= 0.8.0'}
+  optionator@0.9.4:
     dependencies:
       deep-is: 0.1.4
       fast-levenshtein: 2.0.6
@@ -5857,11 +7759,8 @@ packages:
       prelude-ls: 1.2.1
       type-check: 0.4.0
       word-wrap: 1.2.5
-    dev: true
 
-  /ora@5.4.1:
-    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: '>=10'}
+  ora@5.4.1:
     dependencies:
       bl: 4.1.0
       chalk: 4.1.2
@@ -5872,379 +7771,205 @@ packages:
       log-symbols: 4.1.0
       strip-ansi: 6.0.1
       wcwidth: 1.0.1
-    dev: true
 
-  /os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  os-tmpdir@1.0.2: {}
 
-  /p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
+  p-limit@3.1.0:
     dependencies:
       yocto-queue: 0.1.0
-    dev: true
 
-  /p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-limit@4.0.0:
     dependencies:
       yocto-queue: 1.1.1
-    dev: true
 
-  /p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
+  p-locate@5.0.0:
     dependencies:
       p-limit: 3.1.0
-    dev: true
 
-  /p-locate@6.0.0:
-    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+  p-locate@6.0.0:
     dependencies:
       p-limit: 4.0.0
-    dev: true
 
-  /package-manager-detector@0.2.2:
-    resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==}
-    dev: true
+  package-manager-detector@0.2.2: {}
 
-  /pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: false
+  pako@1.0.11: {}
 
-  /parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
+  parent-module@1.0.1:
     dependencies:
       callsites: 3.1.0
-    dev: true
 
-  /parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
+  parse-json@5.2.0:
     dependencies:
       '@babel/code-frame': 7.26.2
       error-ex: 1.3.2
       json-parse-even-better-errors: 2.3.1
       lines-and-columns: 1.2.4
-    dev: true
 
-  /parse-passwd@1.0.0:
-    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  parse-passwd@1.0.0: {}
 
-  /pascalcase@0.1.1:
-    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  pascalcase@0.1.1: {}
 
-  /path-browserify@1.0.1:
-    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
+  path-browserify@1.0.1: {}
 
-  /path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-    dev: true
+  path-exists@4.0.0: {}
 
-  /path-exists@5.0.0:
-    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    dev: true
+  path-exists@5.0.0: {}
 
-  /path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
+  path-is-absolute@1.0.1: {}
 
-  /path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
-    dev: true
+  path-key@3.1.1: {}
 
-  /path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-    dev: true
+  path-key@4.0.0: {}
 
-  /path-to-regexp@6.2.2:
-    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
-    dev: true
+  path-to-regexp@6.2.2: {}
 
-  /path-to-regexp@6.3.0:
-    resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
-    dev: false
+  path-to-regexp@6.3.0: {}
 
-  /path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-    dev: true
+  path-type@4.0.0: {}
 
-  /pathe@0.2.0:
-    resolution: {integrity: sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==}
-    dev: true
+  pathe@0.2.0: {}
 
-  /pathe@1.1.2:
-    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
-    dev: true
+  pathe@1.1.2: {}
 
-  /perfect-debounce@1.0.0:
-    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
-    dev: true
+  perfect-debounce@1.0.0: {}
 
-  /picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
+  picocolors@1.1.1: {}
 
-  /picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-    dev: true
+  picomatch@2.3.1: {}
 
-  /picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
-    dev: true
+  picomatch@4.0.2: {}
 
-  /pidtree@0.6.0:
-    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-    dev: true
+  pidtree@0.6.0: {}
 
-  /pinia@2.2.6(typescript@5.5.4)(vue@3.5.12):
-    resolution: {integrity: sha512-vIsR8JkDN5Ga2vAxqOE2cJj4VtsHnzpR1Fz30kClxlh0yCHfec6uoMeM3e/ddqmwFUejK3NlrcQa/shnpyT4hA==}
-    peerDependencies:
-      '@vue/composition-api': ^1.4.0
-      typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.5.11
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-      typescript:
-        optional: true
+  pinia@2.2.6(typescript@5.5.4)(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       '@vue/devtools-api': 6.6.4
-      typescript: 5.5.4
       vue: 3.5.12(typescript@5.5.4)
-      vue-demi: 0.14.10(vue@3.5.12)
-    dev: false
+      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
+    optionalDependencies:
+      typescript: 5.5.4
 
-  /pkg-types@1.2.1:
-    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
+  pkg-types@1.2.1:
     dependencies:
       confbox: 0.1.8
       mlly: 1.7.2
       pathe: 1.1.2
-    dev: true
 
-  /posix-character-classes@0.1.1:
-    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  posix-character-classes@0.1.1: {}
 
-  /possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-    dev: true
+  possible-typed-array-names@1.0.0: {}
 
-  /postcss-html@1.7.0:
-    resolution: {integrity: sha512-MfcMpSUIaR/nNgeVS8AyvyDugXlADjN9AcV7e5rDfrF1wduIAGSkL4q2+wgrZgA3sHVAHLDO9FuauHhZYW2nBw==}
-    engines: {node: ^12 || >=14}
+  postcss-html@1.7.0:
     dependencies:
       htmlparser2: 8.0.2
       js-tokens: 9.0.0
       postcss: 8.4.49
       postcss-safe-parser: 6.0.0(postcss@8.4.49)
-    dev: true
 
-  /postcss-media-query-parser@0.2.3:
-    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
-    dev: true
+  postcss-media-query-parser@0.2.3: {}
 
-  /postcss-prefix-selector@1.16.1(postcss@5.2.18):
-    resolution: {integrity: sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==}
-    peerDependencies:
-      postcss: '>4 <9'
+  postcss-prefix-selector@1.16.1(postcss@5.2.18):
     dependencies:
       postcss: 5.2.18
-    dev: true
 
-  /postcss-resolve-nested-selector@0.1.6:
-    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
-    dev: true
+  postcss-resolve-nested-selector@0.1.6: {}
 
-  /postcss-safe-parser@6.0.0(postcss@8.4.49):
-    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
+  postcss-safe-parser@6.0.0(postcss@8.4.49):
     dependencies:
       postcss: 8.4.49
-    dev: true
 
-  /postcss-safe-parser@7.0.1(postcss@8.4.49):
-    resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==}
-    engines: {node: '>=18.0'}
-    peerDependencies:
-      postcss: ^8.4.31
+  postcss-safe-parser@7.0.1(postcss@8.4.49):
     dependencies:
       postcss: 8.4.49
-    dev: true
 
-  /postcss-scss@4.0.9(postcss@8.4.49):
-    resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.4.29
+  postcss-scss@4.0.9(postcss@8.4.49):
     dependencies:
       postcss: 8.4.49
-    dev: true
 
-  /postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
+  postcss-selector-parser@6.1.2:
     dependencies:
       cssesc: 3.0.0
       util-deprecate: 1.0.2
-    dev: true
 
-  /postcss-sorting@8.0.2(postcss@8.4.49):
-    resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
-    peerDependencies:
-      postcss: ^8.4.20
+  postcss-sorting@8.0.2(postcss@8.4.49):
     dependencies:
       postcss: 8.4.49
-    dev: true
 
-  /postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-    dev: true
+  postcss-value-parser@4.2.0: {}
 
-  /postcss@5.2.18:
-    resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
-    engines: {node: '>=0.12'}
+  postcss@5.2.18:
     dependencies:
       chalk: 1.1.3
       js-base64: 2.6.4
       source-map: 0.5.7
       supports-color: 3.2.3
-    dev: true
 
-  /postcss@8.4.49:
-    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
-    engines: {node: ^10 || ^12 || >=14}
+  postcss@8.4.49:
     dependencies:
       nanoid: 3.3.7
       picocolors: 1.1.1
       source-map-js: 1.2.1
 
-  /posthtml-parser@0.2.1:
-    resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==}
+  posthtml-parser@0.2.1:
     dependencies:
       htmlparser2: 3.10.1
       isobject: 2.1.0
-    dev: true
 
-  /posthtml-rename-id@1.0.12:
-    resolution: {integrity: sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==}
+  posthtml-rename-id@1.0.12:
     dependencies:
       escape-string-regexp: 1.0.5
-    dev: true
 
-  /posthtml-render@1.4.0:
-    resolution: {integrity: sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==}
-    engines: {node: '>=10'}
-    dev: true
+  posthtml-render@1.4.0: {}
 
-  /posthtml-svg-mode@1.0.3:
-    resolution: {integrity: sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==}
+  posthtml-svg-mode@1.0.3:
     dependencies:
       merge-options: 1.0.1
       posthtml: 0.9.2
       posthtml-parser: 0.2.1
       posthtml-render: 1.4.0
-    dev: true
 
-  /posthtml@0.9.2:
-    resolution: {integrity: sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==}
-    engines: {node: '>=0.10.0'}
+  posthtml@0.9.2:
     dependencies:
       posthtml-parser: 0.2.1
       posthtml-render: 1.4.0
-    dev: true
 
-  /preact@10.24.3:
-    resolution: {integrity: sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==}
-    dev: false
+  preact@10.24.3: {}
 
-  /prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
-    dev: true
+  prelude-ls@1.2.1: {}
 
-  /prettier-linter-helpers@1.0.0:
-    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
-    engines: {node: '>=6.0.0'}
+  prettier-linter-helpers@1.0.0:
     dependencies:
-      fast-diff: 1.3.0
-    dev: true
-
-  /prettier@3.3.3:
-    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
-    engines: {node: '>=14'}
-    hasBin: true
-    dev: true
+      fast-diff: 1.3.0
 
-  /prismjs@1.29.0:
-    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
-    engines: {node: '>=6'}
-    dev: false
+  prettier@3.3.3: {}
 
-  /process-nextick-args@2.0.1:
-    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
-    dev: false
+  prismjs@1.29.0: {}
 
-  /proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: false
+  process-nextick-args@2.0.1: {}
 
-  /punycode@2.3.1:
-    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
-    engines: {node: '>=6'}
-    dev: true
+  proxy-from-env@1.1.0: {}
 
-  /qs@6.13.0:
-    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
-    engines: {node: '>=0.6'}
+  punycode@2.3.1: {}
+
+  qs@6.13.0:
     dependencies:
       side-channel: 1.0.6
 
-  /query-string@4.3.4:
-    resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
-    engines: {node: '>=0.10.0'}
+  query-string@4.3.4:
     dependencies:
       object-assign: 4.1.1
       strict-uri-encode: 1.1.0
-    dev: true
 
-  /queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-    dev: true
+  queue-microtask@1.2.3: {}
 
-  /raw-body@2.5.2:
-    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
-    engines: {node: '>= 0.8'}
+  raw-body@2.5.2:
     dependencies:
       bytes: 3.1.2
       http-errors: 2.0.0
       iconv-lite: 0.4.24
       unpipe: 1.0.0
-    dev: true
 
-  /readable-stream@2.3.8:
-    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
+  readable-stream@2.3.8:
     dependencies:
       core-util-is: 1.0.3
       inherits: 2.0.4
@@ -6253,145 +7978,79 @@ packages:
       safe-buffer: 5.1.2
       string_decoder: 1.1.1
       util-deprecate: 1.0.2
-    dev: false
 
-  /readable-stream@3.6.2:
-    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
-    engines: {node: '>= 6'}
+  readable-stream@3.6.2:
     dependencies:
       inherits: 2.0.4
       string_decoder: 1.3.0
       util-deprecate: 1.0.2
 
-  /readdir-glob@1.1.3:
-    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
+  readdir-glob@1.1.3:
     dependencies:
       minimatch: 5.1.6
-    dev: false
 
-  /readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
+  readdirp@3.6.0:
     dependencies:
       picomatch: 2.3.1
-    dev: true
 
-  /readdirp@4.0.2:
-    resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==}
-    engines: {node: '>= 14.16.0'}
-    dev: true
+  readdirp@4.0.2: {}
 
-  /regenerator-runtime@0.14.1:
-    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
-    dev: false
+  regenerator-runtime@0.14.1: {}
 
-  /regex-not@1.0.2:
-    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
-    engines: {node: '>=0.10.0'}
+  regex-not@1.0.2:
     dependencies:
       extend-shallow: 3.0.2
       safe-regex: 1.1.0
-    dev: true
 
-  /regexp.prototype.flags@1.5.3:
-    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
-    engines: {node: '>= 0.4'}
+  regexp.prototype.flags@1.5.3:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-errors: 1.3.0
       set-function-name: 2.0.2
-    dev: true
 
-  /repeat-element@1.1.4:
-    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  repeat-element@1.1.4: {}
 
-  /repeat-string@1.6.1:
-    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: '>=0.10'}
-    dev: true
+  repeat-string@1.6.1: {}
 
-  /require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  require-directory@2.1.1: {}
 
-  /require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  require-from-string@2.0.2: {}
 
-  /resolve-dir@1.0.1:
-    resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
-    engines: {node: '>=0.10.0'}
+  resolve-dir@1.0.1:
     dependencies:
       expand-tilde: 2.0.2
       global-modules: 1.0.0
-    dev: true
 
-  /resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
-    dev: true
+  resolve-from@4.0.0: {}
 
-  /resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-    dev: true
+  resolve-from@5.0.0: {}
 
-  /resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
-    dev: true
+  resolve-pkg-maps@1.0.0: {}
 
-  /resolve-url@0.2.1:
-    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
-    deprecated: https://github.com/lydell/resolve-url#deprecated
-    dev: true
+  resolve-url@0.2.1: {}
 
-  /restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
+  restore-cursor@3.1.0:
     dependencies:
       onetime: 5.1.2
       signal-exit: 3.0.7
-    dev: true
 
-  /restore-cursor@5.1.0:
-    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
-    engines: {node: '>=18'}
+  restore-cursor@5.1.0:
     dependencies:
       onetime: 7.0.0
       signal-exit: 4.1.0
-    dev: true
 
-  /ret@0.1.15:
-    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
-    engines: {node: '>=0.12'}
-    dev: true
+  ret@0.1.15: {}
 
-  /reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-    dev: true
+  reusify@1.0.4: {}
 
-  /rfdc@1.4.1:
-    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
-    dev: true
+  rfdc@1.4.1: {}
 
-  /rimraf@2.7.1:
-    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
-    deprecated: Rimraf versions prior to v4 are no longer supported
-    hasBin: true
+  rimraf@2.7.1:
     dependencies:
       glob: 7.2.3
-    dev: false
 
-  /rollup@4.25.0:
-    resolution: {integrity: sha512-uVbClXmR6wvx5R1M3Od4utyLUxrmOcEm3pAtMphn73Apq19PDtHpgZoEvqH2YnnaNUuvKmg2DgRd2Sqv+odyqg==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
+  rollup@4.25.0:
     dependencies:
       '@types/estree': 1.0.6
     optionalDependencies:
@@ -6414,99 +8073,61 @@ packages:
       '@rollup/rollup-win32-ia32-msvc': 4.25.0
       '@rollup/rollup-win32-x64-msvc': 4.25.0
       fsevents: 2.3.3
-    dev: true
 
-  /run-async@2.4.1:
-    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
-    engines: {node: '>=0.12.0'}
-    dev: true
+  run-async@2.4.1: {}
 
-  /run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
+  run-parallel@1.2.0:
     dependencies:
       queue-microtask: 1.2.3
-    dev: true
 
-  /rxjs@7.8.1:
-    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
+  rxjs@7.8.1:
     dependencies:
       tslib: 2.8.1
-    dev: true
 
-  /safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
-    engines: {node: '>=0.4'}
+  safe-array-concat@1.1.2:
     dependencies:
       call-bind: 1.0.7
       get-intrinsic: 1.2.4
       has-symbols: 1.0.3
       isarray: 2.0.5
-    dev: true
 
-  /safe-buffer@5.1.2:
-    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
-    dev: false
+  safe-buffer@5.1.2: {}
 
-  /safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
+  safe-buffer@5.2.1: {}
 
-  /safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
-    engines: {node: '>= 0.4'}
+  safe-regex-test@1.0.3:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-regex: 1.1.4
-    dev: true
 
-  /safe-regex@1.1.0:
-    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
+  safe-regex@1.1.0:
     dependencies:
       ret: 0.1.15
-    dev: true
 
-  /safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-    dev: true
+  safer-buffer@2.1.2: {}
 
-  /sass@1.80.6:
-    resolution: {integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
+  sass@1.80.6:
     dependencies:
       chokidar: 4.0.1
       immutable: 4.3.7
       source-map-js: 1.2.1
     optionalDependencies:
       '@parcel/watcher': 2.5.0
-    dev: true
 
-  /saxes@5.0.1:
-    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
-    engines: {node: '>=10'}
+  saxes@5.0.1:
     dependencies:
       xmlchars: 2.2.0
-    dev: false
 
-  /scroll-into-view-if-needed@2.2.31:
-    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
+  scroll-into-view-if-needed@2.2.31:
     dependencies:
       compute-scroll-into-view: 1.0.20
-    dev: false
 
-  /scule@1.3.0:
-    resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}
-    dev: true
+  scule@1.3.0: {}
 
-  /semver@7.6.3:
-    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
-    engines: {node: '>=10'}
-    hasBin: true
-    dev: true
+  semver@7.6.3: {}
 
-  /set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
+  set-function-length@1.2.2:
     dependencies:
       define-data-property: 1.1.4
       es-errors: 1.3.0
@@ -6515,144 +8136,89 @@ packages:
       gopd: 1.0.1
       has-property-descriptors: 1.0.2
 
-  /set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
+  set-function-name@2.0.2:
     dependencies:
       define-data-property: 1.1.4
       es-errors: 1.3.0
       functions-have-names: 1.2.3
       has-property-descriptors: 1.0.2
-    dev: true
 
-  /set-value@2.0.1:
-    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
-    engines: {node: '>=0.10.0'}
+  set-value@2.0.1:
     dependencies:
       extend-shallow: 2.0.1
       is-extendable: 0.1.1
       is-plain-object: 2.0.4
       split-string: 3.1.0
-    dev: true
 
-  /setimmediate@1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-    dev: false
+  setimmediate@1.0.5: {}
 
-  /setprototypeof@1.2.0:
-    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
-    dev: true
+  setprototypeof@1.2.0: {}
 
-  /shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
+  shebang-command@2.0.0:
     dependencies:
       shebang-regex: 3.0.0
-    dev: true
 
-  /shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
-    dev: true
+  shebang-regex@3.0.0: {}
 
-  /side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
-    engines: {node: '>= 0.4'}
+  side-channel@1.0.6:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       get-intrinsic: 1.2.4
       object-inspect: 1.13.3
 
-  /signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-    dev: true
+  signal-exit@3.0.7: {}
 
-  /signal-exit@4.1.0:
-    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: '>=14'}
-    dev: true
+  signal-exit@4.1.0: {}
 
-  /sirv@2.0.4:
-    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
-    engines: {node: '>= 10'}
+  sirv@2.0.4:
     dependencies:
       '@polka/url': 1.0.0-next.28
       mrmime: 2.0.0
       totalist: 3.0.1
-    dev: true
 
-  /slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
-    dev: true
+  slash@3.0.0: {}
 
-  /slate-history@0.66.0(slate@0.72.8):
-    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
-    peerDependencies:
-      slate: '>=0.65.3'
+  slate-history@0.66.0(slate@0.72.8):
     dependencies:
       is-plain-object: 5.0.0
       slate: 0.72.8
-    dev: false
 
-  /slate@0.72.8:
-    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
+  slate@0.72.8:
     dependencies:
       immer: 9.0.21
       is-plain-object: 5.0.0
       tiny-warning: 1.0.3
-    dev: false
 
-  /slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
+  slice-ansi@4.0.0:
     dependencies:
       ansi-styles: 4.3.0
       astral-regex: 2.0.0
       is-fullwidth-code-point: 3.0.0
-    dev: true
 
-  /slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
+  slice-ansi@5.0.0:
     dependencies:
       ansi-styles: 6.2.1
       is-fullwidth-code-point: 4.0.0
-    dev: true
 
-  /slice-ansi@7.1.0:
-    resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
-    engines: {node: '>=18'}
+  slice-ansi@7.1.0:
     dependencies:
       ansi-styles: 6.2.1
       is-fullwidth-code-point: 5.0.0
-    dev: true
 
-  /snabbdom@3.6.2:
-    resolution: {integrity: sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==}
-    engines: {node: '>=12.17.0'}
-    dev: false
+  snabbdom@3.6.2: {}
 
-  /snapdragon-node@2.1.1:
-    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
-    engines: {node: '>=0.10.0'}
+  snapdragon-node@2.1.1:
     dependencies:
       define-property: 1.0.0
       isobject: 3.0.1
       snapdragon-util: 3.0.1
-    dev: true
 
-  /snapdragon-util@3.0.1:
-    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
-    engines: {node: '>=0.10.0'}
+  snapdragon-util@3.0.1:
     dependencies:
       kind-of: 3.2.2
-    dev: true
 
-  /snapdragon@0.8.2:
-    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
-    engines: {node: '>=0.10.0'}
+  snapdragon@0.8.2:
     dependencies:
       base: 0.11.2
       debug: 2.6.9
@@ -6664,276 +8230,155 @@ packages:
       use: 3.1.1
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /sortablejs@1.15.3:
-    resolution: {integrity: sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==}
-    dev: false
+  sortablejs@1.15.3: {}
 
-  /source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
+  source-map-js@1.2.1: {}
 
-  /source-map-resolve@0.5.3:
-    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
-    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
+  source-map-resolve@0.5.3:
     dependencies:
       atob: 2.1.2
       decode-uri-component: 0.2.2
       resolve-url: 0.2.1
       source-map-url: 0.4.1
       urix: 0.1.0
-    dev: true
 
-  /source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
+  source-map-support@0.5.21:
     dependencies:
       buffer-from: 1.1.2
       source-map: 0.6.1
-    dev: true
 
-  /source-map-url@0.4.1:
-    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
-    deprecated: See https://github.com/lydell/source-map-url#deprecated
-    dev: true
+  source-map-url@0.4.1: {}
 
-  /source-map@0.5.7:
-    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  source-map@0.5.7: {}
 
-  /source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  source-map@0.6.1: {}
 
-  /split-string@3.1.0:
-    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
-    engines: {node: '>=0.10.0'}
+  split-string@3.1.0:
     dependencies:
       extend-shallow: 3.0.2
-    dev: true
 
-  /split2@4.2.0:
-    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
-    engines: {node: '>= 10.x'}
-    dev: true
+  split2@4.2.0: {}
 
-  /ssr-window@3.0.0:
-    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
-    dev: false
+  ssr-window@3.0.0: {}
 
-  /stable@0.1.8:
-    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
-    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
-    dev: true
+  stable@0.1.8: {}
 
-  /static-extend@0.1.2:
-    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
-    engines: {node: '>=0.10.0'}
+  static-extend@0.1.2:
     dependencies:
       define-property: 0.2.5
       object-copy: 0.1.0
-    dev: true
 
-  /statuses@2.0.1:
-    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  statuses@2.0.1: {}
 
-  /strict-uri-encode@1.1.0:
-    resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  strict-uri-encode@1.1.0: {}
 
-  /string-argv@0.3.2:
-    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
-    engines: {node: '>=0.6.19'}
-    dev: true
+  string-argv@0.3.2: {}
 
-  /string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
+  string-width@4.2.3:
     dependencies:
       emoji-regex: 8.0.0
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
-    dev: true
 
-  /string-width@7.2.0:
-    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
-    engines: {node: '>=18'}
+  string-width@7.2.0:
     dependencies:
       emoji-regex: 10.4.0
       get-east-asian-width: 1.3.0
       strip-ansi: 7.1.0
-    dev: true
 
-  /string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
-    engines: {node: '>= 0.4'}
+  string.prototype.trim@1.2.9:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-abstract: 1.23.3
       es-object-atoms: 1.0.0
-    dev: true
 
-  /string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
+  string.prototype.trimend@1.0.8:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
-    dev: true
 
-  /string.prototype.trimstart@1.0.8:
-    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
-    engines: {node: '>= 0.4'}
+  string.prototype.trimstart@1.0.8:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
       es-object-atoms: 1.0.0
-    dev: true
 
-  /string_decoder@1.1.1:
-    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
+  string_decoder@1.1.1:
     dependencies:
       safe-buffer: 5.1.2
-    dev: false
 
-  /string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
+  string_decoder@1.3.0:
     dependencies:
       safe-buffer: 5.2.1
 
-  /strip-ansi@3.0.1:
-    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
-    engines: {node: '>=0.10.0'}
+  strip-ansi@3.0.1:
     dependencies:
       ansi-regex: 2.1.1
-    dev: true
 
-  /strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
+  strip-ansi@6.0.1:
     dependencies:
       ansi-regex: 5.0.1
-    dev: true
 
-  /strip-ansi@7.1.0:
-    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: '>=12'}
+  strip-ansi@7.1.0:
     dependencies:
       ansi-regex: 6.1.0
-    dev: true
 
-  /strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-    dev: true
+  strip-bom@4.0.0: {}
 
-  /strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-    dev: true
+  strip-final-newline@3.0.0: {}
 
-  /strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-    dev: true
+  strip-json-comments@3.1.1: {}
 
-  /strip-literal@2.1.0:
-    resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}
+  strip-literal@2.1.0:
     dependencies:
       js-tokens: 9.0.0
-    dev: true
 
-  /stylelint-config-html@1.1.0(postcss-html@1.7.0)(stylelint@16.10.0):
-    resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==}
-    engines: {node: ^12 || >=14}
-    peerDependencies:
-      postcss-html: ^1.0.0
-      stylelint: '>=14.0.0'
+  stylelint-config-html@1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       postcss-html: 1.7.0
       stylelint: 16.10.0(typescript@5.5.4)
-    dev: true
 
-  /stylelint-config-recess-order@5.1.1(stylelint@16.10.0):
-    resolution: {integrity: sha512-eDAHWVBelzDbMbdMj15pSw0Ycykv5eLeriJdbGCp0zd44yvhgZLI+wyVHegzXp5NrstxTPSxl0fuOVKdMm0XLA==}
-    peerDependencies:
-      stylelint: '>=16'
+  stylelint-config-recess-order@5.1.1(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-order: 6.0.4(stylelint@16.10.0)
-    dev: true
+      stylelint-order: 6.0.4(stylelint@16.10.0(typescript@5.5.4))
 
-  /stylelint-config-recommended-scss@14.1.0(postcss@8.4.49)(stylelint@16.10.0):
-    resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
-      stylelint: ^16.6.1
-    peerDependenciesMeta:
-      postcss:
-        optional: true
+  stylelint-config-recommended-scss@14.1.0(postcss@8.4.49)(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
-      postcss: 8.4.49
       postcss-scss: 4.0.9(postcss@8.4.49)
       stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0)
-      stylelint-scss: 6.9.0(stylelint@16.10.0)
-    dev: true
+      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-scss: 6.9.0(stylelint@16.10.0(typescript@5.5.4))
+    optionalDependencies:
+      postcss: 8.4.49
 
-  /stylelint-config-recommended-vue@1.5.0(postcss-html@1.7.0)(stylelint@16.10.0):
-    resolution: {integrity: sha512-65TAK/clUqkNtkZLcuytoxU0URQYlml+30Nhop7sRkCZ/mtWdXt7T+spPSB3KMKlb+82aEVJ4OrcstyDBdbosg==}
-    engines: {node: ^12 || >=14}
-    peerDependencies:
-      postcss-html: ^1.0.0
-      stylelint: '>=14.0.0'
+  stylelint-config-recommended-vue@1.5.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       postcss-html: 1.7.0
       semver: 7.6.3
       stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-html: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0)
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0)
-    dev: true
+      stylelint-config-html: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
+      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
 
-  /stylelint-config-recommended@14.0.1(stylelint@16.10.0):
-    resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.1.0
+  stylelint-config-recommended@14.0.1(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       stylelint: 16.10.0(typescript@5.5.4)
-    dev: true
 
-  /stylelint-config-standard@36.0.1(stylelint@16.10.0):
-    resolution: {integrity: sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.1.0
+  stylelint-config-standard@36.0.1(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0)
-    dev: true
+      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
 
-  /stylelint-order@6.0.4(stylelint@16.10.0):
-    resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
-    peerDependencies:
-      stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
+  stylelint-order@6.0.4(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       postcss: 8.4.49
       postcss-sorting: 8.0.2(postcss@8.4.49)
       stylelint: 16.10.0(typescript@5.5.4)
-    dev: true
 
-  /stylelint-scss@6.9.0(stylelint@16.10.0):
-    resolution: {integrity: sha512-oWOR+g6ccagfrENecImGmorWWjVyWpt2R8bmkhOW8FkNNPGStZPQMqb8QWMW4Lwu9TyPqmyjHkkAsy3weqsnNw==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.0.2
+  stylelint-scss@6.9.0(stylelint@16.10.0(typescript@5.5.4)):
     dependencies:
       css-tree: 3.0.1
       is-plain-object: 5.0.0
@@ -6944,16 +8389,12 @@ packages:
       postcss-selector-parser: 6.1.2
       postcss-value-parser: 4.2.0
       stylelint: 16.10.0(typescript@5.5.4)
-    dev: true
 
-  /stylelint@16.10.0(typescript@5.5.4):
-    resolution: {integrity: sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==}
-    engines: {node: '>=18.12.0'}
-    hasBin: true
+  stylelint@16.10.0(typescript@5.5.4):
     dependencies:
       '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
       '@csstools/css-tokenizer': 3.0.3
-      '@csstools/media-query-list-parser': 3.0.1(@csstools/css-parser-algorithms@3.0.4)(@csstools/css-tokenizer@3.0.3)
+      '@csstools/media-query-list-parser': 3.0.1(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
       '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2)
       '@dual-bundle/import-meta-resolve': 4.1.0
       balanced-match: 2.0.0
@@ -6992,44 +8433,27 @@ packages:
     transitivePeerDependencies:
       - supports-color
       - typescript
-    dev: true
 
-  /supports-color@2.0.0:
-    resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
-    engines: {node: '>=0.8.0'}
-    dev: true
+  supports-color@2.0.0: {}
 
-  /supports-color@3.2.3:
-    resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==}
-    engines: {node: '>=0.8.0'}
+  supports-color@3.2.3:
     dependencies:
       has-flag: 1.0.0
-    dev: true
 
-  /supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
+  supports-color@5.5.0:
     dependencies:
       has-flag: 3.0.0
-    dev: true
 
-  /supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
+  supports-color@7.2.0:
     dependencies:
       has-flag: 4.0.0
-    dev: true
 
-  /supports-hyperlinks@3.1.0:
-    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
-    engines: {node: '>=14.18'}
+  supports-hyperlinks@3.1.0:
     dependencies:
       has-flag: 4.0.0
       supports-color: 7.2.0
-    dev: true
 
-  /svg-baker@1.7.0:
-    resolution: {integrity: sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==}
+  svg-baker@1.7.0:
     dependencies:
       bluebird: 3.7.2
       clone: 2.1.2
@@ -7046,16 +8470,10 @@ packages:
       traverse: 0.6.10
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /svg-tags@1.0.0:
-    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
-    dev: true
+  svg-tags@1.0.0: {}
 
-  /svgo@2.8.0:
-    resolution: {integrity: sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
+  svgo@2.8.0:
     dependencies:
       '@trysound/sax': 0.2.0
       commander: 7.2.0
@@ -7064,230 +8482,135 @@ packages:
       csso: 4.2.0
       picocolors: 1.1.1
       stable: 0.1.8
-    dev: true
 
-  /synckit@0.9.2:
-    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
+  synckit@0.9.2:
     dependencies:
       '@pkgr/core': 0.1.1
       tslib: 2.8.1
-    dev: true
 
-  /table@6.8.2:
-    resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
-    engines: {node: '>=10.0.0'}
+  table@6.8.2:
     dependencies:
       ajv: 8.17.1
       lodash.truncate: 4.4.2
       slice-ansi: 4.0.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
-  /tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
+  tar-stream@2.2.0:
     dependencies:
       bl: 4.1.0
       end-of-stream: 1.4.4
       fs-constants: 1.0.0
       inherits: 2.0.4
       readable-stream: 3.6.2
-    dev: false
 
-  /terser@5.36.0:
-    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
-    engines: {node: '>=10'}
-    hasBin: true
+  terser@5.36.0:
     dependencies:
       '@jridgewell/source-map': 0.3.6
       acorn: 8.14.0
       commander: 2.20.3
       source-map-support: 0.5.21
-    dev: true
 
-  /text-extensions@2.4.0:
-    resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
-    engines: {node: '>=8'}
-    dev: true
+  text-extensions@2.4.0: {}
 
-  /text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-    dev: true
+  text-table@0.2.0: {}
 
-  /through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-    dev: true
+  through@2.3.8: {}
 
-  /tiny-warning@1.0.3:
-    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
-    dev: false
+  tiny-warning@1.0.3: {}
 
-  /tinyexec@0.3.1:
-    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
-    dev: true
+  tinyexec@0.3.1: {}
 
-  /tinyglobby@0.2.10:
-    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
-    engines: {node: '>=12.0.0'}
+  tinyglobby@0.2.10:
     dependencies:
       fdir: 6.4.2(picomatch@4.0.2)
       picomatch: 4.0.2
-    dev: true
 
-  /tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
+  tmp@0.0.33:
     dependencies:
       os-tmpdir: 1.0.2
-    dev: true
 
-  /tmp@0.2.3:
-    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
-    engines: {node: '>=14.14'}
-    dev: false
+  tmp@0.2.3: {}
 
-  /to-object-path@0.3.0:
-    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
-    engines: {node: '>=0.10.0'}
+  to-object-path@0.3.0:
     dependencies:
       kind-of: 3.2.2
-    dev: true
 
-  /to-regex-range@2.1.1:
-    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
-    engines: {node: '>=0.10.0'}
+  to-regex-range@2.1.1:
     dependencies:
       is-number: 3.0.0
       repeat-string: 1.6.1
-    dev: true
 
-  /to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
+  to-regex-range@5.0.1:
     dependencies:
       is-number: 7.0.0
-    dev: true
 
-  /to-regex@3.0.2:
-    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
-    engines: {node: '>=0.10.0'}
+  to-regex@3.0.2:
     dependencies:
       define-property: 2.0.2
       extend-shallow: 3.0.2
       regex-not: 1.0.2
       safe-regex: 1.1.0
-    dev: true
 
-  /toidentifier@1.0.1:
-    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
-    engines: {node: '>=0.6'}
-    dev: true
+  toidentifier@1.0.1: {}
 
-  /totalist@3.0.1:
-    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
-    engines: {node: '>=6'}
-    dev: true
+  totalist@3.0.1: {}
 
-  /traverse@0.3.9:
-    resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
-    dev: false
+  traverse@0.3.9: {}
 
-  /traverse@0.6.10:
-    resolution: {integrity: sha512-hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA==}
-    engines: {node: '>= 0.4'}
+  traverse@0.6.10:
     dependencies:
       gopd: 1.0.1
       typedarray.prototype.slice: 1.0.3
       which-typed-array: 1.1.15
-    dev: true
 
-  /ts-api-utils@1.4.0(typescript@5.5.4):
-    resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      typescript: '>=4.2.0'
+  ts-api-utils@1.4.0(typescript@5.5.4):
     dependencies:
       typescript: 5.5.4
-    dev: true
 
-  /tslib@2.3.0:
-    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
-    dev: false
+  tslib@2.3.0: {}
 
-  /tslib@2.8.1:
-    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
-    dev: true
+  tslib@2.8.1: {}
 
-  /tsscmp@1.0.6:
-    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
-    engines: {node: '>=0.6.x'}
-    dev: true
+  tsscmp@1.0.6: {}
 
-  /tsx@4.19.2:
-    resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
+  tsx@4.19.2:
     dependencies:
       esbuild: 0.23.1
       get-tsconfig: 4.8.1
     optionalDependencies:
       fsevents: 2.3.3
-    dev: true
 
-  /type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
+  type-check@0.4.0:
     dependencies:
       prelude-ls: 1.2.1
-    dev: true
 
-  /type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-    dev: true
+  type-fest@0.20.2: {}
 
-  /type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
-    dev: true
+  type-fest@0.21.3: {}
 
-  /type-is@1.6.18:
-    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
-    engines: {node: '>= 0.6'}
+  type-is@1.6.18:
     dependencies:
       media-typer: 0.3.0
       mime-types: 2.1.35
-    dev: true
 
-  /type@2.7.3:
-    resolution: {integrity: sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==}
-    dev: false
+  type@2.7.3: {}
 
-  /typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
-    engines: {node: '>= 0.4'}
+  typed-array-buffer@1.0.2:
     dependencies:
       call-bind: 1.0.7
       es-errors: 1.3.0
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
-    engines: {node: '>= 0.4'}
+  typed-array-byte-length@1.0.1:
     dependencies:
       call-bind: 1.0.7
       for-each: 0.3.3
       gopd: 1.0.1
       has-proto: 1.0.3
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
-    engines: {node: '>= 0.4'}
+  typed-array-byte-offset@1.0.2:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.7
@@ -7295,11 +8618,8 @@ packages:
       gopd: 1.0.1
       has-proto: 1.0.3
       is-typed-array: 1.1.13
-    dev: true
 
-  /typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
-    engines: {node: '>= 0.4'}
+  typed-array-length@1.0.6:
     dependencies:
       call-bind: 1.0.7
       for-each: 0.3.3
@@ -7307,11 +8627,8 @@ packages:
       has-proto: 1.0.3
       is-typed-array: 1.1.13
       possible-typed-array-names: 1.0.0
-    dev: true
 
-  /typedarray.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==}
-    engines: {node: '>= 0.4'}
+  typedarray.prototype.slice@1.0.3:
     dependencies:
       call-bind: 1.0.7
       define-properties: 1.2.1
@@ -7319,67 +8636,44 @@ packages:
       es-errors: 1.3.0
       typed-array-buffer: 1.0.2
       typed-array-byte-offset: 1.0.2
-    dev: true
 
-  /typescript-eslint@8.14.0(eslint@9.14.0)(typescript@5.5.4):
-    resolution: {integrity: sha512-K8fBJHxVL3kxMmwByvz8hNdBJ8a0YqKzKDX6jRlrjMuNXyd5T2V02HIq37+OiWXvUUOXgOOGiSSOh26Mh8pC3w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  typescript-eslint@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4):
     dependencies:
-      '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0)(eslint@9.14.0)(typescript@5.5.4)
-      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0)(typescript@5.5.4)
+      '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
+    optionalDependencies:
       typescript: 5.5.4
     transitivePeerDependencies:
       - eslint
       - supports-color
-    dev: true
 
-  /typescript@5.5.4:
-    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
-    engines: {node: '>=14.17'}
-    hasBin: true
+  typescript@5.5.4: {}
 
-  /ufo@1.5.4:
-    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
-    dev: true
+  ufo@1.5.4: {}
 
-  /unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
+  unbox-primitive@1.0.2:
     dependencies:
       call-bind: 1.0.7
       has-bigints: 1.0.2
       has-symbols: 1.0.3
       which-boxed-primitive: 1.0.2
-    dev: true
 
-  /unconfig@0.5.5:
-    resolution: {integrity: sha512-VQZ5PT9HDX+qag0XdgQi8tJepPhXiR/yVOkn707gJDKo31lGjRilPREiQJ9Z6zd/Ugpv6ZvO5VxVIcatldYcNQ==}
+  unconfig@0.5.5:
     dependencies:
       '@antfu/utils': 0.7.10
       defu: 6.1.4
       importx: 0.4.4
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
-    dev: true
+  undici-types@6.19.8: {}
 
-  /unicorn-magic@0.1.0:
-    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
-    engines: {node: '>=18'}
-    dev: true
+  unicorn-magic@0.1.0: {}
 
-  /unimport@3.13.1:
-    resolution: {integrity: sha512-nNrVzcs93yrZQOW77qnyOVHtb68LegvhYFwxFMfuuWScmwQmyVCG/NBuN8tYsaGzgQUVYv34E/af+Cc9u4og4A==}
+  unimport@3.13.1(rollup@4.25.0):
     dependencies:
-      '@rollup/pluginutils': 5.1.3
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       acorn: 8.14.0
       escape-string-regexp: 5.0.0
       estree-walker: 3.0.3
@@ -7395,37 +8689,20 @@ packages:
     transitivePeerDependencies:
       - rollup
       - webpack-sources
-    dev: true
 
-  /union-value@1.0.1:
-    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
-    engines: {node: '>=0.10.0'}
+  union-value@1.0.1:
     dependencies:
       arr-union: 3.1.0
       get-value: 2.0.6
       is-extendable: 0.1.1
       set-value: 2.0.1
-    dev: true
 
-  /universalify@2.0.1:
-    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
-    engines: {node: '>= 10.0.0'}
-    dev: true
+  universalify@2.0.1: {}
 
-  /unocss@0.63.6(postcss@8.4.49)(typescript@5.5.4)(vite@5.4.11):
-    resolution: {integrity: sha512-OKJJKEFWVz+Lsf3JdOgRiRtL+QOUQRBov89taUcCPFPZtrhP6pPVFCZHD9qMvY4IChMX7dzalQax3ZXJ3hbtkQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@unocss/webpack': 0.63.6
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
-    peerDependenciesMeta:
-      '@unocss/webpack':
-        optional: true
-      vite:
-        optional: true
+  unocss@0.63.6(postcss@8.4.49)(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
     dependencies:
-      '@unocss/astro': 0.63.6(typescript@5.5.4)(vite@5.4.11)
-      '@unocss/cli': 0.63.6
+      '@unocss/astro': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+      '@unocss/cli': 0.63.6(rollup@4.25.0)
       '@unocss/core': 0.63.6
       '@unocss/postcss': 0.63.6(postcss@8.4.49)
       '@unocss/preset-attributify': 0.63.6
@@ -7440,61 +8717,37 @@ packages:
       '@unocss/transformer-compile-class': 0.63.6
       '@unocss/transformer-directives': 0.63.6
       '@unocss/transformer-variant-group': 0.63.6
-      '@unocss/vite': 0.63.6(typescript@5.5.4)(vite@5.4.11)
+      '@unocss/vite': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
+    optionalDependencies:
       vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - postcss
       - rollup
       - supports-color
       - typescript
-    dev: true
 
-  /unpipe@1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  unpipe@1.0.0: {}
 
-  /unplugin-auto-import@0.18.3(@vueuse/core@10.11.1):
-    resolution: {integrity: sha512-q3FUtGQjYA2e+kb1WumyiQMjHM27MrTQ05QfVwtLRVhyYe+KF6TblBYaEX9L6Z0EibsqaXAiW+RFfkcQpfaXzg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@nuxt/kit': ^3.2.2
-      '@vueuse/core': '*'
-    peerDependenciesMeta:
-      '@nuxt/kit':
-        optional: true
-      '@vueuse/core':
-        optional: true
+  unplugin-auto-import@0.18.3(@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4)))(rollup@4.25.0):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.3
-      '@vueuse/core': 10.11.1(vue@3.5.12)
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       fast-glob: 3.3.2
       local-pkg: 0.5.0
       magic-string: 0.30.12
       minimatch: 9.0.5
-      unimport: 3.13.1
+      unimport: 3.13.1(rollup@4.25.0)
       unplugin: 1.15.0
+    optionalDependencies:
+      '@vueuse/core': 10.11.1(vue@3.5.12(typescript@5.5.4))
     transitivePeerDependencies:
       - rollup
       - webpack-sources
-    dev: true
 
-  /unplugin-vue-components@0.27.4(vue@3.5.12):
-    resolution: {integrity: sha512-1XVl5iXG7P1UrOMnaj2ogYa5YTq8aoh5jwDPQhemwO/OrXW+lPQKDXd1hMz15qxQPxgb/XXlbgo3HQ2rLEbmXQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/parser': ^7.15.8
-      '@nuxt/kit': ^3.2.2
-      vue: 2 || 3
-    peerDependenciesMeta:
-      '@babel/parser':
-        optional: true
-      '@nuxt/kit':
-        optional: true
+  unplugin-vue-components@0.27.4(@babel/parser@7.26.2)(rollup@4.25.0)(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.3
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       chokidar: 3.6.0
       debug: 4.3.7
       fast-glob: 3.3.2
@@ -7504,35 +8757,24 @@ packages:
       mlly: 1.7.2
       unplugin: 1.15.0
       vue: 3.5.12(typescript@5.5.4)
+    optionalDependencies:
+      '@babel/parser': 7.26.2
     transitivePeerDependencies:
       - rollup
       - supports-color
       - webpack-sources
-    dev: true
 
-  /unplugin@1.15.0:
-    resolution: {integrity: sha512-jTPIs63W+DUEDW207ztbaoO7cQ4p5aVaB823LSlxpsFEU3Mykwxf3ZGC/wzxFJeZlASZYgVrWeo7LgOrqJZ8RA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      webpack-sources: ^3
-    peerDependenciesMeta:
-      webpack-sources:
-        optional: true
+  unplugin@1.15.0:
     dependencies:
       acorn: 8.14.0
       webpack-virtual-modules: 0.6.2
-    dev: true
 
-  /unset-value@1.0.0:
-    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
-    engines: {node: '>=0.10.0'}
+  unset-value@1.0.0:
     dependencies:
       has-value: 0.3.1
       isobject: 3.0.1
-    dev: true
 
-  /unzipper@0.10.14:
-    resolution: {integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==}
+  unzipper@0.10.14:
     dependencies:
       big-integer: 1.6.52
       binary: 0.3.0
@@ -7544,66 +8786,36 @@ packages:
       listenercount: 1.0.1
       readable-stream: 2.3.8
       setimmediate: 1.0.5
-    dev: false
 
-  /update-browserslist-db@1.1.1(browserslist@4.24.2):
-    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
+  update-browserslist-db@1.1.1(browserslist@4.24.2):
     dependencies:
       browserslist: 4.24.2
       escalade: 3.2.0
       picocolors: 1.1.1
-    dev: true
 
-  /uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
+  uri-js@4.4.1:
     dependencies:
       punycode: 2.3.1
-    dev: true
 
-  /urix@0.1.0:
-    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
-    deprecated: Please see https://github.com/lydell/urix#deprecated
-    dev: true
+  urix@0.1.0: {}
 
-  /use@3.1.1:
-    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  use@3.1.1: {}
 
-  /util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
+  util-deprecate@1.0.2: {}
 
-  /uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-    dev: false
+  uuid@8.3.2: {}
 
-  /vary@1.1.2:
-    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: '>= 0.8'}
-    dev: true
+  vary@1.1.2: {}
 
-  /vite-plugin-mock-dev-server@1.8.0(esbuild@0.23.1)(vite@5.4.11):
-    resolution: {integrity: sha512-YAf0MZbBX/RYyr75kcTfjyCV9ybGoJZNN6FS6nMwKswoB/6uVQOcnjPc3bJBTwEsKord3TaYiuXkHk6e12pv6A==}
-    engines: {node: ^18 || >= 20}
-    peerDependencies:
-      esbuild: '>=0.21.0'
-      vite: '>=4.0.0'
-    peerDependenciesMeta:
-      esbuild:
-        optional: true
+  vite-plugin-mock-dev-server@1.8.0(esbuild@0.23.1)(rollup@4.25.0)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
     dependencies:
       '@pengzhanbo/utils': 1.1.2
-      '@rollup/pluginutils': 5.1.3
+      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
       chokidar: 3.6.0
       co-body: 6.2.0
       cookies: 0.9.1
       cors: 2.8.5
       debug: 4.3.7
-      esbuild: 0.23.1
       fast-glob: 3.3.2
       formidable: 2.1.2
       http-status: 1.8.1
@@ -7614,17 +8826,15 @@ packages:
       picocolors: 1.1.1
       vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
       ws: 8.18.0
+    optionalDependencies:
+      esbuild: 0.23.1
     transitivePeerDependencies:
       - bufferutil
       - rollup
       - supports-color
       - utf-8-validate
-    dev: true
 
-  /vite-plugin-svg-icons@2.0.1(vite@5.4.11):
-    resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
-    peerDependencies:
-      vite: '>=2.0.0'
+  vite-plugin-svg-icons@2.0.1(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
     dependencies:
       '@types/svgo': 2.6.4
       cors: 2.8.5
@@ -7637,75 +8847,28 @@ packages:
       vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0):
-    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
-    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.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0):
     dependencies:
-      '@types/node': 22.9.0
       esbuild: 0.21.5
       postcss: 8.4.49
       rollup: 4.25.0
-      sass: 1.80.6
-      terser: 5.36.0
     optionalDependencies:
+      '@types/node': 22.9.0
       fsevents: 2.3.3
-    dev: true
+      sass: 1.80.6
+      terser: 5.36.0
 
-  /vscode-uri@3.0.8:
-    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
-    dev: true
+  vscode-uri@3.0.8: {}
 
-  /vue-demi@0.14.10(vue@3.5.12):
-    resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    requiresBuild: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
+  vue-demi@0.14.10(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       vue: 3.5.12(typescript@5.5.4)
 
-  /vue-eslint-parser@9.4.3(eslint@9.14.0):
-    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '>=6.0.0'
+  vue-eslint-parser@9.4.3(eslint@9.14.0(jiti@1.21.6)):
     dependencies:
       debug: 4.3.7
-      eslint: 9.14.0
+      eslint: 9.14.0(jiti@1.21.6)
       eslint-scope: 7.2.2
       eslint-visitor-keys: 3.4.3
       espree: 9.6.1
@@ -7714,189 +8877,114 @@ packages:
       semver: 7.6.3
     transitivePeerDependencies:
       - supports-color
-    dev: true
 
-  /vue-flow-layout@0.0.5(typescript@5.5.4):
-    resolution: {integrity: sha512-lZlqQ/Se1trGMtBMneZDWaiQiQBuxU8ivZ+KpJMem5zKROFpzuPq9KqyWABbSYbxq0qhqZs1I4DBwrY041rtOA==}
+  vue-flow-layout@0.0.5(typescript@5.5.4):
     dependencies:
       vue: 3.5.12(typescript@5.5.4)
     transitivePeerDependencies:
       - typescript
-    dev: true
 
-  /vue-i18n@9.9.1(vue@3.5.12):
-    resolution: {integrity: sha512-xyQ4VspLdNSPTKBFBPWa1tvtj+9HuockZwgFeD2OhxxXuC2CWeNvV4seu2o9+vbQOyQbhAM5Ez56oxUrrnTWdw==}
-    engines: {node: '>= 16'}
-    peerDependencies:
-      vue: ^3.0.0
+  vue-i18n@9.9.1(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       '@intlify/core-base': 9.9.1
       '@intlify/shared': 9.9.1
       '@vue/devtools-api': 6.6.4
       vue: 3.5.12(typescript@5.5.4)
-    dev: false
 
-  /vue-router@4.4.5(vue@3.5.12):
-    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
-    peerDependencies:
-      vue: ^3.2.0
+  vue-picture-cropper@0.7.0(vue@3.5.12(typescript@5.5.4)):
+    dependencies:
+      '@bassist/utils': 0.4.0
+      cropperjs: 1.6.2
+      vue: 3.5.12(typescript@5.5.4)
+
+  vue-router@4.4.5(vue@3.5.12(typescript@5.5.4)):
     dependencies:
       '@vue/devtools-api': 6.6.4
       vue: 3.5.12(typescript@5.5.4)
-    dev: false
 
-  /vue-tsc@2.1.10(typescript@5.5.4):
-    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
-    hasBin: true
-    peerDependencies:
-      typescript: '>=5.0.0'
+  vue-tsc@2.1.10(typescript@5.5.4):
     dependencies:
       '@volar/typescript': 2.4.10
       '@vue/language-core': 2.1.10(typescript@5.5.4)
       semver: 7.6.3
       typescript: 5.5.4
-    dev: true
 
-  /vue@3.5.12(typescript@5.5.4):
-    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  vue@3.5.12(typescript@5.5.4):
     dependencies:
       '@vue/compiler-dom': 3.5.12
       '@vue/compiler-sfc': 3.5.12
       '@vue/runtime-dom': 3.5.12
-      '@vue/server-renderer': 3.5.12(vue@3.5.12)
+      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.5.4))
       '@vue/shared': 3.5.12
+    optionalDependencies:
       typescript: 5.5.4
 
-  /wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
+  wcwidth@1.0.1:
     dependencies:
       defaults: 1.0.4
-    dev: true
 
-  /webpack-virtual-modules@0.6.2:
-    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
-    dev: true
+  webpack-virtual-modules@0.6.2: {}
 
-  /which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
+  which-boxed-primitive@1.0.2:
     dependencies:
       is-bigint: 1.0.4
       is-boolean-object: 1.1.2
       is-number-object: 1.0.7
       is-string: 1.0.7
       is-symbol: 1.0.4
-    dev: true
 
-  /which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
-    engines: {node: '>= 0.4'}
+  which-typed-array@1.1.15:
     dependencies:
       available-typed-arrays: 1.0.7
       call-bind: 1.0.7
       for-each: 0.3.3
       gopd: 1.0.1
       has-tostringtag: 1.0.2
-    dev: true
 
-  /which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
+  which@1.3.1:
     dependencies:
       isexe: 2.0.0
-    dev: true
 
-  /which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
+  which@2.0.2:
     dependencies:
       isexe: 2.0.0
-    dev: true
 
-  /wildcard@1.1.2:
-    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
-    dev: false
+  wildcard@1.1.2: {}
 
-  /word-wrap@1.2.5:
-    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
-    engines: {node: '>=0.10.0'}
-    dev: true
+  word-wrap@1.2.5: {}
 
-  /wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
+  wrap-ansi@7.0.0:
     dependencies:
       ansi-styles: 4.3.0
       string-width: 4.2.3
       strip-ansi: 6.0.1
-    dev: true
 
-  /wrap-ansi@9.0.0:
-    resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
-    engines: {node: '>=18'}
+  wrap-ansi@9.0.0:
     dependencies:
       ansi-styles: 6.2.1
       string-width: 7.2.0
       strip-ansi: 7.1.0
-    dev: true
 
-  /wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
+  wrappy@1.0.2: {}
 
-  /write-file-atomic@5.0.1:
-    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
+  write-file-atomic@5.0.1:
     dependencies:
       imurmurhash: 0.1.4
       signal-exit: 4.1.0
-    dev: true
 
-  /ws@8.18.0:
-    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
+  ws@8.18.0: {}
 
-  /xml-name-validator@4.0.0:
-    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
-    engines: {node: '>=12'}
-    dev: true
+  xml-name-validator@4.0.0: {}
 
-  /xmlchars@2.2.0:
-    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
-    dev: false
+  xmlchars@2.2.0: {}
 
-  /y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-    dev: true
+  y18n@5.0.8: {}
 
-  /yaml@2.5.1:
-    resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}
-    engines: {node: '>= 14'}
-    hasBin: true
-    dev: true
+  yaml@2.5.1: {}
 
-  /yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-    dev: true
+  yargs-parser@21.1.1: {}
 
-  /yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
+  yargs@17.7.2:
     dependencies:
       cliui: 8.0.1
       escalade: 3.2.0
@@ -7905,29 +8993,17 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
-    dev: true
 
-  /yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-    dev: true
+  yocto-queue@0.1.0: {}
 
-  /yocto-queue@1.1.1:
-    resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
-    engines: {node: '>=12.20'}
-    dev: true
+  yocto-queue@1.1.1: {}
 
-  /zip-stream@4.1.1:
-    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
-    engines: {node: '>= 10'}
+  zip-stream@4.1.1:
     dependencies:
       archiver-utils: 3.0.4
       compress-commons: 4.1.2
       readable-stream: 3.6.2
-    dev: false
 
-  /zrender@5.6.0:
-    resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
+  zrender@5.6.0:
     dependencies:
       tslib: 2.3.0
-    dev: false
diff --git a/src/components/ImgCorpper/compressUtil.js b/src/components/ImgCorpper/compressUtil.js
new file mode 100644
index 00000000..f9f83d84
--- /dev/null
+++ b/src/components/ImgCorpper/compressUtil.js
@@ -0,0 +1,92 @@
+/**
+ * 图片压缩类
+ * @param minSize
+ * @param maxSize
+ * @constructor
+ */
+export function PhotoCompress(minSize, maxSize) {
+  var nextQ = 0.5; // 压缩比例
+  var maxQ = 1;
+  var minQ = 0;
+
+  /**
+   * 将base64转换为文件
+   * @param base64Codes base64编码
+   * @param fileName 文件名称
+   * @returns {*}
+   */
+  PhotoCompress.prototype.dataUrlToFile = function (base64Codes, fileName = new Date().getTime()) {
+    var arr = base64Codes.split(","),
+      mime = arr[0].match(/:(.*?);/)[1],
+      bStr = atob(arr[1]),
+      n = bStr.length,
+      u8arr = new Uint8Array(n);
+    while (n--) {
+      u8arr[n] = bStr.charCodeAt(n);
+    }
+    return new File([u8arr], fileName, { type: mime });
+  };
+
+  /**
+   * 图片压缩
+   * @param file 文件
+   * @param callback 回调函数
+   */
+  PhotoCompress.prototype.compress = function (file, callback) {
+    var self = this;
+    self.imgBase64(file, function (image, canvas) {
+      var base64Codes = canvas.toDataURL(file.type, nextQ); // y压缩
+      var compressFile = self.dataUrlToFile(base64Codes, file.name.split(".")[0]); // 转成file文件
+      var compressFileSize = compressFile.size; // 压缩后文件大小 k
+      // console.log("图片质量：" + nextQ);
+      // console.log("压缩后文件大小：" + compressFileSize / 1024);
+      if (compressFileSize > maxSize) {
+        // 压缩后文件大于最大值
+        maxQ = nextQ;
+        nextQ = (nextQ + minQ) / 2; // 质量降低
+        self.compress(file, callback);
+      } else if (compressFileSize < minSize) {
+        // 压缩以后文件小于最小值
+        minQ = nextQ;
+        nextQ = (nextQ + maxQ) / 2; // 质量提高
+        self.compress(file, callback);
+      } else {
+        callback(compressFile);
+      }
+    });
+  };
+
+  /**
+   * 将图片转化为base64
+   * @param file 文件
+   * @param callback 回调函数
+   */
+  PhotoCompress.prototype.imgBase64 = function (file, callback) {
+    // 看支持不支持FileReader
+    if (!file || !window.FileReader) return;
+    var image = new Image();
+    // 绑定 load 事件处理器，加载完成后执行
+    image.onload = function () {
+      var canvas = document.createElement("canvas");
+      var ctx = canvas.getContext("2d");
+      ctx.clearRect(0, 0, canvas.width, canvas.height);
+      canvas.width = image.width * nextQ;
+      canvas.height = image.height * nextQ;
+      ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
+      callback(image, canvas);
+    };
+    if (/^image/.test(file.type)) {
+      // 创建一个reader
+      var reader = new FileReader();
+      // 将图片将转成 base64 格式
+      reader.readAsDataURL(file);
+      // 读取成功后的回调
+      reader.onload = function () {
+        // self.imgUrls.push(this.result);
+        // 设置src属性，浏览器会自动加载。
+        // 记住必须先绑定事件，才能设置src属性，否则会出同步问题。
+        image.src = this.result;
+      };
+    }
+  };
+}
diff --git a/src/components/ImgCorpper/corpperDialog.vue b/src/components/ImgCorpper/corpperDialog.vue
new file mode 100644
index 00000000..98c41fe4
--- /dev/null
+++ b/src/components/ImgCorpper/corpperDialog.vue
@@ -0,0 +1,205 @@
+<template>
+  <el-dialog
+    v-model="isShowModal"
+    title="裁剪图片"
+    width="50%"
+    :close-on-press-escape="false"
+    :close-on-click-modal="false"
+    align-center
+    @close="cancel"
+  >
+    <div class="modal-content">
+      <VuePictureCropper
+        :img="pic"
+        :boxStyle="corpBoxStyle"
+        :options="corpOptions"
+        :presetMode="corpPresetMode"
+        @ready="ready"
+      />
+    </div>
+    <div class="m-t-10 btns">
+      <el-button class="default-btn" @click="cancel">取消</el-button>
+      <el-button v-if="showClear" class="default-btn" @click="clear">关闭</el-button>
+      <el-button v-if="showReset" class="default-btn" @click="reset">重置</el-button>
+      <el-button class="default-btn primary" @click="getResult">确定</el-button>
+    </div>
+  </el-dialog>
+</template>
+
+<script setup lang="ts">
+// 组件文档：https://cropper.chengpeiquan.com/zh/quick-start.html
+import VuePictureCropper, { cropper } from "vue-picture-cropper";
+import { PhotoCompress } from "./compressUtil.js";
+
+const props = defineProps({
+  visible: {
+    type: Boolean,
+  },
+  image: {
+    type: [String, File],
+  },
+  presetMode: {
+    type: Object,
+  },
+  options: {
+    type: Object,
+  },
+  boxStyle: {
+    type: Object,
+  },
+  showClear: {
+    // 是否显示 Clear 按钮
+    type: Boolean,
+  },
+  showReset: {
+    // 是否显示 Reset 按钮
+    type: Boolean,
+  },
+  isCompress: {
+    // 是否压缩裁剪后的图片大小
+    type: Boolean,
+  },
+  compressSize: {
+    // 压缩图片大小限制
+    type: Object,
+    default: {
+      maxSize: 0.3 * 1024 * 1024, // 300k
+      minSize: 0.03 * 1024 * 1024, // 30k
+    },
+  },
+});
+
+/** 裁剪组件属性配置 */
+const corpOptions = computed(() => {
+  return {
+    viewMode: 1, // 裁剪框范围 1-只能在图片区域内活动
+    dragMode: "move", // 可选值 crop(可绘制裁剪框) | move(仅移动)
+    // aspectRatio: 1 / 1,// 裁剪框的宽高比
+    cropBoxResizable: false, // 是否可以调整裁剪区的大小
+    ...props.options,
+  };
+});
+/** 裁剪区域的样式 */
+const corpBoxStyle = computed(() => {
+  return {
+    width: "auto",
+    height: "400px",
+    backgroundColor: "#f8f8f8",
+    margin: "auto",
+    ...props.boxStyle,
+  };
+});
+
+/** 预设模式配置 */
+const corpPresetMode = computed(() => {
+  return {
+    mode: "fixedSize",
+    width: 200,
+    height: 200,
+    ...props.presetMode,
+  };
+});
+const emits = defineEmits(["close"]);
+
+watch(
+  () => props.visible,
+  (val) => {
+    isShowModal.value = val;
+    if (!val) {
+      pic.value = "";
+      result.dataURL = "";
+      result.blobURL = "";
+      reset();
+    }
+  }
+);
+
+watch(
+  () => props.image,
+  (val) => {
+    pic.value = val;
+  }
+);
+
+const isShowModal = ref(false);
+const pic = ref("");
+const result = reactive({
+  dataURL: "",
+  blobURL: "",
+});
+
+async function getResult() {
+  if (!cropper) return;
+  const base64 = cropper.getDataURL();
+  const blob = await cropper.getBlob();
+  if (!blob) return;
+
+  let file = await cropper.getFile({
+    fileName: "locales.fileName",
+  });
+
+  result.dataURL = base64;
+  result.blobURL = URL.createObjectURL(blob);
+  const { minSize, maxSize } = props.compressSize;
+  // console.log(file.size, maxSize)
+  // 是否限制文件大小
+  if (props.isCompress && file.size > maxSize) {
+    // console.log("compress")
+    const photoCompress = new PhotoCompress(minSize, maxSize);
+    photoCompress.compress(file, function (f) {
+      const r = new FileReader();
+      r.readAsDataURL(f);
+      r.onload = function (e) {
+        emits("close", { result, file: f });
+      };
+    });
+  } else {
+    // console.log("crop")
+    emits("close", { result, file });
+  }
+}
+
+/**
+ * Clear the crop box
+ */
+function clear() {
+  if (!cropper) return;
+  cropper.clear();
+}
+
+/**
+ * Reset the default cropping area
+ */
+function reset() {
+  if (!cropper) return;
+  cropper.reset();
+}
+
+/**
+ * The ready event passed to Cropper.js
+ */
+function ready() {
+  // console.log('Cropper is ready.')
+}
+
+function cancel() {
+  emits("close");
+}
+</script>
+
+<style lang="scss" scoped>
+.modal-wrap {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 99;
+  width: 100%;
+  height: 100%;
+  overflow: hidden;
+}
+
+.btns {
+  display: flex;
+  justify-content: flex-end;
+}
+</style>
diff --git a/src/components/ImgCorpper/index.vue b/src/components/ImgCorpper/index.vue
new file mode 100644
index 00000000..d80ad2ae
--- /dev/null
+++ b/src/components/ImgCorpper/index.vue
@@ -0,0 +1,211 @@
+<template>
+  <el-upload
+    v-model:file-list="fileList"
+    list-type="picture-card"
+    :auto-upload="true"
+    :class="fileList.length >= 1 || !props.showUploadBtn ? 'hide' : 'show'"
+    :before-upload="handleBeforeUpload"
+    :data="props.data"
+    :name="props.name"
+    :accept="props.accept"
+    :limit="1"
+  >
+    <i-ep-plus />
+    {{ title }}
+    <template #file="{ file }">
+      <div style="width: 100%">
+        <img class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" alt="" />
+        <span class="el-upload-list__item-actions">
+          <span class="el-upload-list__item-preview" @click="previewImg(file)">
+            <el-icon><zoom-in /></el-icon>
+          </span>
+          <span
+            v-if="props.showDelBtn"
+            class="el-upload-list__item-delete"
+            @click="handleRemove(file)"
+          >
+            <el-icon><Delete /></el-icon>
+          </span>
+        </span>
+      </div>
+    </template>
+  </el-upload>
+
+  <el-image-viewer
+    v-if="viewVisible"
+    :zoom-rate="1.2"
+    :initialIndex="initialIndex"
+    :url-list="[viewFile]"
+    @close="closePreview"
+  />
+
+  <CorpperDialog
+    :visible="isShowCorpper"
+    :image="selectPic"
+    :isCompress="true"
+    :showReset="true"
+    :presetMode="presetMode"
+    @close="hideCorpper"
+  />
+</template>
+
+<script setup lang="ts">
+import CorpperDialog from "./corpperDialog.vue";
+
+import { UploadRawFile, UploadUserFile, UploadFile, UploadProps } from "element-plus";
+const emit = defineEmits(["update:modelValue"]);
+
+const props = defineProps({
+  /**
+   * 文件路径
+   */
+  modelValue: {
+    type: String,
+    default: "",
+  },
+  title: {
+    type: String,
+    default: "上传图片",
+  },
+
+  /**
+   * 上传文件的参数名
+   */
+  name: {
+    type: String,
+    default: "file",
+  },
+  /**
+   * 文件上传数量限制
+   */
+  limit: {
+    type: Number,
+    default: 1,
+  },
+  /**
+   * 是否显示删除按钮
+   */
+  showDelBtn: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 是否显示上传按钮
+   */
+  showUploadBtn: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 单张图片最大大小
+   */
+  uploadMaxSize: {
+    type: Number,
+    default: 2 * 1024 * 1024,
+  },
+  /**
+   * 上传文件类型
+   */
+  accept: {
+    type: String,
+    default: "image/*",
+  },
+
+  presetMode: {
+    type: Object,
+    default: "{ width: 200, height: 200 }",
+  },
+});
+
+const selectPic = ref("");
+const isShowCorpper = ref(false);
+
+const viewVisible = ref(false);
+const initialIndex = ref(0);
+
+const fileList = ref([] as UploadUserFile[]);
+const viewFile = ref(props.modelValue as string);
+
+watch(
+  () => props.modelValue,
+  (newVal: string) => {
+    if (!newVal) {
+      fileList.value = [];
+      return;
+    }
+
+    fileList.value = [{ url: newVal } as UploadUserFile];
+
+    viewFile.value = newVal;
+  },
+  { immediate: true }
+);
+/**
+ * 删除图片
+ */
+function handleRemove(removeFile: UploadFile) {
+  const filePath = removeFile.url;
+  if (filePath) {
+    emit("update:modelValue", "");
+  }
+}
+
+/**
+ * 限制用户上传文件的格式和大小
+ */
+function handleBeforeUpload(file: UploadRawFile) {
+  const reader = new FileReader();
+  reader.readAsDataURL(file);
+  reader.onload = () => {
+    selectPic.value = String(reader.result);
+    isShowCorpper.value = true;
+  };
+
+  if (file.size > props.uploadMaxSize) {
+    ElMessage.warning("上传图片不能大于 " + Math.trunc(props.uploadMaxSize / 1024 / 1024) + "M");
+    return false;
+  }
+  return true;
+}
+
+/**
+ * 预览图片
+ */
+const previewImg: UploadProps["onPreview"] = (uploadFile: UploadFile) => {
+  viewFile.value = uploadFile.url!;
+  initialIndex.value = 0;
+  viewVisible.value = true;
+};
+
+/**
+ * 关闭预览
+ */
+const closePreview = () => {
+  viewVisible.value = false;
+};
+
+function hideCorpper(data: any) {
+  isShowCorpper.value = false;
+  if (data) {
+    const {
+      result: { dataURL },
+      file,
+    } = data;
+    emit("update:modelValue", dataURL);
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.hide {
+  :deep(.el-upload--picture-card) {
+    display: none;
+  }
+}
+
+.show {
+  :deep(.el-upload--picture-card) {
+    display: flex;
+  }
+}
+</style>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index fcc072db..f84deedf 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -91,6 +91,7 @@ declare module "vue" {
     ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
     SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
+    ImgCorpper: (typeof import("./../components/ImgCorpper/index.vue"))["default"];
   }
   export interface ComponentCustomProperties {
     vLoading: (typeof import("element-plus/es"))["ElLoadingDirective"];
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 0fc573a5..b01c4ed9 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -23,6 +23,22 @@
         </el-table>
       </el-form-item>
 
+      <el-form-item label="单图裁剪">
+        <ImgCorpper
+          v-model="cprpperValue"
+          :presetMode="{ width: 295, height: 413 }"
+          :title="'上传图片'"
+        />
+      </el-form-item>
+      <el-form-item label="参数说明">
+        <el-table :data="imageCprpperUploadArgData" border>
+          <el-table-column prop="argsName" label="参数名称" width="300" />
+          <el-table-column prop="type" label="参数类型" width="200" />
+          <el-table-column prop="default" label="默认值" width="400" />
+          <el-table-column prop="desc" label="描述" width="300" />
+        </el-table>
+      </el-form-item>
+
       <el-form-item label="多图上传">
         <MultiImageUpload v-model="picUrls" />
       </el-form-item>
@@ -81,6 +97,29 @@ const singleImageUploadArgData = [
   },
 ];
 
+const imageCprpperUploadArgData = [
+  {
+    argsName: "v-model",
+    type: "Object",
+    default: "",
+    desc: "裁剪后图片Base64编码",
+  },
+  {
+    argsName: "presetMode",
+    type: "String",
+    default: "{ width: 295, height: 413 }",
+    desc: "裁剪窗口的长宽，及裁剪图片大小",
+  },
+  {
+    argsName: "title",
+    type: "String",
+    default: "上传图片",
+    desc: "组件内容",
+  },
+];
+
+const cprpperValue = ref();
+
 // 多图
 const picUrls = ref([
   "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",

From ba7e41c78eeb62363977ea74ff81cbd1ffe97a18 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 26 Nov 2024 22:20:45 +0800
Subject: [PATCH 079/497] =?UTF-8?q?style:=20:lipstick:=20=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E6=8E=A7=E5=88=B6=E5=8F=B0=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 63 ++++++++---------------------------
 1 file changed, 14 insertions(+), 49 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 512c23d5..88a5191d 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -16,20 +16,6 @@
             </div>
           </div>
         </el-col>
-
-        <el-col :span="6" :xs="24">
-          <div class="flex h-full items-center justify-around">
-            <el-statistic v-for="item in statisticData" :key="item.key" :value="item.value">
-              <template #title>
-                <div class="flex items-center">
-                  <svg-icon :icon-class="item.iconClass" size="20px" />
-                  <span class="text-[16px] ml-1">{{ item.title }}</span>
-                </div>
-              </template>
-              <template v-if="item.suffix" #suffix>/100</template>
-            </el-statistic>
-          </div>
-        </el-col>
       </el-row>
     </el-card>
 
@@ -167,6 +153,18 @@ import { useUserStore } from "@/store/modules/user";
 import StatsAPI, { VisitStatsVO } from "@/api/system/log";
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 
+interface VisitStats {
+  title: string;
+  icon: string;
+  tagType: "primary" | "success" | "warning";
+  growthRate: number;
+  // 粒度
+  granularity: string;
+  // 今日数量
+  todayCount: number;
+  totalCount: number;
+}
+
 const noticeDetailRef = ref();
 
 const userStore = useUserStore();
@@ -186,44 +184,11 @@ const greetings = computed(() => {
   }
 });
 
-// 右上角数量
-const statisticData = ref([
-  {
-    value: 99,
-    iconClass: "message",
-    title: "消息",
-    key: "message",
-  },
-  {
-    value: 50,
-    iconClass: "todo",
-    title: "待办",
-    suffix: "/100",
-    key: "upcoming",
-  },
-  {
-    value: 10,
-    iconClass: "project",
-    title: "项目",
-    key: "project",
-  },
-]);
-
 const onlineUserCount = ref(0);
 
 const visitStatsLoading = ref(true);
 const visitStatsList = ref<VisitStats[] | null>(Array(3).fill({}));
-interface VisitStats {
-  title: string;
-  icon: string;
-  tagType: "primary" | "success" | "warning";
-  growthRate: number;
-  // 粒度
-  granularity: string;
-  // 今日数量
-  todayCount: number;
-  totalCount: number;
-}
+
 // 加载访问统计数据
 const loadVisitStatsData = async () => {
   const list: VisitStatsVO[] = await StatsAPI.getVisitStats();
@@ -244,7 +209,7 @@ const loadVisitStatsData = async () => {
   }
 };
 
-/** 格式化增长率 */
+// 格式化增长率
 const formatGrowthRate = (growthRate: number): string => {
   if (growthRate === 0) {
     return "-";

From 038bfd7a798c23d88a10907ac85d90cb376d30a1 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 26 Nov 2024 22:23:51 +0800
Subject: [PATCH 080/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4pnpm-lock.yaml=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore     |    1 +
 pnpm-lock.yaml | 9009 ------------------------------------------------
 2 files changed, 1 insertion(+), 9009 deletions(-)
 delete mode 100644 pnpm-lock.yaml

diff --git a/.gitignore b/.gitignore
index 6c640aba..0a2a67f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ dist-ssr
 *.local
 
 stats.html
+pnpm-lock.yaml
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
deleted file mode 100644
index fb7eb6cf..00000000
--- a/pnpm-lock.yaml
+++ /dev/null
@@ -1,9009 +0,0 @@
-lockfileVersion: '9.0'
-
-settings:
-  autoInstallPeers: true
-  excludeLinksFromLockfile: false
-
-importers:
-
-  .:
-    dependencies:
-      '@element-plus/icons-vue':
-        specifier: ^2.3.1
-        version: 2.3.1(vue@3.5.12(typescript@5.5.4))
-      '@stomp/stompjs':
-        specifier: ^7.0.0
-        version: 7.0.0
-      '@vueuse/core':
-        specifier: ^10.11.1
-        version: 10.11.1(vue@3.5.12(typescript@5.5.4))
-      '@wangeditor/editor':
-        specifier: ^5.1.23
-        version: 5.1.23
-      '@wangeditor/editor-for-vue':
-        specifier: 5.1.10
-        version: 5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12(typescript@5.5.4))
-      animate.css:
-        specifier: ^4.1.1
-        version: 4.1.1
-      axios:
-        specifier: ^1.7.7
-        version: 1.7.7
-      codemirror:
-        specifier: ^5.65.18
-        version: 5.65.18
-      codemirror-editor-vue3:
-        specifier: ^2.8.0
-        version: 2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12(typescript@5.5.4))
-      echarts:
-        specifier: ^5.5.1
-        version: 5.5.1
-      element-plus:
-        specifier: ^2.8.7
-        version: 2.8.7(vue@3.5.12(typescript@5.5.4))
-      exceljs:
-        specifier: ^4.4.0
-        version: 4.4.0
-      lodash-es:
-        specifier: ^4.17.21
-        version: 4.17.21
-      nprogress:
-        specifier: ^0.2.0
-        version: 0.2.0
-      path-browserify:
-        specifier: ^1.0.1
-        version: 1.0.1
-      path-to-regexp:
-        specifier: ^6.3.0
-        version: 6.3.0
-      pinia:
-        specifier: ^2.2.6
-        version: 2.2.6(typescript@5.5.4)(vue@3.5.12(typescript@5.5.4))
-      qs:
-        specifier: ^6.13.0
-        version: 6.13.0
-      sortablejs:
-        specifier: ^1.15.3
-        version: 1.15.3
-      vue:
-        specifier: ^3.5.12
-        version: 3.5.12(typescript@5.5.4)
-      vue-i18n:
-        specifier: 9.9.1
-        version: 9.9.1(vue@3.5.12(typescript@5.5.4))
-      vue-picture-cropper:
-        specifier: ^0.7.0
-        version: 0.7.0(vue@3.5.12(typescript@5.5.4))
-      vue-router:
-        specifier: ^4.4.5
-        version: 4.4.5(vue@3.5.12(typescript@5.5.4))
-    devDependencies:
-      '@commitlint/cli':
-        specifier: ^19.5.0
-        version: 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
-      '@commitlint/config-conventional':
-        specifier: ^19.5.0
-        version: 19.5.0
-      '@eslint/js':
-        specifier: ^9.14.0
-        version: 9.14.0
-      '@types/codemirror':
-        specifier: ^5.60.15
-        version: 5.60.15
-      '@types/lodash':
-        specifier: ^4.17.13
-        version: 4.17.13
-      '@types/node':
-        specifier: ^22.9.0
-        version: 22.9.0
-      '@types/nprogress':
-        specifier: ^0.2.3
-        version: 0.2.3
-      '@types/path-browserify':
-        specifier: ^1.0.3
-        version: 1.0.3
-      '@types/qs':
-        specifier: ^6.9.17
-        version: 6.9.17
-      '@types/sortablejs':
-        specifier: ^1.15.8
-        version: 1.15.8
-      '@typescript-eslint/eslint-plugin':
-        specifier: ^8.14.0
-        version: 8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/parser':
-        specifier: ^8.14.0
-        version: 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@vitejs/plugin-vue':
-        specifier: ^5.1.5
-        version: 5.1.5(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))(vue@3.5.12(typescript@5.5.4))
-      autoprefixer:
-        specifier: ^10.4.20
-        version: 10.4.20(postcss@8.4.49)
-      commitizen:
-        specifier: ^4.3.1
-        version: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
-      cz-git:
-        specifier: 1.9.4
-        version: 1.9.4
-      eslint:
-        specifier: ^9.14.0
-        version: 9.14.0(jiti@1.21.6)
-      eslint-config-prettier:
-        specifier: ^9.1.0
-        version: 9.1.0(eslint@9.14.0(jiti@1.21.6))
-      eslint-plugin-prettier:
-        specifier: ^5.2.1
-        version: 5.2.1(eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)))(eslint@9.14.0(jiti@1.21.6))(prettier@3.3.3)
-      eslint-plugin-vue:
-        specifier: ^9.31.0
-        version: 9.31.0(eslint@9.14.0(jiti@1.21.6))
-      globals:
-        specifier: ^15.12.0
-        version: 15.12.0
-      husky:
-        specifier: ^9.1.6
-        version: 9.1.6
-      lint-staged:
-        specifier: ^15.2.10
-        version: 15.2.10
-      postcss:
-        specifier: ^8.4.49
-        version: 8.4.49
-      postcss-html:
-        specifier: ^1.7.0
-        version: 1.7.0
-      postcss-scss:
-        specifier: ^4.0.9
-        version: 4.0.9(postcss@8.4.49)
-      prettier:
-        specifier: ^3.3.3
-        version: 3.3.3
-      sass:
-        specifier: ^1.80.6
-        version: 1.80.6
-      stylelint:
-        specifier: ^16.10.0
-        version: 16.10.0(typescript@5.5.4)
-      stylelint-config-html:
-        specifier: ^1.1.0
-        version: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-config-recess-order:
-        specifier: ^5.1.1
-        version: 5.1.1(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-config-recommended-scss:
-        specifier: ^14.1.0
-        version: 14.1.0(postcss@8.4.49)(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-config-recommended-vue:
-        specifier: ^1.5.0
-        version: 1.5.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-config-standard:
-        specifier: ^36.0.1
-        version: 36.0.1(stylelint@16.10.0(typescript@5.5.4))
-      terser:
-        specifier: ^5.36.0
-        version: 5.36.0
-      typescript:
-        specifier: 5.5.4
-        version: 5.5.4
-      typescript-eslint:
-        specifier: ^8.14.0
-        version: 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      unocss:
-        specifier: ^0.63.6
-        version: 0.63.6(postcss@8.4.49)(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-      unplugin-auto-import:
-        specifier: ^0.18.3
-        version: 0.18.3(@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4)))(rollup@4.25.0)
-      unplugin-vue-components:
-        specifier: ^0.27.4
-        version: 0.27.4(@babel/parser@7.26.2)(rollup@4.25.0)(vue@3.5.12(typescript@5.5.4))
-      vite:
-        specifier: ^5.4.11
-        version: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-      vite-plugin-mock-dev-server:
-        specifier: ^1.8.0
-        version: 1.8.0(esbuild@0.23.1)(rollup@4.25.0)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-      vite-plugin-svg-icons:
-        specifier: ^2.0.1
-        version: 2.0.1(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-      vue-eslint-parser:
-        specifier: ^9.4.3
-        version: 9.4.3(eslint@9.14.0(jiti@1.21.6))
-      vue-tsc:
-        specifier: ^2.1.10
-        version: 2.1.10(typescript@5.5.4)
-
-packages:
-
-  '@ampproject/remapping@2.3.0':
-    resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
-    engines: {node: '>=6.0.0'}
-
-  '@antfu/install-pkg@0.4.1':
-    resolution: {integrity: sha512-T7yB5QNG29afhWVkVq7XeIMBa5U/vs9mX69YqayXypPRmYzUmzwnYltplHmPtZ4HPCn+sQKeXW8I47wCbuBOjw==}
-
-  '@antfu/utils@0.7.10':
-    resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==}
-
-  '@babel/code-frame@7.26.2':
-    resolution: {integrity: sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-string-parser@7.25.9':
-    resolution: {integrity: sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/helper-validator-identifier@7.25.9':
-    resolution: {integrity: sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/parser@7.26.2':
-    resolution: {integrity: sha512-DWMCZH9WA4Maitz2q21SRKHo9QXZxkDsbNZoVD62gusNtNBBqDg9i7uOhASfTfIGNzW+O+r7+jAlM8dwphcJKQ==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
-
-  '@babel/runtime@7.26.0':
-    resolution: {integrity: sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==}
-    engines: {node: '>=6.9.0'}
-
-  '@babel/types@7.26.0':
-    resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
-    engines: {node: '>=6.9.0'}
-
-  '@bassist/utils@0.4.0':
-    resolution: {integrity: sha512-aoFTl0jUjm8/tDZodP41wnEkvB+C5O9NFCuYN/ztL6jSUSsuBkXq90/1ifBm1XhV/zySHgLYlU1+tgo3XtQ+nA==}
-
-  '@commitlint/cli@19.5.0':
-    resolution: {integrity: sha512-gaGqSliGwB86MDmAAKAtV9SV1SHdmN8pnGq4EJU4+hLisQ7IFfx4jvU4s+pk6tl0+9bv6yT+CaZkufOinkSJIQ==}
-    engines: {node: '>=v18'}
-    hasBin: true
-
-  '@commitlint/config-conventional@19.5.0':
-    resolution: {integrity: sha512-OBhdtJyHNPryZKg0fFpZNOBM1ZDbntMvqMuSmpfyP86XSfwzGw4CaoYRG4RutUPg0BTK07VMRIkNJT6wi2zthg==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/config-validator@19.5.0':
-    resolution: {integrity: sha512-CHtj92H5rdhKt17RmgALhfQt95VayrUo2tSqY9g2w+laAXyk7K/Ef6uPm9tn5qSIwSmrLjKaXK9eiNuxmQrDBw==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/ensure@19.5.0':
-    resolution: {integrity: sha512-Kv0pYZeMrdg48bHFEU5KKcccRfKmISSm9MvgIgkpI6m+ohFTB55qZlBW6eYqh/XDfRuIO0x4zSmvBjmOwWTwkg==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/execute-rule@19.5.0':
-    resolution: {integrity: sha512-aqyGgytXhl2ejlk+/rfgtwpPexYyri4t8/n4ku6rRJoRhGZpLFMqrZ+YaubeGysCP6oz4mMA34YSTaSOKEeNrg==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/format@19.5.0':
-    resolution: {integrity: sha512-yNy088miE52stCI3dhG/vvxFo9e4jFkU1Mj3xECfzp/bIS/JUay4491huAlVcffOoMK1cd296q0W92NlER6r3A==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/is-ignored@19.5.0':
-    resolution: {integrity: sha512-0XQ7Llsf9iL/ANtwyZ6G0NGp5Y3EQ8eDQSxv/SRcfJ0awlBY4tHFAvwWbw66FVUaWICH7iE5en+FD9TQsokZ5w==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/lint@19.5.0':
-    resolution: {integrity: sha512-cAAQwJcRtiBxQWO0eprrAbOurtJz8U6MgYqLz+p9kLElirzSCc0vGMcyCaA1O7AqBuxo11l1XsY3FhOFowLAAg==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/load@19.5.0':
-    resolution: {integrity: sha512-INOUhkL/qaKqwcTUvCE8iIUf5XHsEPCLY9looJ/ipzi7jtGhgmtH7OOFiNvwYgH7mA8osUWOUDV8t4E2HAi4xA==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/message@19.5.0':
-    resolution: {integrity: sha512-R7AM4YnbxN1Joj1tMfCyBryOC5aNJBdxadTZkuqtWi3Xj0kMdutq16XQwuoGbIzL2Pk62TALV1fZDCv36+JhTQ==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/parse@19.5.0':
-    resolution: {integrity: sha512-cZ/IxfAlfWYhAQV0TwcbdR1Oc0/r0Ik1GEessDJ3Lbuma/MRO8FRQX76eurcXtmhJC//rj52ZSZuXUg0oIX0Fw==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/read@19.5.0':
-    resolution: {integrity: sha512-TjS3HLPsLsxFPQj6jou8/CZFAmOP2y+6V4PGYt3ihbQKTY1Jnv0QG28WRKl/d1ha6zLODPZqsxLEov52dhR9BQ==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/resolve-extends@19.5.0':
-    resolution: {integrity: sha512-CU/GscZhCUsJwcKTJS9Ndh3AKGZTNFIOoQB2n8CmFnizE0VnEuJoum+COW+C1lNABEeqk6ssfc1Kkalm4bDklA==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/rules@19.5.0':
-    resolution: {integrity: sha512-hDW5TPyf/h1/EufSHEKSp6Hs+YVsDMHazfJ2azIk9tHPXS6UqSz1dIRs1gpqS3eMXgtkT7JH6TW4IShdqOwhAw==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/to-lines@19.5.0':
-    resolution: {integrity: sha512-R772oj3NHPkodOSRZ9bBVNq224DOxQtNef5Pl8l2M8ZnkkzQfeSTr4uxawV2Sd3ui05dUVzvLNnzenDBO1KBeQ==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/top-level@19.5.0':
-    resolution: {integrity: sha512-IP1YLmGAk0yWrImPRRc578I3dDUI5A2UBJx9FbSOjxe9sTlzFiwVJ+zeMLgAtHMtGZsC8LUnzmW1qRemkFU4ng==}
-    engines: {node: '>=v18'}
-
-  '@commitlint/types@19.5.0':
-    resolution: {integrity: sha512-DSHae2obMSMkAtTBSOulg5X7/z+rGLxcXQIkg3OmWvY6wifojge5uVMydfhUvs7yQj+V7jNmRZ2Xzl8GJyqRgg==}
-    engines: {node: '>=v18'}
-
-  '@csstools/css-parser-algorithms@3.0.4':
-    resolution: {integrity: sha512-Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@csstools/css-tokenizer': ^3.0.3
-
-  '@csstools/css-tokenizer@3.0.3':
-    resolution: {integrity: sha512-UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==}
-    engines: {node: '>=18'}
-
-  '@csstools/media-query-list-parser@3.0.1':
-    resolution: {integrity: sha512-HNo8gGD02kHmcbX6PvCoUuOQvn4szyB9ca63vZHKX5A81QytgDG4oxG4IaEfHTlEZSZ6MjPEMWIVU+zF2PZcgw==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      '@csstools/css-parser-algorithms': ^3.0.1
-      '@csstools/css-tokenizer': ^3.0.1
-
-  '@csstools/selector-specificity@4.0.0':
-    resolution: {integrity: sha512-189nelqtPd8++phaHNwYovKZI0FOzH1vQEE3QhHHkNIGrg5fSs9CbYP3RvfEH5geztnIA9Jwq91wyOIwAW5JIQ==}
-    engines: {node: '>=18'}
-    peerDependencies:
-      postcss-selector-parser: ^6.1.0
-
-  '@ctrl/tinycolor@3.6.1':
-    resolution: {integrity: sha512-SITSV6aIXsuVNV3f3O0f2n/cgyEDWoSqtZMYiAmcsYHydcKrOz3gUxB/iXd/Qf08+IZX4KpgNbvUdMBmWz+kcA==}
-    engines: {node: '>=10'}
-
-  '@dual-bundle/import-meta-resolve@4.1.0':
-    resolution: {integrity: sha512-+nxncfwHM5SgAtrVzgpzJOI1ol0PkumhVo469KCf9lUi21IGcY90G98VuHm9VRrUypmAzawAHO9bs6hqeADaVg==}
-
-  '@element-plus/icons-vue@2.3.1':
-    resolution: {integrity: sha512-XxVUZv48RZAd87ucGS48jPf6pKu0yV5UCg9f4FFwtrYxXOwWuVJo6wOvSLKEoMQKjv8GsX/mhP6UsC1lRwbUWg==}
-    peerDependencies:
-      vue: ^3.2.0
-
-  '@esbuild/aix-ppc64@0.21.5':
-    resolution: {integrity: sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/aix-ppc64@0.23.1':
-    resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [aix]
-
-  '@esbuild/android-arm64@0.21.5':
-    resolution: {integrity: sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm64@0.23.1':
-    resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [android]
-
-  '@esbuild/android-arm@0.21.5':
-    resolution: {integrity: sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-arm@0.23.1':
-    resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [android]
-
-  '@esbuild/android-x64@0.21.5':
-    resolution: {integrity: sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/android-x64@0.23.1':
-    resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [android]
-
-  '@esbuild/darwin-arm64@0.21.5':
-    resolution: {integrity: sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-arm64@0.23.1':
-    resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.21.5':
-    resolution: {integrity: sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/darwin-x64@0.23.1':
-    resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@esbuild/freebsd-arm64@0.21.5':
-    resolution: {integrity: sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-arm64@0.23.1':
-    resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.21.5':
-    resolution: {integrity: sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/freebsd-x64@0.23.1':
-    resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@esbuild/linux-arm64@0.21.5':
-    resolution: {integrity: sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm64@0.23.1':
-    resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.21.5':
-    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-arm@0.23.1':
-    resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==}
-    engines: {node: '>=18'}
-    cpu: [arm]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.21.5':
-    resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-ia32@0.23.1':
-    resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.21.5':
-    resolution: {integrity: sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==}
-    engines: {node: '>=12'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-loong64@0.23.1':
-    resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==}
-    engines: {node: '>=18'}
-    cpu: [loong64]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.21.5':
-    resolution: {integrity: sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==}
-    engines: {node: '>=12'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-mips64el@0.23.1':
-    resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==}
-    engines: {node: '>=18'}
-    cpu: [mips64el]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.21.5':
-    resolution: {integrity: sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==}
-    engines: {node: '>=12'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-ppc64@0.23.1':
-    resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==}
-    engines: {node: '>=18'}
-    cpu: [ppc64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.21.5':
-    resolution: {integrity: sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==}
-    engines: {node: '>=12'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-riscv64@0.23.1':
-    resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==}
-    engines: {node: '>=18'}
-    cpu: [riscv64]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.21.5':
-    resolution: {integrity: sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==}
-    engines: {node: '>=12'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-s390x@0.23.1':
-    resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==}
-    engines: {node: '>=18'}
-    cpu: [s390x]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.21.5':
-    resolution: {integrity: sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/linux-x64@0.23.1':
-    resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [linux]
-
-  '@esbuild/netbsd-x64@0.21.5':
-    resolution: {integrity: sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/netbsd-x64@0.23.1':
-    resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [netbsd]
-
-  '@esbuild/openbsd-arm64@0.23.1':
-    resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.21.5':
-    resolution: {integrity: sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/openbsd-x64@0.23.1':
-    resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [openbsd]
-
-  '@esbuild/sunos-x64@0.21.5':
-    resolution: {integrity: sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/sunos-x64@0.23.1':
-    resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [sunos]
-
-  '@esbuild/win32-arm64@0.21.5':
-    resolution: {integrity: sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==}
-    engines: {node: '>=12'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-arm64@0.23.1':
-    resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==}
-    engines: {node: '>=18'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.21.5':
-    resolution: {integrity: sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==}
-    engines: {node: '>=12'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-ia32@0.23.1':
-    resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==}
-    engines: {node: '>=18'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.21.5':
-    resolution: {integrity: sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==}
-    engines: {node: '>=12'}
-    cpu: [x64]
-    os: [win32]
-
-  '@esbuild/win32-x64@0.23.1':
-    resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==}
-    engines: {node: '>=18'}
-    cpu: [x64]
-    os: [win32]
-
-  '@eslint-community/eslint-utils@4.4.1':
-    resolution: {integrity: sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.0.0 || ^7.0.0 || >=8.0.0
-
-  '@eslint-community/regexpp@4.12.1':
-    resolution: {integrity: sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==}
-    engines: {node: ^12.0.0 || ^14.0.0 || >=16.0.0}
-
-  '@eslint/config-array@0.18.0':
-    resolution: {integrity: sha512-fTxvnS1sRMu3+JjXwJG0j/i4RT9u4qJ+lqS/yCGap4lH4zZGzQ7tu+xZqQmcMZq5OBZDL4QRxQzRjkWcGt8IVw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/core@0.7.0':
-    resolution: {integrity: sha512-xp5Jirz5DyPYlPiKat8jaq0EmYvDXKKpzTbxXMpT9eqlRJkRKIz9AGMdlvYjih+im+QlhWrpvVjl8IPC/lHlUw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/eslintrc@3.1.0':
-    resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/js@9.14.0':
-    resolution: {integrity: sha512-pFoEtFWCPyDOl+C6Ift+wC7Ro89otjigCf5vcuWqWgqNSQbRrpjSvdeE6ofLz4dHmyxD5f7gIdGT4+p36L6Twg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/object-schema@2.1.4':
-    resolution: {integrity: sha512-BsWiH1yFGjXXS2yvrf5LyuoSIIbPrGUWob917o+BTKuZ7qJdxX8aJLRxs1fS9n6r7vESrq1OUqb68dANcFXuQQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@eslint/plugin-kit@0.2.2':
-    resolution: {integrity: sha512-CXtq5nR4Su+2I47WPOlWud98Y5Lv8Kyxp2ukhgFx/eW6Blm18VXJO5WuQylPugRo8nbluoi6GvvxBLqHcvqUUw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@fast-csv/format@4.3.5':
-    resolution: {integrity: sha512-8iRn6QF3I8Ak78lNAa+Gdl5MJJBM5vRHivFtMRUWINdevNo00K7OXxS2PshawLKTejVwieIlPmK5YlLu6w4u8A==}
-
-  '@fast-csv/parse@4.3.6':
-    resolution: {integrity: sha512-uRsLYksqpbDmWaSmzvJcuApSEe38+6NQZBUsuAyMZKqHxH0g1wcJgsKUvN3WC8tewaqFjBMMGrkHmC+T7k8LvA==}
-
-  '@floating-ui/core@1.6.8':
-    resolution: {integrity: sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==}
-
-  '@floating-ui/dom@1.6.12':
-    resolution: {integrity: sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==}
-
-  '@floating-ui/utils@0.2.8':
-    resolution: {integrity: sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==}
-
-  '@hapi/bourne@3.0.0':
-    resolution: {integrity: sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==}
-
-  '@humanfs/core@0.19.1':
-    resolution: {integrity: sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==}
-    engines: {node: '>=18.18.0'}
-
-  '@humanfs/node@0.16.6':
-    resolution: {integrity: sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==}
-    engines: {node: '>=18.18.0'}
-
-  '@humanwhocodes/module-importer@1.0.1':
-    resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==}
-    engines: {node: '>=12.22'}
-
-  '@humanwhocodes/retry@0.3.1':
-    resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==}
-    engines: {node: '>=18.18'}
-
-  '@humanwhocodes/retry@0.4.1':
-    resolution: {integrity: sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==}
-    engines: {node: '>=18.18'}
-
-  '@iconify/types@2.0.0':
-    resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==}
-
-  '@iconify/utils@2.1.33':
-    resolution: {integrity: sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==}
-
-  '@intlify/core-base@9.9.1':
-    resolution: {integrity: sha512-qsV15dg7jNX2faBRyKMgZS8UcFJViWEUPLdzZ9UR0kQZpFVeIpc0AG7ZOfeP7pX2T9SQ5jSiorq/tii9nkkafA==}
-    engines: {node: '>= 16'}
-
-  '@intlify/message-compiler@9.9.1':
-    resolution: {integrity: sha512-zTvP6X6HeumHOXuAE1CMMsV6tTX+opKMOxO1OHTCg5N5Sm/F7d8o2jdT6W6L5oHUsJ/vvkGefHIs7Q3hfowmsA==}
-    engines: {node: '>= 16'}
-
-  '@intlify/shared@9.9.1':
-    resolution: {integrity: sha512-b3Pta1nwkz5rGq434v0psHwEwHGy1pYCttfcM22IE//K9owbpkEvFptx9VcuRAxjQdrO2If249cmDDjBu5wMDA==}
-    engines: {node: '>= 16'}
-
-  '@jridgewell/gen-mapping@0.3.5':
-    resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/resolve-uri@3.1.2':
-    resolution: {integrity: sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/set-array@1.2.1':
-    resolution: {integrity: sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==}
-    engines: {node: '>=6.0.0'}
-
-  '@jridgewell/source-map@0.3.6':
-    resolution: {integrity: sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==}
-
-  '@jridgewell/sourcemap-codec@1.5.0':
-    resolution: {integrity: sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==}
-
-  '@jridgewell/trace-mapping@0.3.25':
-    resolution: {integrity: sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==}
-
-  '@nodelib/fs.scandir@2.1.5':
-    resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==}
-    engines: {node: '>= 8'}
-
-  '@nodelib/fs.stat@2.0.5':
-    resolution: {integrity: sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==}
-    engines: {node: '>= 8'}
-
-  '@nodelib/fs.walk@1.2.8':
-    resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-    engines: {node: '>= 8'}
-
-  '@parcel/watcher-android-arm64@2.5.0':
-    resolution: {integrity: sha512-qlX4eS28bUcQCdribHkg/herLe+0A9RyYC+mm2PXpncit8z5b3nSqGVzMNR3CmtAOgRutiZ02eIJJgP/b1iEFQ==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [android]
-
-  '@parcel/watcher-darwin-arm64@2.5.0':
-    resolution: {integrity: sha512-hyZ3TANnzGfLpRA2s/4U1kbw2ZI4qGxaRJbBH2DCSREFfubMswheh8TeiC1sGZ3z2jUf3s37P0BBlrD3sjVTUw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@parcel/watcher-darwin-x64@2.5.0':
-    resolution: {integrity: sha512-9rhlwd78saKf18fT869/poydQK8YqlU26TMiNg7AIu7eBp9adqbJZqmdFOsbZ5cnLp5XvRo9wcFmNHgHdWaGYA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [darwin]
-
-  '@parcel/watcher-freebsd-x64@2.5.0':
-    resolution: {integrity: sha512-syvfhZzyM8kErg3VF0xpV8dixJ+RzbUaaGaeb7uDuz0D3FK97/mZ5AJQ3XNnDsXX7KkFNtyQyFrXZzQIcN49Tw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@parcel/watcher-linux-arm-glibc@2.5.0':
-    resolution: {integrity: sha512-0VQY1K35DQET3dVYWpOaPFecqOT9dbuCfzjxoQyif1Wc574t3kOSkKevULddcR9znz1TcklCE7Ht6NIxjvTqLA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-arm-musl@2.5.0':
-    resolution: {integrity: sha512-6uHywSIzz8+vi2lAzFeltnYbdHsDm3iIB57d4g5oaB9vKwjb6N6dRIgZMujw4nm5r6v9/BQH0noq6DzHrqr2pA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-linux-arm64-glibc@2.5.0':
-    resolution: {integrity: sha512-BfNjXwZKxBy4WibDb/LDCriWSKLz+jJRL3cM/DllnHH5QUyoiUNEp3GmL80ZqxeumoADfCCP19+qiYiC8gUBjA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-arm64-musl@2.5.0':
-    resolution: {integrity: sha512-S1qARKOphxfiBEkwLUbHjCY9BWPdWnW9j7f7Hb2jPplu8UZ3nes7zpPOW9bkLbHRvWM0WDTsjdOTUgW0xLBN1Q==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-linux-x64-glibc@2.5.0':
-    resolution: {integrity: sha512-d9AOkusyXARkFD66S6zlGXyzx5RvY+chTP9Jp0ypSTC9d4lzyRs9ovGf/80VCxjKddcUvnsGwCHWuF2EoPgWjw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@parcel/watcher-linux-x64-musl@2.5.0':
-    resolution: {integrity: sha512-iqOC+GoTDoFyk/VYSFHwjHhYrk8bljW6zOhPuhi5t9ulqiYq1togGJB5e3PwYVFFfeVgc6pbz3JdQyDoBszVaA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@parcel/watcher-win32-arm64@2.5.0':
-    resolution: {integrity: sha512-twtft1d+JRNkM5YbmexfcH/N4znDtjgysFaV9zvZmmJezQsKpkfLYJ+JFV3uygugK6AtIM2oADPkB2AdhBrNig==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [arm64]
-    os: [win32]
-
-  '@parcel/watcher-win32-ia32@2.5.0':
-    resolution: {integrity: sha512-+rgpsNRKwo8A53elqbbHXdOMtY/tAtTzManTWShB5Kk54N8Q9mzNWV7tV+IbGueCbcj826MfWGU3mprWtuf1TA==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [ia32]
-    os: [win32]
-
-  '@parcel/watcher-win32-x64@2.5.0':
-    resolution: {integrity: sha512-lPrxve92zEHdgeff3aiu4gDOIt4u7sJYha6wbdEZDCDUhtjTsOMiaJzG5lMY4GkWH8p0fMmO2Ppq5G5XXG+DQw==}
-    engines: {node: '>= 10.0.0'}
-    cpu: [x64]
-    os: [win32]
-
-  '@parcel/watcher@2.5.0':
-    resolution: {integrity: sha512-i0GV1yJnm2n3Yq1qw6QrUrd/LI9bE8WEBOTtOkpCXHHdyN3TAGgqAK/DAT05z4fq2x04cARXt2pDmjWjL92iTQ==}
-    engines: {node: '>= 10.0.0'}
-
-  '@pengzhanbo/utils@1.1.2':
-    resolution: {integrity: sha512-geM6O5jEs2Hvg3LxwffjxrhZVftqysM6VDFvGHm+XMf2ZwunZIehPkd/W2mwbJBbFoqVqACl+c1/y48MffMiDg==}
-
-  '@pkgr/core@0.1.1':
-    resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
-    engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
-
-  '@polka/url@1.0.0-next.28':
-    resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==}
-
-  '@rollup/pluginutils@5.1.3':
-    resolution: {integrity: sha512-Pnsb6f32CD2W3uCaLZIzDmeFyQ2b8UWMFI7xtwUezpcGBDVDW6y9XgAWIlARiGAo6eNF5FK5aQTr0LFyNyqq5A==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0||^4.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-
-  '@rollup/rollup-android-arm-eabi@4.25.0':
-    resolution: {integrity: sha512-CC/ZqFZwlAIbU1wUPisHyV/XRc5RydFrNLtgl3dGYskdwPZdt4HERtKm50a/+DtTlKeCq9IXFEWR+P6blwjqBA==}
-    cpu: [arm]
-    os: [android]
-
-  '@rollup/rollup-android-arm64@4.25.0':
-    resolution: {integrity: sha512-/Y76tmLGUJqVBXXCfVS8Q8FJqYGhgH4wl4qTA24E9v/IJM0XvJCGQVSW1QZ4J+VURO9h8YCa28sTFacZXwK7Rg==}
-    cpu: [arm64]
-    os: [android]
-
-  '@rollup/rollup-darwin-arm64@4.25.0':
-    resolution: {integrity: sha512-YVT6L3UrKTlC0FpCZd0MGA7NVdp7YNaEqkENbWQ7AOVOqd/7VzyHpgIpc1mIaxRAo1ZsJRH45fq8j4N63I/vvg==}
-    cpu: [arm64]
-    os: [darwin]
-
-  '@rollup/rollup-darwin-x64@4.25.0':
-    resolution: {integrity: sha512-ZRL+gexs3+ZmmWmGKEU43Bdn67kWnMeWXLFhcVv5Un8FQcx38yulHBA7XR2+KQdYIOtD0yZDWBCudmfj6lQJoA==}
-    cpu: [x64]
-    os: [darwin]
-
-  '@rollup/rollup-freebsd-arm64@4.25.0':
-    resolution: {integrity: sha512-xpEIXhiP27EAylEpreCozozsxWQ2TJbOLSivGfXhU4G1TBVEYtUPi2pOZBnvGXHyOdLAUUhPnJzH3ah5cqF01g==}
-    cpu: [arm64]
-    os: [freebsd]
-
-  '@rollup/rollup-freebsd-x64@4.25.0':
-    resolution: {integrity: sha512-sC5FsmZGlJv5dOcURrsnIK7ngc3Kirnx3as2XU9uER+zjfyqIjdcMVgzy4cOawhsssqzoAX19qmxgJ8a14Qrqw==}
-    cpu: [x64]
-    os: [freebsd]
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.25.0':
-    resolution: {integrity: sha512-uD/dbLSs1BEPzg564TpRAQ/YvTnCds2XxyOndAO8nJhaQcqQGFgv/DAVko/ZHap3boCvxnzYMa3mTkV/B/3SWA==}
-    cpu: [arm]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-arm-musleabihf@4.25.0':
-    resolution: {integrity: sha512-ZVt/XkrDlQWegDWrwyC3l0OfAF7yeJUF4fq5RMS07YM72BlSfn2fQQ6lPyBNjt+YbczMguPiJoCfaQC2dnflpQ==}
-    cpu: [arm]
-    os: [linux]
-    libc: [musl]
-
-  '@rollup/rollup-linux-arm64-gnu@4.25.0':
-    resolution: {integrity: sha512-qboZ+T0gHAW2kkSDPHxu7quaFaaBlynODXpBVnPxUgvWYaE84xgCKAPEYE+fSMd3Zv5PyFZR+L0tCdYCMAtG0A==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-arm64-musl@4.25.0':
-    resolution: {integrity: sha512-ndWTSEmAaKr88dBuogGH2NZaxe7u2rDoArsejNslugHZ+r44NfWiwjzizVS1nUOHo+n1Z6qV3X60rqE/HlISgw==}
-    cpu: [arm64]
-    os: [linux]
-    libc: [musl]
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.25.0':
-    resolution: {integrity: sha512-BVSQvVa2v5hKwJSy6X7W1fjDex6yZnNKy3Kx1JGimccHft6HV0THTwNtC2zawtNXKUu+S5CjXslilYdKBAadzA==}
-    cpu: [ppc64]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-riscv64-gnu@4.25.0':
-    resolution: {integrity: sha512-G4hTREQrIdeV0PE2JruzI+vXdRnaK1pg64hemHq2v5fhv8C7WjVaeXc9P5i4Q5UC06d/L+zA0mszYIKl+wY8oA==}
-    cpu: [riscv64]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-s390x-gnu@4.25.0':
-    resolution: {integrity: sha512-9T/w0kQ+upxdkFL9zPVB6zy9vWW1deA3g8IauJxojN4bnz5FwSsUAD034KpXIVX5j5p/rn6XqumBMxfRkcHapQ==}
-    cpu: [s390x]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-x64-gnu@4.25.0':
-    resolution: {integrity: sha512-ThcnU0EcMDn+J4B9LD++OgBYxZusuA7iemIIiz5yzEcFg04VZFzdFjuwPdlURmYPZw+fgVrFzj4CA64jSTG4Ig==}
-    cpu: [x64]
-    os: [linux]
-    libc: [glibc]
-
-  '@rollup/rollup-linux-x64-musl@4.25.0':
-    resolution: {integrity: sha512-zx71aY2oQxGxAT1JShfhNG79PnjYhMC6voAjzpu/xmMjDnKNf6Nl/xv7YaB/9SIa9jDYf8RBPWEnjcdlhlv1rQ==}
-    cpu: [x64]
-    os: [linux]
-    libc: [musl]
-
-  '@rollup/rollup-win32-arm64-msvc@4.25.0':
-    resolution: {integrity: sha512-JT8tcjNocMs4CylWY/CxVLnv8e1lE7ff1fi6kbGocWwxDq9pj30IJ28Peb+Y8yiPNSF28oad42ApJB8oUkwGww==}
-    cpu: [arm64]
-    os: [win32]
-
-  '@rollup/rollup-win32-ia32-msvc@4.25.0':
-    resolution: {integrity: sha512-dRLjLsO3dNOfSN6tjyVlG+Msm4IiZnGkuZ7G5NmpzwF9oOc582FZG05+UdfTbz5Jd4buK/wMb6UeHFhG18+OEg==}
-    cpu: [ia32]
-    os: [win32]
-
-  '@rollup/rollup-win32-x64-msvc@4.25.0':
-    resolution: {integrity: sha512-/RqrIFtLB926frMhZD0a5oDa4eFIbyNEwLLloMTEjmqfwZWXywwVVOVmwTsuyhC9HKkVEZcOOi+KV4U9wmOdlg==}
-    cpu: [x64]
-    os: [win32]
-
-  '@stomp/stompjs@7.0.0':
-    resolution: {integrity: sha512-fGdq4wPDnSV/KyOsjq4P+zLc8MFWC3lMmP5FBgLWKPJTYcuCbAIrnRGjB7q2jHZdYCOD5vxLuFoKIYLy5/u8Pw==}
-
-  '@sxzz/popperjs-es@2.11.7':
-    resolution: {integrity: sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ==}
-
-  '@transloadit/prettier-bytes@0.0.7':
-    resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
-
-  '@trysound/sax@0.2.0':
-    resolution: {integrity: sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==}
-    engines: {node: '>=10.13.0'}
-
-  '@types/codemirror@5.60.15':
-    resolution: {integrity: sha512-dTOvwEQ+ouKJ/rE9LT1Ue2hmP6H1mZv5+CCnNWu2qtiOe2LQa9lCprEY20HxiDmV/Bxh+dXjywmy5aKvoGjULA==}
-
-  '@types/conventional-commits-parser@5.0.0':
-    resolution: {integrity: sha512-loB369iXNmAZglwWATL+WRe+CRMmmBPtpolYzIebFaX4YA3x+BEfLqhUAV9WanycKI3TG1IMr5bMJDajDKLlUQ==}
-
-  '@types/estree@1.0.6':
-    resolution: {integrity: sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==}
-
-  '@types/event-emitter@0.3.5':
-    resolution: {integrity: sha512-zx2/Gg0Eg7gwEiOIIh5w9TrhKKTeQh7CPCOPNc0el4pLSwzebA8SmnHwZs2dWlLONvyulykSwGSQxQHLhjGLvQ==}
-
-  '@types/json-schema@7.0.15':
-    resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==}
-
-  '@types/lodash-es@4.17.12':
-    resolution: {integrity: sha512-0NgftHUcV4v34VhXm8QBSftKVXtbkBG3ViCjs6+eJ5a6y6Mi/jiFGPc1sC7QK+9BFhWrURE3EOggmWaSxL9OzQ==}
-
-  '@types/lodash@4.17.13':
-    resolution: {integrity: sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==}
-
-  '@types/node@14.18.63':
-    resolution: {integrity: sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==}
-
-  '@types/node@22.9.0':
-    resolution: {integrity: sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==}
-
-  '@types/nprogress@0.2.3':
-    resolution: {integrity: sha512-k7kRA033QNtC+gLc4VPlfnue58CM1iQLgn1IMAU8VPHGOj7oIHPp9UlhedEnD/Gl8evoCjwkZjlBORtZ3JByUA==}
-
-  '@types/path-browserify@1.0.3':
-    resolution: {integrity: sha512-ZmHivEbNCBtAfcrFeBCiTjdIc2dey0l7oCGNGpSuRTy8jP6UVND7oUowlvDujBy8r2Hoa8bfFUOCiPWfmtkfxw==}
-
-  '@types/qs@6.9.17':
-    resolution: {integrity: sha512-rX4/bPcfmvxHDv0XjfJELTTr+iB+tn032nPILqHm5wbthUUUuVtNGGqzhya9XUxjTP8Fpr0qYgSZZKxGY++svQ==}
-
-  '@types/sortablejs@1.15.8':
-    resolution: {integrity: sha512-b79830lW+RZfwaztgs1aVPgbasJ8e7AXtZYHTELNXZPsERt4ymJdjV4OccDbHQAvHrCcFpbF78jkm0R6h/pZVg==}
-
-  '@types/svgo@2.6.4':
-    resolution: {integrity: sha512-l4cmyPEckf8moNYHdJ+4wkHvFxjyW6ulm9l4YGaOxeyBWPhBOT0gvni1InpFPdzx1dKf/2s62qGITwxNWnPQng==}
-
-  '@types/tern@0.23.9':
-    resolution: {integrity: sha512-ypzHFE/wBzh+BlH6rrBgS5I/Z7RD21pGhZ2rltb/+ZrVM1awdZwjx7hE5XfuYgHWk9uvV5HLZN3SloevCAp3Bw==}
-
-  '@types/web-bluetooth@0.0.16':
-    resolution: {integrity: sha512-oh8q2Zc32S6gd/j50GowEjKLoOVOwHP/bWVjKJInBwQqdOYMdPrf1oVlelTlyfFK3CKxL1uahMDAr+vy8T7yMQ==}
-
-  '@types/web-bluetooth@0.0.20':
-    resolution: {integrity: sha512-g9gZnnXVq7gM7v3tJCWV/qw7w+KeOlSHAhgF9RytFyifW6AF61hdT2ucrYhPq9hLs5JIryeupHV3qGk95dH9ow==}
-
-  '@typescript-eslint/eslint-plugin@8.14.0':
-    resolution: {integrity: sha512-tqp8H7UWFaZj0yNO6bycd5YjMwxa6wIHOLZvWPkidwbgLCsBMetQoGj7DPuAlWa2yGO3H48xmPwjhsSPPCGU5w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/parser@8.14.0':
-    resolution: {integrity: sha512-2p82Yn9juUJq0XynBXtFCyrBDb6/dJombnz6vbo6mgQEtWHfvHbQuEa9kAOVIt1c9YFwi7H6WxtPj1kg+80+RA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/scope-manager@8.14.0':
-    resolution: {integrity: sha512-aBbBrnW9ARIDn92Zbo7rguLnqQ/pOrUguVpbUwzOhkFg2npFDwTgPGqFqE0H5feXcOoJOfX3SxlJaKEVtq54dw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/type-utils@8.14.0':
-    resolution: {integrity: sha512-Xcz9qOtZuGusVOH5Uk07NGs39wrKkf3AxlkK79RBK6aJC1l03CobXjJbwBPSidetAOV+5rEVuiT1VSBUOAsanQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/types@8.14.0':
-    resolution: {integrity: sha512-yjeB9fnO/opvLJFAsPNYlKPnEM8+z4og09Pk504dkqonT02AyL5Z9SSqlE0XqezS93v6CXn49VHvB2G7XSsl0g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@typescript-eslint/typescript-estree@8.14.0':
-    resolution: {integrity: sha512-OPXPLYKGZi9XS/49rdaCbR5j/S14HazviBlUQFvSKz3npr3NikF+mrgK7CFVur6XEt95DZp/cmke9d5i3vtVnQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@typescript-eslint/utils@8.14.0':
-    resolution: {integrity: sha512-OGqj6uB8THhrHj0Fk27DcHPojW7zKwKkPmHXHvQ58pLYp4hy8CSUdTKykKeh+5vFqTTVmjz0zCOOPKRovdsgHA==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      eslint: ^8.57.0 || ^9.0.0
-
-  '@typescript-eslint/visitor-keys@8.14.0':
-    resolution: {integrity: sha512-vG0XZo8AdTH9OE6VFRwAZldNc7qtJ/6NLGWak+BtENuEUXGZgFpihILPiBvKXvJ2nFu27XNGC6rKiwuaoMbYzQ==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  '@unocss/astro@0.63.6':
-    resolution: {integrity: sha512-5Fjlv6dpQo6o2PUAcEv8p24G8rn8Op79xLFofq2V+iA/Q32G9/UsxTLOpj+yc+q0YdJrFfDCT2X/3pvVY8Db5g==}
-    peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
-    peerDependenciesMeta:
-      vite:
-        optional: true
-
-  '@unocss/cli@0.63.6':
-    resolution: {integrity: sha512-OZb8hO0x4nCJjFd3Gq3km78YnyMAdq282D+BLiDE6IhQ5WHCVL7fyhfgIVL6xwxISDVxiyITwNb72ky0MEutPg==}
-    engines: {node: '>=14'}
-    hasBin: true
-
-  '@unocss/config@0.63.6':
-    resolution: {integrity: sha512-+4Lt5uTwRgu1z7vhOUzDf+mL+BQYdaa/Z8NMT2Fiqb37tcjEKvmwaUHdfE22Vif1luDgC6xqFsn6qqFtOxhoWQ==}
-    engines: {node: '>=14'}
-
-  '@unocss/core@0.63.6':
-    resolution: {integrity: sha512-Q4QPgJ271Up89+vIqqOKgtdCKkFpHqvHN8W1LUlKPqtYnOvVYaOIVNAZowaIdEhPuc83yLc6Tg2+7riK18QKEw==}
-
-  '@unocss/extractor-arbitrary-variants@0.63.6':
-    resolution: {integrity: sha512-HJX0oAa9uzwKYoU8CoJdP1gxjuqFmOLxyZmITjStAmZNZpIxlz2wz4VrHmqml2dkvx/mifGGGc/GxZpQ36D12Q==}
-
-  '@unocss/inspector@0.63.6':
-    resolution: {integrity: sha512-DQDJnhtzdHIQXD2vCdj5ytFnHfQCWJGPmrHJHXxzkTYn8nIovV1roVl1ITLxkDIIYK9bdYneg2imQN5JCZhHmQ==}
-
-  '@unocss/postcss@0.63.6':
-    resolution: {integrity: sha512-XI6U1jMwbQoSHVWpZZu3Cxp3t1PVj5VOj+IYtz7xmcWP9GVK+eyETo/xyB0l4muD4emXfSrhNDrFYzSyIyF5cg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      postcss: ^8.4.21
-
-  '@unocss/preset-attributify@0.63.6':
-    resolution: {integrity: sha512-sHH17mfl/THHLxCLAHqPdUniCNMFjAxBHFDZYgGi83azuarF2evI5Mtc3Qsj3nzoSQwTPmK2VY3XYUUrpPDGWQ==}
-
-  '@unocss/preset-icons@0.63.6':
-    resolution: {integrity: sha512-fRU44wXABnMPT/9zhKBNSUeDJlOxJhUJP9W3FSRnc+ktjAifJIj0xpUKtEqxL46QMq825Bsj2yDSquzP+XYGnQ==}
-
-  '@unocss/preset-mini@0.63.6':
-    resolution: {integrity: sha512-pZDZbSuxabHSwPIy3zCgQ4MNdVCSHvOvZecreH+v96R1oOhquiwU8WiSbkxvZiKiLQJd7JUVW87E1pAzr5ZGGQ==}
-
-  '@unocss/preset-tagify@0.63.6':
-    resolution: {integrity: sha512-3lKhk4MW3RqJBwIvBXHj0H0/kHkFlKtCIBQFiBcCJh8TXOID8IZ0iVjuGwdlk63VTizI/wnsNDOVpj6YcjRRlw==}
-
-  '@unocss/preset-typography@0.63.6':
-    resolution: {integrity: sha512-AXmBVnbV54gUIv5kbywjZek9ZlKRwJfBDVMtWOcLOjN3AHirGx1W2oq2UzNkfYZ2leof/Y2BocxeTwGCCRhqDQ==}
-
-  '@unocss/preset-uno@0.63.6':
-    resolution: {integrity: sha512-67PbHyVgAe9Rz0Rhyl3zBibFuGmqQMRPMkRjNYrwmmtNydpQYsXbfnDs0p8mZFp6uO2o3Jkh7urqEtixHHvq0Q==}
-
-  '@unocss/preset-web-fonts@0.63.6':
-    resolution: {integrity: sha512-ko1aHDax0u5CQi1BXggv6uW5Vq/LQRWwzOxqBFTh1JlGHPZTw4CdVJkYnlpt3WEW+FPUzZYjhKmMmQY7KtOTng==}
-
-  '@unocss/preset-wind@0.63.6':
-    resolution: {integrity: sha512-W3oZ2TXSqStNE+X++kcspRTF2Szu2ej6NW5Kiyy6WQn/+ZD77AF4VtvzHtzFVZ2QKpEIovGBpU5tywooHbB7hw==}
-
-  '@unocss/reset@0.63.6':
-    resolution: {integrity: sha512-gq73RSZj54MOloqrivkoMPXCqNG2WpIyBT1AYlF76uKxEEbUD41E8uBUhLSKs7gFgF01yQJLRaIuyN1yw09pbQ==}
-
-  '@unocss/rule-utils@0.63.6':
-    resolution: {integrity: sha512-moeDEq5d9mB8gSYeoqHMkXWWekaFFdhg7QCuwwCbxCc+NPMOgGkmfAoafz+y2tdvK7pEuT191RWOiHQ0MkA5oQ==}
-    engines: {node: '>=14'}
-
-  '@unocss/transformer-attributify-jsx@0.63.6':
-    resolution: {integrity: sha512-/RU09MF+hJK7cFbLJ+8vloCGyhn6Oys8R6gey0auB0+nw/ucUXoLQKWgUqo9taQlLuYOiehdkYjQSdWn5lyA/Q==}
-
-  '@unocss/transformer-compile-class@0.63.6':
-    resolution: {integrity: sha512-zzAqs8adnTUOLA88RgcToadcrz9gjxrZk6IrcmMqMmWqk0MOWNQHIN0RzKa/yaw4QhO2xuGyIz4/WHyXuCXMQg==}
-
-  '@unocss/transformer-directives@0.63.6':
-    resolution: {integrity: sha512-XcNOwLRbfrJSU6YXyLgiMzAigSzjIdvHwS3lLCZ2n6DWuLmTuXBfvVtRxeJ+aflNkhpQNKONCClC4s6I2r53uw==}
-
-  '@unocss/transformer-variant-group@0.63.6':
-    resolution: {integrity: sha512-ebYSjZnZrtcJYjmAEDwGVwPuaQ9EVWKNDDJFFSusP8k/6PjJoHDh0qkj+hdPPDhYn81yzJQalU1eSUSlfC30VA==}
-
-  '@unocss/vite@0.63.6':
-    resolution: {integrity: sha512-gxK3gtvYQH5S/qtuvsY4M0S+KJPZnYrOQI/Gopufx+b2qgmwZ/TSAe66gWeKYfe3DfQsmA3PPh/GXpkK+/FnHg==}
-    peerDependencies:
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
-
-  '@uppy/companion-client@2.2.2':
-    resolution: {integrity: sha512-5mTp2iq97/mYSisMaBtFRry6PTgZA6SIL7LePteOV5x0/DxKfrZW3DEiQERJmYpHzy7k8johpm2gHnEKto56Og==}
-
-  '@uppy/core@2.3.4':
-    resolution: {integrity: sha512-iWAqppC8FD8mMVqewavCz+TNaet6HPXitmGXpGGREGrakZ4FeuWytVdrelydzTdXx6vVKkOmI2FLztGg73sENQ==}
-
-  '@uppy/store-default@2.1.1':
-    resolution: {integrity: sha512-xnpTxvot2SeAwGwbvmJ899ASk5tYXhmZzD/aCFsXePh/v8rNvR2pKlcQUH7cF/y4baUGq3FHO/daKCok/mpKqQ==}
-
-  '@uppy/utils@4.1.3':
-    resolution: {integrity: sha512-nTuMvwWYobnJcytDO3t+D6IkVq/Qs4Xv3vyoEZ+Iaf8gegZP+rEyoaFT2CK5XLRMienPyqRqNbIfRuFaOWSIFw==}
-
-  '@uppy/xhr-upload@2.1.3':
-    resolution: {integrity: sha512-YWOQ6myBVPs+mhNjfdWsQyMRWUlrDLMoaG7nvf/G6Y3GKZf8AyjFDjvvJ49XWQ+DaZOftGkHmF1uh/DBeGivJQ==}
-    peerDependencies:
-      '@uppy/core': ^2.3.3
-
-  '@vitejs/plugin-vue@5.1.5':
-    resolution: {integrity: sha512-dlnib73G05CDBAUR/YpuZcQQ47fpjihnnNouAAqN62z+oqSsWJ+kh52GRzIxpkgFG3q11eXK7Di7RMmoCwISZA==}
-    engines: {node: ^18.0.0 || >=20.0.0}
-    peerDependencies:
-      vite: ^5.0.0
-      vue: ^3.2.25
-
-  '@volar/language-core@2.4.10':
-    resolution: {integrity: sha512-hG3Z13+nJmGaT+fnQzAkS0hjJRa2FCeqZt6Bd+oGNhUkQ+mTFsDETg5rqUTxyzIh5pSOGY7FHCWUS8G82AzLCA==}
-
-  '@volar/source-map@2.4.10':
-    resolution: {integrity: sha512-OCV+b5ihV0RF3A7vEvNyHPi4G4kFa6ukPmyVocmqm5QzOd8r5yAtiNvaPEjl8dNvgC/lj4JPryeeHLdXd62rWA==}
-
-  '@volar/typescript@2.4.10':
-    resolution: {integrity: sha512-F8ZtBMhSXyYKuBfGpYwqA5rsONnOwAVvjyE7KPYJ7wgZqo2roASqNWUnianOomJX5u1cxeRooHV59N0PhvEOgw==}
-
-  '@vue/compiler-core@3.5.12':
-    resolution: {integrity: sha512-ISyBTRMmMYagUxhcpyEH0hpXRd/KqDU4ymofPgl2XAkY9ZhQ+h0ovEZJIiPop13UmR/54oA2cgMDjgroRelaEw==}
-
-  '@vue/compiler-dom@3.5.12':
-    resolution: {integrity: sha512-9G6PbJ03uwxLHKQ3P42cMTi85lDRvGLB2rSGOiQqtXELat6uI4n8cNz9yjfVHRPIu+MsK6TE418Giruvgptckg==}
-
-  '@vue/compiler-sfc@3.5.12':
-    resolution: {integrity: sha512-2k973OGo2JuAa5+ZlekuQJtitI5CgLMOwgl94BzMCsKZCX/xiqzJYzapl4opFogKHqwJk34vfsaKpfEhd1k5nw==}
-
-  '@vue/compiler-ssr@3.5.12':
-    resolution: {integrity: sha512-eLwc7v6bfGBSM7wZOGPmRavSWzNFF6+PdRhE+VFJhNCgHiF8AM7ccoqcv5kBXA2eWUfigD7byekvf/JsOfKvPA==}
-
-  '@vue/compiler-vue2@2.7.16':
-    resolution: {integrity: sha512-qYC3Psj9S/mfu9uVi5WvNZIzq+xnXMhOwbTFKKDD7b1lhpnn71jXSFdTQ+WsIEk0ONCd7VV2IMm7ONl6tbQ86A==}
-
-  '@vue/devtools-api@6.6.4':
-    resolution: {integrity: sha512-sGhTPMuXqZ1rVOk32RylztWkfXTRhuS7vgAKv0zjqk8gbsHkJ7xfFf+jbySxt7tWObEJwyKaHMikV/WGDiQm8g==}
-
-  '@vue/language-core@2.1.10':
-    resolution: {integrity: sha512-DAI289d0K3AB5TUG3xDp9OuQ71CnrujQwJrQnfuZDwo6eGNf0UoRlPuaVNO+Zrn65PC3j0oB2i7mNmVPggeGeQ==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  '@vue/reactivity@3.5.12':
-    resolution: {integrity: sha512-UzaN3Da7xnJXdz4Okb/BGbAaomRHc3RdoWqTzlvd9+WBR5m3J39J1fGcHes7U3za0ruYn/iYy/a1euhMEHvTAg==}
-
-  '@vue/runtime-core@3.5.12':
-    resolution: {integrity: sha512-hrMUYV6tpocr3TL3Ad8DqxOdpDe4zuQY4HPY3X/VRh+L2myQO8MFXPAMarIOSGNu0bFAjh1yBkMPXZBqCk62Uw==}
-
-  '@vue/runtime-dom@3.5.12':
-    resolution: {integrity: sha512-q8VFxR9A2MRfBr6/55Q3umyoN7ya836FzRXajPB6/Vvuv0zOPL+qltd9rIMzG/DbRLAIlREmnLsplEF/kotXKA==}
-
-  '@vue/server-renderer@3.5.12':
-    resolution: {integrity: sha512-I3QoeDDeEPZm8yR28JtY+rk880Oqmj43hreIBVTicisFTx/Dl7JpG72g/X7YF8hnQD3IFhkky5i2bPonwrTVPg==}
-    peerDependencies:
-      vue: 3.5.12
-
-  '@vue/shared@3.5.12':
-    resolution: {integrity: sha512-L2RPSAwUFbgZH20etwrXyVyCBu9OxRSi8T/38QsvnkJyvq2LufW2lDCOzm7t/U9C1mkhJGWYfCuFBCmIuNivrg==}
-
-  '@vueuse/core@10.11.1':
-    resolution: {integrity: sha512-guoy26JQktXPcz+0n3GukWIy/JDNKti9v6VEMu6kV2sYBsWuGiTU8OWdg+ADfUbHg3/3DlqySDe7JmdHrktiww==}
-
-  '@vueuse/core@9.13.0':
-    resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
-
-  '@vueuse/metadata@10.11.1':
-    resolution: {integrity: sha512-IGa5FXd003Ug1qAZmyE8wF3sJ81xGLSqTqtQ6jaVfkeZ4i5kS2mwQF61yhVqojRnenVew5PldLyRgvdl4YYuSw==}
-
-  '@vueuse/metadata@9.13.0':
-    resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
-
-  '@vueuse/shared@10.11.1':
-    resolution: {integrity: sha512-LHpC8711VFZlDaYUXEBbFBCQ7GS3dVU9mjOhhMhXP6txTV4EhYQg/KGnQuvt/sPAtoUKq7VVUnL6mVtFoL42sA==}
-
-  '@vueuse/shared@9.13.0':
-    resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
-
-  '@wangeditor/basic-modules@1.1.7':
-    resolution: {integrity: sha512-cY9CPkLJaqF05STqfpZKWG4LpxTMeGSIIF1fHvfm/mz+JXatCagjdkbxdikOuKYlxDdeqvOeBmsUBItufDLXZg==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.throttle: ^4.1.1
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/code-highlight@1.0.3':
-    resolution: {integrity: sha512-iazHwO14XpCuIWJNTQTikqUhGKyqj+dUNWJ9288Oym9M2xMVHvnsOmDU2sgUDWVy+pOLojReMPgXCsvvNlOOhw==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/core@1.1.19':
-    resolution: {integrity: sha512-KevkB47+7GhVszyYF2pKGKtCSj/YzmClsD03C3zTt+9SR2XWT5T0e3yQqg8baZpcMvkjs1D8Dv4fk8ok/UaS2Q==}
-    peerDependencies:
-      '@uppy/core': ^2.1.1
-      '@uppy/xhr-upload': ^2.0.3
-      dom7: ^3.0.0
-      is-hotkey: ^0.2.0
-      lodash.camelcase: ^4.3.0
-      lodash.clonedeep: ^4.5.0
-      lodash.debounce: ^4.0.8
-      lodash.foreach: ^4.5.0
-      lodash.isequal: ^4.5.0
-      lodash.throttle: ^4.1.1
-      lodash.toarray: ^4.4.0
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/editor-for-vue@5.1.10':
-    resolution: {integrity: sha512-OdtMnMt0HpYriY1+Efo3KHviUB5zwlZIaHypNw5MPRn8uFq3MFLET5u8pbB/PiEF5Ff88YAp7T9Xw1dvJzT8sA==}
-    peerDependencies:
-      '@wangeditor/editor': '>=5.0.0'
-      vue: ^3.0.5
-
-  '@wangeditor/editor@5.1.23':
-    resolution: {integrity: sha512-0RxfeVTuK1tktUaPROnCoFfaHVJpRAIE2zdS0mpP+vq1axVQpLjM8+fCvKzqYIkH0Pg+C+44hJpe3VVroSkEuQ==}
-
-  '@wangeditor/list-module@1.0.5':
-    resolution: {integrity: sha512-uDuYTP6DVhcYf7mF1pTlmNn5jOb4QtcVhYwSSAkyg09zqxI1qBqsfUnveeDeDqIuptSJhkh81cyxi+MF8sEPOQ==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/table-module@1.1.4':
-    resolution: {integrity: sha512-5saanU9xuEocxaemGdNi9t8MCDSucnykEC6jtuiT72kt+/Hhh4nERYx1J20OPsTCCdVr7hIyQenFD1iSRkIQ6w==}
-    peerDependencies:
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.isequal: ^4.5.0
-      lodash.throttle: ^4.1.1
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/upload-image-module@1.0.2':
-    resolution: {integrity: sha512-z81lk/v71OwPDYeQDxj6cVr81aDP90aFuywb8nPD6eQeECtOymrqRODjpO6VGvCVxVck8nUxBHtbxKtjgcwyiA==}
-    peerDependencies:
-      '@uppy/core': ^2.0.3
-      '@uppy/xhr-upload': ^2.0.3
-      '@wangeditor/basic-modules': 1.x
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      lodash.foreach: ^4.5.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@wangeditor/video-module@1.1.4':
-    resolution: {integrity: sha512-ZdodDPqKQrgx3IwWu4ZiQmXI8EXZ3hm2/fM6E3t5dB8tCaIGWQZhmqd6P5knfkRAd3z2+YRSRbxOGfoRSp/rLg==}
-    peerDependencies:
-      '@uppy/core': ^2.1.4
-      '@uppy/xhr-upload': ^2.0.7
-      '@wangeditor/core': 1.x
-      dom7: ^3.0.0
-      nanoid: ^3.2.0
-      slate: ^0.72.0
-      snabbdom: ^3.1.0
-
-  '@withtypes/mime@0.1.2':
-    resolution: {integrity: sha512-PB9BfZGzwblUONJY0LiOwsHCA6uV3DIPj/w9ReekdHxPOl0VdUFgI5s4avKycuuq9Gf5Nz2ZPA2O36GAUzlMPA==}
-
-  JSONStream@1.3.5:
-    resolution: {integrity: sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==}
-    hasBin: true
-
-  acorn-jsx@5.3.2:
-    resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
-    peerDependencies:
-      acorn: ^6.0.0 || ^7.0.0 || ^8.0.0
-
-  acorn@8.14.0:
-    resolution: {integrity: sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-
-  ajv@6.12.6:
-    resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
-
-  ajv@8.17.1:
-    resolution: {integrity: sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==}
-
-  alien-signals@0.2.1:
-    resolution: {integrity: sha512-FlEQrDJe9r2RI4cDlnK2zYqJezvx1uJaWEuwxsnlFqnPwvJbgitNBRumWrLDv8lA+7cCikpMxfJD2TTHiaTklA==}
-
-  animate.css@4.1.1:
-    resolution: {integrity: sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ==}
-
-  ansi-escapes@4.3.2:
-    resolution: {integrity: sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==}
-    engines: {node: '>=8'}
-
-  ansi-escapes@7.0.0:
-    resolution: {integrity: sha512-GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==}
-    engines: {node: '>=18'}
-
-  ansi-regex@2.1.1:
-    resolution: {integrity: sha512-TIGnTpdo+E3+pCyAluZvtED5p5wCqLdezCyhPZzKPcxvFplEt4i+W7OONCKgeZFT3+y5NZZfOOS/Bdcanm1MYA==}
-    engines: {node: '>=0.10.0'}
-
-  ansi-regex@5.0.1:
-    resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
-    engines: {node: '>=8'}
-
-  ansi-regex@6.1.0:
-    resolution: {integrity: sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==}
-    engines: {node: '>=12'}
-
-  ansi-styles@2.2.1:
-    resolution: {integrity: sha512-kmCevFghRiWM7HB5zTPULl4r9bVFSWjz62MhqizDGUrq2NWuNMQyuv4tHHoKJHs69M/MF64lEcHdYIocrdWQYA==}
-    engines: {node: '>=0.10.0'}
-
-  ansi-styles@3.2.1:
-    resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
-    engines: {node: '>=4'}
-
-  ansi-styles@4.3.0:
-    resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==}
-    engines: {node: '>=8'}
-
-  ansi-styles@6.2.1:
-    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
-    engines: {node: '>=12'}
-
-  anymatch@3.1.3:
-    resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
-    engines: {node: '>= 8'}
-
-  archiver-utils@2.1.0:
-    resolution: {integrity: sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==}
-    engines: {node: '>= 6'}
-
-  archiver-utils@3.0.4:
-    resolution: {integrity: sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==}
-    engines: {node: '>= 10'}
-
-  archiver@5.3.2:
-    resolution: {integrity: sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==}
-    engines: {node: '>= 10'}
-
-  argparse@2.0.1:
-    resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==}
-
-  arr-diff@4.0.0:
-    resolution: {integrity: sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==}
-    engines: {node: '>=0.10.0'}
-
-  arr-flatten@1.1.0:
-    resolution: {integrity: sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==}
-    engines: {node: '>=0.10.0'}
-
-  arr-union@3.1.0:
-    resolution: {integrity: sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==}
-    engines: {node: '>=0.10.0'}
-
-  array-buffer-byte-length@1.0.1:
-    resolution: {integrity: sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==}
-    engines: {node: '>= 0.4'}
-
-  array-ify@1.0.0:
-    resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
-
-  array-union@2.1.0:
-    resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==}
-    engines: {node: '>=8'}
-
-  array-unique@0.3.2:
-    resolution: {integrity: sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==}
-    engines: {node: '>=0.10.0'}
-
-  arraybuffer.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==}
-    engines: {node: '>= 0.4'}
-
-  asap@2.0.6:
-    resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
-
-  assign-symbols@1.0.0:
-    resolution: {integrity: sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==}
-    engines: {node: '>=0.10.0'}
-
-  astral-regex@2.0.0:
-    resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
-    engines: {node: '>=8'}
-
-  async-validator@4.2.5:
-    resolution: {integrity: sha512-7HhHjtERjqlNbZtqNqy2rckN/SpOOlmDliet+lP7k+eKZEjPk3DgyeU9lIXLdeLz0uBbbVp+9Qdow9wJWgwwfg==}
-
-  async@3.2.6:
-    resolution: {integrity: sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==}
-
-  asynckit@0.4.0:
-    resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==}
-
-  at-least-node@1.0.0:
-    resolution: {integrity: sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==}
-    engines: {node: '>= 4.0.0'}
-
-  atob@2.1.2:
-    resolution: {integrity: sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==}
-    engines: {node: '>= 4.5.0'}
-    hasBin: true
-
-  autoprefixer@10.4.20:
-    resolution: {integrity: sha512-XY25y5xSv/wEoqzDyXXME4AFfkZI0P23z6Fs3YgymDnKJkCGOnkL0iTxCa85UTqaSgfcqyf3UA6+c7wUvx/16g==}
-    engines: {node: ^10 || ^12 || >=14}
-    hasBin: true
-    peerDependencies:
-      postcss: ^8.1.0
-
-  available-typed-arrays@1.0.7:
-    resolution: {integrity: sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==}
-    engines: {node: '>= 0.4'}
-
-  axios@1.7.7:
-    resolution: {integrity: sha512-S4kL7XrjgBmvdGut0sN3yJxqYzrDOnivkBiN0OFs6hLiUam3UPvswUo0kqGyhqUZGEOytHyumEdXsAkgCOUf3Q==}
-
-  balanced-match@1.0.2:
-    resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
-
-  balanced-match@2.0.0:
-    resolution: {integrity: sha512-1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==}
-
-  base64-js@1.5.1:
-    resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
-
-  base@0.11.2:
-    resolution: {integrity: sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==}
-    engines: {node: '>=0.10.0'}
-
-  big-integer@1.6.52:
-    resolution: {integrity: sha512-QxD8cf2eVqJOOz63z6JIN9BzvVs/dlySa5HGSBH5xtR8dPteIRQnBxxKqkNTiT6jbDTF6jAfrd4oMcND9RGbQg==}
-    engines: {node: '>=0.6'}
-
-  big.js@5.2.2:
-    resolution: {integrity: sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==}
-
-  binary-extensions@2.3.0:
-    resolution: {integrity: sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==}
-    engines: {node: '>=8'}
-
-  binary@0.3.0:
-    resolution: {integrity: sha512-D4H1y5KYwpJgK8wk1Cue5LLPgmwHKYSChkbspQg5JtVuR5ulGckxfR62H3AE9UDkdMC8yyXlqYihuz3Aqg2XZg==}
-
-  bl@4.1.0:
-    resolution: {integrity: sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==}
-
-  bluebird@3.4.7:
-    resolution: {integrity: sha512-iD3898SR7sWVRHbiQv+sHUtHnMvC1o3nW5rAcqnq3uOn07DSAppZYUkIGslDz6gXC7HfunPe7YVBgoEJASPcHA==}
-
-  bluebird@3.7.2:
-    resolution: {integrity: sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==}
-
-  boolbase@1.0.0:
-    resolution: {integrity: sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==}
-
-  brace-expansion@1.1.11:
-    resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
-
-  brace-expansion@2.0.1:
-    resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
-
-  braces@2.3.2:
-    resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
-    engines: {node: '>=0.10.0'}
-
-  braces@3.0.3:
-    resolution: {integrity: sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==}
-    engines: {node: '>=8'}
-
-  browserslist@4.24.2:
-    resolution: {integrity: sha512-ZIc+Q62revdMcqC6aChtW4jz3My3klmCO1fEmINZY/8J3EpBg5/A/D0AKmBveUh6pgoeycoMkVMko84tuYS+Gg==}
-    engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
-    hasBin: true
-
-  buffer-crc32@0.2.13:
-    resolution: {integrity: sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==}
-
-  buffer-from@1.1.2:
-    resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==}
-
-  buffer-indexof-polyfill@1.0.2:
-    resolution: {integrity: sha512-I7wzHwA3t1/lwXQh+A5PbNvJxgfo5r3xulgpYDB5zckTu/Z9oUK9biouBKQUjEqzaz3HnAT6TYoovmE+GqSf7A==}
-    engines: {node: '>=0.10'}
-
-  buffer@5.7.1:
-    resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
-
-  buffers@0.1.1:
-    resolution: {integrity: sha512-9q/rDEGSb/Qsvv2qvzIzdluL5k7AaJOTrw23z9reQthrbF7is4CtlT0DXyO1oei2DCp4uojjzQ7igaSHp1kAEQ==}
-    engines: {node: '>=0.2.0'}
-
-  bundle-require@5.0.0:
-    resolution: {integrity: sha512-GuziW3fSSmopcx4KRymQEJVbZUfqlCqcq7dvs6TYwKRZiegK/2buMxQTPs6MGlNv50wms1699qYO54R8XfRX4w==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-    peerDependencies:
-      esbuild: '>=0.18'
-
-  bytes@3.1.2:
-    resolution: {integrity: sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==}
-    engines: {node: '>= 0.8'}
-
-  cac@6.7.14:
-    resolution: {integrity: sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==}
-    engines: {node: '>=8'}
-
-  cache-base@1.0.1:
-    resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
-    engines: {node: '>=0.10.0'}
-
-  cachedir@2.3.0:
-    resolution: {integrity: sha512-A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw==}
-    engines: {node: '>=6'}
-
-  call-bind@1.0.7:
-    resolution: {integrity: sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==}
-    engines: {node: '>= 0.4'}
-
-  callsites@3.1.0:
-    resolution: {integrity: sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==}
-    engines: {node: '>=6'}
-
-  caniuse-lite@1.0.30001680:
-    resolution: {integrity: sha512-rPQy70G6AGUMnbwS1z6Xg+RkHYPAi18ihs47GH0jcxIG7wArmPgY3XbS2sRdBbxJljp3thdT8BIqv9ccCypiPA==}
-
-  chainsaw@0.1.0:
-    resolution: {integrity: sha512-75kWfWt6MEKNC8xYXIdRpDehRYY/tNSgwKaJq+dbbDcxORuVrrQ+SEHoWsniVn9XPYfP4gmdWIeDk/4YNp1rNQ==}
-
-  chalk@1.1.3:
-    resolution: {integrity: sha512-U3lRVLMSlsCfjqYPbLyVv11M9CPW4I728d6TCKMAOJueEeB9/8o+eSsMnxPJD+Q+K909sdESg7C+tIkoH6on1A==}
-    engines: {node: '>=0.10.0'}
-
-  chalk@2.4.2:
-    resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==}
-    engines: {node: '>=4'}
-
-  chalk@4.1.2:
-    resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==}
-    engines: {node: '>=10'}
-
-  chalk@5.3.0:
-    resolution: {integrity: sha512-dLitG79d+GV1Nb/VYcCDFivJeK1hiukt9QjRNVOsUtTy1rR1YJsmpGGTZ3qJos+uw7WmWF4wUwBd9jxjocFC2w==}
-    engines: {node: ^12.17.0 || ^14.13 || >=16.0.0}
-
-  chardet@0.7.0:
-    resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
-
-  chokidar@3.6.0:
-    resolution: {integrity: sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==}
-    engines: {node: '>= 8.10.0'}
-
-  chokidar@4.0.1:
-    resolution: {integrity: sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==}
-    engines: {node: '>= 14.16.0'}
-
-  class-utils@0.3.6:
-    resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
-    engines: {node: '>=0.10.0'}
-
-  cli-cursor@3.1.0:
-    resolution: {integrity: sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==}
-    engines: {node: '>=8'}
-
-  cli-cursor@5.0.0:
-    resolution: {integrity: sha512-aCj4O5wKyszjMmDT4tZj93kxyydN/K5zPWSCe6/0AV/AA1pqe5ZBIw0a2ZfPQV7lL5/yb5HsUreJ6UFAF1tEQw==}
-    engines: {node: '>=18'}
-
-  cli-spinners@2.9.2:
-    resolution: {integrity: sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==}
-    engines: {node: '>=6'}
-
-  cli-truncate@4.0.0:
-    resolution: {integrity: sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==}
-    engines: {node: '>=18'}
-
-  cli-width@3.0.0:
-    resolution: {integrity: sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==}
-    engines: {node: '>= 10'}
-
-  cliui@8.0.1:
-    resolution: {integrity: sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==}
-    engines: {node: '>=12'}
-
-  clone@1.0.4:
-    resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
-    engines: {node: '>=0.8'}
-
-  clone@2.1.2:
-    resolution: {integrity: sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==}
-    engines: {node: '>=0.8'}
-
-  co-body@6.2.0:
-    resolution: {integrity: sha512-Kbpv2Yd1NdL1V/V4cwLVxraHDV6K8ayohr2rmH0J87Er8+zJjcTa6dAn9QMPC9CRgU8+aNajKbSf1TzDB1yKPA==}
-    engines: {node: '>=8.0.0'}
-
-  codemirror-editor-vue3@2.8.0:
-    resolution: {integrity: sha512-ebYGNhBpLmQNLguXzNyMMkn6K8v3lcS5/Ncvdn6YS4bLGEHE67MfsJIS/WV0L7I6WavUuFlY/Rs/AJKChIwSwg==}
-    peerDependencies:
-      codemirror: ^5
-      diff-match-patch: ^1.0.5
-      vue: ^3.x
-
-  codemirror@5.65.18:
-    resolution: {integrity: sha512-Gaz4gHnkbHMGgahNt3CA5HBk5lLQBqmD/pBgeB4kQU6OedZmqMBjlRF0LSrp2tJ4wlLNPm2FfaUd1pDy0mdlpA==}
-
-  collection-visit@1.0.0:
-    resolution: {integrity: sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==}
-    engines: {node: '>=0.10.0'}
-
-  color-convert@1.9.3:
-    resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==}
-
-  color-convert@2.0.1:
-    resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==}
-    engines: {node: '>=7.0.0'}
-
-  color-name@1.1.3:
-    resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==}
-
-  color-name@1.1.4:
-    resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==}
-
-  colord@2.9.3:
-    resolution: {integrity: sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==}
-
-  colorette@2.0.20:
-    resolution: {integrity: sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==}
-
-  combined-stream@1.0.8:
-    resolution: {integrity: sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==}
-    engines: {node: '>= 0.8'}
-
-  commander@12.1.0:
-    resolution: {integrity: sha512-Vw8qHK3bZM9y/P10u3Vib8o/DdkvA2OtPtZvD871QKjy74Wj1WSKFILMPRPSdUSx5RFK1arlJzEtA4PkFgnbuA==}
-    engines: {node: '>=18'}
-
-  commander@2.20.3:
-    resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
-
-  commander@7.2.0:
-    resolution: {integrity: sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==}
-    engines: {node: '>= 10'}
-
-  commitizen@4.3.1:
-    resolution: {integrity: sha512-gwAPAVTy/j5YcOOebcCRIijn+mSjWJC+IYKivTu6aG8Ei/scoXgfsMRnuAk6b0GRste2J4NGxVdMN3ZpfNaVaw==}
-    engines: {node: '>= 12'}
-    hasBin: true
-
-  compare-func@2.0.0:
-    resolution: {integrity: sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==}
-
-  component-emitter@1.3.1:
-    resolution: {integrity: sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==}
-
-  compress-commons@4.1.2:
-    resolution: {integrity: sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==}
-    engines: {node: '>= 10'}
-
-  compute-scroll-into-view@1.0.20:
-    resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==}
-
-  concat-map@0.0.1:
-    resolution: {integrity: sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==}
-
-  confbox@0.1.8:
-    resolution: {integrity: sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==}
-
-  consola@3.2.3:
-    resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==}
-    engines: {node: ^14.18.0 || >=16.10.0}
-
-  conventional-changelog-angular@7.0.0:
-    resolution: {integrity: sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==}
-    engines: {node: '>=16'}
-
-  conventional-changelog-conventionalcommits@7.0.2:
-    resolution: {integrity: sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==}
-    engines: {node: '>=16'}
-
-  conventional-commit-types@3.0.0:
-    resolution: {integrity: sha512-SmmCYnOniSsAa9GqWOeLqc179lfr5TRu5b4QFDkbsrJ5TZjPJx85wtOr3zn+1dbeNiXDKGPbZ72IKbPhLXh/Lg==}
-
-  conventional-commits-parser@5.0.0:
-    resolution: {integrity: sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==}
-    engines: {node: '>=16'}
-    hasBin: true
-
-  cookies@0.9.1:
-    resolution: {integrity: sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==}
-    engines: {node: '>= 0.8'}
-
-  copy-descriptor@0.1.1:
-    resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
-    engines: {node: '>=0.10.0'}
-
-  core-util-is@1.0.3:
-    resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==}
-
-  cors@2.8.5:
-    resolution: {integrity: sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==}
-    engines: {node: '>= 0.10'}
-
-  cosmiconfig-typescript-loader@5.1.0:
-    resolution: {integrity: sha512-7PtBB+6FdsOvZyJtlF3hEPpACq7RQX6BVGsgC7/lfVXnKMvNCu/XY3ykreqG5w/rBNdu2z8LCIKoF3kpHHdHlA==}
-    engines: {node: '>=v16'}
-    peerDependencies:
-      '@types/node': '*'
-      cosmiconfig: '>=8.2'
-      typescript: '>=4'
-
-  cosmiconfig@9.0.0:
-    resolution: {integrity: sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      typescript: '>=4.9.5'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  crc-32@1.2.2:
-    resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
-    engines: {node: '>=0.8'}
-    hasBin: true
-
-  crc32-stream@4.0.3:
-    resolution: {integrity: sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==}
-    engines: {node: '>= 10'}
-
-  cropperjs@1.6.2:
-    resolution: {integrity: sha512-nhymn9GdnV3CqiEHJVai54TULFAE3VshJTXSqSJKa8yXAKyBKDWdhHarnlIPrshJ0WMFTGuFvG02YjLXfPiuOA==}
-
-  cross-spawn@7.0.5:
-    resolution: {integrity: sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==}
-    engines: {node: '>= 8'}
-
-  css-functions-list@3.2.3:
-    resolution: {integrity: sha512-IQOkD3hbR5KrN93MtcYuad6YPuTSUhntLHDuLEbFWE+ff2/XSZNdZG+LcbbIW5AXKg/WFIfYItIzVoHngHXZzA==}
-    engines: {node: '>=12 || >=16'}
-
-  css-select@4.3.0:
-    resolution: {integrity: sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==}
-
-  css-tree@1.1.3:
-    resolution: {integrity: sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==}
-    engines: {node: '>=8.0.0'}
-
-  css-tree@3.0.1:
-    resolution: {integrity: sha512-8Fxxv+tGhORlshCdCwnNJytvlvq46sOLSYEx2ZIGurahWvMucSRnyjPA3AmrMq4VPRYbHVpWj5VkiVasrM2H4Q==}
-    engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0}
-
-  css-what@6.1.0:
-    resolution: {integrity: sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==}
-    engines: {node: '>= 6'}
-
-  cssesc@3.0.0:
-    resolution: {integrity: sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==}
-    engines: {node: '>=4'}
-    hasBin: true
-
-  csso@4.2.0:
-    resolution: {integrity: sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==}
-    engines: {node: '>=8.0.0'}
-
-  csstype@3.1.3:
-    resolution: {integrity: sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==}
-
-  cz-conventional-changelog@3.3.0:
-    resolution: {integrity: sha512-U466fIzU5U22eES5lTNiNbZ+d8dfcHcssH4o7QsdWaCcRs/feIPCxKYSWkYBNs5mny7MvEfwpTLWjvbm94hecw==}
-    engines: {node: '>= 10'}
-
-  cz-git@1.9.4:
-    resolution: {integrity: sha512-VntWcIEFfW8+7RgwYaRn1r10NhUkl8/8ZdJQRupEdqE7QXBCSjNP8hKSk9zhSLzYAsdXfGEAwiAYJM1T2Qsh8w==}
-    engines: {node: '>=v12.20.0'}
-
-  d@1.0.2:
-    resolution: {integrity: sha512-MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==}
-    engines: {node: '>=0.12'}
-
-  dargs@8.1.0:
-    resolution: {integrity: sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==}
-    engines: {node: '>=12'}
-
-  data-view-buffer@1.0.1:
-    resolution: {integrity: sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==}
-    engines: {node: '>= 0.4'}
-
-  data-view-byte-length@1.0.1:
-    resolution: {integrity: sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==}
-    engines: {node: '>= 0.4'}
-
-  data-view-byte-offset@1.0.0:
-    resolution: {integrity: sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==}
-    engines: {node: '>= 0.4'}
-
-  dayjs@1.11.13:
-    resolution: {integrity: sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==}
-
-  de-indent@1.0.2:
-    resolution: {integrity: sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==}
-
-  debug@2.6.9:
-    resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  debug@4.3.7:
-    resolution: {integrity: sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==}
-    engines: {node: '>=6.0'}
-    peerDependencies:
-      supports-color: '*'
-    peerDependenciesMeta:
-      supports-color:
-        optional: true
-
-  decode-uri-component@0.2.2:
-    resolution: {integrity: sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==}
-    engines: {node: '>=0.10'}
-
-  dedent@0.7.0:
-    resolution: {integrity: sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==}
-
-  deep-is@0.1.4:
-    resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
-
-  defaults@1.0.4:
-    resolution: {integrity: sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==}
-
-  define-data-property@1.1.4:
-    resolution: {integrity: sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==}
-    engines: {node: '>= 0.4'}
-
-  define-properties@1.2.1:
-    resolution: {integrity: sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==}
-    engines: {node: '>= 0.4'}
-
-  define-property@0.2.5:
-    resolution: {integrity: sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==}
-    engines: {node: '>=0.10.0'}
-
-  define-property@1.0.0:
-    resolution: {integrity: sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==}
-    engines: {node: '>=0.10.0'}
-
-  define-property@2.0.2:
-    resolution: {integrity: sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==}
-    engines: {node: '>=0.10.0'}
-
-  defu@6.1.4:
-    resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==}
-
-  delayed-stream@1.0.0:
-    resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
-    engines: {node: '>=0.4.0'}
-
-  depd@2.0.0:
-    resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
-    engines: {node: '>= 0.8'}
-
-  destr@2.0.3:
-    resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==}
-
-  detect-file@1.0.0:
-    resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
-    engines: {node: '>=0.10.0'}
-
-  detect-indent@6.1.0:
-    resolution: {integrity: sha512-reYkTUJAZb9gUuZ2RvVCNhVHdg62RHnJ7WJl8ftMi4diZ6NWlciOzQN88pUhSELEwflJht4oQDv0F0BMlwaYtA==}
-    engines: {node: '>=8'}
-
-  detect-libc@1.0.3:
-    resolution: {integrity: sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-
-  dezalgo@1.0.4:
-    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
-
-  diff-match-patch@1.0.5:
-    resolution: {integrity: sha512-IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==}
-
-  dir-glob@3.0.1:
-    resolution: {integrity: sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==}
-    engines: {node: '>=8'}
-
-  dom-serializer@0.2.2:
-    resolution: {integrity: sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==}
-
-  dom-serializer@1.4.1:
-    resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
-
-  dom-serializer@2.0.0:
-    resolution: {integrity: sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==}
-
-  dom7@3.0.0:
-    resolution: {integrity: sha512-oNlcUdHsC4zb7Msx7JN3K0Nro1dzJ48knvBOnDPKJ2GV9wl1i5vydJZUSyOfrkKFDZEud/jBsTk92S/VGSAe/g==}
-
-  domelementtype@1.3.1:
-    resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
-
-  domelementtype@2.3.0:
-    resolution: {integrity: sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==}
-
-  domhandler@2.4.2:
-    resolution: {integrity: sha512-JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==}
-
-  domhandler@4.3.1:
-    resolution: {integrity: sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==}
-    engines: {node: '>= 4'}
-
-  domhandler@5.0.3:
-    resolution: {integrity: sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==}
-    engines: {node: '>= 4'}
-
-  domutils@1.7.0:
-    resolution: {integrity: sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==}
-
-  domutils@2.8.0:
-    resolution: {integrity: sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==}
-
-  domutils@3.1.0:
-    resolution: {integrity: sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==}
-
-  dot-prop@5.3.0:
-    resolution: {integrity: sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==}
-    engines: {node: '>=8'}
-
-  duplexer2@0.1.4:
-    resolution: {integrity: sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==}
-
-  duplexer@0.1.2:
-    resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
-
-  echarts@5.5.1:
-    resolution: {integrity: sha512-Fce8upazaAXUVUVsjgV6mBnGuqgO+JNDlcgF79Dksy4+wgGpQB2lmYoO4TSweFg/mZITdpGHomw/cNBJZj1icA==}
-
-  electron-to-chromium@1.5.56:
-    resolution: {integrity: sha512-7lXb9dAvimCFdvUMTyucD4mnIndt/xhRKFAlky0CyFogdnNmdPQNoHI23msF/2V4mpTxMzgMdjK4+YRlFlRQZw==}
-
-  element-plus@2.8.7:
-    resolution: {integrity: sha512-oGQyFRufFOgjd872tZc+T4xQAYLlX4hj6d3ixeY13L4fFNUuc1N49JHAqJGPda0tdx3qCnjceZoh1kqqj2+tXQ==}
-    peerDependencies:
-      vue: ^3.2.0
-
-  emoji-regex@10.4.0:
-    resolution: {integrity: sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==}
-
-  emoji-regex@8.0.0:
-    resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
-
-  emojis-list@3.0.0:
-    resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
-    engines: {node: '>= 4'}
-
-  end-of-stream@1.4.4:
-    resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
-
-  entities@1.1.2:
-    resolution: {integrity: sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==}
-
-  entities@2.2.0:
-    resolution: {integrity: sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==}
-
-  entities@4.5.0:
-    resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==}
-    engines: {node: '>=0.12'}
-
-  env-paths@2.2.1:
-    resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
-    engines: {node: '>=6'}
-
-  environment@1.1.0:
-    resolution: {integrity: sha512-xUtoPkMggbz0MPyPiIWr1Kp4aeWJjDZ6SMvURhimjdZgsRuDplF5/s9hcgGhyXMhs+6vpnuoiZ2kFiu3FMnS8Q==}
-    engines: {node: '>=18'}
-
-  error-ex@1.3.2:
-    resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
-
-  es-abstract@1.23.3:
-    resolution: {integrity: sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==}
-    engines: {node: '>= 0.4'}
-
-  es-define-property@1.0.0:
-    resolution: {integrity: sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==}
-    engines: {node: '>= 0.4'}
-
-  es-errors@1.3.0:
-    resolution: {integrity: sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==}
-    engines: {node: '>= 0.4'}
-
-  es-object-atoms@1.0.0:
-    resolution: {integrity: sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==}
-    engines: {node: '>= 0.4'}
-
-  es-set-tostringtag@2.0.3:
-    resolution: {integrity: sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==}
-    engines: {node: '>= 0.4'}
-
-  es-to-primitive@1.2.1:
-    resolution: {integrity: sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==}
-    engines: {node: '>= 0.4'}
-
-  es5-ext@0.10.64:
-    resolution: {integrity: sha512-p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==}
-    engines: {node: '>=0.10'}
-
-  es6-iterator@2.0.3:
-    resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
-
-  es6-symbol@3.1.4:
-    resolution: {integrity: sha512-U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==}
-    engines: {node: '>=0.12'}
-
-  esbuild@0.21.5:
-    resolution: {integrity: sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==}
-    engines: {node: '>=12'}
-    hasBin: true
-
-  esbuild@0.23.1:
-    resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  escalade@3.2.0:
-    resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==}
-    engines: {node: '>=6'}
-
-  escape-html@1.0.3:
-    resolution: {integrity: sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==}
-
-  escape-string-regexp@1.0.5:
-    resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==}
-    engines: {node: '>=0.8.0'}
-
-  escape-string-regexp@4.0.0:
-    resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==}
-    engines: {node: '>=10'}
-
-  escape-string-regexp@5.0.0:
-    resolution: {integrity: sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==}
-    engines: {node: '>=12'}
-
-  eslint-config-prettier@9.1.0:
-    resolution: {integrity: sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==}
-    hasBin: true
-    peerDependencies:
-      eslint: '>=7.0.0'
-
-  eslint-plugin-prettier@5.2.1:
-    resolution: {integrity: sha512-gH3iR3g4JfF+yYPaJYkN7jEl9QbweL/YfkoRlNnuIEHEz1vHVlCmWOS+eGGiRuzHQXdJFCOTxRgvju9b8VUmrw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-    peerDependencies:
-      '@types/eslint': '>=8.0.0'
-      eslint: '>=8.0.0'
-      eslint-config-prettier: '*'
-      prettier: '>=3.0.0'
-    peerDependenciesMeta:
-      '@types/eslint':
-        optional: true
-      eslint-config-prettier:
-        optional: true
-
-  eslint-plugin-vue@9.31.0:
-    resolution: {integrity: sha512-aYMUCgivhz1o4tLkRHj5oq9YgYPM4/EJc0M7TAKRLCUA5OYxRLAhYEVD2nLtTwLyixEFI+/QXSvKU9ESZFgqjQ==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: ^6.2.0 || ^7.0.0 || ^8.0.0 || ^9.0.0
-
-  eslint-scope@7.2.2:
-    resolution: {integrity: sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  eslint-scope@8.2.0:
-    resolution: {integrity: sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  eslint-visitor-keys@3.4.3:
-    resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  eslint-visitor-keys@4.2.0:
-    resolution: {integrity: sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  eslint@9.14.0:
-    resolution: {integrity: sha512-c2FHsVBr87lnUtjP4Yhvk4yEhKrQavGafRA/Se1ouse8PfbfC/Qh9Mxa00yWsZRlqeUB9raXip0aiiUZkgnr9g==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    hasBin: true
-    peerDependencies:
-      jiti: '*'
-    peerDependenciesMeta:
-      jiti:
-        optional: true
-
-  esniff@2.0.1:
-    resolution: {integrity: sha512-kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==}
-    engines: {node: '>=0.10'}
-
-  espree@10.3.0:
-    resolution: {integrity: sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-
-  espree@9.6.1:
-    resolution: {integrity: sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==}
-    engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
-
-  esquery@1.6.0:
-    resolution: {integrity: sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==}
-    engines: {node: '>=0.10'}
-
-  esrecurse@4.3.0:
-    resolution: {integrity: sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==}
-    engines: {node: '>=4.0'}
-
-  estraverse@5.3.0:
-    resolution: {integrity: sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==}
-    engines: {node: '>=4.0'}
-
-  estree-walker@2.0.2:
-    resolution: {integrity: sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==}
-
-  estree-walker@3.0.3:
-    resolution: {integrity: sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==}
-
-  esutils@2.0.3:
-    resolution: {integrity: sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==}
-    engines: {node: '>=0.10.0'}
-
-  etag@1.8.1:
-    resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
-    engines: {node: '>= 0.6'}
-
-  event-emitter@0.3.5:
-    resolution: {integrity: sha512-D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==}
-
-  eventemitter3@5.0.1:
-    resolution: {integrity: sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA==}
-
-  exceljs@4.4.0:
-    resolution: {integrity: sha512-XctvKaEMaj1Ii9oDOqbW/6e1gXknSY4g/aLCDicOXqBE4M0nRWkUu0PTp++UPNzoFY12BNHMfs/VadKIS6llvg==}
-    engines: {node: '>=8.3.0'}
-
-  execa@8.0.1:
-    resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==}
-    engines: {node: '>=16.17'}
-
-  expand-brackets@2.1.4:
-    resolution: {integrity: sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==}
-    engines: {node: '>=0.10.0'}
-
-  expand-tilde@2.0.2:
-    resolution: {integrity: sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==}
-    engines: {node: '>=0.10.0'}
-
-  ext@1.7.0:
-    resolution: {integrity: sha512-6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==}
-
-  extend-shallow@2.0.1:
-    resolution: {integrity: sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==}
-    engines: {node: '>=0.10.0'}
-
-  extend-shallow@3.0.2:
-    resolution: {integrity: sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==}
-    engines: {node: '>=0.10.0'}
-
-  external-editor@3.1.0:
-    resolution: {integrity: sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==}
-    engines: {node: '>=4'}
-
-  extglob@2.0.4:
-    resolution: {integrity: sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==}
-    engines: {node: '>=0.10.0'}
-
-  fast-csv@4.3.6:
-    resolution: {integrity: sha512-2RNSpuwwsJGP0frGsOmTb9oUF+VkFSM4SyLTDgwf2ciHWTarN0lQTC+F2f/t5J9QjW+c65VFIAAu85GsvMIusw==}
-    engines: {node: '>=10.0.0'}
-
-  fast-deep-equal@3.1.3:
-    resolution: {integrity: sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==}
-
-  fast-diff@1.3.0:
-    resolution: {integrity: sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==}
-
-  fast-glob@3.3.2:
-    resolution: {integrity: sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==}
-    engines: {node: '>=8.6.0'}
-
-  fast-json-stable-stringify@2.1.0:
-    resolution: {integrity: sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==}
-
-  fast-levenshtein@2.0.6:
-    resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==}
-
-  fast-uri@3.0.3:
-    resolution: {integrity: sha512-aLrHthzCjH5He4Z2H9YZ+v6Ujb9ocRuW6ZzkJQOrTxleEijANq4v1TsaPaVG1PZcuurEzrLcWRyYBYXD5cEiaw==}
-
-  fastest-levenshtein@1.0.16:
-    resolution: {integrity: sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==}
-    engines: {node: '>= 4.9.1'}
-
-  fastq@1.17.1:
-    resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==}
-
-  fdir@6.4.2:
-    resolution: {integrity: sha512-KnhMXsKSPZlAhp7+IjUkRZKPb4fUyccpDrdFXbi4QL1qkmFh9kVY09Yox+n4MaOb3lHZ1Tv829C3oaaXoMYPDQ==}
-    peerDependencies:
-      picomatch: ^3 || ^4
-    peerDependenciesMeta:
-      picomatch:
-        optional: true
-
-  figures@3.2.0:
-    resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
-    engines: {node: '>=8'}
-
-  file-entry-cache@8.0.0:
-    resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==}
-    engines: {node: '>=16.0.0'}
-
-  file-entry-cache@9.1.0:
-    resolution: {integrity: sha512-/pqPFG+FdxWQj+/WSuzXSDaNzxgTLr/OrR1QuqfEZzDakpdYE70PwUxL7BPUa8hpjbvY1+qvCl8k+8Tq34xJgg==}
-    engines: {node: '>=18'}
-
-  fill-range@4.0.0:
-    resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
-    engines: {node: '>=0.10.0'}
-
-  fill-range@7.1.1:
-    resolution: {integrity: sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==}
-    engines: {node: '>=8'}
-
-  find-node-modules@2.1.3:
-    resolution: {integrity: sha512-UC2I2+nx1ZuOBclWVNdcnbDR5dlrOdVb7xNjmT/lHE+LsgztWks3dG7boJ37yTS/venXw84B/mAW9uHVoC5QRg==}
-
-  find-root@1.1.0:
-    resolution: {integrity: sha512-NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng==}
-
-  find-up@5.0.0:
-    resolution: {integrity: sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==}
-    engines: {node: '>=10'}
-
-  find-up@7.0.0:
-    resolution: {integrity: sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==}
-    engines: {node: '>=18'}
-
-  findup-sync@4.0.0:
-    resolution: {integrity: sha512-6jvvn/12IC4quLBL1KNokxC7wWTvYncaVUYSoxWw7YykPLuRrnv4qdHcSOywOI5RpkOVGeQRtWM8/q+G6W6qfQ==}
-    engines: {node: '>= 8'}
-
-  flat-cache@4.0.1:
-    resolution: {integrity: sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==}
-    engines: {node: '>=16'}
-
-  flat-cache@5.0.0:
-    resolution: {integrity: sha512-JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==}
-    engines: {node: '>=18'}
-
-  flatted@3.3.1:
-    resolution: {integrity: sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==}
-
-  follow-redirects@1.15.9:
-    resolution: {integrity: sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-
-  for-each@0.3.3:
-    resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
-
-  for-in@1.0.2:
-    resolution: {integrity: sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==}
-    engines: {node: '>=0.10.0'}
-
-  form-data@4.0.1:
-    resolution: {integrity: sha512-tzN8e4TX8+kkxGPK8D5u0FNmjPUjw3lwC9lSLxxoB/+GtsJG91CO8bSWy73APlgAZzZbXEYZJuxjkHH2w+Ezhw==}
-    engines: {node: '>= 6'}
-
-  formidable@2.1.2:
-    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
-
-  fraction.js@4.3.7:
-    resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
-
-  fragment-cache@0.2.1:
-    resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
-    engines: {node: '>=0.10.0'}
-
-  fs-constants@1.0.0:
-    resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
-
-  fs-extra@10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
-
-  fs-extra@9.1.0:
-    resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
-    engines: {node: '>=10'}
-
-  fs.realpath@1.0.0:
-    resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
-
-  fsevents@2.3.3:
-    resolution: {integrity: sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==}
-    engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
-    os: [darwin]
-
-  fstream@1.0.12:
-    resolution: {integrity: sha512-WvJ193OHa0GHPEL+AycEJgxvBEwyfRkN1vhjca23OaPVMCaLCXTd5qAu82AjTcgP1UJmytkOKb63Ypde7raDIg==}
-    engines: {node: '>=0.6'}
-    deprecated: This package is no longer supported.
-
-  function-bind@1.1.2:
-    resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==}
-
-  function.prototype.name@1.1.6:
-    resolution: {integrity: sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==}
-    engines: {node: '>= 0.4'}
-
-  functions-have-names@1.2.3:
-    resolution: {integrity: sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==}
-
-  get-caller-file@2.0.5:
-    resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-
-  get-east-asian-width@1.3.0:
-    resolution: {integrity: sha512-vpeMIQKxczTD/0s2CdEWHcb0eeJe6TFjxb+J5xgX7hScxqrGuyjmv4c1D4A/gelKfyox0gJJwIHF+fLjeaM8kQ==}
-    engines: {node: '>=18'}
-
-  get-intrinsic@1.2.4:
-    resolution: {integrity: sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==}
-    engines: {node: '>= 0.4'}
-
-  get-stream@8.0.1:
-    resolution: {integrity: sha512-VaUJspBffn/LMCJVoMvSAdmscJyS1auj5Zulnn5UoYcY531UWmdwhRWkcGKnGU93m5HSXP9LP2usOryrBtQowA==}
-    engines: {node: '>=16'}
-
-  get-symbol-description@1.0.2:
-    resolution: {integrity: sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==}
-    engines: {node: '>= 0.4'}
-
-  get-tsconfig@4.8.1:
-    resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==}
-
-  get-value@2.0.6:
-    resolution: {integrity: sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==}
-    engines: {node: '>=0.10.0'}
-
-  git-raw-commits@4.0.0:
-    resolution: {integrity: sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==}
-    engines: {node: '>=16'}
-    hasBin: true
-
-  glob-parent@5.1.2:
-    resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==}
-    engines: {node: '>= 6'}
-
-  glob-parent@6.0.2:
-    resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
-    engines: {node: '>=10.13.0'}
-
-  glob@7.2.3:
-    resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
-    deprecated: Glob versions prior to v9 are no longer supported
-
-  global-directory@4.0.1:
-    resolution: {integrity: sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==}
-    engines: {node: '>=18'}
-
-  global-modules@1.0.0:
-    resolution: {integrity: sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==}
-    engines: {node: '>=0.10.0'}
-
-  global-modules@2.0.0:
-    resolution: {integrity: sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==}
-    engines: {node: '>=6'}
-
-  global-prefix@1.0.2:
-    resolution: {integrity: sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==}
-    engines: {node: '>=0.10.0'}
-
-  global-prefix@3.0.0:
-    resolution: {integrity: sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==}
-    engines: {node: '>=6'}
-
-  globals@13.24.0:
-    resolution: {integrity: sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==}
-    engines: {node: '>=8'}
-
-  globals@14.0.0:
-    resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==}
-    engines: {node: '>=18'}
-
-  globals@15.12.0:
-    resolution: {integrity: sha512-1+gLErljJFhbOVyaetcwJiJ4+eLe45S2E7P5UiZ9xGfeq3ATQf5DOv9G7MH3gGbKQLkzmNh2DxfZwLdw+j6oTQ==}
-    engines: {node: '>=18'}
-
-  globalthis@1.0.4:
-    resolution: {integrity: sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==}
-    engines: {node: '>= 0.4'}
-
-  globby@11.1.0:
-    resolution: {integrity: sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==}
-    engines: {node: '>=10'}
-
-  globjoin@0.1.4:
-    resolution: {integrity: sha512-xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==}
-
-  gopd@1.0.1:
-    resolution: {integrity: sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==}
-
-  graceful-fs@4.2.11:
-    resolution: {integrity: sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==}
-
-  graphemer@1.4.0:
-    resolution: {integrity: sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==}
-
-  gzip-size@6.0.0:
-    resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==}
-    engines: {node: '>=10'}
-
-  has-ansi@2.0.0:
-    resolution: {integrity: sha512-C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg==}
-    engines: {node: '>=0.10.0'}
-
-  has-bigints@1.0.2:
-    resolution: {integrity: sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==}
-
-  has-flag@1.0.0:
-    resolution: {integrity: sha512-DyYHfIYwAJmjAjSSPKANxI8bFY9YtFrgkAfinBojQ8YJTOuOuav64tMUJv584SES4xl74PmuaevIyaLESHdTAA==}
-    engines: {node: '>=0.10.0'}
-
-  has-flag@3.0.0:
-    resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==}
-    engines: {node: '>=4'}
-
-  has-flag@4.0.0:
-    resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
-    engines: {node: '>=8'}
-
-  has-property-descriptors@1.0.2:
-    resolution: {integrity: sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==}
-
-  has-proto@1.0.3:
-    resolution: {integrity: sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==}
-    engines: {node: '>= 0.4'}
-
-  has-symbols@1.0.3:
-    resolution: {integrity: sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==}
-    engines: {node: '>= 0.4'}
-
-  has-tostringtag@1.0.2:
-    resolution: {integrity: sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==}
-    engines: {node: '>= 0.4'}
-
-  has-value@0.3.1:
-    resolution: {integrity: sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==}
-    engines: {node: '>=0.10.0'}
-
-  has-value@1.0.0:
-    resolution: {integrity: sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==}
-    engines: {node: '>=0.10.0'}
-
-  has-values@0.1.4:
-    resolution: {integrity: sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==}
-    engines: {node: '>=0.10.0'}
-
-  has-values@1.0.0:
-    resolution: {integrity: sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==}
-    engines: {node: '>=0.10.0'}
-
-  hasown@2.0.2:
-    resolution: {integrity: sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==}
-    engines: {node: '>= 0.4'}
-
-  he@1.2.0:
-    resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
-    hasBin: true
-
-  hexoid@1.0.0:
-    resolution: {integrity: sha512-QFLV0taWQOZtvIRIAdBChesmogZrtuXvVWsFHZTk2SU+anspqZ2vMnoLg7IE1+Uk16N19APic1BuF8bC8c2m5g==}
-    engines: {node: '>=8'}
-
-  homedir-polyfill@1.0.3:
-    resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
-    engines: {node: '>=0.10.0'}
-
-  html-tags@3.3.1:
-    resolution: {integrity: sha512-ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==}
-    engines: {node: '>=8'}
-
-  html-void-elements@2.0.1:
-    resolution: {integrity: sha512-0quDb7s97CfemeJAnW9wC0hw78MtW7NU3hqtCD75g2vFlDLt36llsYD7uB7SUzojLMP24N5IatXf7ylGXiGG9A==}
-
-  htmlparser2@3.10.1:
-    resolution: {integrity: sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==}
-
-  htmlparser2@8.0.2:
-    resolution: {integrity: sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==}
-
-  http-errors@2.0.0:
-    resolution: {integrity: sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==}
-    engines: {node: '>= 0.8'}
-
-  http-status@1.8.1:
-    resolution: {integrity: sha512-YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==}
-    engines: {node: '>= 0.4.0'}
-
-  human-signals@5.0.0:
-    resolution: {integrity: sha512-AXcZb6vzzrFAUE61HnN4mpLqd/cSIwNQjtNWR0euPm6y0iqx3G4gOXaIDdtdDwZmhwe82LA6+zinmW4UBWVePQ==}
-    engines: {node: '>=16.17.0'}
-
-  husky@9.1.6:
-    resolution: {integrity: sha512-sqbjZKK7kf44hfdE94EoX8MZNk0n7HeW37O4YrVGCF4wzgQjp+akPAkfUK5LZ6KuR/6sqeAVuXHji+RzQgOn5A==}
-    engines: {node: '>=18'}
-    hasBin: true
-
-  i18next@20.6.1:
-    resolution: {integrity: sha512-yCMYTMEJ9ihCwEQQ3phLo7I/Pwycf8uAx+sRHwwk5U9Aui/IZYgQRyMqXafQOw5QQ7DM1Z+WyEXWIqSuJHhG2A==}
-
-  iconv-lite@0.4.24:
-    resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==}
-    engines: {node: '>=0.10.0'}
-
-  ieee754@1.2.1:
-    resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
-
-  ignore@5.3.2:
-    resolution: {integrity: sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==}
-    engines: {node: '>= 4'}
-
-  ignore@6.0.2:
-    resolution: {integrity: sha512-InwqeHHN2XpumIkMvpl/DCJVrAHgCsG5+cn1XlnLWGwtZBm8QJfSusItfrwx81CTp5agNZqpKU2J/ccC5nGT4A==}
-    engines: {node: '>= 4'}
-
-  image-size@0.5.5:
-    resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-
-  immediate@3.0.6:
-    resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==}
-
-  immer@9.0.21:
-    resolution: {integrity: sha512-bc4NBHqOqSfRW7POMkHd51LvClaeMXpm8dx0e8oE2GORbq5aRK7Bxl4FyzVLdGtLmvLKL7BTDBG5ACQm4HWjTA==}
-
-  immutable@4.3.7:
-    resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==}
-
-  import-fresh@3.3.0:
-    resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==}
-    engines: {node: '>=6'}
-
-  import-meta-resolve@4.1.0:
-    resolution: {integrity: sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==}
-
-  importx@0.4.4:
-    resolution: {integrity: sha512-Lo1pukzAREqrBnnHC+tj+lreMTAvyxtkKsMxLY8H15M/bvLl54p3YuoTI70Tz7Il0AsgSlD7Lrk/FaApRcBL7w==}
-
-  imurmurhash@0.1.4:
-    resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==}
-    engines: {node: '>=0.8.19'}
-
-  inflation@2.1.0:
-    resolution: {integrity: sha512-t54PPJHG1Pp7VQvxyVCJ9mBbjG3Hqryges9bXoOO6GExCPa+//i/d5GSuFtpx3ALLd7lgIAur6zrIlBQyJuMlQ==}
-    engines: {node: '>= 0.8.0'}
-
-  inflight@1.0.6:
-    resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
-    deprecated: This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.
-
-  inherits@2.0.4:
-    resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
-
-  ini@1.3.8:
-    resolution: {integrity: sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==}
-
-  ini@4.1.1:
-    resolution: {integrity: sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  inquirer@8.2.5:
-    resolution: {integrity: sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ==}
-    engines: {node: '>=12.0.0'}
-
-  internal-slot@1.0.7:
-    resolution: {integrity: sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==}
-    engines: {node: '>= 0.4'}
-
-  is-accessor-descriptor@1.0.1:
-    resolution: {integrity: sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==}
-    engines: {node: '>= 0.10'}
-
-  is-array-buffer@3.0.4:
-    resolution: {integrity: sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==}
-    engines: {node: '>= 0.4'}
-
-  is-arrayish@0.2.1:
-    resolution: {integrity: sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==}
-
-  is-bigint@1.0.4:
-    resolution: {integrity: sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==}
-
-  is-binary-path@2.1.0:
-    resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
-    engines: {node: '>=8'}
-
-  is-boolean-object@1.1.2:
-    resolution: {integrity: sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==}
-    engines: {node: '>= 0.4'}
-
-  is-buffer@1.1.6:
-    resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
-
-  is-callable@1.2.7:
-    resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
-    engines: {node: '>= 0.4'}
-
-  is-core-module@2.15.1:
-    resolution: {integrity: sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==}
-    engines: {node: '>= 0.4'}
-
-  is-data-descriptor@1.0.1:
-    resolution: {integrity: sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==}
-    engines: {node: '>= 0.4'}
-
-  is-data-view@1.0.1:
-    resolution: {integrity: sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==}
-    engines: {node: '>= 0.4'}
-
-  is-date-object@1.0.5:
-    resolution: {integrity: sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==}
-    engines: {node: '>= 0.4'}
-
-  is-descriptor@0.1.7:
-    resolution: {integrity: sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==}
-    engines: {node: '>= 0.4'}
-
-  is-descriptor@1.0.3:
-    resolution: {integrity: sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==}
-    engines: {node: '>= 0.4'}
-
-  is-extendable@0.1.1:
-    resolution: {integrity: sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==}
-    engines: {node: '>=0.10.0'}
-
-  is-extendable@1.0.1:
-    resolution: {integrity: sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==}
-    engines: {node: '>=0.10.0'}
-
-  is-extglob@2.1.1:
-    resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
-    engines: {node: '>=0.10.0'}
-
-  is-fullwidth-code-point@3.0.0:
-    resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
-    engines: {node: '>=8'}
-
-  is-fullwidth-code-point@4.0.0:
-    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
-    engines: {node: '>=12'}
-
-  is-fullwidth-code-point@5.0.0:
-    resolution: {integrity: sha512-OVa3u9kkBbw7b8Xw5F9P+D/T9X+Z4+JruYVNapTjPYZYUznQ5YfWeFkOj606XYYW8yugTfC8Pj0hYqvi4ryAhA==}
-    engines: {node: '>=18'}
-
-  is-glob@4.0.3:
-    resolution: {integrity: sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==}
-    engines: {node: '>=0.10.0'}
-
-  is-hotkey@0.2.0:
-    resolution: {integrity: sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==}
-
-  is-interactive@1.0.0:
-    resolution: {integrity: sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==}
-    engines: {node: '>=8'}
-
-  is-negative-zero@2.0.3:
-    resolution: {integrity: sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==}
-    engines: {node: '>= 0.4'}
-
-  is-number-object@1.0.7:
-    resolution: {integrity: sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==}
-    engines: {node: '>= 0.4'}
-
-  is-number@3.0.0:
-    resolution: {integrity: sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==}
-    engines: {node: '>=0.10.0'}
-
-  is-number@7.0.0:
-    resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
-    engines: {node: '>=0.12.0'}
-
-  is-obj@2.0.0:
-    resolution: {integrity: sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==}
-    engines: {node: '>=8'}
-
-  is-plain-obj@1.1.0:
-    resolution: {integrity: sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==}
-    engines: {node: '>=0.10.0'}
-
-  is-plain-object@2.0.4:
-    resolution: {integrity: sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==}
-    engines: {node: '>=0.10.0'}
-
-  is-plain-object@5.0.0:
-    resolution: {integrity: sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==}
-    engines: {node: '>=0.10.0'}
-
-  is-regex@1.1.4:
-    resolution: {integrity: sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==}
-    engines: {node: '>= 0.4'}
-
-  is-shared-array-buffer@1.0.3:
-    resolution: {integrity: sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==}
-    engines: {node: '>= 0.4'}
-
-  is-stream@3.0.0:
-    resolution: {integrity: sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  is-string@1.0.7:
-    resolution: {integrity: sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==}
-    engines: {node: '>= 0.4'}
-
-  is-symbol@1.0.4:
-    resolution: {integrity: sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==}
-    engines: {node: '>= 0.4'}
-
-  is-text-path@2.0.0:
-    resolution: {integrity: sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==}
-    engines: {node: '>=8'}
-
-  is-typed-array@1.1.13:
-    resolution: {integrity: sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==}
-    engines: {node: '>= 0.4'}
-
-  is-unicode-supported@0.1.0:
-    resolution: {integrity: sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==}
-    engines: {node: '>=10'}
-
-  is-url@1.2.4:
-    resolution: {integrity: sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==}
-
-  is-utf8@0.2.1:
-    resolution: {integrity: sha512-rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==}
-
-  is-weakref@1.0.2:
-    resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
-
-  is-windows@1.0.2:
-    resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
-    engines: {node: '>=0.10.0'}
-
-  isarray@1.0.0:
-    resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==}
-
-  isarray@2.0.5:
-    resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-
-  isexe@2.0.0:
-    resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==}
-
-  isobject@2.1.0:
-    resolution: {integrity: sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==}
-    engines: {node: '>=0.10.0'}
-
-  isobject@3.0.1:
-    resolution: {integrity: sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==}
-    engines: {node: '>=0.10.0'}
-
-  jiti@1.21.6:
-    resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==}
-    hasBin: true
-
-  jiti@2.0.0-beta.3:
-    resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==}
-    hasBin: true
-
-  js-base64@2.6.4:
-    resolution: {integrity: sha512-pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ==}
-
-  js-tokens@4.0.0:
-    resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==}
-
-  js-tokens@9.0.0:
-    resolution: {integrity: sha512-WriZw1luRMlmV3LGJaR6QOJjWwgLUTf89OwT2lUOyjX2dJGBwgmIkbcz+7WFZjrZM635JOIR517++e/67CP9dQ==}
-
-  js-yaml@4.1.0:
-    resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==}
-    hasBin: true
-
-  json-buffer@3.0.1:
-    resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==}
-
-  json-parse-even-better-errors@2.3.1:
-    resolution: {integrity: sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==}
-
-  json-schema-traverse@0.4.1:
-    resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
-
-  json-schema-traverse@1.0.0:
-    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
-
-  json-stable-stringify-without-jsonify@1.0.1:
-    resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==}
-
-  json5@1.0.2:
-    resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
-    hasBin: true
-
-  json5@2.2.3:
-    resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
-    engines: {node: '>=6'}
-    hasBin: true
-
-  jsonfile@6.1.0:
-    resolution: {integrity: sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==}
-
-  jsonparse@1.3.1:
-    resolution: {integrity: sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==}
-    engines: {'0': node >= 0.2.0}
-
-  jszip@3.10.1:
-    resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==}
-
-  keygrip@1.1.0:
-    resolution: {integrity: sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==}
-    engines: {node: '>= 0.6'}
-
-  keyv@4.5.4:
-    resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==}
-
-  kind-of@3.2.2:
-    resolution: {integrity: sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==}
-    engines: {node: '>=0.10.0'}
-
-  kind-of@4.0.0:
-    resolution: {integrity: sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==}
-    engines: {node: '>=0.10.0'}
-
-  kind-of@5.1.0:
-    resolution: {integrity: sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==}
-    engines: {node: '>=0.10.0'}
-
-  kind-of@6.0.3:
-    resolution: {integrity: sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==}
-    engines: {node: '>=0.10.0'}
-
-  known-css-properties@0.34.0:
-    resolution: {integrity: sha512-tBECoUqNFbyAY4RrbqsBQqDFpGXAEbdD5QKr8kACx3+rnArmuuR22nKQWKazvp07N9yjTyDZaw/20UIH8tL9DQ==}
-
-  known-css-properties@0.35.0:
-    resolution: {integrity: sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==}
-
-  kolorist@1.8.0:
-    resolution: {integrity: sha512-Y+60/zizpJ3HRH8DCss+q95yr6145JXZo46OTpFvDZWLfRCE4qChOyk1b26nMaNpfHHgxagk9dXT5OP0Tfe+dQ==}
-
-  lazystream@1.0.1:
-    resolution: {integrity: sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==}
-    engines: {node: '>= 0.6.3'}
-
-  levn@0.4.1:
-    resolution: {integrity: sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==}
-    engines: {node: '>= 0.8.0'}
-
-  lie@3.3.0:
-    resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==}
-
-  lilconfig@3.1.2:
-    resolution: {integrity: sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==}
-    engines: {node: '>=14'}
-
-  lines-and-columns@1.2.4:
-    resolution: {integrity: sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==}
-
-  lint-staged@15.2.10:
-    resolution: {integrity: sha512-5dY5t743e1byO19P9I4b3x8HJwalIznL5E1FWYnU6OWw33KxNBSLAc6Cy7F2PsFEO8FKnLwjwm5hx7aMF0jzZg==}
-    engines: {node: '>=18.12.0'}
-    hasBin: true
-
-  listenercount@1.0.1:
-    resolution: {integrity: sha512-3mk/Zag0+IJxeDrxSgaDPy4zZ3w05PRZeJNnlWhzFz5OkX49J4krc+A8X2d2M69vGMBEX0uyl8M+W+8gH+kBqQ==}
-
-  listr2@8.2.5:
-    resolution: {integrity: sha512-iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==}
-    engines: {node: '>=18.0.0'}
-
-  load-tsconfig@0.2.5:
-    resolution: {integrity: sha512-IXO6OCs9yg8tMKzfPZ1YmheJbZCiEsnBdcB03l0OcfK9prKnJb96siuHCr5Fl37/yo9DnKU+TLpxzTUspw9shg==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  loader-utils@1.4.2:
-    resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
-    engines: {node: '>=4.0.0'}
-
-  local-pkg@0.5.0:
-    resolution: {integrity: sha512-ok6z3qlYyCDS4ZEU27HaU6x/xZa9Whf8jD4ptH5UZTQYZVYeb9bnZ3ojVhiJNLiXK1Hfc0GNbLXcmZ5plLDDBg==}
-    engines: {node: '>=14'}
-
-  locate-path@6.0.0:
-    resolution: {integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==}
-    engines: {node: '>=10'}
-
-  locate-path@7.2.0:
-    resolution: {integrity: sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  lodash-es@4.17.21:
-    resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
-
-  lodash-unified@1.0.3:
-    resolution: {integrity: sha512-WK9qSozxXOD7ZJQlpSqOT+om2ZfcT4yO+03FuzAHD0wF6S0l0090LRPDx3vhTTLZ8cFKpBn+IOcVXK6qOcIlfQ==}
-    peerDependencies:
-      '@types/lodash-es': '*'
-      lodash: '*'
-      lodash-es: '*'
-
-  lodash.camelcase@4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
-
-  lodash.clonedeep@4.5.0:
-    resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
-
-  lodash.debounce@4.0.8:
-    resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
-
-  lodash.defaults@4.2.0:
-    resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
-
-  lodash.difference@4.5.0:
-    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
-
-  lodash.escaperegexp@4.1.2:
-    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
-
-  lodash.flatten@4.4.0:
-    resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
-
-  lodash.foreach@4.5.0:
-    resolution: {integrity: sha512-aEXTF4d+m05rVOAUG3z4vZZ4xVexLKZGF0lIxuHZ1Hplpk/3B6Z1+/ICICYRLm7c41Z2xiejbkCkJoTlypoXhQ==}
-
-  lodash.groupby@4.6.0:
-    resolution: {integrity: sha512-5dcWxm23+VAoz+awKmBaiBvzox8+RqMgFhi7UvX9DHZr2HdxHXM/Wrf8cfKpsW37RNrvtPn6hSwNqurSILbmJw==}
-
-  lodash.isboolean@3.0.3:
-    resolution: {integrity: sha512-Bz5mupy2SVbPHURB98VAcw+aHh4vRV5IPNhILUCsOzRmsTmSQ17jIuqopAentWoehktxGd9e/hbIXq980/1QJg==}
-
-  lodash.isequal@4.5.0:
-    resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
-
-  lodash.isfunction@3.0.9:
-    resolution: {integrity: sha512-AirXNj15uRIMMPihnkInB4i3NHeb4iBtNg9WRWuK2o31S+ePwwNmDPaTL3o7dTJ+VXNZim7rFs4rxN4YU1oUJw==}
-
-  lodash.isnil@4.0.0:
-    resolution: {integrity: sha512-up2Mzq3545mwVnMhTDMdfoG1OurpA/s5t88JmQX809eH3C8491iu2sfKhTfhQtKY78oPNhiaHJUpT/dUDAAtng==}
-
-  lodash.isplainobject@4.0.6:
-    resolution: {integrity: sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==}
-
-  lodash.isundefined@3.0.1:
-    resolution: {integrity: sha512-MXB1is3s899/cD8jheYYE2V9qTHwKvt+npCwpD+1Sxm3Q3cECXCiYHjeHWXNwr6Q0SOBPrYUDxendrO6goVTEA==}
-
-  lodash.kebabcase@4.1.1:
-    resolution: {integrity: sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==}
-
-  lodash.map@4.6.0:
-    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
-
-  lodash.merge@4.6.2:
-    resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
-
-  lodash.mergewith@4.6.2:
-    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
-
-  lodash.snakecase@4.1.1:
-    resolution: {integrity: sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==}
-
-  lodash.startcase@4.4.0:
-    resolution: {integrity: sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==}
-
-  lodash.throttle@4.1.1:
-    resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
-
-  lodash.toarray@4.4.0:
-    resolution: {integrity: sha512-QyffEA3i5dma5q2490+SgCvDN0pXLmRGSyAANuVi0HQ01Pkfr9fuoKQW8wm1wGBnJITs/mS7wQvS6VshUEBFCw==}
-
-  lodash.truncate@4.4.2:
-    resolution: {integrity: sha512-jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw==}
-
-  lodash.union@4.6.0:
-    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
-
-  lodash.uniq@4.5.0:
-    resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
-
-  lodash.upperfirst@4.3.1:
-    resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
-
-  lodash@4.17.21:
-    resolution: {integrity: sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==}
-
-  log-symbols@4.1.0:
-    resolution: {integrity: sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==}
-    engines: {node: '>=10'}
-
-  log-update@6.1.0:
-    resolution: {integrity: sha512-9ie8ItPR6tjY5uYJh8K/Zrv/RMZ5VOlOWvtZdEHYSTFKZfIBPQa9tOAEeAWhd+AnIneLJ22w5fjOYtoutpWq5w==}
-    engines: {node: '>=18'}
-
-  longest@2.0.1:
-    resolution: {integrity: sha512-Ajzxb8CM6WAnFjgiloPsI3bF+WCxcvhdIG3KNA2KN962+tdBsHcuQ4k4qX/EcS/2CRkcc0iAkR956Nib6aXU/Q==}
-    engines: {node: '>=0.10.0'}
-
-  magic-string@0.30.12:
-    resolution: {integrity: sha512-Ea8I3sQMVXr8JhN4z+H/d8zwo+tYDgHE9+5G4Wnrwhs0gaK9fXTKx0Tw5Xwsd/bCPTTZNRAdpyzvoeORe9LYpw==}
-
-  map-cache@0.2.2:
-    resolution: {integrity: sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==}
-    engines: {node: '>=0.10.0'}
-
-  map-visit@1.0.0:
-    resolution: {integrity: sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==}
-    engines: {node: '>=0.10.0'}
-
-  mathml-tag-names@2.1.3:
-    resolution: {integrity: sha512-APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==}
-
-  mdn-data@2.0.14:
-    resolution: {integrity: sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow==}
-
-  mdn-data@2.12.1:
-    resolution: {integrity: sha512-rsfnCbOHjqrhWxwt5/wtSLzpoKTzW7OXdT5lLOIH1OTYhWu9rRJveGq0sKvDZODABH7RX+uoR+DYcpFnq4Tf6Q==}
-
-  mdn-data@2.12.2:
-    resolution: {integrity: sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==}
-
-  media-typer@0.3.0:
-    resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
-    engines: {node: '>= 0.6'}
-
-  memoize-one@6.0.0:
-    resolution: {integrity: sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==}
-
-  meow@12.1.1:
-    resolution: {integrity: sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==}
-    engines: {node: '>=16.10'}
-
-  meow@13.2.0:
-    resolution: {integrity: sha512-pxQJQzB6djGPXh08dacEloMFopsOqGVRKFPYvPOt9XDZ1HasbgDZA74CJGreSU4G3Ak7EFJGoiH2auq+yXISgA==}
-    engines: {node: '>=18'}
-
-  merge-options@1.0.1:
-    resolution: {integrity: sha512-iuPV41VWKWBIOpBsjoxjDZw8/GbSfZ2mk7N1453bwMrfzdrIk7EzBd+8UVR6rkw67th7xnk9Dytl3J+lHPdxvg==}
-    engines: {node: '>=4'}
-
-  merge-stream@2.0.0:
-    resolution: {integrity: sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==}
-
-  merge2@1.4.1:
-    resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
-    engines: {node: '>= 8'}
-
-  merge@2.1.1:
-    resolution: {integrity: sha512-jz+Cfrg9GWOZbQAnDQ4hlVnQky+341Yk5ru8bZSe6sIDTCIg8n9i/u7hSQGSVOF3C7lH6mGtqjkiT9G4wFLL0w==}
-
-  micromatch@3.1.0:
-    resolution: {integrity: sha512-3StSelAE+hnRvMs8IdVW7Uhk8CVed5tp+kLLGlBP6WiRAXS21GPGu/Nat4WNPXj2Eoc24B02SaeoyozPMfj0/g==}
-    engines: {node: '>=0.10.0'}
-
-  micromatch@4.0.8:
-    resolution: {integrity: sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==}
-    engines: {node: '>=8.6'}
-
-  mime-db@1.52.0:
-    resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
-    engines: {node: '>= 0.6'}
-
-  mime-match@1.0.2:
-    resolution: {integrity: sha512-VXp/ugGDVh3eCLOBCiHZMYWQaTNUHv2IJrut+yXA6+JbLPXHglHwfS/5A5L0ll+jkCY7fIzRJcH6OIunF+c6Cg==}
-
-  mime-types@2.1.35:
-    resolution: {integrity: sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==}
-    engines: {node: '>= 0.6'}
-
-  mime@3.0.0:
-    resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-
-  mimic-fn@2.1.0:
-    resolution: {integrity: sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==}
-    engines: {node: '>=6'}
-
-  mimic-fn@4.0.0:
-    resolution: {integrity: sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==}
-    engines: {node: '>=12'}
-
-  mimic-function@5.0.1:
-    resolution: {integrity: sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==}
-    engines: {node: '>=18'}
-
-  minimatch@3.1.2:
-    resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
-
-  minimatch@5.1.6:
-    resolution: {integrity: sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==}
-    engines: {node: '>=10'}
-
-  minimatch@9.0.5:
-    resolution: {integrity: sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
-  minimist@1.2.7:
-    resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
-
-  minimist@1.2.8:
-    resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
-
-  mixin-deep@1.3.2:
-    resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
-    engines: {node: '>=0.10.0'}
-
-  mkdirp@0.5.6:
-    resolution: {integrity: sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==}
-    hasBin: true
-
-  mlly@1.7.2:
-    resolution: {integrity: sha512-tN3dvVHYVz4DhSXinXIk7u9syPYaJvio118uomkovAtWBT+RdbP6Lfh/5Lvo519YMmwBafwlh20IPTXIStscpA==}
-
-  mrmime@2.0.0:
-    resolution: {integrity: sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==}
-    engines: {node: '>=10'}
-
-  ms@2.0.0:
-    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
-
-  ms@2.1.3:
-    resolution: {integrity: sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==}
-
-  muggle-string@0.4.1:
-    resolution: {integrity: sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==}
-
-  mute-stream@0.0.8:
-    resolution: {integrity: sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==}
-
-  namespace-emitter@2.0.1:
-    resolution: {integrity: sha512-N/sMKHniSDJBjfrkbS/tpkPj4RAbvW3mr8UAzvlMHyun93XEm83IAvhWtJVHo+RHn/oO8Job5YN4b+wRjSVp5g==}
-
-  nanoid@3.3.7:
-    resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
-    engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
-    hasBin: true
-
-  nanomatch@1.2.13:
-    resolution: {integrity: sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==}
-    engines: {node: '>=0.10.0'}
-
-  natural-compare@1.4.0:
-    resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==}
-
-  next-tick@1.1.0:
-    resolution: {integrity: sha512-CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==}
-
-  node-addon-api@7.1.1:
-    resolution: {integrity: sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==}
-
-  node-fetch-native@1.6.4:
-    resolution: {integrity: sha512-IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==}
-
-  node-releases@2.0.18:
-    resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==}
-
-  normalize-path@3.0.0:
-    resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==}
-    engines: {node: '>=0.10.0'}
-
-  normalize-range@0.1.2:
-    resolution: {integrity: sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==}
-    engines: {node: '>=0.10.0'}
-
-  normalize-wheel-es@1.2.0:
-    resolution: {integrity: sha512-Wj7+EJQ8mSuXr2iWfnujrimU35R2W4FAErEyTmJoJ7ucwTn2hOUSsRehMb5RSYkxXGTM7Y9QpvPmp++w5ftoJw==}
-
-  npm-run-path@5.3.0:
-    resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  nprogress@0.2.0:
-    resolution: {integrity: sha512-I19aIingLgR1fmhftnbWWO3dXc0hSxqHQHQb3H8m+K3TnEn/iSeTZZOyvKXWqQESMwuUVnatlCnZdLBZZt2VSA==}
-
-  nth-check@2.1.1:
-    resolution: {integrity: sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==}
-
-  object-assign@4.1.1:
-    resolution: {integrity: sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==}
-    engines: {node: '>=0.10.0'}
-
-  object-copy@0.1.0:
-    resolution: {integrity: sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==}
-    engines: {node: '>=0.10.0'}
-
-  object-inspect@1.13.3:
-    resolution: {integrity: sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==}
-    engines: {node: '>= 0.4'}
-
-  object-keys@1.1.1:
-    resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
-    engines: {node: '>= 0.4'}
-
-  object-visit@1.0.1:
-    resolution: {integrity: sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==}
-    engines: {node: '>=0.10.0'}
-
-  object.assign@4.1.5:
-    resolution: {integrity: sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==}
-    engines: {node: '>= 0.4'}
-
-  object.pick@1.3.0:
-    resolution: {integrity: sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==}
-    engines: {node: '>=0.10.0'}
-
-  ofetch@1.4.1:
-    resolution: {integrity: sha512-QZj2DfGplQAr2oj9KzceK9Hwz6Whxazmn85yYeVuS3u9XTMOGMRx0kO95MQ+vLsj/S/NwBDMMLU5hpxvI6Tklw==}
-
-  once@1.4.0:
-    resolution: {integrity: sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==}
-
-  onetime@5.1.2:
-    resolution: {integrity: sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==}
-    engines: {node: '>=6'}
-
-  onetime@6.0.0:
-    resolution: {integrity: sha512-1FlR+gjXK7X+AsAHso35MnyN5KqGwJRi/31ft6x0M194ht7S+rWAvd7PHss9xSKMzE0asv1pyIHaJYq+BbacAQ==}
-    engines: {node: '>=12'}
-
-  onetime@7.0.0:
-    resolution: {integrity: sha512-VXJjc87FScF88uafS3JllDgvAm+c/Slfz06lorj2uAY34rlUu0Nt+v8wreiImcrgAjjIHp1rXpTDlLOGw29WwQ==}
-    engines: {node: '>=18'}
-
-  optionator@0.9.4:
-    resolution: {integrity: sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==}
-    engines: {node: '>= 0.8.0'}
-
-  ora@5.4.1:
-    resolution: {integrity: sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==}
-    engines: {node: '>=10'}
-
-  os-tmpdir@1.0.2:
-    resolution: {integrity: sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==}
-    engines: {node: '>=0.10.0'}
-
-  p-limit@3.1.0:
-    resolution: {integrity: sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==}
-    engines: {node: '>=10'}
-
-  p-limit@4.0.0:
-    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  p-locate@5.0.0:
-    resolution: {integrity: sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==}
-    engines: {node: '>=10'}
-
-  p-locate@6.0.0:
-    resolution: {integrity: sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  package-manager-detector@0.2.2:
-    resolution: {integrity: sha512-VgXbyrSNsml4eHWIvxxG/nTL4wgybMTXCV2Un/+yEc3aDKKU6nQBZjbeP3Pl3qm9Qg92X/1ng4ffvCeD/zwHgg==}
-
-  pako@1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-
-  parent-module@1.0.1:
-    resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
-    engines: {node: '>=6'}
-
-  parse-json@5.2.0:
-    resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==}
-    engines: {node: '>=8'}
-
-  parse-passwd@1.0.0:
-    resolution: {integrity: sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==}
-    engines: {node: '>=0.10.0'}
-
-  pascalcase@0.1.1:
-    resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
-    engines: {node: '>=0.10.0'}
-
-  path-browserify@1.0.1:
-    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
-
-  path-exists@4.0.0:
-    resolution: {integrity: sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==}
-    engines: {node: '>=8'}
-
-  path-exists@5.0.0:
-    resolution: {integrity: sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==}
-    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
-
-  path-is-absolute@1.0.1:
-    resolution: {integrity: sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==}
-    engines: {node: '>=0.10.0'}
-
-  path-key@3.1.1:
-    resolution: {integrity: sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==}
-    engines: {node: '>=8'}
-
-  path-key@4.0.0:
-    resolution: {integrity: sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==}
-    engines: {node: '>=12'}
-
-  path-to-regexp@6.2.2:
-    resolution: {integrity: sha512-GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==}
-
-  path-to-regexp@6.3.0:
-    resolution: {integrity: sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==}
-
-  path-type@4.0.0:
-    resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
-    engines: {node: '>=8'}
-
-  pathe@0.2.0:
-    resolution: {integrity: sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==}
-
-  pathe@1.1.2:
-    resolution: {integrity: sha512-whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==}
-
-  perfect-debounce@1.0.0:
-    resolution: {integrity: sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==}
-
-  picocolors@1.1.1:
-    resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
-
-  picomatch@2.3.1:
-    resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==}
-    engines: {node: '>=8.6'}
-
-  picomatch@4.0.2:
-    resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==}
-    engines: {node: '>=12'}
-
-  pidtree@0.6.0:
-    resolution: {integrity: sha512-eG2dWTVw5bzqGRztnHExczNxt5VGsE6OwTeCG3fdUf9KBsZzO3R5OIIIzWR+iZA0NtZ+RDVdaoE2dK1cn6jH4g==}
-    engines: {node: '>=0.10'}
-    hasBin: true
-
-  pinia@2.2.6:
-    resolution: {integrity: sha512-vIsR8JkDN5Ga2vAxqOE2cJj4VtsHnzpR1Fz30kClxlh0yCHfec6uoMeM3e/ddqmwFUejK3NlrcQa/shnpyT4hA==}
-    peerDependencies:
-      '@vue/composition-api': ^1.4.0
-      typescript: '>=4.4.4'
-      vue: ^2.6.14 || ^3.5.11
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-      typescript:
-        optional: true
-
-  pkg-types@1.2.1:
-    resolution: {integrity: sha512-sQoqa8alT3nHjGuTjuKgOnvjo4cljkufdtLMnO2LBP/wRwuDlo1tkaEdMxCRhyGRPacv/ztlZgDPm2b7FAmEvw==}
-
-  posix-character-classes@0.1.1:
-    resolution: {integrity: sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==}
-    engines: {node: '>=0.10.0'}
-
-  possible-typed-array-names@1.0.0:
-    resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==}
-    engines: {node: '>= 0.4'}
-
-  postcss-html@1.7.0:
-    resolution: {integrity: sha512-MfcMpSUIaR/nNgeVS8AyvyDugXlADjN9AcV7e5rDfrF1wduIAGSkL4q2+wgrZgA3sHVAHLDO9FuauHhZYW2nBw==}
-    engines: {node: ^12 || >=14}
-
-  postcss-media-query-parser@0.2.3:
-    resolution: {integrity: sha512-3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==}
-
-  postcss-prefix-selector@1.16.1:
-    resolution: {integrity: sha512-Umxu+FvKMwlY6TyDzGFoSUnzW+NOfMBLyC1tAkIjgX+Z/qGspJeRjVC903D7mx7TuBpJlwti2ibXtWuA7fKMeQ==}
-    peerDependencies:
-      postcss: '>4 <9'
-
-  postcss-resolve-nested-selector@0.1.6:
-    resolution: {integrity: sha512-0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==}
-
-  postcss-safe-parser@6.0.0:
-    resolution: {integrity: sha512-FARHN8pwH+WiS2OPCxJI8FuRJpTVnn6ZNFiqAM2aeW2LwTHWWmWgIyKC6cUo0L8aeKiF/14MNvnpls6R2PBeMQ==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
-
-  postcss-safe-parser@7.0.1:
-    resolution: {integrity: sha512-0AioNCJZ2DPYz5ABT6bddIqlhgwhpHZ/l65YAYo0BCIn0xiDpsnTHz0gnoTGk0OXZW0JRs+cDwL8u/teRdz+8A==}
-    engines: {node: '>=18.0'}
-    peerDependencies:
-      postcss: ^8.4.31
-
-  postcss-scss@4.0.9:
-    resolution: {integrity: sha512-AjKOeiwAitL/MXxQW2DliT28EKukvvbEWx3LBmJIRN8KfBGZbRTxNYW0kSqi1COiTZ57nZ9NW06S6ux//N1c9A==}
-    engines: {node: '>=12.0'}
-    peerDependencies:
-      postcss: ^8.4.29
-
-  postcss-selector-parser@6.1.2:
-    resolution: {integrity: sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==}
-    engines: {node: '>=4'}
-
-  postcss-sorting@8.0.2:
-    resolution: {integrity: sha512-M9dkSrmU00t/jK7rF6BZSZauA5MAaBW4i5EnJXspMwt4iqTh/L9j6fgMnbElEOfyRyfLfVbIHj/R52zHzAPe1Q==}
-    peerDependencies:
-      postcss: ^8.4.20
-
-  postcss-value-parser@4.2.0:
-    resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==}
-
-  postcss@5.2.18:
-    resolution: {integrity: sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==}
-    engines: {node: '>=0.12'}
-
-  postcss@8.4.49:
-    resolution: {integrity: sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==}
-    engines: {node: ^10 || ^12 || >=14}
-
-  posthtml-parser@0.2.1:
-    resolution: {integrity: sha512-nPC53YMqJnc/+1x4fRYFfm81KV2V+G9NZY+hTohpYg64Ay7NemWWcV4UWuy/SgMupqQ3kJ88M/iRfZmSnxT+pw==}
-
-  posthtml-rename-id@1.0.12:
-    resolution: {integrity: sha512-UKXf9OF/no8WZo9edRzvuMenb6AD5hDLzIepJW+a4oJT+T/Lx7vfMYWT4aWlGNQh0WMhnUx1ipN9OkZ9q+ddEw==}
-
-  posthtml-render@1.4.0:
-    resolution: {integrity: sha512-W1779iVHGfq0Fvh2PROhCe2QhB8mEErgqzo1wpIt36tCgChafP+hbXIhLDOM8ePJrZcFs0vkNEtdibEWVqChqw==}
-    engines: {node: '>=10'}
-
-  posthtml-svg-mode@1.0.3:
-    resolution: {integrity: sha512-hEqw9NHZ9YgJ2/0G7CECOeuLQKZi8HjWLkBaSVtOWjygQ9ZD8P7tqeowYs7WrFdKsWEKG7o+IlsPY8jrr0CJpQ==}
-
-  posthtml@0.9.2:
-    resolution: {integrity: sha512-spBB5sgC4cv2YcW03f/IAUN1pgDJWNWD8FzkyY4mArLUMJW+KlQhlmUdKAHQuPfb00Jl5xIfImeOsf6YL8QK7Q==}
-    engines: {node: '>=0.10.0'}
-
-  preact@10.24.3:
-    resolution: {integrity: sha512-Z2dPnBnMUfyQfSQ+GBdsGa16hz35YmLmtTLhM169uW944hYL6xzTYkJjC07j+Wosz733pMWx0fgON3JNw1jJQA==}
-
-  prelude-ls@1.2.1:
-    resolution: {integrity: sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==}
-    engines: {node: '>= 0.8.0'}
-
-  prettier-linter-helpers@1.0.0:
-    resolution: {integrity: sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==}
-    engines: {node: '>=6.0.0'}
-
-  prettier@3.3.3:
-    resolution: {integrity: sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==}
-    engines: {node: '>=14'}
-    hasBin: true
-
-  prismjs@1.29.0:
-    resolution: {integrity: sha512-Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==}
-    engines: {node: '>=6'}
-
-  process-nextick-args@2.0.1:
-    resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==}
-
-  proxy-from-env@1.1.0:
-    resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-
-  punycode@2.3.1:
-    resolution: {integrity: sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==}
-    engines: {node: '>=6'}
-
-  qs@6.13.0:
-    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
-    engines: {node: '>=0.6'}
-
-  query-string@4.3.4:
-    resolution: {integrity: sha512-O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q==}
-    engines: {node: '>=0.10.0'}
-
-  queue-microtask@1.2.3:
-    resolution: {integrity: sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==}
-
-  raw-body@2.5.2:
-    resolution: {integrity: sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==}
-    engines: {node: '>= 0.8'}
-
-  readable-stream@2.3.8:
-    resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==}
-
-  readable-stream@3.6.2:
-    resolution: {integrity: sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==}
-    engines: {node: '>= 6'}
-
-  readdir-glob@1.1.3:
-    resolution: {integrity: sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==}
-
-  readdirp@3.6.0:
-    resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
-    engines: {node: '>=8.10.0'}
-
-  readdirp@4.0.2:
-    resolution: {integrity: sha512-yDMz9g+VaZkqBYS/ozoBJwaBhTbZo3UNYQHNRw1D3UFQB8oHB4uS/tAODO+ZLjGWmUbKnIlOWO+aaIiAxrUWHA==}
-    engines: {node: '>= 14.16.0'}
-
-  regenerator-runtime@0.14.1:
-    resolution: {integrity: sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==}
-
-  regex-not@1.0.2:
-    resolution: {integrity: sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==}
-    engines: {node: '>=0.10.0'}
-
-  regexp.prototype.flags@1.5.3:
-    resolution: {integrity: sha512-vqlC04+RQoFalODCbCumG2xIOvapzVMHwsyIGM/SIE8fRhFFsXeH8/QQ+s0T0kDAhKc4k30s73/0ydkHQz6HlQ==}
-    engines: {node: '>= 0.4'}
-
-  repeat-element@1.1.4:
-    resolution: {integrity: sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==}
-    engines: {node: '>=0.10.0'}
-
-  repeat-string@1.6.1:
-    resolution: {integrity: sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==}
-    engines: {node: '>=0.10'}
-
-  require-directory@2.1.1:
-    resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
-    engines: {node: '>=0.10.0'}
-
-  require-from-string@2.0.2:
-    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
-    engines: {node: '>=0.10.0'}
-
-  resolve-dir@1.0.1:
-    resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
-    engines: {node: '>=0.10.0'}
-
-  resolve-from@4.0.0:
-    resolution: {integrity: sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==}
-    engines: {node: '>=4'}
-
-  resolve-from@5.0.0:
-    resolution: {integrity: sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==}
-    engines: {node: '>=8'}
-
-  resolve-pkg-maps@1.0.0:
-    resolution: {integrity: sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==}
-
-  resolve-url@0.2.1:
-    resolution: {integrity: sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==}
-    deprecated: https://github.com/lydell/resolve-url#deprecated
-
-  restore-cursor@3.1.0:
-    resolution: {integrity: sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==}
-    engines: {node: '>=8'}
-
-  restore-cursor@5.1.0:
-    resolution: {integrity: sha512-oMA2dcrw6u0YfxJQXm342bFKX/E4sG9rbTzO9ptUcR/e8A33cHuvStiYOwH7fszkZlZ1z/ta9AAoPk2F4qIOHA==}
-    engines: {node: '>=18'}
-
-  ret@0.1.15:
-    resolution: {integrity: sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==}
-    engines: {node: '>=0.12'}
-
-  reusify@1.0.4:
-    resolution: {integrity: sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==}
-    engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
-
-  rfdc@1.4.1:
-    resolution: {integrity: sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==}
-
-  rimraf@2.7.1:
-    resolution: {integrity: sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==}
-    deprecated: Rimraf versions prior to v4 are no longer supported
-    hasBin: true
-
-  rollup@4.25.0:
-    resolution: {integrity: sha512-uVbClXmR6wvx5R1M3Od4utyLUxrmOcEm3pAtMphn73Apq19PDtHpgZoEvqH2YnnaNUuvKmg2DgRd2Sqv+odyqg==}
-    engines: {node: '>=18.0.0', npm: '>=8.0.0'}
-    hasBin: true
-
-  run-async@2.4.1:
-    resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
-    engines: {node: '>=0.12.0'}
-
-  run-parallel@1.2.0:
-    resolution: {integrity: sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==}
-
-  rxjs@7.8.1:
-    resolution: {integrity: sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg==}
-
-  safe-array-concat@1.1.2:
-    resolution: {integrity: sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==}
-    engines: {node: '>=0.4'}
-
-  safe-buffer@5.1.2:
-    resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==}
-
-  safe-buffer@5.2.1:
-    resolution: {integrity: sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==}
-
-  safe-regex-test@1.0.3:
-    resolution: {integrity: sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==}
-    engines: {node: '>= 0.4'}
-
-  safe-regex@1.1.0:
-    resolution: {integrity: sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==}
-
-  safer-buffer@2.1.2:
-    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-
-  sass@1.80.6:
-    resolution: {integrity: sha512-ccZgdHNiBF1NHBsWvacvT5rju3y1d/Eu+8Ex6c21nHp2lZGLBEtuwc415QfiI1PJa1TpCo3iXwwSRjRpn2Ckjg==}
-    engines: {node: '>=14.0.0'}
-    hasBin: true
-
-  saxes@5.0.1:
-    resolution: {integrity: sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==}
-    engines: {node: '>=10'}
-
-  scroll-into-view-if-needed@2.2.31:
-    resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==}
-
-  scule@1.3.0:
-    resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==}
-
-  semver@7.6.3:
-    resolution: {integrity: sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  set-function-length@1.2.2:
-    resolution: {integrity: sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==}
-    engines: {node: '>= 0.4'}
-
-  set-function-name@2.0.2:
-    resolution: {integrity: sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==}
-    engines: {node: '>= 0.4'}
-
-  set-value@2.0.1:
-    resolution: {integrity: sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==}
-    engines: {node: '>=0.10.0'}
-
-  setimmediate@1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-
-  setprototypeof@1.2.0:
-    resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
-
-  shebang-command@2.0.0:
-    resolution: {integrity: sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==}
-    engines: {node: '>=8'}
-
-  shebang-regex@3.0.0:
-    resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
-    engines: {node: '>=8'}
-
-  side-channel@1.0.6:
-    resolution: {integrity: sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==}
-    engines: {node: '>= 0.4'}
-
-  signal-exit@3.0.7:
-    resolution: {integrity: sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==}
-
-  signal-exit@4.1.0:
-    resolution: {integrity: sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==}
-    engines: {node: '>=14'}
-
-  sirv@2.0.4:
-    resolution: {integrity: sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==}
-    engines: {node: '>= 10'}
-
-  slash@3.0.0:
-    resolution: {integrity: sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==}
-    engines: {node: '>=8'}
-
-  slate-history@0.66.0:
-    resolution: {integrity: sha512-6MWpxGQZiMvSINlCbMW43E2YBSVMCMCIwQfBzGssjWw4kb0qfvj0pIdblWNRQZD0hR6WHP+dHHgGSeVdMWzfng==}
-    peerDependencies:
-      slate: '>=0.65.3'
-
-  slate@0.72.8:
-    resolution: {integrity: sha512-/nJwTswQgnRurpK+bGJFH1oM7naD5qDmHd89JyiKNT2oOKD8marW0QSBtuFnwEbL5aGCS8AmrhXQgNOsn4osAw==}
-
-  slice-ansi@4.0.0:
-    resolution: {integrity: sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==}
-    engines: {node: '>=10'}
-
-  slice-ansi@5.0.0:
-    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
-    engines: {node: '>=12'}
-
-  slice-ansi@7.1.0:
-    resolution: {integrity: sha512-bSiSngZ/jWeX93BqeIAbImyTbEihizcwNjFoRUIY/T1wWQsfsm2Vw1agPKylXvQTU7iASGdHhyqRlqQzfz+Htg==}
-    engines: {node: '>=18'}
-
-  snabbdom@3.6.2:
-    resolution: {integrity: sha512-ig5qOnCDbugFntKi6c7Xlib8bA6xiJVk8O+WdFrV3wxbMqeHO0hXFQC4nAhPVWfZfi8255lcZkNhtIBINCc4+Q==}
-    engines: {node: '>=12.17.0'}
-
-  snapdragon-node@2.1.1:
-    resolution: {integrity: sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==}
-    engines: {node: '>=0.10.0'}
-
-  snapdragon-util@3.0.1:
-    resolution: {integrity: sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==}
-    engines: {node: '>=0.10.0'}
-
-  snapdragon@0.8.2:
-    resolution: {integrity: sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==}
-    engines: {node: '>=0.10.0'}
-
-  sortablejs@1.15.3:
-    resolution: {integrity: sha512-zdK3/kwwAK1cJgy1rwl1YtNTbRmc8qW/+vgXf75A7NHag5of4pyI6uK86ktmQETyWRH7IGaE73uZOOBcGxgqZg==}
-
-  source-map-js@1.2.1:
-    resolution: {integrity: sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==}
-    engines: {node: '>=0.10.0'}
-
-  source-map-resolve@0.5.3:
-    resolution: {integrity: sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==}
-    deprecated: See https://github.com/lydell/source-map-resolve#deprecated
-
-  source-map-support@0.5.21:
-    resolution: {integrity: sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==}
-
-  source-map-url@0.4.1:
-    resolution: {integrity: sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==}
-    deprecated: See https://github.com/lydell/source-map-url#deprecated
-
-  source-map@0.5.7:
-    resolution: {integrity: sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==}
-    engines: {node: '>=0.10.0'}
-
-  source-map@0.6.1:
-    resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
-    engines: {node: '>=0.10.0'}
-
-  split-string@3.1.0:
-    resolution: {integrity: sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==}
-    engines: {node: '>=0.10.0'}
-
-  split2@4.2.0:
-    resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
-    engines: {node: '>= 10.x'}
-
-  ssr-window@3.0.0:
-    resolution: {integrity: sha512-q+8UfWDg9Itrg0yWK7oe5p/XRCJpJF9OBtXfOPgSJl+u3Xd5KI328RUEvUqSMVM9CiQUEf1QdBzJMkYGErj9QA==}
-
-  stable@0.1.8:
-    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
-    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
-
-  static-extend@0.1.2:
-    resolution: {integrity: sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==}
-    engines: {node: '>=0.10.0'}
-
-  statuses@2.0.1:
-    resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
-    engines: {node: '>= 0.8'}
-
-  strict-uri-encode@1.1.0:
-    resolution: {integrity: sha512-R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==}
-    engines: {node: '>=0.10.0'}
-
-  string-argv@0.3.2:
-    resolution: {integrity: sha512-aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==}
-    engines: {node: '>=0.6.19'}
-
-  string-width@4.2.3:
-    resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
-    engines: {node: '>=8'}
-
-  string-width@7.2.0:
-    resolution: {integrity: sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==}
-    engines: {node: '>=18'}
-
-  string.prototype.trim@1.2.9:
-    resolution: {integrity: sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==}
-    engines: {node: '>= 0.4'}
-
-  string.prototype.trimend@1.0.8:
-    resolution: {integrity: sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==}
-
-  string.prototype.trimstart@1.0.8:
-    resolution: {integrity: sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==}
-    engines: {node: '>= 0.4'}
-
-  string_decoder@1.1.1:
-    resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==}
-
-  string_decoder@1.3.0:
-    resolution: {integrity: sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==}
-
-  strip-ansi@3.0.1:
-    resolution: {integrity: sha512-VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg==}
-    engines: {node: '>=0.10.0'}
-
-  strip-ansi@6.0.1:
-    resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
-    engines: {node: '>=8'}
-
-  strip-ansi@7.1.0:
-    resolution: {integrity: sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==}
-    engines: {node: '>=12'}
-
-  strip-bom@4.0.0:
-    resolution: {integrity: sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==}
-    engines: {node: '>=8'}
-
-  strip-final-newline@3.0.0:
-    resolution: {integrity: sha512-dOESqjYr96iWYylGObzd39EuNTa5VJxyvVAEm5Jnh7KGo75V43Hk1odPQkNDyXNmUR6k+gEiDVXnjB8HJ3crXw==}
-    engines: {node: '>=12'}
-
-  strip-json-comments@3.1.1:
-    resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==}
-    engines: {node: '>=8'}
-
-  strip-literal@2.1.0:
-    resolution: {integrity: sha512-Op+UycaUt/8FbN/Z2TWPBLge3jWrP3xj10f3fnYxf052bKuS3EKs1ZQcVGjnEMdsNVAM+plXRdmjrZ/KgG3Skw==}
-
-  stylelint-config-html@1.1.0:
-    resolution: {integrity: sha512-IZv4IVESjKLumUGi+HWeb7skgO6/g4VMuAYrJdlqQFndgbj6WJAXPhaysvBiXefX79upBdQVumgYcdd17gCpjQ==}
-    engines: {node: ^12 || >=14}
-    peerDependencies:
-      postcss-html: ^1.0.0
-      stylelint: '>=14.0.0'
-
-  stylelint-config-recess-order@5.1.1:
-    resolution: {integrity: sha512-eDAHWVBelzDbMbdMj15pSw0Ycykv5eLeriJdbGCp0zd44yvhgZLI+wyVHegzXp5NrstxTPSxl0fuOVKdMm0XLA==}
-    peerDependencies:
-      stylelint: '>=16'
-
-  stylelint-config-recommended-scss@14.1.0:
-    resolution: {integrity: sha512-bhaMhh1u5dQqSsf6ri2GVWWQW5iUjBYgcHkh7SgDDn92ijoItC/cfO/W+fpXshgTQWhwFkP1rVcewcv4jaftRg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      postcss: ^8.3.3
-      stylelint: ^16.6.1
-    peerDependenciesMeta:
-      postcss:
-        optional: true
-
-  stylelint-config-recommended-vue@1.5.0:
-    resolution: {integrity: sha512-65TAK/clUqkNtkZLcuytoxU0URQYlml+30Nhop7sRkCZ/mtWdXt7T+spPSB3KMKlb+82aEVJ4OrcstyDBdbosg==}
-    engines: {node: ^12 || >=14}
-    peerDependencies:
-      postcss-html: ^1.0.0
-      stylelint: '>=14.0.0'
-
-  stylelint-config-recommended@14.0.1:
-    resolution: {integrity: sha512-bLvc1WOz/14aPImu/cufKAZYfXs/A/owZfSMZ4N+16WGXLoX5lOir53M6odBxvhgmgdxCVnNySJmZKx73T93cg==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.1.0
-
-  stylelint-config-standard@36.0.1:
-    resolution: {integrity: sha512-8aX8mTzJ6cuO8mmD5yon61CWuIM4UD8Q5aBcWKGSf6kg+EC3uhB+iOywpTK4ca6ZL7B49en8yanOFtUW0qNzyw==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.1.0
-
-  stylelint-order@6.0.4:
-    resolution: {integrity: sha512-0UuKo4+s1hgQ/uAxlYU4h0o0HS4NiQDud0NAUNI0aa8FJdmYHA5ZZTFHiV5FpmE3071e9pZx5j0QpVJW5zOCUA==}
-    peerDependencies:
-      stylelint: ^14.0.0 || ^15.0.0 || ^16.0.1
-
-  stylelint-scss@6.9.0:
-    resolution: {integrity: sha512-oWOR+g6ccagfrENecImGmorWWjVyWpt2R8bmkhOW8FkNNPGStZPQMqb8QWMW4Lwu9TyPqmyjHkkAsy3weqsnNw==}
-    engines: {node: '>=18.12.0'}
-    peerDependencies:
-      stylelint: ^16.0.2
-
-  stylelint@16.10.0:
-    resolution: {integrity: sha512-z/8X2rZ52dt2c0stVwI9QL2AFJhLhbPkyfpDFcizs200V/g7v+UYY6SNcB9hKOLcDDX/yGLDsY/pX08sLkz9xQ==}
-    engines: {node: '>=18.12.0'}
-    hasBin: true
-
-  supports-color@2.0.0:
-    resolution: {integrity: sha512-KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g==}
-    engines: {node: '>=0.8.0'}
-
-  supports-color@3.2.3:
-    resolution: {integrity: sha512-Jds2VIYDrlp5ui7t8abHN2bjAu4LV/q4N2KivFPpGH0lrka0BMq/33AmECUXlKPcHigkNaqfXRENFju+rlcy+A==}
-    engines: {node: '>=0.8.0'}
-
-  supports-color@5.5.0:
-    resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==}
-    engines: {node: '>=4'}
-
-  supports-color@7.2.0:
-    resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==}
-    engines: {node: '>=8'}
-
-  supports-hyperlinks@3.1.0:
-    resolution: {integrity: sha512-2rn0BZ+/f7puLOHZm1HOJfwBggfaHXUpPUSSG/SWM4TWp5KCfmNYwnC3hruy2rZlMnmWZ+QAGpZfchu3f3695A==}
-    engines: {node: '>=14.18'}
-
-  svg-baker@1.7.0:
-    resolution: {integrity: sha512-nibslMbkXOIkqKVrfcncwha45f97fGuAOn1G99YwnwTj8kF9YiM6XexPcUso97NxOm6GsP0SIvYVIosBis1xLg==}
-
-  svg-tags@1.0.0:
-    resolution: {integrity: sha512-ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==}
-
-  svgo@2.8.0:
-    resolution: {integrity: sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-
-  synckit@0.9.2:
-    resolution: {integrity: sha512-vrozgXDQwYO72vHjUb/HnFbQx1exDjoKzqx23aXEg2a9VIg2TSFZ8FmeZpTjUCFMYw7mpX4BE2SFu8wI7asYsw==}
-    engines: {node: ^14.18.0 || >=16.0.0}
-
-  table@6.8.2:
-    resolution: {integrity: sha512-w2sfv80nrAh2VCbqR5AK27wswXhqcck2AhfnNW76beQXskGZ1V12GwS//yYVa3d3fcvAip2OUnbDAjW2k3v9fA==}
-    engines: {node: '>=10.0.0'}
-
-  tar-stream@2.2.0:
-    resolution: {integrity: sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==}
-    engines: {node: '>=6'}
-
-  terser@5.36.0:
-    resolution: {integrity: sha512-IYV9eNMuFAV4THUspIRXkLakHnV6XO7FEdtKjf/mDyrnqUg9LnlOn6/RwRvM9SZjR4GUq8Nk8zj67FzVARr74w==}
-    engines: {node: '>=10'}
-    hasBin: true
-
-  text-extensions@2.4.0:
-    resolution: {integrity: sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==}
-    engines: {node: '>=8'}
-
-  text-table@0.2.0:
-    resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==}
-
-  through@2.3.8:
-    resolution: {integrity: sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==}
-
-  tiny-warning@1.0.3:
-    resolution: {integrity: sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==}
-
-  tinyexec@0.3.1:
-    resolution: {integrity: sha512-WiCJLEECkO18gwqIp6+hJg0//p23HXp4S+gGtAKu3mI2F2/sXC4FvHvXvB0zJVVaTPhx1/tOwdbRsa1sOBIKqQ==}
-
-  tinyglobby@0.2.10:
-    resolution: {integrity: sha512-Zc+8eJlFMvgatPZTl6A9L/yht8QqdmUNtURHaKZLmKBE12hNPSrqNkUp2cs3M/UKmNVVAMFQYSjYIVHDjW5zew==}
-    engines: {node: '>=12.0.0'}
-
-  tmp@0.0.33:
-    resolution: {integrity: sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==}
-    engines: {node: '>=0.6.0'}
-
-  tmp@0.2.3:
-    resolution: {integrity: sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==}
-    engines: {node: '>=14.14'}
-
-  to-object-path@0.3.0:
-    resolution: {integrity: sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==}
-    engines: {node: '>=0.10.0'}
-
-  to-regex-range@2.1.1:
-    resolution: {integrity: sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==}
-    engines: {node: '>=0.10.0'}
-
-  to-regex-range@5.0.1:
-    resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==}
-    engines: {node: '>=8.0'}
-
-  to-regex@3.0.2:
-    resolution: {integrity: sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==}
-    engines: {node: '>=0.10.0'}
-
-  toidentifier@1.0.1:
-    resolution: {integrity: sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==}
-    engines: {node: '>=0.6'}
-
-  totalist@3.0.1:
-    resolution: {integrity: sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==}
-    engines: {node: '>=6'}
-
-  traverse@0.3.9:
-    resolution: {integrity: sha512-iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ==}
-
-  traverse@0.6.10:
-    resolution: {integrity: sha512-hN4uFRxbK+PX56DxYiGHsTn2dME3TVr9vbNqlQGcGcPhJAn+tdP126iA+TArMpI4YSgnTkMWyoLl5bf81Hi5TA==}
-    engines: {node: '>= 0.4'}
-
-  ts-api-utils@1.4.0:
-    resolution: {integrity: sha512-032cPxaEKwM+GT3vA5JXNzIaizx388rhsSW79vGRNGXfRRAdEAn2mvk36PvK5HnOchyWZ7afLEXqYCvPCrzuzQ==}
-    engines: {node: '>=16'}
-    peerDependencies:
-      typescript: '>=4.2.0'
-
-  tslib@2.3.0:
-    resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
-
-  tslib@2.8.1:
-    resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==}
-
-  tsscmp@1.0.6:
-    resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
-    engines: {node: '>=0.6.x'}
-
-  tsx@4.19.2:
-    resolution: {integrity: sha512-pOUl6Vo2LUq/bSa8S5q7b91cgNSjctn9ugq/+Mvow99qW6x/UZYwzxy/3NmqoT66eHYfCVvFvACC58UBPFf28g==}
-    engines: {node: '>=18.0.0'}
-    hasBin: true
-
-  type-check@0.4.0:
-    resolution: {integrity: sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==}
-    engines: {node: '>= 0.8.0'}
-
-  type-fest@0.20.2:
-    resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
-    engines: {node: '>=10'}
-
-  type-fest@0.21.3:
-    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-    engines: {node: '>=10'}
-
-  type-is@1.6.18:
-    resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
-    engines: {node: '>= 0.6'}
-
-  type@2.7.3:
-    resolution: {integrity: sha512-8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==}
-
-  typed-array-buffer@1.0.2:
-    resolution: {integrity: sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-byte-length@1.0.1:
-    resolution: {integrity: sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-byte-offset@1.0.2:
-    resolution: {integrity: sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==}
-    engines: {node: '>= 0.4'}
-
-  typed-array-length@1.0.6:
-    resolution: {integrity: sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==}
-    engines: {node: '>= 0.4'}
-
-  typedarray.prototype.slice@1.0.3:
-    resolution: {integrity: sha512-8WbVAQAUlENo1q3c3zZYuy5k9VzBQvp8AX9WOtbvyWlLM1v5JaSRmjubLjzHF4JFtptjH/5c/i95yaElvcjC0A==}
-    engines: {node: '>= 0.4'}
-
-  typescript-eslint@8.14.0:
-    resolution: {integrity: sha512-K8fBJHxVL3kxMmwByvz8hNdBJ8a0YqKzKDX6jRlrjMuNXyd5T2V02HIq37+OiWXvUUOXgOOGiSSOh26Mh8pC3w==}
-    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  typescript@5.5.4:
-    resolution: {integrity: sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==}
-    engines: {node: '>=14.17'}
-    hasBin: true
-
-  ufo@1.5.4:
-    resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==}
-
-  unbox-primitive@1.0.2:
-    resolution: {integrity: sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==}
-
-  unconfig@0.5.5:
-    resolution: {integrity: sha512-VQZ5PT9HDX+qag0XdgQi8tJepPhXiR/yVOkn707gJDKo31lGjRilPREiQJ9Z6zd/Ugpv6ZvO5VxVIcatldYcNQ==}
-
-  undici-types@6.19.8:
-    resolution: {integrity: sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==}
-
-  unicorn-magic@0.1.0:
-    resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==}
-    engines: {node: '>=18'}
-
-  unimport@3.13.1:
-    resolution: {integrity: sha512-nNrVzcs93yrZQOW77qnyOVHtb68LegvhYFwxFMfuuWScmwQmyVCG/NBuN8tYsaGzgQUVYv34E/af+Cc9u4og4A==}
-
-  union-value@1.0.1:
-    resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
-    engines: {node: '>=0.10.0'}
-
-  universalify@2.0.1:
-    resolution: {integrity: sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==}
-    engines: {node: '>= 10.0.0'}
-
-  unocss@0.63.6:
-    resolution: {integrity: sha512-OKJJKEFWVz+Lsf3JdOgRiRtL+QOUQRBov89taUcCPFPZtrhP6pPVFCZHD9qMvY4IChMX7dzalQax3ZXJ3hbtkQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@unocss/webpack': 0.63.6
-      vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0
-    peerDependenciesMeta:
-      '@unocss/webpack':
-        optional: true
-      vite:
-        optional: true
-
-  unpipe@1.0.0:
-    resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
-    engines: {node: '>= 0.8'}
-
-  unplugin-auto-import@0.18.3:
-    resolution: {integrity: sha512-q3FUtGQjYA2e+kb1WumyiQMjHM27MrTQ05QfVwtLRVhyYe+KF6TblBYaEX9L6Z0EibsqaXAiW+RFfkcQpfaXzg==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@nuxt/kit': ^3.2.2
-      '@vueuse/core': '*'
-    peerDependenciesMeta:
-      '@nuxt/kit':
-        optional: true
-      '@vueuse/core':
-        optional: true
-
-  unplugin-vue-components@0.27.4:
-    resolution: {integrity: sha512-1XVl5iXG7P1UrOMnaj2ogYa5YTq8aoh5jwDPQhemwO/OrXW+lPQKDXd1hMz15qxQPxgb/XXlbgo3HQ2rLEbmXQ==}
-    engines: {node: '>=14'}
-    peerDependencies:
-      '@babel/parser': ^7.15.8
-      '@nuxt/kit': ^3.2.2
-      vue: 2 || 3
-    peerDependenciesMeta:
-      '@babel/parser':
-        optional: true
-      '@nuxt/kit':
-        optional: true
-
-  unplugin@1.15.0:
-    resolution: {integrity: sha512-jTPIs63W+DUEDW207ztbaoO7cQ4p5aVaB823LSlxpsFEU3Mykwxf3ZGC/wzxFJeZlASZYgVrWeo7LgOrqJZ8RA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      webpack-sources: ^3
-    peerDependenciesMeta:
-      webpack-sources:
-        optional: true
-
-  unset-value@1.0.0:
-    resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
-    engines: {node: '>=0.10.0'}
-
-  unzipper@0.10.14:
-    resolution: {integrity: sha512-ti4wZj+0bQTiX2KmKWuwj7lhV+2n//uXEotUmGuQqrbVZSEGFMbI68+c6JCQ8aAmUWYvtHEz2A8K6wXvueR/6g==}
-
-  update-browserslist-db@1.1.1:
-    resolution: {integrity: sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==}
-    hasBin: true
-    peerDependencies:
-      browserslist: '>= 4.21.0'
-
-  uri-js@4.4.1:
-    resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
-
-  urix@0.1.0:
-    resolution: {integrity: sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==}
-    deprecated: Please see https://github.com/lydell/urix#deprecated
-
-  use@3.1.1:
-    resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
-    engines: {node: '>=0.10.0'}
-
-  util-deprecate@1.0.2:
-    resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
-
-  uuid@8.3.2:
-    resolution: {integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==}
-    hasBin: true
-
-  vary@1.1.2:
-    resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
-    engines: {node: '>= 0.8'}
-
-  vite-plugin-mock-dev-server@1.8.0:
-    resolution: {integrity: sha512-YAf0MZbBX/RYyr75kcTfjyCV9ybGoJZNN6FS6nMwKswoB/6uVQOcnjPc3bJBTwEsKord3TaYiuXkHk6e12pv6A==}
-    engines: {node: ^18 || >= 20}
-    peerDependencies:
-      esbuild: '>=0.21.0'
-      vite: '>=4.0.0'
-    peerDependenciesMeta:
-      esbuild:
-        optional: true
-
-  vite-plugin-svg-icons@2.0.1:
-    resolution: {integrity: sha512-6ktD+DhV6Rz3VtedYvBKKVA2eXF+sAQVaKkKLDSqGUfnhqXl3bj5PPkVTl3VexfTuZy66PmINi8Q6eFnVfRUmA==}
-    peerDependencies:
-      vite: '>=2.0.0'
-
-  vite@5.4.11:
-    resolution: {integrity: sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==}
-    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
-
-  vscode-uri@3.0.8:
-    resolution: {integrity: sha512-AyFQ0EVmsOZOlAnxoFOGOq1SQDWAB7C6aqMGS23svWAllfOaxbuFvcT8D1i8z3Gyn8fraVeZNNmN6e9bxxXkKw==}
-
-  vue-demi@0.14.10:
-    resolution: {integrity: sha512-nMZBOwuzabUO0nLgIcc6rycZEebF6eeUfaiQx9+WSk8e29IbLvPU9feI6tqW4kTo3hvoYAJkMh8n8D0fuISphg==}
-    engines: {node: '>=12'}
-    hasBin: true
-    peerDependencies:
-      '@vue/composition-api': ^1.0.0-rc.1
-      vue: ^3.0.0-0 || ^2.6.0
-    peerDependenciesMeta:
-      '@vue/composition-api':
-        optional: true
-
-  vue-eslint-parser@9.4.3:
-    resolution: {integrity: sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==}
-    engines: {node: ^14.17.0 || >=16.0.0}
-    peerDependencies:
-      eslint: '>=6.0.0'
-
-  vue-flow-layout@0.0.5:
-    resolution: {integrity: sha512-lZlqQ/Se1trGMtBMneZDWaiQiQBuxU8ivZ+KpJMem5zKROFpzuPq9KqyWABbSYbxq0qhqZs1I4DBwrY041rtOA==}
-
-  vue-i18n@9.9.1:
-    resolution: {integrity: sha512-xyQ4VspLdNSPTKBFBPWa1tvtj+9HuockZwgFeD2OhxxXuC2CWeNvV4seu2o9+vbQOyQbhAM5Ez56oxUrrnTWdw==}
-    engines: {node: '>= 16'}
-    peerDependencies:
-      vue: ^3.0.0
-
-  vue-picture-cropper@0.7.0:
-    resolution: {integrity: sha512-NF7+Dgso6d0GB16E5d/BbrcTIHm1VWz8dS3IjLhoBl+ZeC+yDA46CyJphQuO32SisaPmrKHN8VbiE2LgAfhnkQ==}
-    peerDependencies:
-      vue: '>=3.2.13'
-
-  vue-router@4.4.5:
-    resolution: {integrity: sha512-4fKZygS8cH1yCyuabAXGUAsyi1b2/o/OKgu/RUb+znIYOxPRxdkytJEx+0wGcpBE1pX6vUgh5jwWOKRGvuA/7Q==}
-    peerDependencies:
-      vue: ^3.2.0
-
-  vue-tsc@2.1.10:
-    resolution: {integrity: sha512-RBNSfaaRHcN5uqVqJSZh++Gy/YUzryuv9u1aFWhsammDJXNtUiJMNoJ747lZcQ68wUQFx6E73y4FY3D8E7FGMA==}
-    hasBin: true
-    peerDependencies:
-      typescript: '>=5.0.0'
-
-  vue@3.5.12:
-    resolution: {integrity: sha512-CLVZtXtn2ItBIi/zHZ0Sg1Xkb7+PU32bJJ8Bmy7ts3jxXTcbfsEfBivFYYWz1Hur+lalqGAh65Coin0r+HRUfg==}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-
-  wcwidth@1.0.1:
-    resolution: {integrity: sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==}
-
-  webpack-virtual-modules@0.6.2:
-    resolution: {integrity: sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==}
-
-  which-boxed-primitive@1.0.2:
-    resolution: {integrity: sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==}
-
-  which-typed-array@1.1.15:
-    resolution: {integrity: sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==}
-    engines: {node: '>= 0.4'}
-
-  which@1.3.1:
-    resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
-    hasBin: true
-
-  which@2.0.2:
-    resolution: {integrity: sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==}
-    engines: {node: '>= 8'}
-    hasBin: true
-
-  wildcard@1.1.2:
-    resolution: {integrity: sha512-DXukZJxpHA8LuotRwL0pP1+rS6CS7FF2qStDDE1C7DDg2rLud2PXRMuEDYIPhgEezwnlHNL4c+N6MfMTjCGTng==}
-
-  word-wrap@1.2.5:
-    resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
-    engines: {node: '>=0.10.0'}
-
-  wrap-ansi@7.0.0:
-    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
-    engines: {node: '>=10'}
-
-  wrap-ansi@9.0.0:
-    resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
-    engines: {node: '>=18'}
-
-  wrappy@1.0.2:
-    resolution: {integrity: sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==}
-
-  write-file-atomic@5.0.1:
-    resolution: {integrity: sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==}
-    engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
-
-  ws@8.18.0:
-    resolution: {integrity: sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: '>=5.0.2'
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-
-  xml-name-validator@4.0.0:
-    resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
-    engines: {node: '>=12'}
-
-  xmlchars@2.2.0:
-    resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
-
-  y18n@5.0.8:
-    resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==}
-    engines: {node: '>=10'}
-
-  yaml@2.5.1:
-    resolution: {integrity: sha512-bLQOjaX/ADgQ20isPJRvF0iRUHIxVhYvr53Of7wGcWlO2jvtUlH5m87DsmulFVxRpNLOnI4tB6p/oh8D7kpn9Q==}
-    engines: {node: '>= 14'}
-    hasBin: true
-
-  yargs-parser@21.1.1:
-    resolution: {integrity: sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==}
-    engines: {node: '>=12'}
-
-  yargs@17.7.2:
-    resolution: {integrity: sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==}
-    engines: {node: '>=12'}
-
-  yocto-queue@0.1.0:
-    resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
-    engines: {node: '>=10'}
-
-  yocto-queue@1.1.1:
-    resolution: {integrity: sha512-b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==}
-    engines: {node: '>=12.20'}
-
-  zip-stream@4.1.1:
-    resolution: {integrity: sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==}
-    engines: {node: '>= 10'}
-
-  zrender@5.6.0:
-    resolution: {integrity: sha512-uzgraf4njmmHAbEUxMJ8Oxg+P3fT04O+9p7gY+wJRVxo8Ge+KmYv0WJev945EH4wFuc4OY2NLXz46FZrWS9xJg==}
-
-snapshots:
-
-  '@ampproject/remapping@2.3.0':
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@antfu/install-pkg@0.4.1':
-    dependencies:
-      package-manager-detector: 0.2.2
-      tinyexec: 0.3.1
-
-  '@antfu/utils@0.7.10': {}
-
-  '@babel/code-frame@7.26.2':
-    dependencies:
-      '@babel/helper-validator-identifier': 7.25.9
-      js-tokens: 4.0.0
-      picocolors: 1.1.1
-
-  '@babel/helper-string-parser@7.25.9': {}
-
-  '@babel/helper-validator-identifier@7.25.9': {}
-
-  '@babel/parser@7.26.2':
-    dependencies:
-      '@babel/types': 7.26.0
-
-  '@babel/runtime@7.26.0':
-    dependencies:
-      regenerator-runtime: 0.14.1
-
-  '@babel/types@7.26.0':
-    dependencies:
-      '@babel/helper-string-parser': 7.25.9
-      '@babel/helper-validator-identifier': 7.25.9
-
-  '@bassist/utils@0.4.0':
-    dependencies:
-      '@withtypes/mime': 0.1.2
-
-  '@commitlint/cli@19.5.0(@types/node@22.9.0)(typescript@5.5.4)':
-    dependencies:
-      '@commitlint/format': 19.5.0
-      '@commitlint/lint': 19.5.0
-      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
-      '@commitlint/read': 19.5.0
-      '@commitlint/types': 19.5.0
-      tinyexec: 0.3.1
-      yargs: 17.7.2
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-
-  '@commitlint/config-conventional@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      conventional-changelog-conventionalcommits: 7.0.2
-
-  '@commitlint/config-validator@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      ajv: 8.17.1
-
-  '@commitlint/ensure@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      lodash.camelcase: 4.3.0
-      lodash.kebabcase: 4.1.1
-      lodash.snakecase: 4.1.1
-      lodash.startcase: 4.4.0
-      lodash.upperfirst: 4.3.1
-
-  '@commitlint/execute-rule@19.5.0': {}
-
-  '@commitlint/format@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      chalk: 5.3.0
-
-  '@commitlint/is-ignored@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      semver: 7.6.3
-
-  '@commitlint/lint@19.5.0':
-    dependencies:
-      '@commitlint/is-ignored': 19.5.0
-      '@commitlint/parse': 19.5.0
-      '@commitlint/rules': 19.5.0
-      '@commitlint/types': 19.5.0
-
-  '@commitlint/load@19.5.0(@types/node@22.9.0)(typescript@5.5.4)':
-    dependencies:
-      '@commitlint/config-validator': 19.5.0
-      '@commitlint/execute-rule': 19.5.0
-      '@commitlint/resolve-extends': 19.5.0
-      '@commitlint/types': 19.5.0
-      chalk: 5.3.0
-      cosmiconfig: 9.0.0(typescript@5.5.4)
-      cosmiconfig-typescript-loader: 5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0(typescript@5.5.4))(typescript@5.5.4)
-      lodash.isplainobject: 4.0.6
-      lodash.merge: 4.6.2
-      lodash.uniq: 4.5.0
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-
-  '@commitlint/message@19.5.0': {}
-
-  '@commitlint/parse@19.5.0':
-    dependencies:
-      '@commitlint/types': 19.5.0
-      conventional-changelog-angular: 7.0.0
-      conventional-commits-parser: 5.0.0
-
-  '@commitlint/read@19.5.0':
-    dependencies:
-      '@commitlint/top-level': 19.5.0
-      '@commitlint/types': 19.5.0
-      git-raw-commits: 4.0.0
-      minimist: 1.2.8
-      tinyexec: 0.3.1
-
-  '@commitlint/resolve-extends@19.5.0':
-    dependencies:
-      '@commitlint/config-validator': 19.5.0
-      '@commitlint/types': 19.5.0
-      global-directory: 4.0.1
-      import-meta-resolve: 4.1.0
-      lodash.mergewith: 4.6.2
-      resolve-from: 5.0.0
-
-  '@commitlint/rules@19.5.0':
-    dependencies:
-      '@commitlint/ensure': 19.5.0
-      '@commitlint/message': 19.5.0
-      '@commitlint/to-lines': 19.5.0
-      '@commitlint/types': 19.5.0
-
-  '@commitlint/to-lines@19.5.0': {}
-
-  '@commitlint/top-level@19.5.0':
-    dependencies:
-      find-up: 7.0.0
-
-  '@commitlint/types@19.5.0':
-    dependencies:
-      '@types/conventional-commits-parser': 5.0.0
-      chalk: 5.3.0
-
-  '@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3)':
-    dependencies:
-      '@csstools/css-tokenizer': 3.0.3
-
-  '@csstools/css-tokenizer@3.0.3': {}
-
-  '@csstools/media-query-list-parser@3.0.1(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)':
-    dependencies:
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
-
-  '@csstools/selector-specificity@4.0.0(postcss-selector-parser@6.1.2)':
-    dependencies:
-      postcss-selector-parser: 6.1.2
-
-  '@ctrl/tinycolor@3.6.1': {}
-
-  '@dual-bundle/import-meta-resolve@4.1.0': {}
-
-  '@element-plus/icons-vue@2.3.1(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      vue: 3.5.12(typescript@5.5.4)
-
-  '@esbuild/aix-ppc64@0.21.5':
-    optional: true
-
-  '@esbuild/aix-ppc64@0.23.1':
-    optional: true
-
-  '@esbuild/android-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/android-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/android-arm@0.21.5':
-    optional: true
-
-  '@esbuild/android-arm@0.23.1':
-    optional: true
-
-  '@esbuild/android-x64@0.21.5':
-    optional: true
-
-  '@esbuild/android-x64@0.23.1':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/darwin-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/darwin-x64@0.21.5':
-    optional: true
-
-  '@esbuild/darwin-x64@0.23.1':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/freebsd-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/freebsd-x64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-arm@0.21.5':
-    optional: true
-
-  '@esbuild/linux-arm@0.23.1':
-    optional: true
-
-  '@esbuild/linux-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/linux-ia32@0.23.1':
-    optional: true
-
-  '@esbuild/linux-loong64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-loong64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.21.5':
-    optional: true
-
-  '@esbuild/linux-mips64el@0.23.1':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-ppc64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-riscv64@0.23.1':
-    optional: true
-
-  '@esbuild/linux-s390x@0.21.5':
-    optional: true
-
-  '@esbuild/linux-s390x@0.23.1':
-    optional: true
-
-  '@esbuild/linux-x64@0.21.5':
-    optional: true
-
-  '@esbuild/linux-x64@0.23.1':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/netbsd-x64@0.23.1':
-    optional: true
-
-  '@esbuild/openbsd-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.21.5':
-    optional: true
-
-  '@esbuild/openbsd-x64@0.23.1':
-    optional: true
-
-  '@esbuild/sunos-x64@0.21.5':
-    optional: true
-
-  '@esbuild/sunos-x64@0.23.1':
-    optional: true
-
-  '@esbuild/win32-arm64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-arm64@0.23.1':
-    optional: true
-
-  '@esbuild/win32-ia32@0.21.5':
-    optional: true
-
-  '@esbuild/win32-ia32@0.23.1':
-    optional: true
-
-  '@esbuild/win32-x64@0.21.5':
-    optional: true
-
-  '@esbuild/win32-x64@0.23.1':
-    optional: true
-
-  '@eslint-community/eslint-utils@4.4.1(eslint@9.14.0(jiti@1.21.6))':
-    dependencies:
-      eslint: 9.14.0(jiti@1.21.6)
-      eslint-visitor-keys: 3.4.3
-
-  '@eslint-community/regexpp@4.12.1': {}
-
-  '@eslint/config-array@0.18.0':
-    dependencies:
-      '@eslint/object-schema': 2.1.4
-      debug: 4.3.7
-      minimatch: 3.1.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/core@0.7.0': {}
-
-  '@eslint/eslintrc@3.1.0':
-    dependencies:
-      ajv: 6.12.6
-      debug: 4.3.7
-      espree: 10.3.0
-      globals: 14.0.0
-      ignore: 5.3.2
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      minimatch: 3.1.2
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@eslint/js@9.14.0': {}
-
-  '@eslint/object-schema@2.1.4': {}
-
-  '@eslint/plugin-kit@0.2.2':
-    dependencies:
-      levn: 0.4.1
-
-  '@fast-csv/format@4.3.5':
-    dependencies:
-      '@types/node': 14.18.63
-      lodash.escaperegexp: 4.1.2
-      lodash.isboolean: 3.0.3
-      lodash.isequal: 4.5.0
-      lodash.isfunction: 3.0.9
-      lodash.isnil: 4.0.0
-
-  '@fast-csv/parse@4.3.6':
-    dependencies:
-      '@types/node': 14.18.63
-      lodash.escaperegexp: 4.1.2
-      lodash.groupby: 4.6.0
-      lodash.isfunction: 3.0.9
-      lodash.isnil: 4.0.0
-      lodash.isundefined: 3.0.1
-      lodash.uniq: 4.5.0
-
-  '@floating-ui/core@1.6.8':
-    dependencies:
-      '@floating-ui/utils': 0.2.8
-
-  '@floating-ui/dom@1.6.12':
-    dependencies:
-      '@floating-ui/core': 1.6.8
-      '@floating-ui/utils': 0.2.8
-
-  '@floating-ui/utils@0.2.8': {}
-
-  '@hapi/bourne@3.0.0': {}
-
-  '@humanfs/core@0.19.1': {}
-
-  '@humanfs/node@0.16.6':
-    dependencies:
-      '@humanfs/core': 0.19.1
-      '@humanwhocodes/retry': 0.3.1
-
-  '@humanwhocodes/module-importer@1.0.1': {}
-
-  '@humanwhocodes/retry@0.3.1': {}
-
-  '@humanwhocodes/retry@0.4.1': {}
-
-  '@iconify/types@2.0.0': {}
-
-  '@iconify/utils@2.1.33':
-    dependencies:
-      '@antfu/install-pkg': 0.4.1
-      '@antfu/utils': 0.7.10
-      '@iconify/types': 2.0.0
-      debug: 4.3.7
-      kolorist: 1.8.0
-      local-pkg: 0.5.0
-      mlly: 1.7.2
-    transitivePeerDependencies:
-      - supports-color
-
-  '@intlify/core-base@9.9.1':
-    dependencies:
-      '@intlify/message-compiler': 9.9.1
-      '@intlify/shared': 9.9.1
-
-  '@intlify/message-compiler@9.9.1':
-    dependencies:
-      '@intlify/shared': 9.9.1
-      source-map-js: 1.2.1
-
-  '@intlify/shared@9.9.1': {}
-
-  '@jridgewell/gen-mapping@0.3.5':
-    dependencies:
-      '@jridgewell/set-array': 1.2.1
-      '@jridgewell/sourcemap-codec': 1.5.0
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@jridgewell/resolve-uri@3.1.2': {}
-
-  '@jridgewell/set-array@1.2.1': {}
-
-  '@jridgewell/source-map@0.3.6':
-    dependencies:
-      '@jridgewell/gen-mapping': 0.3.5
-      '@jridgewell/trace-mapping': 0.3.25
-
-  '@jridgewell/sourcemap-codec@1.5.0': {}
-
-  '@jridgewell/trace-mapping@0.3.25':
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.2
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  '@nodelib/fs.scandir@2.1.5':
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      run-parallel: 1.2.0
-
-  '@nodelib/fs.stat@2.0.5': {}
-
-  '@nodelib/fs.walk@1.2.8':
-    dependencies:
-      '@nodelib/fs.scandir': 2.1.5
-      fastq: 1.17.1
-
-  '@parcel/watcher-android-arm64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-darwin-arm64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-darwin-x64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-freebsd-x64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm-glibc@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm-musl@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm64-glibc@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-arm64-musl@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-x64-glibc@2.5.0':
-    optional: true
-
-  '@parcel/watcher-linux-x64-musl@2.5.0':
-    optional: true
-
-  '@parcel/watcher-win32-arm64@2.5.0':
-    optional: true
-
-  '@parcel/watcher-win32-ia32@2.5.0':
-    optional: true
-
-  '@parcel/watcher-win32-x64@2.5.0':
-    optional: true
-
-  '@parcel/watcher@2.5.0':
-    dependencies:
-      detect-libc: 1.0.3
-      is-glob: 4.0.3
-      micromatch: 4.0.8
-      node-addon-api: 7.1.1
-    optionalDependencies:
-      '@parcel/watcher-android-arm64': 2.5.0
-      '@parcel/watcher-darwin-arm64': 2.5.0
-      '@parcel/watcher-darwin-x64': 2.5.0
-      '@parcel/watcher-freebsd-x64': 2.5.0
-      '@parcel/watcher-linux-arm-glibc': 2.5.0
-      '@parcel/watcher-linux-arm-musl': 2.5.0
-      '@parcel/watcher-linux-arm64-glibc': 2.5.0
-      '@parcel/watcher-linux-arm64-musl': 2.5.0
-      '@parcel/watcher-linux-x64-glibc': 2.5.0
-      '@parcel/watcher-linux-x64-musl': 2.5.0
-      '@parcel/watcher-win32-arm64': 2.5.0
-      '@parcel/watcher-win32-ia32': 2.5.0
-      '@parcel/watcher-win32-x64': 2.5.0
-    optional: true
-
-  '@pengzhanbo/utils@1.1.2': {}
-
-  '@pkgr/core@0.1.1': {}
-
-  '@polka/url@1.0.0-next.28': {}
-
-  '@rollup/pluginutils@5.1.3(rollup@4.25.0)':
-    dependencies:
-      '@types/estree': 1.0.6
-      estree-walker: 2.0.2
-      picomatch: 4.0.2
-    optionalDependencies:
-      rollup: 4.25.0
-
-  '@rollup/rollup-android-arm-eabi@4.25.0':
-    optional: true
-
-  '@rollup/rollup-android-arm64@4.25.0':
-    optional: true
-
-  '@rollup/rollup-darwin-arm64@4.25.0':
-    optional: true
-
-  '@rollup/rollup-darwin-x64@4.25.0':
-    optional: true
-
-  '@rollup/rollup-freebsd-arm64@4.25.0':
-    optional: true
-
-  '@rollup/rollup-freebsd-x64@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm-gnueabihf@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm-musleabihf@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-gnu@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-arm64-musl@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-powerpc64le-gnu@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-riscv64-gnu@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-s390x-gnu@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-gnu@4.25.0':
-    optional: true
-
-  '@rollup/rollup-linux-x64-musl@4.25.0':
-    optional: true
-
-  '@rollup/rollup-win32-arm64-msvc@4.25.0':
-    optional: true
-
-  '@rollup/rollup-win32-ia32-msvc@4.25.0':
-    optional: true
-
-  '@rollup/rollup-win32-x64-msvc@4.25.0':
-    optional: true
-
-  '@stomp/stompjs@7.0.0': {}
-
-  '@sxzz/popperjs-es@2.11.7': {}
-
-  '@transloadit/prettier-bytes@0.0.7': {}
-
-  '@trysound/sax@0.2.0': {}
-
-  '@types/codemirror@5.60.15':
-    dependencies:
-      '@types/tern': 0.23.9
-
-  '@types/conventional-commits-parser@5.0.0':
-    dependencies:
-      '@types/node': 22.9.0
-
-  '@types/estree@1.0.6': {}
-
-  '@types/event-emitter@0.3.5': {}
-
-  '@types/json-schema@7.0.15': {}
-
-  '@types/lodash-es@4.17.12':
-    dependencies:
-      '@types/lodash': 4.17.13
-
-  '@types/lodash@4.17.13': {}
-
-  '@types/node@14.18.63': {}
-
-  '@types/node@22.9.0':
-    dependencies:
-      undici-types: 6.19.8
-
-  '@types/nprogress@0.2.3': {}
-
-  '@types/path-browserify@1.0.3': {}
-
-  '@types/qs@6.9.17': {}
-
-  '@types/sortablejs@1.15.8': {}
-
-  '@types/svgo@2.6.4':
-    dependencies:
-      '@types/node': 22.9.0
-
-  '@types/tern@0.23.9':
-    dependencies:
-      '@types/estree': 1.0.6
-
-  '@types/web-bluetooth@0.0.16': {}
-
-  '@types/web-bluetooth@0.0.20': {}
-
-  '@typescript-eslint/eslint-plugin@8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
-    dependencies:
-      '@eslint-community/regexpp': 4.12.1
-      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/scope-manager': 8.14.0
-      '@typescript-eslint/type-utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.14.0
-      eslint: 9.14.0(jiti@1.21.6)
-      graphemer: 1.4.0
-      ignore: 5.3.2
-      natural-compare: 1.4.0
-      ts-api-utils: 1.4.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/scope-manager': 8.14.0
-      '@typescript-eslint/types': 8.14.0
-      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
-      '@typescript-eslint/visitor-keys': 8.14.0
-      debug: 4.3.7
-      eslint: 9.14.0(jiti@1.21.6)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/scope-manager@8.14.0':
-    dependencies:
-      '@typescript-eslint/types': 8.14.0
-      '@typescript-eslint/visitor-keys': 8.14.0
-
-  '@typescript-eslint/type-utils@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      debug: 4.3.7
-      ts-api-utils: 1.4.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-
-  '@typescript-eslint/types@8.14.0': {}
-
-  '@typescript-eslint/typescript-estree@8.14.0(typescript@5.5.4)':
-    dependencies:
-      '@typescript-eslint/types': 8.14.0
-      '@typescript-eslint/visitor-keys': 8.14.0
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      is-glob: 4.0.3
-      minimatch: 9.0.5
-      semver: 7.6.3
-      ts-api-utils: 1.4.0(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - supports-color
-
-  '@typescript-eslint/utils@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)':
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
-      '@typescript-eslint/scope-manager': 8.14.0
-      '@typescript-eslint/types': 8.14.0
-      '@typescript-eslint/typescript-estree': 8.14.0(typescript@5.5.4)
-      eslint: 9.14.0(jiti@1.21.6)
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  '@typescript-eslint/visitor-keys@8.14.0':
-    dependencies:
-      '@typescript-eslint/types': 8.14.0
-      eslint-visitor-keys: 3.4.3
-
-  '@unocss/astro@0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/reset': 0.63.6
-      '@unocss/vite': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-    optionalDependencies:
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-      - typescript
-
-  '@unocss/cli@0.63.6(rollup@4.25.0)':
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      '@unocss/config': 0.63.6
-      '@unocss/core': 0.63.6
-      '@unocss/preset-uno': 0.63.6
-      cac: 6.7.14
-      chokidar: 3.6.0
-      colorette: 2.0.20
-      consola: 3.2.3
-      magic-string: 0.30.12
-      pathe: 1.1.2
-      perfect-debounce: 1.0.0
-      tinyglobby: 0.2.10
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-
-  '@unocss/config@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      unconfig: 0.5.5
-    transitivePeerDependencies:
-      - supports-color
-
-  '@unocss/core@0.63.6': {}
-
-  '@unocss/extractor-arbitrary-variants@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/inspector@0.63.6(typescript@5.5.4)':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-      gzip-size: 6.0.0
-      sirv: 2.0.4
-      vue-flow-layout: 0.0.5(typescript@5.5.4)
-    transitivePeerDependencies:
-      - typescript
-
-  '@unocss/postcss@0.63.6(postcss@8.4.49)':
-    dependencies:
-      '@unocss/config': 0.63.6
-      '@unocss/core': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-      css-tree: 3.0.1
-      postcss: 8.4.49
-      tinyglobby: 0.2.10
-    transitivePeerDependencies:
-      - supports-color
-
-  '@unocss/preset-attributify@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/preset-icons@0.63.6':
-    dependencies:
-      '@iconify/utils': 2.1.33
-      '@unocss/core': 0.63.6
-      ofetch: 1.4.1
-    transitivePeerDependencies:
-      - supports-color
-
-  '@unocss/preset-mini@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/extractor-arbitrary-variants': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-
-  '@unocss/preset-tagify@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/preset-typography@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/preset-mini': 0.63.6
-
-  '@unocss/preset-uno@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/preset-mini': 0.63.6
-      '@unocss/preset-wind': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-
-  '@unocss/preset-web-fonts@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      ofetch: 1.4.1
-
-  '@unocss/preset-wind@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/preset-mini': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-
-  '@unocss/reset@0.63.6': {}
-
-  '@unocss/rule-utils@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      magic-string: 0.30.12
-
-  '@unocss/transformer-attributify-jsx@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/transformer-compile-class@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/transformer-directives@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-      '@unocss/rule-utils': 0.63.6
-      css-tree: 3.0.1
-
-  '@unocss/transformer-variant-group@0.63.6':
-    dependencies:
-      '@unocss/core': 0.63.6
-
-  '@unocss/vite@0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))':
-    dependencies:
-      '@ampproject/remapping': 2.3.0
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      '@unocss/config': 0.63.6
-      '@unocss/core': 0.63.6
-      '@unocss/inspector': 0.63.6(typescript@5.5.4)
-      chokidar: 3.6.0
-      magic-string: 0.30.12
-      tinyglobby: 0.2.10
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-      - typescript
-
-  '@uppy/companion-client@2.2.2':
-    dependencies:
-      '@uppy/utils': 4.1.3
-      namespace-emitter: 2.0.1
-
-  '@uppy/core@2.3.4':
-    dependencies:
-      '@transloadit/prettier-bytes': 0.0.7
-      '@uppy/store-default': 2.1.1
-      '@uppy/utils': 4.1.3
-      lodash.throttle: 4.1.1
-      mime-match: 1.0.2
-      namespace-emitter: 2.0.1
-      nanoid: 3.3.7
-      preact: 10.24.3
-
-  '@uppy/store-default@2.1.1': {}
-
-  '@uppy/utils@4.1.3':
-    dependencies:
-      lodash.throttle: 4.1.1
-
-  '@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4)':
-    dependencies:
-      '@uppy/companion-client': 2.2.2
-      '@uppy/core': 2.3.4
-      '@uppy/utils': 4.1.3
-      nanoid: 3.3.7
-
-  '@vitejs/plugin-vue@5.1.5(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-      vue: 3.5.12(typescript@5.5.4)
-
-  '@volar/language-core@2.4.10':
-    dependencies:
-      '@volar/source-map': 2.4.10
-
-  '@volar/source-map@2.4.10': {}
-
-  '@volar/typescript@2.4.10':
-    dependencies:
-      '@volar/language-core': 2.4.10
-      path-browserify: 1.0.1
-      vscode-uri: 3.0.8
-
-  '@vue/compiler-core@3.5.12':
-    dependencies:
-      '@babel/parser': 7.26.2
-      '@vue/shared': 3.5.12
-      entities: 4.5.0
-      estree-walker: 2.0.2
-      source-map-js: 1.2.1
-
-  '@vue/compiler-dom@3.5.12':
-    dependencies:
-      '@vue/compiler-core': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/compiler-sfc@3.5.12':
-    dependencies:
-      '@babel/parser': 7.26.2
-      '@vue/compiler-core': 3.5.12
-      '@vue/compiler-dom': 3.5.12
-      '@vue/compiler-ssr': 3.5.12
-      '@vue/shared': 3.5.12
-      estree-walker: 2.0.2
-      magic-string: 0.30.12
-      postcss: 8.4.49
-      source-map-js: 1.2.1
-
-  '@vue/compiler-ssr@3.5.12':
-    dependencies:
-      '@vue/compiler-dom': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/compiler-vue2@2.7.16':
-    dependencies:
-      de-indent: 1.0.2
-      he: 1.2.0
-
-  '@vue/devtools-api@6.6.4': {}
-
-  '@vue/language-core@2.1.10(typescript@5.5.4)':
-    dependencies:
-      '@volar/language-core': 2.4.10
-      '@vue/compiler-dom': 3.5.12
-      '@vue/compiler-vue2': 2.7.16
-      '@vue/shared': 3.5.12
-      alien-signals: 0.2.1
-      minimatch: 9.0.5
-      muggle-string: 0.4.1
-      path-browserify: 1.0.1
-    optionalDependencies:
-      typescript: 5.5.4
-
-  '@vue/reactivity@3.5.12':
-    dependencies:
-      '@vue/shared': 3.5.12
-
-  '@vue/runtime-core@3.5.12':
-    dependencies:
-      '@vue/reactivity': 3.5.12
-      '@vue/shared': 3.5.12
-
-  '@vue/runtime-dom@3.5.12':
-    dependencies:
-      '@vue/reactivity': 3.5.12
-      '@vue/runtime-core': 3.5.12
-      '@vue/shared': 3.5.12
-      csstype: 3.1.3
-
-  '@vue/server-renderer@3.5.12(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      '@vue/compiler-ssr': 3.5.12
-      '@vue/shared': 3.5.12
-      vue: 3.5.12(typescript@5.5.4)
-
-  '@vue/shared@3.5.12': {}
-
-  '@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      '@types/web-bluetooth': 0.0.20
-      '@vueuse/metadata': 10.11.1
-      '@vueuse/shared': 10.11.1(vue@3.5.12(typescript@5.5.4))
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-
-  '@vueuse/core@9.13.0(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      '@types/web-bluetooth': 0.0.16
-      '@vueuse/metadata': 9.13.0
-      '@vueuse/shared': 9.13.0(vue@3.5.12(typescript@5.5.4))
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-
-  '@vueuse/metadata@10.11.1': {}
-
-  '@vueuse/metadata@9.13.0': {}
-
-  '@vueuse/shared@10.11.1(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-
-  '@vueuse/shared@9.13.0(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-      - vue
-
-  '@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      is-url: 1.2.4
-      lodash.throttle: 4.1.1
-      nanoid: 3.3.7
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/code-highlight@1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      prismjs: 1.29.0
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@types/event-emitter': 0.3.5
-      '@uppy/core': 2.3.4
-      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      dom7: 3.0.0
-      event-emitter: 0.3.5
-      html-void-elements: 2.0.1
-      i18next: 20.6.1
-      is-hotkey: 0.2.0
-      lodash.camelcase: 4.3.0
-      lodash.clonedeep: 4.5.0
-      lodash.debounce: 4.0.8
-      lodash.foreach: 4.5.0
-      lodash.isequal: 4.5.0
-      lodash.throttle: 4.1.1
-      lodash.toarray: 4.4.0
-      nanoid: 3.3.7
-      scroll-into-view-if-needed: 2.2.31
-      slate: 0.72.8
-      slate-history: 0.66.0(slate@0.72.8)
-      snabbdom: 3.6.2
-
-  '@wangeditor/editor-for-vue@5.1.10(@wangeditor/editor@5.1.23)(vue@3.5.12(typescript@5.5.4))':
-    dependencies:
-      '@wangeditor/editor': 5.1.23
-      vue: 3.5.12(typescript@5.5.4)
-
-  '@wangeditor/editor@5.1.23':
-    dependencies:
-      '@uppy/core': 2.3.4
-      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/code-highlight': 1.0.3(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/list-module': 1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/table-module': 1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/upload-image-module': 1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/video-module': 1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      is-hotkey: 0.2.0
-      lodash.camelcase: 4.3.0
-      lodash.clonedeep: 4.5.0
-      lodash.debounce: 4.0.8
-      lodash.foreach: 4.5.0
-      lodash.isequal: 4.5.0
-      lodash.throttle: 4.1.1
-      lodash.toarray: 4.4.0
-      nanoid: 3.3.7
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/list-module@1.0.5(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/table-module@1.1.4(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      lodash.isequal: 4.5.0
-      lodash.throttle: 4.1.1
-      nanoid: 3.3.7
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/upload-image-module@1.0.2(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/basic-modules@1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.foreach@4.5.0)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@uppy/core': 2.3.4
-      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/basic-modules': 1.1.7(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(lodash.throttle@4.1.1)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      lodash.foreach: 4.5.0
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@wangeditor/video-module@1.1.4(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(@wangeditor/core@1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2))(dom7@3.0.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)':
-    dependencies:
-      '@uppy/core': 2.3.4
-      '@uppy/xhr-upload': 2.1.3(@uppy/core@2.3.4)
-      '@wangeditor/core': 1.1.19(@uppy/core@2.3.4)(@uppy/xhr-upload@2.1.3(@uppy/core@2.3.4))(dom7@3.0.0)(is-hotkey@0.2.0)(lodash.camelcase@4.3.0)(lodash.clonedeep@4.5.0)(lodash.debounce@4.0.8)(lodash.foreach@4.5.0)(lodash.isequal@4.5.0)(lodash.throttle@4.1.1)(lodash.toarray@4.4.0)(nanoid@3.3.7)(slate@0.72.8)(snabbdom@3.6.2)
-      dom7: 3.0.0
-      nanoid: 3.3.7
-      slate: 0.72.8
-      snabbdom: 3.6.2
-
-  '@withtypes/mime@0.1.2':
-    dependencies:
-      mime: 3.0.0
-
-  JSONStream@1.3.5:
-    dependencies:
-      jsonparse: 1.3.1
-      through: 2.3.8
-
-  acorn-jsx@5.3.2(acorn@8.14.0):
-    dependencies:
-      acorn: 8.14.0
-
-  acorn@8.14.0: {}
-
-  ajv@6.12.6:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-json-stable-stringify: 2.1.0
-      json-schema-traverse: 0.4.1
-      uri-js: 4.4.1
-
-  ajv@8.17.1:
-    dependencies:
-      fast-deep-equal: 3.1.3
-      fast-uri: 3.0.3
-      json-schema-traverse: 1.0.0
-      require-from-string: 2.0.2
-
-  alien-signals@0.2.1: {}
-
-  animate.css@4.1.1: {}
-
-  ansi-escapes@4.3.2:
-    dependencies:
-      type-fest: 0.21.3
-
-  ansi-escapes@7.0.0:
-    dependencies:
-      environment: 1.1.0
-
-  ansi-regex@2.1.1: {}
-
-  ansi-regex@5.0.1: {}
-
-  ansi-regex@6.1.0: {}
-
-  ansi-styles@2.2.1: {}
-
-  ansi-styles@3.2.1:
-    dependencies:
-      color-convert: 1.9.3
-
-  ansi-styles@4.3.0:
-    dependencies:
-      color-convert: 2.0.1
-
-  ansi-styles@6.2.1: {}
-
-  anymatch@3.1.3:
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-
-  archiver-utils@2.1.0:
-    dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
-      normalize-path: 3.0.0
-      readable-stream: 2.3.8
-
-  archiver-utils@3.0.4:
-    dependencies:
-      glob: 7.2.3
-      graceful-fs: 4.2.11
-      lazystream: 1.0.1
-      lodash.defaults: 4.2.0
-      lodash.difference: 4.5.0
-      lodash.flatten: 4.4.0
-      lodash.isplainobject: 4.0.6
-      lodash.union: 4.6.0
-      normalize-path: 3.0.0
-      readable-stream: 3.6.2
-
-  archiver@5.3.2:
-    dependencies:
-      archiver-utils: 2.1.0
-      async: 3.2.6
-      buffer-crc32: 0.2.13
-      readable-stream: 3.6.2
-      readdir-glob: 1.1.3
-      tar-stream: 2.2.0
-      zip-stream: 4.1.1
-
-  argparse@2.0.1: {}
-
-  arr-diff@4.0.0: {}
-
-  arr-flatten@1.1.0: {}
-
-  arr-union@3.1.0: {}
-
-  array-buffer-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      is-array-buffer: 3.0.4
-
-  array-ify@1.0.0: {}
-
-  array-union@2.1.0: {}
-
-  array-unique@0.3.2: {}
-
-  arraybuffer.prototype.slice@1.0.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      is-array-buffer: 3.0.4
-      is-shared-array-buffer: 1.0.3
-
-  asap@2.0.6: {}
-
-  assign-symbols@1.0.0: {}
-
-  astral-regex@2.0.0: {}
-
-  async-validator@4.2.5: {}
-
-  async@3.2.6: {}
-
-  asynckit@0.4.0: {}
-
-  at-least-node@1.0.0: {}
-
-  atob@2.1.2: {}
-
-  autoprefixer@10.4.20(postcss@8.4.49):
-    dependencies:
-      browserslist: 4.24.2
-      caniuse-lite: 1.0.30001680
-      fraction.js: 4.3.7
-      normalize-range: 0.1.2
-      picocolors: 1.1.1
-      postcss: 8.4.49
-      postcss-value-parser: 4.2.0
-
-  available-typed-arrays@1.0.7:
-    dependencies:
-      possible-typed-array-names: 1.0.0
-
-  axios@1.7.7:
-    dependencies:
-      follow-redirects: 1.15.9
-      form-data: 4.0.1
-      proxy-from-env: 1.1.0
-    transitivePeerDependencies:
-      - debug
-
-  balanced-match@1.0.2: {}
-
-  balanced-match@2.0.0: {}
-
-  base64-js@1.5.1: {}
-
-  base@0.11.2:
-    dependencies:
-      cache-base: 1.0.1
-      class-utils: 0.3.6
-      component-emitter: 1.3.1
-      define-property: 1.0.0
-      isobject: 3.0.1
-      mixin-deep: 1.3.2
-      pascalcase: 0.1.1
-
-  big-integer@1.6.52: {}
-
-  big.js@5.2.2: {}
-
-  binary-extensions@2.3.0: {}
-
-  binary@0.3.0:
-    dependencies:
-      buffers: 0.1.1
-      chainsaw: 0.1.0
-
-  bl@4.1.0:
-    dependencies:
-      buffer: 5.7.1
-      inherits: 2.0.4
-      readable-stream: 3.6.2
-
-  bluebird@3.4.7: {}
-
-  bluebird@3.7.2: {}
-
-  boolbase@1.0.0: {}
-
-  brace-expansion@1.1.11:
-    dependencies:
-      balanced-match: 1.0.2
-      concat-map: 0.0.1
-
-  brace-expansion@2.0.1:
-    dependencies:
-      balanced-match: 1.0.2
-
-  braces@2.3.2:
-    dependencies:
-      arr-flatten: 1.1.0
-      array-unique: 0.3.2
-      extend-shallow: 2.0.1
-      fill-range: 4.0.0
-      isobject: 3.0.1
-      repeat-element: 1.1.4
-      snapdragon: 0.8.2
-      snapdragon-node: 2.1.1
-      split-string: 3.1.0
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  braces@3.0.3:
-    dependencies:
-      fill-range: 7.1.1
-
-  browserslist@4.24.2:
-    dependencies:
-      caniuse-lite: 1.0.30001680
-      electron-to-chromium: 1.5.56
-      node-releases: 2.0.18
-      update-browserslist-db: 1.1.1(browserslist@4.24.2)
-
-  buffer-crc32@0.2.13: {}
-
-  buffer-from@1.1.2: {}
-
-  buffer-indexof-polyfill@1.0.2: {}
-
-  buffer@5.7.1:
-    dependencies:
-      base64-js: 1.5.1
-      ieee754: 1.2.1
-
-  buffers@0.1.1: {}
-
-  bundle-require@5.0.0(esbuild@0.23.1):
-    dependencies:
-      esbuild: 0.23.1
-      load-tsconfig: 0.2.5
-
-  bytes@3.1.2: {}
-
-  cac@6.7.14: {}
-
-  cache-base@1.0.1:
-    dependencies:
-      collection-visit: 1.0.0
-      component-emitter: 1.3.1
-      get-value: 2.0.6
-      has-value: 1.0.0
-      isobject: 3.0.1
-      set-value: 2.0.1
-      to-object-path: 0.3.0
-      union-value: 1.0.1
-      unset-value: 1.0.0
-
-  cachedir@2.3.0: {}
-
-  call-bind@1.0.7:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      set-function-length: 1.2.2
-
-  callsites@3.1.0: {}
-
-  caniuse-lite@1.0.30001680: {}
-
-  chainsaw@0.1.0:
-    dependencies:
-      traverse: 0.3.9
-
-  chalk@1.1.3:
-    dependencies:
-      ansi-styles: 2.2.1
-      escape-string-regexp: 1.0.5
-      has-ansi: 2.0.0
-      strip-ansi: 3.0.1
-      supports-color: 2.0.0
-
-  chalk@2.4.2:
-    dependencies:
-      ansi-styles: 3.2.1
-      escape-string-regexp: 1.0.5
-      supports-color: 5.5.0
-
-  chalk@4.1.2:
-    dependencies:
-      ansi-styles: 4.3.0
-      supports-color: 7.2.0
-
-  chalk@5.3.0: {}
-
-  chardet@0.7.0: {}
-
-  chokidar@3.6.0:
-    dependencies:
-      anymatch: 3.1.3
-      braces: 3.0.3
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.3
-
-  chokidar@4.0.1:
-    dependencies:
-      readdirp: 4.0.2
-
-  class-utils@0.3.6:
-    dependencies:
-      arr-union: 3.1.0
-      define-property: 0.2.5
-      isobject: 3.0.1
-      static-extend: 0.1.2
-
-  cli-cursor@3.1.0:
-    dependencies:
-      restore-cursor: 3.1.0
-
-  cli-cursor@5.0.0:
-    dependencies:
-      restore-cursor: 5.1.0
-
-  cli-spinners@2.9.2: {}
-
-  cli-truncate@4.0.0:
-    dependencies:
-      slice-ansi: 5.0.0
-      string-width: 7.2.0
-
-  cli-width@3.0.0: {}
-
-  cliui@8.0.1:
-    dependencies:
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      wrap-ansi: 7.0.0
-
-  clone@1.0.4: {}
-
-  clone@2.1.2: {}
-
-  co-body@6.2.0:
-    dependencies:
-      '@hapi/bourne': 3.0.0
-      inflation: 2.1.0
-      qs: 6.13.0
-      raw-body: 2.5.2
-      type-is: 1.6.18
-
-  codemirror-editor-vue3@2.8.0(codemirror@5.65.18)(diff-match-patch@1.0.5)(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      codemirror: 5.65.18
-      diff-match-patch: 1.0.5
-      vue: 3.5.12(typescript@5.5.4)
-
-  codemirror@5.65.18: {}
-
-  collection-visit@1.0.0:
-    dependencies:
-      map-visit: 1.0.0
-      object-visit: 1.0.1
-
-  color-convert@1.9.3:
-    dependencies:
-      color-name: 1.1.3
-
-  color-convert@2.0.1:
-    dependencies:
-      color-name: 1.1.4
-
-  color-name@1.1.3: {}
-
-  color-name@1.1.4: {}
-
-  colord@2.9.3: {}
-
-  colorette@2.0.20: {}
-
-  combined-stream@1.0.8:
-    dependencies:
-      delayed-stream: 1.0.0
-
-  commander@12.1.0: {}
-
-  commander@2.20.3: {}
-
-  commander@7.2.0: {}
-
-  commitizen@4.3.1(@types/node@22.9.0)(typescript@5.5.4):
-    dependencies:
-      cachedir: 2.3.0
-      cz-conventional-changelog: 3.3.0(@types/node@22.9.0)(typescript@5.5.4)
-      dedent: 0.7.0
-      detect-indent: 6.1.0
-      find-node-modules: 2.1.3
-      find-root: 1.1.0
-      fs-extra: 9.1.0
-      glob: 7.2.3
-      inquirer: 8.2.5
-      is-utf8: 0.2.1
-      lodash: 4.17.21
-      minimist: 1.2.7
-      strip-bom: 4.0.0
-      strip-json-comments: 3.1.1
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-
-  compare-func@2.0.0:
-    dependencies:
-      array-ify: 1.0.0
-      dot-prop: 5.3.0
-
-  component-emitter@1.3.1: {}
-
-  compress-commons@4.1.2:
-    dependencies:
-      buffer-crc32: 0.2.13
-      crc32-stream: 4.0.3
-      normalize-path: 3.0.0
-      readable-stream: 3.6.2
-
-  compute-scroll-into-view@1.0.20: {}
-
-  concat-map@0.0.1: {}
-
-  confbox@0.1.8: {}
-
-  consola@3.2.3: {}
-
-  conventional-changelog-angular@7.0.0:
-    dependencies:
-      compare-func: 2.0.0
-
-  conventional-changelog-conventionalcommits@7.0.2:
-    dependencies:
-      compare-func: 2.0.0
-
-  conventional-commit-types@3.0.0: {}
-
-  conventional-commits-parser@5.0.0:
-    dependencies:
-      JSONStream: 1.3.5
-      is-text-path: 2.0.0
-      meow: 12.1.1
-      split2: 4.2.0
-
-  cookies@0.9.1:
-    dependencies:
-      depd: 2.0.0
-      keygrip: 1.1.0
-
-  copy-descriptor@0.1.1: {}
-
-  core-util-is@1.0.3: {}
-
-  cors@2.8.5:
-    dependencies:
-      object-assign: 4.1.1
-      vary: 1.1.2
-
-  cosmiconfig-typescript-loader@5.1.0(@types/node@22.9.0)(cosmiconfig@9.0.0(typescript@5.5.4))(typescript@5.5.4):
-    dependencies:
-      '@types/node': 22.9.0
-      cosmiconfig: 9.0.0(typescript@5.5.4)
-      jiti: 1.21.6
-      typescript: 5.5.4
-
-  cosmiconfig@9.0.0(typescript@5.5.4):
-    dependencies:
-      env-paths: 2.2.1
-      import-fresh: 3.3.0
-      js-yaml: 4.1.0
-      parse-json: 5.2.0
-    optionalDependencies:
-      typescript: 5.5.4
-
-  crc-32@1.2.2: {}
-
-  crc32-stream@4.0.3:
-    dependencies:
-      crc-32: 1.2.2
-      readable-stream: 3.6.2
-
-  cropperjs@1.6.2: {}
-
-  cross-spawn@7.0.5:
-    dependencies:
-      path-key: 3.1.1
-      shebang-command: 2.0.0
-      which: 2.0.2
-
-  css-functions-list@3.2.3: {}
-
-  css-select@4.3.0:
-    dependencies:
-      boolbase: 1.0.0
-      css-what: 6.1.0
-      domhandler: 4.3.1
-      domutils: 2.8.0
-      nth-check: 2.1.1
-
-  css-tree@1.1.3:
-    dependencies:
-      mdn-data: 2.0.14
-      source-map: 0.6.1
-
-  css-tree@3.0.1:
-    dependencies:
-      mdn-data: 2.12.1
-      source-map-js: 1.2.1
-
-  css-what@6.1.0: {}
-
-  cssesc@3.0.0: {}
-
-  csso@4.2.0:
-    dependencies:
-      css-tree: 1.1.3
-
-  csstype@3.1.3: {}
-
-  cz-conventional-changelog@3.3.0(@types/node@22.9.0)(typescript@5.5.4):
-    dependencies:
-      chalk: 2.4.2
-      commitizen: 4.3.1(@types/node@22.9.0)(typescript@5.5.4)
-      conventional-commit-types: 3.0.0
-      lodash.map: 4.6.0
-      longest: 2.0.1
-      word-wrap: 1.2.5
-    optionalDependencies:
-      '@commitlint/load': 19.5.0(@types/node@22.9.0)(typescript@5.5.4)
-    transitivePeerDependencies:
-      - '@types/node'
-      - typescript
-
-  cz-git@1.9.4: {}
-
-  d@1.0.2:
-    dependencies:
-      es5-ext: 0.10.64
-      type: 2.7.3
-
-  dargs@8.1.0: {}
-
-  data-view-buffer@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  data-view-byte-offset@1.0.0:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-data-view: 1.0.1
-
-  dayjs@1.11.13: {}
-
-  de-indent@1.0.2: {}
-
-  debug@2.6.9:
-    dependencies:
-      ms: 2.0.0
-
-  debug@4.3.7:
-    dependencies:
-      ms: 2.1.3
-
-  decode-uri-component@0.2.2: {}
-
-  dedent@0.7.0: {}
-
-  deep-is@0.1.4: {}
-
-  defaults@1.0.4:
-    dependencies:
-      clone: 1.0.4
-
-  define-data-property@1.1.4:
-    dependencies:
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      gopd: 1.0.1
-
-  define-properties@1.2.1:
-    dependencies:
-      define-data-property: 1.1.4
-      has-property-descriptors: 1.0.2
-      object-keys: 1.1.1
-
-  define-property@0.2.5:
-    dependencies:
-      is-descriptor: 0.1.7
-
-  define-property@1.0.0:
-    dependencies:
-      is-descriptor: 1.0.3
-
-  define-property@2.0.2:
-    dependencies:
-      is-descriptor: 1.0.3
-      isobject: 3.0.1
-
-  defu@6.1.4: {}
-
-  delayed-stream@1.0.0: {}
-
-  depd@2.0.0: {}
-
-  destr@2.0.3: {}
-
-  detect-file@1.0.0: {}
-
-  detect-indent@6.1.0: {}
-
-  detect-libc@1.0.3:
-    optional: true
-
-  dezalgo@1.0.4:
-    dependencies:
-      asap: 2.0.6
-      wrappy: 1.0.2
-
-  diff-match-patch@1.0.5: {}
-
-  dir-glob@3.0.1:
-    dependencies:
-      path-type: 4.0.0
-
-  dom-serializer@0.2.2:
-    dependencies:
-      domelementtype: 2.3.0
-      entities: 2.2.0
-
-  dom-serializer@1.4.1:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-      entities: 2.2.0
-
-  dom-serializer@2.0.0:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      entities: 4.5.0
-
-  dom7@3.0.0:
-    dependencies:
-      ssr-window: 3.0.0
-
-  domelementtype@1.3.1: {}
-
-  domelementtype@2.3.0: {}
-
-  domhandler@2.4.2:
-    dependencies:
-      domelementtype: 1.3.1
-
-  domhandler@4.3.1:
-    dependencies:
-      domelementtype: 2.3.0
-
-  domhandler@5.0.3:
-    dependencies:
-      domelementtype: 2.3.0
-
-  domutils@1.7.0:
-    dependencies:
-      dom-serializer: 0.2.2
-      domelementtype: 1.3.1
-
-  domutils@2.8.0:
-    dependencies:
-      dom-serializer: 1.4.1
-      domelementtype: 2.3.0
-      domhandler: 4.3.1
-
-  domutils@3.1.0:
-    dependencies:
-      dom-serializer: 2.0.0
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-
-  dot-prop@5.3.0:
-    dependencies:
-      is-obj: 2.0.0
-
-  duplexer2@0.1.4:
-    dependencies:
-      readable-stream: 2.3.8
-
-  duplexer@0.1.2: {}
-
-  echarts@5.5.1:
-    dependencies:
-      tslib: 2.3.0
-      zrender: 5.6.0
-
-  electron-to-chromium@1.5.56: {}
-
-  element-plus@2.8.7(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@ctrl/tinycolor': 3.6.1
-      '@element-plus/icons-vue': 2.3.1(vue@3.5.12(typescript@5.5.4))
-      '@floating-ui/dom': 1.6.12
-      '@popperjs/core': '@sxzz/popperjs-es@2.11.7'
-      '@types/lodash': 4.17.13
-      '@types/lodash-es': 4.17.12
-      '@vueuse/core': 9.13.0(vue@3.5.12(typescript@5.5.4))
-      async-validator: 4.2.5
-      dayjs: 1.11.13
-      escape-html: 1.0.3
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-      lodash-unified: 1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21)
-      memoize-one: 6.0.0
-      normalize-wheel-es: 1.2.0
-      vue: 3.5.12(typescript@5.5.4)
-    transitivePeerDependencies:
-      - '@vue/composition-api'
-
-  emoji-regex@10.4.0: {}
-
-  emoji-regex@8.0.0: {}
-
-  emojis-list@3.0.0: {}
-
-  end-of-stream@1.4.4:
-    dependencies:
-      once: 1.4.0
-
-  entities@1.1.2: {}
-
-  entities@2.2.0: {}
-
-  entities@4.5.0: {}
-
-  env-paths@2.2.1: {}
-
-  environment@1.1.0: {}
-
-  error-ex@1.3.2:
-    dependencies:
-      is-arrayish: 0.2.1
-
-  es-abstract@1.23.3:
-    dependencies:
-      array-buffer-byte-length: 1.0.1
-      arraybuffer.prototype.slice: 1.0.3
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      data-view-buffer: 1.0.1
-      data-view-byte-length: 1.0.1
-      data-view-byte-offset: 1.0.0
-      es-define-property: 1.0.0
-      es-errors: 1.3.0
-      es-object-atoms: 1.0.0
-      es-set-tostringtag: 2.0.3
-      es-to-primitive: 1.2.1
-      function.prototype.name: 1.1.6
-      get-intrinsic: 1.2.4
-      get-symbol-description: 1.0.2
-      globalthis: 1.0.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-      internal-slot: 1.0.7
-      is-array-buffer: 3.0.4
-      is-callable: 1.2.7
-      is-data-view: 1.0.1
-      is-negative-zero: 2.0.3
-      is-regex: 1.1.4
-      is-shared-array-buffer: 1.0.3
-      is-string: 1.0.7
-      is-typed-array: 1.1.13
-      is-weakref: 1.0.2
-      object-inspect: 1.13.3
-      object-keys: 1.1.1
-      object.assign: 4.1.5
-      regexp.prototype.flags: 1.5.3
-      safe-array-concat: 1.1.2
-      safe-regex-test: 1.0.3
-      string.prototype.trim: 1.2.9
-      string.prototype.trimend: 1.0.8
-      string.prototype.trimstart: 1.0.8
-      typed-array-buffer: 1.0.2
-      typed-array-byte-length: 1.0.1
-      typed-array-byte-offset: 1.0.2
-      typed-array-length: 1.0.6
-      unbox-primitive: 1.0.2
-      which-typed-array: 1.1.15
-
-  es-define-property@1.0.0:
-    dependencies:
-      get-intrinsic: 1.2.4
-
-  es-errors@1.3.0: {}
-
-  es-object-atoms@1.0.0:
-    dependencies:
-      es-errors: 1.3.0
-
-  es-set-tostringtag@2.0.3:
-    dependencies:
-      get-intrinsic: 1.2.4
-      has-tostringtag: 1.0.2
-      hasown: 2.0.2
-
-  es-to-primitive@1.2.1:
-    dependencies:
-      is-callable: 1.2.7
-      is-date-object: 1.0.5
-      is-symbol: 1.0.4
-
-  es5-ext@0.10.64:
-    dependencies:
-      es6-iterator: 2.0.3
-      es6-symbol: 3.1.4
-      esniff: 2.0.1
-      next-tick: 1.1.0
-
-  es6-iterator@2.0.3:
-    dependencies:
-      d: 1.0.2
-      es5-ext: 0.10.64
-      es6-symbol: 3.1.4
-
-  es6-symbol@3.1.4:
-    dependencies:
-      d: 1.0.2
-      ext: 1.7.0
-
-  esbuild@0.21.5:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.21.5
-      '@esbuild/android-arm': 0.21.5
-      '@esbuild/android-arm64': 0.21.5
-      '@esbuild/android-x64': 0.21.5
-      '@esbuild/darwin-arm64': 0.21.5
-      '@esbuild/darwin-x64': 0.21.5
-      '@esbuild/freebsd-arm64': 0.21.5
-      '@esbuild/freebsd-x64': 0.21.5
-      '@esbuild/linux-arm': 0.21.5
-      '@esbuild/linux-arm64': 0.21.5
-      '@esbuild/linux-ia32': 0.21.5
-      '@esbuild/linux-loong64': 0.21.5
-      '@esbuild/linux-mips64el': 0.21.5
-      '@esbuild/linux-ppc64': 0.21.5
-      '@esbuild/linux-riscv64': 0.21.5
-      '@esbuild/linux-s390x': 0.21.5
-      '@esbuild/linux-x64': 0.21.5
-      '@esbuild/netbsd-x64': 0.21.5
-      '@esbuild/openbsd-x64': 0.21.5
-      '@esbuild/sunos-x64': 0.21.5
-      '@esbuild/win32-arm64': 0.21.5
-      '@esbuild/win32-ia32': 0.21.5
-      '@esbuild/win32-x64': 0.21.5
-
-  esbuild@0.23.1:
-    optionalDependencies:
-      '@esbuild/aix-ppc64': 0.23.1
-      '@esbuild/android-arm': 0.23.1
-      '@esbuild/android-arm64': 0.23.1
-      '@esbuild/android-x64': 0.23.1
-      '@esbuild/darwin-arm64': 0.23.1
-      '@esbuild/darwin-x64': 0.23.1
-      '@esbuild/freebsd-arm64': 0.23.1
-      '@esbuild/freebsd-x64': 0.23.1
-      '@esbuild/linux-arm': 0.23.1
-      '@esbuild/linux-arm64': 0.23.1
-      '@esbuild/linux-ia32': 0.23.1
-      '@esbuild/linux-loong64': 0.23.1
-      '@esbuild/linux-mips64el': 0.23.1
-      '@esbuild/linux-ppc64': 0.23.1
-      '@esbuild/linux-riscv64': 0.23.1
-      '@esbuild/linux-s390x': 0.23.1
-      '@esbuild/linux-x64': 0.23.1
-      '@esbuild/netbsd-x64': 0.23.1
-      '@esbuild/openbsd-arm64': 0.23.1
-      '@esbuild/openbsd-x64': 0.23.1
-      '@esbuild/sunos-x64': 0.23.1
-      '@esbuild/win32-arm64': 0.23.1
-      '@esbuild/win32-ia32': 0.23.1
-      '@esbuild/win32-x64': 0.23.1
-
-  escalade@3.2.0: {}
-
-  escape-html@1.0.3: {}
-
-  escape-string-regexp@1.0.5: {}
-
-  escape-string-regexp@4.0.0: {}
-
-  escape-string-regexp@5.0.0: {}
-
-  eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)):
-    dependencies:
-      eslint: 9.14.0(jiti@1.21.6)
-
-  eslint-plugin-prettier@5.2.1(eslint-config-prettier@9.1.0(eslint@9.14.0(jiti@1.21.6)))(eslint@9.14.0(jiti@1.21.6))(prettier@3.3.3):
-    dependencies:
-      eslint: 9.14.0(jiti@1.21.6)
-      prettier: 3.3.3
-      prettier-linter-helpers: 1.0.0
-      synckit: 0.9.2
-    optionalDependencies:
-      eslint-config-prettier: 9.1.0(eslint@9.14.0(jiti@1.21.6))
-
-  eslint-plugin-vue@9.31.0(eslint@9.14.0(jiti@1.21.6)):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
-      eslint: 9.14.0(jiti@1.21.6)
-      globals: 13.24.0
-      natural-compare: 1.4.0
-      nth-check: 2.1.1
-      postcss-selector-parser: 6.1.2
-      semver: 7.6.3
-      vue-eslint-parser: 9.4.3(eslint@9.14.0(jiti@1.21.6))
-      xml-name-validator: 4.0.0
-    transitivePeerDependencies:
-      - supports-color
-
-  eslint-scope@7.2.2:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-scope@8.2.0:
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 5.3.0
-
-  eslint-visitor-keys@3.4.3: {}
-
-  eslint-visitor-keys@4.2.0: {}
-
-  eslint@9.14.0(jiti@1.21.6):
-    dependencies:
-      '@eslint-community/eslint-utils': 4.4.1(eslint@9.14.0(jiti@1.21.6))
-      '@eslint-community/regexpp': 4.12.1
-      '@eslint/config-array': 0.18.0
-      '@eslint/core': 0.7.0
-      '@eslint/eslintrc': 3.1.0
-      '@eslint/js': 9.14.0
-      '@eslint/plugin-kit': 0.2.2
-      '@humanfs/node': 0.16.6
-      '@humanwhocodes/module-importer': 1.0.1
-      '@humanwhocodes/retry': 0.4.1
-      '@types/estree': 1.0.6
-      '@types/json-schema': 7.0.15
-      ajv: 6.12.6
-      chalk: 4.1.2
-      cross-spawn: 7.0.5
-      debug: 4.3.7
-      escape-string-regexp: 4.0.0
-      eslint-scope: 8.2.0
-      eslint-visitor-keys: 4.2.0
-      espree: 10.3.0
-      esquery: 1.6.0
-      esutils: 2.0.3
-      fast-deep-equal: 3.1.3
-      file-entry-cache: 8.0.0
-      find-up: 5.0.0
-      glob-parent: 6.0.2
-      ignore: 5.3.2
-      imurmurhash: 0.1.4
-      is-glob: 4.0.3
-      json-stable-stringify-without-jsonify: 1.0.1
-      lodash.merge: 4.6.2
-      minimatch: 3.1.2
-      natural-compare: 1.4.0
-      optionator: 0.9.4
-      text-table: 0.2.0
-    optionalDependencies:
-      jiti: 1.21.6
-    transitivePeerDependencies:
-      - supports-color
-
-  esniff@2.0.1:
-    dependencies:
-      d: 1.0.2
-      es5-ext: 0.10.64
-      event-emitter: 0.3.5
-      type: 2.7.3
-
-  espree@10.3.0:
-    dependencies:
-      acorn: 8.14.0
-      acorn-jsx: 5.3.2(acorn@8.14.0)
-      eslint-visitor-keys: 4.2.0
-
-  espree@9.6.1:
-    dependencies:
-      acorn: 8.14.0
-      acorn-jsx: 5.3.2(acorn@8.14.0)
-      eslint-visitor-keys: 3.4.3
-
-  esquery@1.6.0:
-    dependencies:
-      estraverse: 5.3.0
-
-  esrecurse@4.3.0:
-    dependencies:
-      estraverse: 5.3.0
-
-  estraverse@5.3.0: {}
-
-  estree-walker@2.0.2: {}
-
-  estree-walker@3.0.3:
-    dependencies:
-      '@types/estree': 1.0.6
-
-  esutils@2.0.3: {}
-
-  etag@1.8.1: {}
-
-  event-emitter@0.3.5:
-    dependencies:
-      d: 1.0.2
-      es5-ext: 0.10.64
-
-  eventemitter3@5.0.1: {}
-
-  exceljs@4.4.0:
-    dependencies:
-      archiver: 5.3.2
-      dayjs: 1.11.13
-      fast-csv: 4.3.6
-      jszip: 3.10.1
-      readable-stream: 3.6.2
-      saxes: 5.0.1
-      tmp: 0.2.3
-      unzipper: 0.10.14
-      uuid: 8.3.2
-
-  execa@8.0.1:
-    dependencies:
-      cross-spawn: 7.0.5
-      get-stream: 8.0.1
-      human-signals: 5.0.0
-      is-stream: 3.0.0
-      merge-stream: 2.0.0
-      npm-run-path: 5.3.0
-      onetime: 6.0.0
-      signal-exit: 4.1.0
-      strip-final-newline: 3.0.0
-
-  expand-brackets@2.1.4:
-    dependencies:
-      debug: 2.6.9
-      define-property: 0.2.5
-      extend-shallow: 2.0.1
-      posix-character-classes: 0.1.1
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  expand-tilde@2.0.2:
-    dependencies:
-      homedir-polyfill: 1.0.3
-
-  ext@1.7.0:
-    dependencies:
-      type: 2.7.3
-
-  extend-shallow@2.0.1:
-    dependencies:
-      is-extendable: 0.1.1
-
-  extend-shallow@3.0.2:
-    dependencies:
-      assign-symbols: 1.0.0
-      is-extendable: 1.0.1
-
-  external-editor@3.1.0:
-    dependencies:
-      chardet: 0.7.0
-      iconv-lite: 0.4.24
-      tmp: 0.0.33
-
-  extglob@2.0.4:
-    dependencies:
-      array-unique: 0.3.2
-      define-property: 1.0.0
-      expand-brackets: 2.1.4
-      extend-shallow: 2.0.1
-      fragment-cache: 0.2.1
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  fast-csv@4.3.6:
-    dependencies:
-      '@fast-csv/format': 4.3.5
-      '@fast-csv/parse': 4.3.6
-
-  fast-deep-equal@3.1.3: {}
-
-  fast-diff@1.3.0: {}
-
-  fast-glob@3.3.2:
-    dependencies:
-      '@nodelib/fs.stat': 2.0.5
-      '@nodelib/fs.walk': 1.2.8
-      glob-parent: 5.1.2
-      merge2: 1.4.1
-      micromatch: 4.0.8
-
-  fast-json-stable-stringify@2.1.0: {}
-
-  fast-levenshtein@2.0.6: {}
-
-  fast-uri@3.0.3: {}
-
-  fastest-levenshtein@1.0.16: {}
-
-  fastq@1.17.1:
-    dependencies:
-      reusify: 1.0.4
-
-  fdir@6.4.2(picomatch@4.0.2):
-    optionalDependencies:
-      picomatch: 4.0.2
-
-  figures@3.2.0:
-    dependencies:
-      escape-string-regexp: 1.0.5
-
-  file-entry-cache@8.0.0:
-    dependencies:
-      flat-cache: 4.0.1
-
-  file-entry-cache@9.1.0:
-    dependencies:
-      flat-cache: 5.0.0
-
-  fill-range@4.0.0:
-    dependencies:
-      extend-shallow: 2.0.1
-      is-number: 3.0.0
-      repeat-string: 1.6.1
-      to-regex-range: 2.1.1
-
-  fill-range@7.1.1:
-    dependencies:
-      to-regex-range: 5.0.1
-
-  find-node-modules@2.1.3:
-    dependencies:
-      findup-sync: 4.0.0
-      merge: 2.1.1
-
-  find-root@1.1.0: {}
-
-  find-up@5.0.0:
-    dependencies:
-      locate-path: 6.0.0
-      path-exists: 4.0.0
-
-  find-up@7.0.0:
-    dependencies:
-      locate-path: 7.2.0
-      path-exists: 5.0.0
-      unicorn-magic: 0.1.0
-
-  findup-sync@4.0.0:
-    dependencies:
-      detect-file: 1.0.0
-      is-glob: 4.0.3
-      micromatch: 4.0.8
-      resolve-dir: 1.0.1
-
-  flat-cache@4.0.1:
-    dependencies:
-      flatted: 3.3.1
-      keyv: 4.5.4
-
-  flat-cache@5.0.0:
-    dependencies:
-      flatted: 3.3.1
-      keyv: 4.5.4
-
-  flatted@3.3.1: {}
-
-  follow-redirects@1.15.9: {}
-
-  for-each@0.3.3:
-    dependencies:
-      is-callable: 1.2.7
-
-  for-in@1.0.2: {}
-
-  form-data@4.0.1:
-    dependencies:
-      asynckit: 0.4.0
-      combined-stream: 1.0.8
-      mime-types: 2.1.35
-
-  formidable@2.1.2:
-    dependencies:
-      dezalgo: 1.0.4
-      hexoid: 1.0.0
-      once: 1.4.0
-      qs: 6.13.0
-
-  fraction.js@4.3.7: {}
-
-  fragment-cache@0.2.1:
-    dependencies:
-      map-cache: 0.2.2
-
-  fs-constants@1.0.0: {}
-
-  fs-extra@10.1.0:
-    dependencies:
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
-  fs-extra@9.1.0:
-    dependencies:
-      at-least-node: 1.0.0
-      graceful-fs: 4.2.11
-      jsonfile: 6.1.0
-      universalify: 2.0.1
-
-  fs.realpath@1.0.0: {}
-
-  fsevents@2.3.3:
-    optional: true
-
-  fstream@1.0.12:
-    dependencies:
-      graceful-fs: 4.2.11
-      inherits: 2.0.4
-      mkdirp: 0.5.6
-      rimraf: 2.7.1
-
-  function-bind@1.1.2: {}
-
-  function.prototype.name@1.1.6:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      functions-have-names: 1.2.3
-
-  functions-have-names@1.2.3: {}
-
-  get-caller-file@2.0.5: {}
-
-  get-east-asian-width@1.3.0: {}
-
-  get-intrinsic@1.2.4:
-    dependencies:
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      has-proto: 1.0.3
-      has-symbols: 1.0.3
-      hasown: 2.0.2
-
-  get-stream@8.0.1: {}
-
-  get-symbol-description@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-
-  get-tsconfig@4.8.1:
-    dependencies:
-      resolve-pkg-maps: 1.0.0
-
-  get-value@2.0.6: {}
-
-  git-raw-commits@4.0.0:
-    dependencies:
-      dargs: 8.1.0
-      meow: 12.1.1
-      split2: 4.2.0
-
-  glob-parent@5.1.2:
-    dependencies:
-      is-glob: 4.0.3
-
-  glob-parent@6.0.2:
-    dependencies:
-      is-glob: 4.0.3
-
-  glob@7.2.3:
-    dependencies:
-      fs.realpath: 1.0.0
-      inflight: 1.0.6
-      inherits: 2.0.4
-      minimatch: 3.1.2
-      once: 1.4.0
-      path-is-absolute: 1.0.1
-
-  global-directory@4.0.1:
-    dependencies:
-      ini: 4.1.1
-
-  global-modules@1.0.0:
-    dependencies:
-      global-prefix: 1.0.2
-      is-windows: 1.0.2
-      resolve-dir: 1.0.1
-
-  global-modules@2.0.0:
-    dependencies:
-      global-prefix: 3.0.0
-
-  global-prefix@1.0.2:
-    dependencies:
-      expand-tilde: 2.0.2
-      homedir-polyfill: 1.0.3
-      ini: 1.3.8
-      is-windows: 1.0.2
-      which: 1.3.1
-
-  global-prefix@3.0.0:
-    dependencies:
-      ini: 1.3.8
-      kind-of: 6.0.3
-      which: 1.3.1
-
-  globals@13.24.0:
-    dependencies:
-      type-fest: 0.20.2
-
-  globals@14.0.0: {}
-
-  globals@15.12.0: {}
-
-  globalthis@1.0.4:
-    dependencies:
-      define-properties: 1.2.1
-      gopd: 1.0.1
-
-  globby@11.1.0:
-    dependencies:
-      array-union: 2.1.0
-      dir-glob: 3.0.1
-      fast-glob: 3.3.2
-      ignore: 5.3.2
-      merge2: 1.4.1
-      slash: 3.0.0
-
-  globjoin@0.1.4: {}
-
-  gopd@1.0.1:
-    dependencies:
-      get-intrinsic: 1.2.4
-
-  graceful-fs@4.2.11: {}
-
-  graphemer@1.4.0: {}
-
-  gzip-size@6.0.0:
-    dependencies:
-      duplexer: 0.1.2
-
-  has-ansi@2.0.0:
-    dependencies:
-      ansi-regex: 2.1.1
-
-  has-bigints@1.0.2: {}
-
-  has-flag@1.0.0: {}
-
-  has-flag@3.0.0: {}
-
-  has-flag@4.0.0: {}
-
-  has-property-descriptors@1.0.2:
-    dependencies:
-      es-define-property: 1.0.0
-
-  has-proto@1.0.3: {}
-
-  has-symbols@1.0.3: {}
-
-  has-tostringtag@1.0.2:
-    dependencies:
-      has-symbols: 1.0.3
-
-  has-value@0.3.1:
-    dependencies:
-      get-value: 2.0.6
-      has-values: 0.1.4
-      isobject: 2.1.0
-
-  has-value@1.0.0:
-    dependencies:
-      get-value: 2.0.6
-      has-values: 1.0.0
-      isobject: 3.0.1
-
-  has-values@0.1.4: {}
-
-  has-values@1.0.0:
-    dependencies:
-      is-number: 3.0.0
-      kind-of: 4.0.0
-
-  hasown@2.0.2:
-    dependencies:
-      function-bind: 1.1.2
-
-  he@1.2.0: {}
-
-  hexoid@1.0.0: {}
-
-  homedir-polyfill@1.0.3:
-    dependencies:
-      parse-passwd: 1.0.0
-
-  html-tags@3.3.1: {}
-
-  html-void-elements@2.0.1: {}
-
-  htmlparser2@3.10.1:
-    dependencies:
-      domelementtype: 1.3.1
-      domhandler: 2.4.2
-      domutils: 1.7.0
-      entities: 1.1.2
-      inherits: 2.0.4
-      readable-stream: 3.6.2
-
-  htmlparser2@8.0.2:
-    dependencies:
-      domelementtype: 2.3.0
-      domhandler: 5.0.3
-      domutils: 3.1.0
-      entities: 4.5.0
-
-  http-errors@2.0.0:
-    dependencies:
-      depd: 2.0.0
-      inherits: 2.0.4
-      setprototypeof: 1.2.0
-      statuses: 2.0.1
-      toidentifier: 1.0.1
-
-  http-status@1.8.1: {}
-
-  human-signals@5.0.0: {}
-
-  husky@9.1.6: {}
-
-  i18next@20.6.1:
-    dependencies:
-      '@babel/runtime': 7.26.0
-
-  iconv-lite@0.4.24:
-    dependencies:
-      safer-buffer: 2.1.2
-
-  ieee754@1.2.1: {}
-
-  ignore@5.3.2: {}
-
-  ignore@6.0.2: {}
-
-  image-size@0.5.5: {}
-
-  immediate@3.0.6: {}
-
-  immer@9.0.21: {}
-
-  immutable@4.3.7: {}
-
-  import-fresh@3.3.0:
-    dependencies:
-      parent-module: 1.0.1
-      resolve-from: 4.0.0
-
-  import-meta-resolve@4.1.0: {}
-
-  importx@0.4.4:
-    dependencies:
-      bundle-require: 5.0.0(esbuild@0.23.1)
-      debug: 4.3.7
-      esbuild: 0.23.1
-      jiti: 2.0.0-beta.3
-      jiti-v1: jiti@1.21.6
-      pathe: 1.1.2
-      tsx: 4.19.2
-    transitivePeerDependencies:
-      - supports-color
-
-  imurmurhash@0.1.4: {}
-
-  inflation@2.1.0: {}
-
-  inflight@1.0.6:
-    dependencies:
-      once: 1.4.0
-      wrappy: 1.0.2
-
-  inherits@2.0.4: {}
-
-  ini@1.3.8: {}
-
-  ini@4.1.1: {}
-
-  inquirer@8.2.5:
-    dependencies:
-      ansi-escapes: 4.3.2
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-width: 3.0.0
-      external-editor: 3.1.0
-      figures: 3.2.0
-      lodash: 4.17.21
-      mute-stream: 0.0.8
-      ora: 5.4.1
-      run-async: 2.4.1
-      rxjs: 7.8.1
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-      through: 2.3.8
-      wrap-ansi: 7.0.0
-
-  internal-slot@1.0.7:
-    dependencies:
-      es-errors: 1.3.0
-      hasown: 2.0.2
-      side-channel: 1.0.6
-
-  is-accessor-descriptor@1.0.1:
-    dependencies:
-      hasown: 2.0.2
-
-  is-array-buffer@3.0.4:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-
-  is-arrayish@0.2.1: {}
-
-  is-bigint@1.0.4:
-    dependencies:
-      has-bigints: 1.0.2
-
-  is-binary-path@2.1.0:
-    dependencies:
-      binary-extensions: 2.3.0
-
-  is-boolean-object@1.1.2:
-    dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
-
-  is-buffer@1.1.6: {}
-
-  is-callable@1.2.7: {}
-
-  is-core-module@2.15.1:
-    dependencies:
-      hasown: 2.0.2
-
-  is-data-descriptor@1.0.1:
-    dependencies:
-      hasown: 2.0.2
-
-  is-data-view@1.0.1:
-    dependencies:
-      is-typed-array: 1.1.13
-
-  is-date-object@1.0.5:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-descriptor@0.1.7:
-    dependencies:
-      is-accessor-descriptor: 1.0.1
-      is-data-descriptor: 1.0.1
-
-  is-descriptor@1.0.3:
-    dependencies:
-      is-accessor-descriptor: 1.0.1
-      is-data-descriptor: 1.0.1
-
-  is-extendable@0.1.1: {}
-
-  is-extendable@1.0.1:
-    dependencies:
-      is-plain-object: 2.0.4
-
-  is-extglob@2.1.1: {}
-
-  is-fullwidth-code-point@3.0.0: {}
-
-  is-fullwidth-code-point@4.0.0: {}
-
-  is-fullwidth-code-point@5.0.0:
-    dependencies:
-      get-east-asian-width: 1.3.0
-
-  is-glob@4.0.3:
-    dependencies:
-      is-extglob: 2.1.1
-
-  is-hotkey@0.2.0: {}
-
-  is-interactive@1.0.0: {}
-
-  is-negative-zero@2.0.3: {}
-
-  is-number-object@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-number@3.0.0:
-    dependencies:
-      kind-of: 3.2.2
-
-  is-number@7.0.0: {}
-
-  is-obj@2.0.0: {}
-
-  is-plain-obj@1.1.0: {}
-
-  is-plain-object@2.0.4:
-    dependencies:
-      isobject: 3.0.1
-
-  is-plain-object@5.0.0: {}
-
-  is-regex@1.1.4:
-    dependencies:
-      call-bind: 1.0.7
-      has-tostringtag: 1.0.2
-
-  is-shared-array-buffer@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-stream@3.0.0: {}
-
-  is-string@1.0.7:
-    dependencies:
-      has-tostringtag: 1.0.2
-
-  is-symbol@1.0.4:
-    dependencies:
-      has-symbols: 1.0.3
-
-  is-text-path@2.0.0:
-    dependencies:
-      text-extensions: 2.4.0
-
-  is-typed-array@1.1.13:
-    dependencies:
-      which-typed-array: 1.1.15
-
-  is-unicode-supported@0.1.0: {}
-
-  is-url@1.2.4: {}
-
-  is-utf8@0.2.1: {}
-
-  is-weakref@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-
-  is-windows@1.0.2: {}
-
-  isarray@1.0.0: {}
-
-  isarray@2.0.5: {}
-
-  isexe@2.0.0: {}
-
-  isobject@2.1.0:
-    dependencies:
-      isarray: 1.0.0
-
-  isobject@3.0.1: {}
-
-  jiti@1.21.6: {}
-
-  jiti@2.0.0-beta.3: {}
-
-  js-base64@2.6.4: {}
-
-  js-tokens@4.0.0: {}
-
-  js-tokens@9.0.0: {}
-
-  js-yaml@4.1.0:
-    dependencies:
-      argparse: 2.0.1
-
-  json-buffer@3.0.1: {}
-
-  json-parse-even-better-errors@2.3.1: {}
-
-  json-schema-traverse@0.4.1: {}
-
-  json-schema-traverse@1.0.0: {}
-
-  json-stable-stringify-without-jsonify@1.0.1: {}
-
-  json5@1.0.2:
-    dependencies:
-      minimist: 1.2.8
-
-  json5@2.2.3: {}
-
-  jsonfile@6.1.0:
-    dependencies:
-      universalify: 2.0.1
-    optionalDependencies:
-      graceful-fs: 4.2.11
-
-  jsonparse@1.3.1: {}
-
-  jszip@3.10.1:
-    dependencies:
-      lie: 3.3.0
-      pako: 1.0.11
-      readable-stream: 2.3.8
-      setimmediate: 1.0.5
-
-  keygrip@1.1.0:
-    dependencies:
-      tsscmp: 1.0.6
-
-  keyv@4.5.4:
-    dependencies:
-      json-buffer: 3.0.1
-
-  kind-of@3.2.2:
-    dependencies:
-      is-buffer: 1.1.6
-
-  kind-of@4.0.0:
-    dependencies:
-      is-buffer: 1.1.6
-
-  kind-of@5.1.0: {}
-
-  kind-of@6.0.3: {}
-
-  known-css-properties@0.34.0: {}
-
-  known-css-properties@0.35.0: {}
-
-  kolorist@1.8.0: {}
-
-  lazystream@1.0.1:
-    dependencies:
-      readable-stream: 2.3.8
-
-  levn@0.4.1:
-    dependencies:
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-
-  lie@3.3.0:
-    dependencies:
-      immediate: 3.0.6
-
-  lilconfig@3.1.2: {}
-
-  lines-and-columns@1.2.4: {}
-
-  lint-staged@15.2.10:
-    dependencies:
-      chalk: 5.3.0
-      commander: 12.1.0
-      debug: 4.3.7
-      execa: 8.0.1
-      lilconfig: 3.1.2
-      listr2: 8.2.5
-      micromatch: 4.0.8
-      pidtree: 0.6.0
-      string-argv: 0.3.2
-      yaml: 2.5.1
-    transitivePeerDependencies:
-      - supports-color
-
-  listenercount@1.0.1: {}
-
-  listr2@8.2.5:
-    dependencies:
-      cli-truncate: 4.0.0
-      colorette: 2.0.20
-      eventemitter3: 5.0.1
-      log-update: 6.1.0
-      rfdc: 1.4.1
-      wrap-ansi: 9.0.0
-
-  load-tsconfig@0.2.5: {}
-
-  loader-utils@1.4.2:
-    dependencies:
-      big.js: 5.2.2
-      emojis-list: 3.0.0
-      json5: 1.0.2
-
-  local-pkg@0.5.0:
-    dependencies:
-      mlly: 1.7.2
-      pkg-types: 1.2.1
-
-  locate-path@6.0.0:
-    dependencies:
-      p-locate: 5.0.0
-
-  locate-path@7.2.0:
-    dependencies:
-      p-locate: 6.0.0
-
-  lodash-es@4.17.21: {}
-
-  lodash-unified@1.0.3(@types/lodash-es@4.17.12)(lodash-es@4.17.21)(lodash@4.17.21):
-    dependencies:
-      '@types/lodash-es': 4.17.12
-      lodash: 4.17.21
-      lodash-es: 4.17.21
-
-  lodash.camelcase@4.3.0: {}
-
-  lodash.clonedeep@4.5.0: {}
-
-  lodash.debounce@4.0.8: {}
-
-  lodash.defaults@4.2.0: {}
-
-  lodash.difference@4.5.0: {}
-
-  lodash.escaperegexp@4.1.2: {}
-
-  lodash.flatten@4.4.0: {}
-
-  lodash.foreach@4.5.0: {}
-
-  lodash.groupby@4.6.0: {}
-
-  lodash.isboolean@3.0.3: {}
-
-  lodash.isequal@4.5.0: {}
-
-  lodash.isfunction@3.0.9: {}
-
-  lodash.isnil@4.0.0: {}
-
-  lodash.isplainobject@4.0.6: {}
-
-  lodash.isundefined@3.0.1: {}
-
-  lodash.kebabcase@4.1.1: {}
-
-  lodash.map@4.6.0: {}
-
-  lodash.merge@4.6.2: {}
-
-  lodash.mergewith@4.6.2: {}
-
-  lodash.snakecase@4.1.1: {}
-
-  lodash.startcase@4.4.0: {}
-
-  lodash.throttle@4.1.1: {}
-
-  lodash.toarray@4.4.0: {}
-
-  lodash.truncate@4.4.2: {}
-
-  lodash.union@4.6.0: {}
-
-  lodash.uniq@4.5.0: {}
-
-  lodash.upperfirst@4.3.1: {}
-
-  lodash@4.17.21: {}
-
-  log-symbols@4.1.0:
-    dependencies:
-      chalk: 4.1.2
-      is-unicode-supported: 0.1.0
-
-  log-update@6.1.0:
-    dependencies:
-      ansi-escapes: 7.0.0
-      cli-cursor: 5.0.0
-      slice-ansi: 7.1.0
-      strip-ansi: 7.1.0
-      wrap-ansi: 9.0.0
-
-  longest@2.0.1: {}
-
-  magic-string@0.30.12:
-    dependencies:
-      '@jridgewell/sourcemap-codec': 1.5.0
-
-  map-cache@0.2.2: {}
-
-  map-visit@1.0.0:
-    dependencies:
-      object-visit: 1.0.1
-
-  mathml-tag-names@2.1.3: {}
-
-  mdn-data@2.0.14: {}
-
-  mdn-data@2.12.1: {}
-
-  mdn-data@2.12.2: {}
-
-  media-typer@0.3.0: {}
-
-  memoize-one@6.0.0: {}
-
-  meow@12.1.1: {}
-
-  meow@13.2.0: {}
-
-  merge-options@1.0.1:
-    dependencies:
-      is-plain-obj: 1.1.0
-
-  merge-stream@2.0.0: {}
-
-  merge2@1.4.1: {}
-
-  merge@2.1.1: {}
-
-  micromatch@3.1.0:
-    dependencies:
-      arr-diff: 4.0.0
-      array-unique: 0.3.2
-      braces: 2.3.2
-      define-property: 1.0.0
-      extend-shallow: 2.0.1
-      extglob: 2.0.4
-      fragment-cache: 0.2.1
-      kind-of: 5.1.0
-      nanomatch: 1.2.13
-      object.pick: 1.3.0
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  micromatch@4.0.8:
-    dependencies:
-      braces: 3.0.3
-      picomatch: 2.3.1
-
-  mime-db@1.52.0: {}
-
-  mime-match@1.0.2:
-    dependencies:
-      wildcard: 1.1.2
-
-  mime-types@2.1.35:
-    dependencies:
-      mime-db: 1.52.0
-
-  mime@3.0.0: {}
-
-  mimic-fn@2.1.0: {}
-
-  mimic-fn@4.0.0: {}
-
-  mimic-function@5.0.1: {}
-
-  minimatch@3.1.2:
-    dependencies:
-      brace-expansion: 1.1.11
-
-  minimatch@5.1.6:
-    dependencies:
-      brace-expansion: 2.0.1
-
-  minimatch@9.0.5:
-    dependencies:
-      brace-expansion: 2.0.1
-
-  minimist@1.2.7: {}
-
-  minimist@1.2.8: {}
-
-  mixin-deep@1.3.2:
-    dependencies:
-      for-in: 1.0.2
-      is-extendable: 1.0.1
-
-  mkdirp@0.5.6:
-    dependencies:
-      minimist: 1.2.8
-
-  mlly@1.7.2:
-    dependencies:
-      acorn: 8.14.0
-      pathe: 1.1.2
-      pkg-types: 1.2.1
-      ufo: 1.5.4
-
-  mrmime@2.0.0: {}
-
-  ms@2.0.0: {}
-
-  ms@2.1.3: {}
-
-  muggle-string@0.4.1: {}
-
-  mute-stream@0.0.8: {}
-
-  namespace-emitter@2.0.1: {}
-
-  nanoid@3.3.7: {}
-
-  nanomatch@1.2.13:
-    dependencies:
-      arr-diff: 4.0.0
-      array-unique: 0.3.2
-      define-property: 2.0.2
-      extend-shallow: 3.0.2
-      fragment-cache: 0.2.1
-      is-windows: 1.0.2
-      kind-of: 6.0.3
-      object.pick: 1.3.0
-      regex-not: 1.0.2
-      snapdragon: 0.8.2
-      to-regex: 3.0.2
-    transitivePeerDependencies:
-      - supports-color
-
-  natural-compare@1.4.0: {}
-
-  next-tick@1.1.0: {}
-
-  node-addon-api@7.1.1:
-    optional: true
-
-  node-fetch-native@1.6.4: {}
-
-  node-releases@2.0.18: {}
-
-  normalize-path@3.0.0: {}
-
-  normalize-range@0.1.2: {}
-
-  normalize-wheel-es@1.2.0: {}
-
-  npm-run-path@5.3.0:
-    dependencies:
-      path-key: 4.0.0
-
-  nprogress@0.2.0: {}
-
-  nth-check@2.1.1:
-    dependencies:
-      boolbase: 1.0.0
-
-  object-assign@4.1.1: {}
-
-  object-copy@0.1.0:
-    dependencies:
-      copy-descriptor: 0.1.1
-      define-property: 0.2.5
-      kind-of: 3.2.2
-
-  object-inspect@1.13.3: {}
-
-  object-keys@1.1.1: {}
-
-  object-visit@1.0.1:
-    dependencies:
-      isobject: 3.0.1
-
-  object.assign@4.1.5:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      has-symbols: 1.0.3
-      object-keys: 1.1.1
-
-  object.pick@1.3.0:
-    dependencies:
-      isobject: 3.0.1
-
-  ofetch@1.4.1:
-    dependencies:
-      destr: 2.0.3
-      node-fetch-native: 1.6.4
-      ufo: 1.5.4
-
-  once@1.4.0:
-    dependencies:
-      wrappy: 1.0.2
-
-  onetime@5.1.2:
-    dependencies:
-      mimic-fn: 2.1.0
-
-  onetime@6.0.0:
-    dependencies:
-      mimic-fn: 4.0.0
-
-  onetime@7.0.0:
-    dependencies:
-      mimic-function: 5.0.1
-
-  optionator@0.9.4:
-    dependencies:
-      deep-is: 0.1.4
-      fast-levenshtein: 2.0.6
-      levn: 0.4.1
-      prelude-ls: 1.2.1
-      type-check: 0.4.0
-      word-wrap: 1.2.5
-
-  ora@5.4.1:
-    dependencies:
-      bl: 4.1.0
-      chalk: 4.1.2
-      cli-cursor: 3.1.0
-      cli-spinners: 2.9.2
-      is-interactive: 1.0.0
-      is-unicode-supported: 0.1.0
-      log-symbols: 4.1.0
-      strip-ansi: 6.0.1
-      wcwidth: 1.0.1
-
-  os-tmpdir@1.0.2: {}
-
-  p-limit@3.1.0:
-    dependencies:
-      yocto-queue: 0.1.0
-
-  p-limit@4.0.0:
-    dependencies:
-      yocto-queue: 1.1.1
-
-  p-locate@5.0.0:
-    dependencies:
-      p-limit: 3.1.0
-
-  p-locate@6.0.0:
-    dependencies:
-      p-limit: 4.0.0
-
-  package-manager-detector@0.2.2: {}
-
-  pako@1.0.11: {}
-
-  parent-module@1.0.1:
-    dependencies:
-      callsites: 3.1.0
-
-  parse-json@5.2.0:
-    dependencies:
-      '@babel/code-frame': 7.26.2
-      error-ex: 1.3.2
-      json-parse-even-better-errors: 2.3.1
-      lines-and-columns: 1.2.4
-
-  parse-passwd@1.0.0: {}
-
-  pascalcase@0.1.1: {}
-
-  path-browserify@1.0.1: {}
-
-  path-exists@4.0.0: {}
-
-  path-exists@5.0.0: {}
-
-  path-is-absolute@1.0.1: {}
-
-  path-key@3.1.1: {}
-
-  path-key@4.0.0: {}
-
-  path-to-regexp@6.2.2: {}
-
-  path-to-regexp@6.3.0: {}
-
-  path-type@4.0.0: {}
-
-  pathe@0.2.0: {}
-
-  pathe@1.1.2: {}
-
-  perfect-debounce@1.0.0: {}
-
-  picocolors@1.1.1: {}
-
-  picomatch@2.3.1: {}
-
-  picomatch@4.0.2: {}
-
-  pidtree@0.6.0: {}
-
-  pinia@2.2.6(typescript@5.5.4)(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@vue/devtools-api': 6.6.4
-      vue: 3.5.12(typescript@5.5.4)
-      vue-demi: 0.14.10(vue@3.5.12(typescript@5.5.4))
-    optionalDependencies:
-      typescript: 5.5.4
-
-  pkg-types@1.2.1:
-    dependencies:
-      confbox: 0.1.8
-      mlly: 1.7.2
-      pathe: 1.1.2
-
-  posix-character-classes@0.1.1: {}
-
-  possible-typed-array-names@1.0.0: {}
-
-  postcss-html@1.7.0:
-    dependencies:
-      htmlparser2: 8.0.2
-      js-tokens: 9.0.0
-      postcss: 8.4.49
-      postcss-safe-parser: 6.0.0(postcss@8.4.49)
-
-  postcss-media-query-parser@0.2.3: {}
-
-  postcss-prefix-selector@1.16.1(postcss@5.2.18):
-    dependencies:
-      postcss: 5.2.18
-
-  postcss-resolve-nested-selector@0.1.6: {}
-
-  postcss-safe-parser@6.0.0(postcss@8.4.49):
-    dependencies:
-      postcss: 8.4.49
-
-  postcss-safe-parser@7.0.1(postcss@8.4.49):
-    dependencies:
-      postcss: 8.4.49
-
-  postcss-scss@4.0.9(postcss@8.4.49):
-    dependencies:
-      postcss: 8.4.49
-
-  postcss-selector-parser@6.1.2:
-    dependencies:
-      cssesc: 3.0.0
-      util-deprecate: 1.0.2
-
-  postcss-sorting@8.0.2(postcss@8.4.49):
-    dependencies:
-      postcss: 8.4.49
-
-  postcss-value-parser@4.2.0: {}
-
-  postcss@5.2.18:
-    dependencies:
-      chalk: 1.1.3
-      js-base64: 2.6.4
-      source-map: 0.5.7
-      supports-color: 3.2.3
-
-  postcss@8.4.49:
-    dependencies:
-      nanoid: 3.3.7
-      picocolors: 1.1.1
-      source-map-js: 1.2.1
-
-  posthtml-parser@0.2.1:
-    dependencies:
-      htmlparser2: 3.10.1
-      isobject: 2.1.0
-
-  posthtml-rename-id@1.0.12:
-    dependencies:
-      escape-string-regexp: 1.0.5
-
-  posthtml-render@1.4.0: {}
-
-  posthtml-svg-mode@1.0.3:
-    dependencies:
-      merge-options: 1.0.1
-      posthtml: 0.9.2
-      posthtml-parser: 0.2.1
-      posthtml-render: 1.4.0
-
-  posthtml@0.9.2:
-    dependencies:
-      posthtml-parser: 0.2.1
-      posthtml-render: 1.4.0
-
-  preact@10.24.3: {}
-
-  prelude-ls@1.2.1: {}
-
-  prettier-linter-helpers@1.0.0:
-    dependencies:
-      fast-diff: 1.3.0
-
-  prettier@3.3.3: {}
-
-  prismjs@1.29.0: {}
-
-  process-nextick-args@2.0.1: {}
-
-  proxy-from-env@1.1.0: {}
-
-  punycode@2.3.1: {}
-
-  qs@6.13.0:
-    dependencies:
-      side-channel: 1.0.6
-
-  query-string@4.3.4:
-    dependencies:
-      object-assign: 4.1.1
-      strict-uri-encode: 1.1.0
-
-  queue-microtask@1.2.3: {}
-
-  raw-body@2.5.2:
-    dependencies:
-      bytes: 3.1.2
-      http-errors: 2.0.0
-      iconv-lite: 0.4.24
-      unpipe: 1.0.0
-
-  readable-stream@2.3.8:
-    dependencies:
-      core-util-is: 1.0.3
-      inherits: 2.0.4
-      isarray: 1.0.0
-      process-nextick-args: 2.0.1
-      safe-buffer: 5.1.2
-      string_decoder: 1.1.1
-      util-deprecate: 1.0.2
-
-  readable-stream@3.6.2:
-    dependencies:
-      inherits: 2.0.4
-      string_decoder: 1.3.0
-      util-deprecate: 1.0.2
-
-  readdir-glob@1.1.3:
-    dependencies:
-      minimatch: 5.1.6
-
-  readdirp@3.6.0:
-    dependencies:
-      picomatch: 2.3.1
-
-  readdirp@4.0.2: {}
-
-  regenerator-runtime@0.14.1: {}
-
-  regex-not@1.0.2:
-    dependencies:
-      extend-shallow: 3.0.2
-      safe-regex: 1.1.0
-
-  regexp.prototype.flags@1.5.3:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-errors: 1.3.0
-      set-function-name: 2.0.2
-
-  repeat-element@1.1.4: {}
-
-  repeat-string@1.6.1: {}
-
-  require-directory@2.1.1: {}
-
-  require-from-string@2.0.2: {}
-
-  resolve-dir@1.0.1:
-    dependencies:
-      expand-tilde: 2.0.2
-      global-modules: 1.0.0
-
-  resolve-from@4.0.0: {}
-
-  resolve-from@5.0.0: {}
-
-  resolve-pkg-maps@1.0.0: {}
-
-  resolve-url@0.2.1: {}
-
-  restore-cursor@3.1.0:
-    dependencies:
-      onetime: 5.1.2
-      signal-exit: 3.0.7
-
-  restore-cursor@5.1.0:
-    dependencies:
-      onetime: 7.0.0
-      signal-exit: 4.1.0
-
-  ret@0.1.15: {}
-
-  reusify@1.0.4: {}
-
-  rfdc@1.4.1: {}
-
-  rimraf@2.7.1:
-    dependencies:
-      glob: 7.2.3
-
-  rollup@4.25.0:
-    dependencies:
-      '@types/estree': 1.0.6
-    optionalDependencies:
-      '@rollup/rollup-android-arm-eabi': 4.25.0
-      '@rollup/rollup-android-arm64': 4.25.0
-      '@rollup/rollup-darwin-arm64': 4.25.0
-      '@rollup/rollup-darwin-x64': 4.25.0
-      '@rollup/rollup-freebsd-arm64': 4.25.0
-      '@rollup/rollup-freebsd-x64': 4.25.0
-      '@rollup/rollup-linux-arm-gnueabihf': 4.25.0
-      '@rollup/rollup-linux-arm-musleabihf': 4.25.0
-      '@rollup/rollup-linux-arm64-gnu': 4.25.0
-      '@rollup/rollup-linux-arm64-musl': 4.25.0
-      '@rollup/rollup-linux-powerpc64le-gnu': 4.25.0
-      '@rollup/rollup-linux-riscv64-gnu': 4.25.0
-      '@rollup/rollup-linux-s390x-gnu': 4.25.0
-      '@rollup/rollup-linux-x64-gnu': 4.25.0
-      '@rollup/rollup-linux-x64-musl': 4.25.0
-      '@rollup/rollup-win32-arm64-msvc': 4.25.0
-      '@rollup/rollup-win32-ia32-msvc': 4.25.0
-      '@rollup/rollup-win32-x64-msvc': 4.25.0
-      fsevents: 2.3.3
-
-  run-async@2.4.1: {}
-
-  run-parallel@1.2.0:
-    dependencies:
-      queue-microtask: 1.2.3
-
-  rxjs@7.8.1:
-    dependencies:
-      tslib: 2.8.1
-
-  safe-array-concat@1.1.2:
-    dependencies:
-      call-bind: 1.0.7
-      get-intrinsic: 1.2.4
-      has-symbols: 1.0.3
-      isarray: 2.0.5
-
-  safe-buffer@5.1.2: {}
-
-  safe-buffer@5.2.1: {}
-
-  safe-regex-test@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-regex: 1.1.4
-
-  safe-regex@1.1.0:
-    dependencies:
-      ret: 0.1.15
-
-  safer-buffer@2.1.2: {}
-
-  sass@1.80.6:
-    dependencies:
-      chokidar: 4.0.1
-      immutable: 4.3.7
-      source-map-js: 1.2.1
-    optionalDependencies:
-      '@parcel/watcher': 2.5.0
-
-  saxes@5.0.1:
-    dependencies:
-      xmlchars: 2.2.0
-
-  scroll-into-view-if-needed@2.2.31:
-    dependencies:
-      compute-scroll-into-view: 1.0.20
-
-  scule@1.3.0: {}
-
-  semver@7.6.3: {}
-
-  set-function-length@1.2.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      function-bind: 1.1.2
-      get-intrinsic: 1.2.4
-      gopd: 1.0.1
-      has-property-descriptors: 1.0.2
-
-  set-function-name@2.0.2:
-    dependencies:
-      define-data-property: 1.1.4
-      es-errors: 1.3.0
-      functions-have-names: 1.2.3
-      has-property-descriptors: 1.0.2
-
-  set-value@2.0.1:
-    dependencies:
-      extend-shallow: 2.0.1
-      is-extendable: 0.1.1
-      is-plain-object: 2.0.4
-      split-string: 3.1.0
-
-  setimmediate@1.0.5: {}
-
-  setprototypeof@1.2.0: {}
-
-  shebang-command@2.0.0:
-    dependencies:
-      shebang-regex: 3.0.0
-
-  shebang-regex@3.0.0: {}
-
-  side-channel@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      get-intrinsic: 1.2.4
-      object-inspect: 1.13.3
-
-  signal-exit@3.0.7: {}
-
-  signal-exit@4.1.0: {}
-
-  sirv@2.0.4:
-    dependencies:
-      '@polka/url': 1.0.0-next.28
-      mrmime: 2.0.0
-      totalist: 3.0.1
-
-  slash@3.0.0: {}
-
-  slate-history@0.66.0(slate@0.72.8):
-    dependencies:
-      is-plain-object: 5.0.0
-      slate: 0.72.8
-
-  slate@0.72.8:
-    dependencies:
-      immer: 9.0.21
-      is-plain-object: 5.0.0
-      tiny-warning: 1.0.3
-
-  slice-ansi@4.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      astral-regex: 2.0.0
-      is-fullwidth-code-point: 3.0.0
-
-  slice-ansi@5.0.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 4.0.0
-
-  slice-ansi@7.1.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      is-fullwidth-code-point: 5.0.0
-
-  snabbdom@3.6.2: {}
-
-  snapdragon-node@2.1.1:
-    dependencies:
-      define-property: 1.0.0
-      isobject: 3.0.1
-      snapdragon-util: 3.0.1
-
-  snapdragon-util@3.0.1:
-    dependencies:
-      kind-of: 3.2.2
-
-  snapdragon@0.8.2:
-    dependencies:
-      base: 0.11.2
-      debug: 2.6.9
-      define-property: 0.2.5
-      extend-shallow: 2.0.1
-      map-cache: 0.2.2
-      source-map: 0.5.7
-      source-map-resolve: 0.5.3
-      use: 3.1.1
-    transitivePeerDependencies:
-      - supports-color
-
-  sortablejs@1.15.3: {}
-
-  source-map-js@1.2.1: {}
-
-  source-map-resolve@0.5.3:
-    dependencies:
-      atob: 2.1.2
-      decode-uri-component: 0.2.2
-      resolve-url: 0.2.1
-      source-map-url: 0.4.1
-      urix: 0.1.0
-
-  source-map-support@0.5.21:
-    dependencies:
-      buffer-from: 1.1.2
-      source-map: 0.6.1
-
-  source-map-url@0.4.1: {}
-
-  source-map@0.5.7: {}
-
-  source-map@0.6.1: {}
-
-  split-string@3.1.0:
-    dependencies:
-      extend-shallow: 3.0.2
-
-  split2@4.2.0: {}
-
-  ssr-window@3.0.0: {}
-
-  stable@0.1.8: {}
-
-  static-extend@0.1.2:
-    dependencies:
-      define-property: 0.2.5
-      object-copy: 0.1.0
-
-  statuses@2.0.1: {}
-
-  strict-uri-encode@1.1.0: {}
-
-  string-argv@0.3.2: {}
-
-  string-width@4.2.3:
-    dependencies:
-      emoji-regex: 8.0.0
-      is-fullwidth-code-point: 3.0.0
-      strip-ansi: 6.0.1
-
-  string-width@7.2.0:
-    dependencies:
-      emoji-regex: 10.4.0
-      get-east-asian-width: 1.3.0
-      strip-ansi: 7.1.0
-
-  string.prototype.trim@1.2.9:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimend@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  string.prototype.trimstart@1.0.8:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-object-atoms: 1.0.0
-
-  string_decoder@1.1.1:
-    dependencies:
-      safe-buffer: 5.1.2
-
-  string_decoder@1.3.0:
-    dependencies:
-      safe-buffer: 5.2.1
-
-  strip-ansi@3.0.1:
-    dependencies:
-      ansi-regex: 2.1.1
-
-  strip-ansi@6.0.1:
-    dependencies:
-      ansi-regex: 5.0.1
-
-  strip-ansi@7.1.0:
-    dependencies:
-      ansi-regex: 6.1.0
-
-  strip-bom@4.0.0: {}
-
-  strip-final-newline@3.0.0: {}
-
-  strip-json-comments@3.1.1: {}
-
-  strip-literal@2.1.0:
-    dependencies:
-      js-tokens: 9.0.0
-
-  stylelint-config-html@1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      postcss-html: 1.7.0
-      stylelint: 16.10.0(typescript@5.5.4)
-
-  stylelint-config-recess-order@5.1.1(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-order: 6.0.4(stylelint@16.10.0(typescript@5.5.4))
-
-  stylelint-config-recommended-scss@14.1.0(postcss@8.4.49)(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      postcss-scss: 4.0.9(postcss@8.4.49)
-      stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-scss: 6.9.0(stylelint@16.10.0(typescript@5.5.4))
-    optionalDependencies:
-      postcss: 8.4.49
-
-  stylelint-config-recommended-vue@1.5.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      postcss-html: 1.7.0
-      semver: 7.6.3
-      stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-html: 1.1.0(postcss-html@1.7.0)(stylelint@16.10.0(typescript@5.5.4))
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
-
-  stylelint-config-recommended@14.0.1(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      stylelint: 16.10.0(typescript@5.5.4)
-
-  stylelint-config-standard@36.0.1(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      stylelint: 16.10.0(typescript@5.5.4)
-      stylelint-config-recommended: 14.0.1(stylelint@16.10.0(typescript@5.5.4))
-
-  stylelint-order@6.0.4(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      postcss: 8.4.49
-      postcss-sorting: 8.0.2(postcss@8.4.49)
-      stylelint: 16.10.0(typescript@5.5.4)
-
-  stylelint-scss@6.9.0(stylelint@16.10.0(typescript@5.5.4)):
-    dependencies:
-      css-tree: 3.0.1
-      is-plain-object: 5.0.0
-      known-css-properties: 0.35.0
-      mdn-data: 2.12.2
-      postcss-media-query-parser: 0.2.3
-      postcss-resolve-nested-selector: 0.1.6
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-      stylelint: 16.10.0(typescript@5.5.4)
-
-  stylelint@16.10.0(typescript@5.5.4):
-    dependencies:
-      '@csstools/css-parser-algorithms': 3.0.4(@csstools/css-tokenizer@3.0.3)
-      '@csstools/css-tokenizer': 3.0.3
-      '@csstools/media-query-list-parser': 3.0.1(@csstools/css-parser-algorithms@3.0.4(@csstools/css-tokenizer@3.0.3))(@csstools/css-tokenizer@3.0.3)
-      '@csstools/selector-specificity': 4.0.0(postcss-selector-parser@6.1.2)
-      '@dual-bundle/import-meta-resolve': 4.1.0
-      balanced-match: 2.0.0
-      colord: 2.9.3
-      cosmiconfig: 9.0.0(typescript@5.5.4)
-      css-functions-list: 3.2.3
-      css-tree: 3.0.1
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      fastest-levenshtein: 1.0.16
-      file-entry-cache: 9.1.0
-      global-modules: 2.0.0
-      globby: 11.1.0
-      globjoin: 0.1.4
-      html-tags: 3.3.1
-      ignore: 6.0.2
-      imurmurhash: 0.1.4
-      is-plain-object: 5.0.0
-      known-css-properties: 0.34.0
-      mathml-tag-names: 2.1.3
-      meow: 13.2.0
-      micromatch: 4.0.8
-      normalize-path: 3.0.0
-      picocolors: 1.1.1
-      postcss: 8.4.49
-      postcss-resolve-nested-selector: 0.1.6
-      postcss-safe-parser: 7.0.1(postcss@8.4.49)
-      postcss-selector-parser: 6.1.2
-      postcss-value-parser: 4.2.0
-      resolve-from: 5.0.0
-      string-width: 4.2.3
-      supports-hyperlinks: 3.1.0
-      svg-tags: 1.0.0
-      table: 6.8.2
-      write-file-atomic: 5.0.1
-    transitivePeerDependencies:
-      - supports-color
-      - typescript
-
-  supports-color@2.0.0: {}
-
-  supports-color@3.2.3:
-    dependencies:
-      has-flag: 1.0.0
-
-  supports-color@5.5.0:
-    dependencies:
-      has-flag: 3.0.0
-
-  supports-color@7.2.0:
-    dependencies:
-      has-flag: 4.0.0
-
-  supports-hyperlinks@3.1.0:
-    dependencies:
-      has-flag: 4.0.0
-      supports-color: 7.2.0
-
-  svg-baker@1.7.0:
-    dependencies:
-      bluebird: 3.7.2
-      clone: 2.1.2
-      he: 1.2.0
-      image-size: 0.5.5
-      loader-utils: 1.4.2
-      merge-options: 1.0.1
-      micromatch: 3.1.0
-      postcss: 5.2.18
-      postcss-prefix-selector: 1.16.1(postcss@5.2.18)
-      posthtml-rename-id: 1.0.12
-      posthtml-svg-mode: 1.0.3
-      query-string: 4.3.4
-      traverse: 0.6.10
-    transitivePeerDependencies:
-      - supports-color
-
-  svg-tags@1.0.0: {}
-
-  svgo@2.8.0:
-    dependencies:
-      '@trysound/sax': 0.2.0
-      commander: 7.2.0
-      css-select: 4.3.0
-      css-tree: 1.1.3
-      csso: 4.2.0
-      picocolors: 1.1.1
-      stable: 0.1.8
-
-  synckit@0.9.2:
-    dependencies:
-      '@pkgr/core': 0.1.1
-      tslib: 2.8.1
-
-  table@6.8.2:
-    dependencies:
-      ajv: 8.17.1
-      lodash.truncate: 4.4.2
-      slice-ansi: 4.0.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  tar-stream@2.2.0:
-    dependencies:
-      bl: 4.1.0
-      end-of-stream: 1.4.4
-      fs-constants: 1.0.0
-      inherits: 2.0.4
-      readable-stream: 3.6.2
-
-  terser@5.36.0:
-    dependencies:
-      '@jridgewell/source-map': 0.3.6
-      acorn: 8.14.0
-      commander: 2.20.3
-      source-map-support: 0.5.21
-
-  text-extensions@2.4.0: {}
-
-  text-table@0.2.0: {}
-
-  through@2.3.8: {}
-
-  tiny-warning@1.0.3: {}
-
-  tinyexec@0.3.1: {}
-
-  tinyglobby@0.2.10:
-    dependencies:
-      fdir: 6.4.2(picomatch@4.0.2)
-      picomatch: 4.0.2
-
-  tmp@0.0.33:
-    dependencies:
-      os-tmpdir: 1.0.2
-
-  tmp@0.2.3: {}
-
-  to-object-path@0.3.0:
-    dependencies:
-      kind-of: 3.2.2
-
-  to-regex-range@2.1.1:
-    dependencies:
-      is-number: 3.0.0
-      repeat-string: 1.6.1
-
-  to-regex-range@5.0.1:
-    dependencies:
-      is-number: 7.0.0
-
-  to-regex@3.0.2:
-    dependencies:
-      define-property: 2.0.2
-      extend-shallow: 3.0.2
-      regex-not: 1.0.2
-      safe-regex: 1.1.0
-
-  toidentifier@1.0.1: {}
-
-  totalist@3.0.1: {}
-
-  traverse@0.3.9: {}
-
-  traverse@0.6.10:
-    dependencies:
-      gopd: 1.0.1
-      typedarray.prototype.slice: 1.0.3
-      which-typed-array: 1.1.15
-
-  ts-api-utils@1.4.0(typescript@5.5.4):
-    dependencies:
-      typescript: 5.5.4
-
-  tslib@2.3.0: {}
-
-  tslib@2.8.1: {}
-
-  tsscmp@1.0.6: {}
-
-  tsx@4.19.2:
-    dependencies:
-      esbuild: 0.23.1
-      get-tsconfig: 4.8.1
-    optionalDependencies:
-      fsevents: 2.3.3
-
-  type-check@0.4.0:
-    dependencies:
-      prelude-ls: 1.2.1
-
-  type-fest@0.20.2: {}
-
-  type-fest@0.21.3: {}
-
-  type-is@1.6.18:
-    dependencies:
-      media-typer: 0.3.0
-      mime-types: 2.1.35
-
-  type@2.7.3: {}
-
-  typed-array-buffer@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      es-errors: 1.3.0
-      is-typed-array: 1.1.13
-
-  typed-array-byte-length@1.0.1:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-byte-offset@1.0.2:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-
-  typed-array-length@1.0.6:
-    dependencies:
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-proto: 1.0.3
-      is-typed-array: 1.1.13
-      possible-typed-array-names: 1.0.0
-
-  typedarray.prototype.slice@1.0.3:
-    dependencies:
-      call-bind: 1.0.7
-      define-properties: 1.2.1
-      es-abstract: 1.23.3
-      es-errors: 1.3.0
-      typed-array-buffer: 1.0.2
-      typed-array-byte-offset: 1.0.2
-
-  typescript-eslint@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4):
-    dependencies:
-      '@typescript-eslint/eslint-plugin': 8.14.0(@typescript-eslint/parser@8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4))(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/parser': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-      '@typescript-eslint/utils': 8.14.0(eslint@9.14.0(jiti@1.21.6))(typescript@5.5.4)
-    optionalDependencies:
-      typescript: 5.5.4
-    transitivePeerDependencies:
-      - eslint
-      - supports-color
-
-  typescript@5.5.4: {}
-
-  ufo@1.5.4: {}
-
-  unbox-primitive@1.0.2:
-    dependencies:
-      call-bind: 1.0.7
-      has-bigints: 1.0.2
-      has-symbols: 1.0.3
-      which-boxed-primitive: 1.0.2
-
-  unconfig@0.5.5:
-    dependencies:
-      '@antfu/utils': 0.7.10
-      defu: 6.1.4
-      importx: 0.4.4
-    transitivePeerDependencies:
-      - supports-color
-
-  undici-types@6.19.8: {}
-
-  unicorn-magic@0.1.0: {}
-
-  unimport@3.13.1(rollup@4.25.0):
-    dependencies:
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      acorn: 8.14.0
-      escape-string-regexp: 5.0.0
-      estree-walker: 3.0.3
-      fast-glob: 3.3.2
-      local-pkg: 0.5.0
-      magic-string: 0.30.12
-      mlly: 1.7.2
-      pathe: 1.1.2
-      pkg-types: 1.2.1
-      scule: 1.3.0
-      strip-literal: 2.1.0
-      unplugin: 1.15.0
-    transitivePeerDependencies:
-      - rollup
-      - webpack-sources
-
-  union-value@1.0.1:
-    dependencies:
-      arr-union: 3.1.0
-      get-value: 2.0.6
-      is-extendable: 0.1.1
-      set-value: 2.0.1
-
-  universalify@2.0.1: {}
-
-  unocss@0.63.6(postcss@8.4.49)(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
-    dependencies:
-      '@unocss/astro': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-      '@unocss/cli': 0.63.6(rollup@4.25.0)
-      '@unocss/core': 0.63.6
-      '@unocss/postcss': 0.63.6(postcss@8.4.49)
-      '@unocss/preset-attributify': 0.63.6
-      '@unocss/preset-icons': 0.63.6
-      '@unocss/preset-mini': 0.63.6
-      '@unocss/preset-tagify': 0.63.6
-      '@unocss/preset-typography': 0.63.6
-      '@unocss/preset-uno': 0.63.6
-      '@unocss/preset-web-fonts': 0.63.6
-      '@unocss/preset-wind': 0.63.6
-      '@unocss/transformer-attributify-jsx': 0.63.6
-      '@unocss/transformer-compile-class': 0.63.6
-      '@unocss/transformer-directives': 0.63.6
-      '@unocss/transformer-variant-group': 0.63.6
-      '@unocss/vite': 0.63.6(rollup@4.25.0)(typescript@5.5.4)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0))
-    optionalDependencies:
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-    transitivePeerDependencies:
-      - postcss
-      - rollup
-      - supports-color
-      - typescript
-
-  unpipe@1.0.0: {}
-
-  unplugin-auto-import@0.18.3(@vueuse/core@10.11.1(vue@3.5.12(typescript@5.5.4)))(rollup@4.25.0):
-    dependencies:
-      '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      fast-glob: 3.3.2
-      local-pkg: 0.5.0
-      magic-string: 0.30.12
-      minimatch: 9.0.5
-      unimport: 3.13.1(rollup@4.25.0)
-      unplugin: 1.15.0
-    optionalDependencies:
-      '@vueuse/core': 10.11.1(vue@3.5.12(typescript@5.5.4))
-    transitivePeerDependencies:
-      - rollup
-      - webpack-sources
-
-  unplugin-vue-components@0.27.4(@babel/parser@7.26.2)(rollup@4.25.0)(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@antfu/utils': 0.7.10
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      chokidar: 3.6.0
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      local-pkg: 0.5.0
-      magic-string: 0.30.12
-      minimatch: 9.0.5
-      mlly: 1.7.2
-      unplugin: 1.15.0
-      vue: 3.5.12(typescript@5.5.4)
-    optionalDependencies:
-      '@babel/parser': 7.26.2
-    transitivePeerDependencies:
-      - rollup
-      - supports-color
-      - webpack-sources
-
-  unplugin@1.15.0:
-    dependencies:
-      acorn: 8.14.0
-      webpack-virtual-modules: 0.6.2
-
-  unset-value@1.0.0:
-    dependencies:
-      has-value: 0.3.1
-      isobject: 3.0.1
-
-  unzipper@0.10.14:
-    dependencies:
-      big-integer: 1.6.52
-      binary: 0.3.0
-      bluebird: 3.4.7
-      buffer-indexof-polyfill: 1.0.2
-      duplexer2: 0.1.4
-      fstream: 1.0.12
-      graceful-fs: 4.2.11
-      listenercount: 1.0.1
-      readable-stream: 2.3.8
-      setimmediate: 1.0.5
-
-  update-browserslist-db@1.1.1(browserslist@4.24.2):
-    dependencies:
-      browserslist: 4.24.2
-      escalade: 3.2.0
-      picocolors: 1.1.1
-
-  uri-js@4.4.1:
-    dependencies:
-      punycode: 2.3.1
-
-  urix@0.1.0: {}
-
-  use@3.1.1: {}
-
-  util-deprecate@1.0.2: {}
-
-  uuid@8.3.2: {}
-
-  vary@1.1.2: {}
-
-  vite-plugin-mock-dev-server@1.8.0(esbuild@0.23.1)(rollup@4.25.0)(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
-    dependencies:
-      '@pengzhanbo/utils': 1.1.2
-      '@rollup/pluginutils': 5.1.3(rollup@4.25.0)
-      chokidar: 3.6.0
-      co-body: 6.2.0
-      cookies: 0.9.1
-      cors: 2.8.5
-      debug: 4.3.7
-      fast-glob: 3.3.2
-      formidable: 2.1.2
-      http-status: 1.8.1
-      is-core-module: 2.15.1
-      json5: 2.2.3
-      mime-types: 2.1.35
-      path-to-regexp: 6.2.2
-      picocolors: 1.1.1
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-      ws: 8.18.0
-    optionalDependencies:
-      esbuild: 0.23.1
-    transitivePeerDependencies:
-      - bufferutil
-      - rollup
-      - supports-color
-      - utf-8-validate
-
-  vite-plugin-svg-icons@2.0.1(vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)):
-    dependencies:
-      '@types/svgo': 2.6.4
-      cors: 2.8.5
-      debug: 4.3.7
-      etag: 1.8.1
-      fs-extra: 10.1.0
-      pathe: 0.2.0
-      svg-baker: 1.7.0
-      svgo: 2.8.0
-      vite: 5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0)
-    transitivePeerDependencies:
-      - supports-color
-
-  vite@5.4.11(@types/node@22.9.0)(sass@1.80.6)(terser@5.36.0):
-    dependencies:
-      esbuild: 0.21.5
-      postcss: 8.4.49
-      rollup: 4.25.0
-    optionalDependencies:
-      '@types/node': 22.9.0
-      fsevents: 2.3.3
-      sass: 1.80.6
-      terser: 5.36.0
-
-  vscode-uri@3.0.8: {}
-
-  vue-demi@0.14.10(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      vue: 3.5.12(typescript@5.5.4)
-
-  vue-eslint-parser@9.4.3(eslint@9.14.0(jiti@1.21.6)):
-    dependencies:
-      debug: 4.3.7
-      eslint: 9.14.0(jiti@1.21.6)
-      eslint-scope: 7.2.2
-      eslint-visitor-keys: 3.4.3
-      espree: 9.6.1
-      esquery: 1.6.0
-      lodash: 4.17.21
-      semver: 7.6.3
-    transitivePeerDependencies:
-      - supports-color
-
-  vue-flow-layout@0.0.5(typescript@5.5.4):
-    dependencies:
-      vue: 3.5.12(typescript@5.5.4)
-    transitivePeerDependencies:
-      - typescript
-
-  vue-i18n@9.9.1(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@intlify/core-base': 9.9.1
-      '@intlify/shared': 9.9.1
-      '@vue/devtools-api': 6.6.4
-      vue: 3.5.12(typescript@5.5.4)
-
-  vue-picture-cropper@0.7.0(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@bassist/utils': 0.4.0
-      cropperjs: 1.6.2
-      vue: 3.5.12(typescript@5.5.4)
-
-  vue-router@4.4.5(vue@3.5.12(typescript@5.5.4)):
-    dependencies:
-      '@vue/devtools-api': 6.6.4
-      vue: 3.5.12(typescript@5.5.4)
-
-  vue-tsc@2.1.10(typescript@5.5.4):
-    dependencies:
-      '@volar/typescript': 2.4.10
-      '@vue/language-core': 2.1.10(typescript@5.5.4)
-      semver: 7.6.3
-      typescript: 5.5.4
-
-  vue@3.5.12(typescript@5.5.4):
-    dependencies:
-      '@vue/compiler-dom': 3.5.12
-      '@vue/compiler-sfc': 3.5.12
-      '@vue/runtime-dom': 3.5.12
-      '@vue/server-renderer': 3.5.12(vue@3.5.12(typescript@5.5.4))
-      '@vue/shared': 3.5.12
-    optionalDependencies:
-      typescript: 5.5.4
-
-  wcwidth@1.0.1:
-    dependencies:
-      defaults: 1.0.4
-
-  webpack-virtual-modules@0.6.2: {}
-
-  which-boxed-primitive@1.0.2:
-    dependencies:
-      is-bigint: 1.0.4
-      is-boolean-object: 1.1.2
-      is-number-object: 1.0.7
-      is-string: 1.0.7
-      is-symbol: 1.0.4
-
-  which-typed-array@1.1.15:
-    dependencies:
-      available-typed-arrays: 1.0.7
-      call-bind: 1.0.7
-      for-each: 0.3.3
-      gopd: 1.0.1
-      has-tostringtag: 1.0.2
-
-  which@1.3.1:
-    dependencies:
-      isexe: 2.0.0
-
-  which@2.0.2:
-    dependencies:
-      isexe: 2.0.0
-
-  wildcard@1.1.2: {}
-
-  word-wrap@1.2.5: {}
-
-  wrap-ansi@7.0.0:
-    dependencies:
-      ansi-styles: 4.3.0
-      string-width: 4.2.3
-      strip-ansi: 6.0.1
-
-  wrap-ansi@9.0.0:
-    dependencies:
-      ansi-styles: 6.2.1
-      string-width: 7.2.0
-      strip-ansi: 7.1.0
-
-  wrappy@1.0.2: {}
-
-  write-file-atomic@5.0.1:
-    dependencies:
-      imurmurhash: 0.1.4
-      signal-exit: 4.1.0
-
-  ws@8.18.0: {}
-
-  xml-name-validator@4.0.0: {}
-
-  xmlchars@2.2.0: {}
-
-  y18n@5.0.8: {}
-
-  yaml@2.5.1: {}
-
-  yargs-parser@21.1.1: {}
-
-  yargs@17.7.2:
-    dependencies:
-      cliui: 8.0.1
-      escalade: 3.2.0
-      get-caller-file: 2.0.5
-      require-directory: 2.1.1
-      string-width: 4.2.3
-      y18n: 5.0.8
-      yargs-parser: 21.1.1
-
-  yocto-queue@0.1.0: {}
-
-  yocto-queue@1.1.1: {}
-
-  zip-stream@4.1.1:
-    dependencies:
-      archiver-utils: 3.0.4
-      compress-commons: 4.1.2
-      readable-stream: 3.6.2
-
-  zrender@5.6.0:
-    dependencies:
-      tslib: 2.3.0

From 5758b8019083321de93c7c97e705d3bf932d0d47 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 26 Nov 2024 23:39:35 +0800
Subject: [PATCH 081/497] =?UTF-8?q?fix:=20:bug:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B6=E7=BA=A7=E8=8F=9C=E5=8D=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E6=AD=A3=E7=A1=AE=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/menu.ts          |  8 ++++----
 src/views/system/menu/index.vue | 21 ++++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/api/system/menu.ts b/src/api/system/menu.ts
index e7ff8495..a3d9b639 100644
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.ts
@@ -49,7 +49,7 @@ const MenuAPI = {
    *
    * @param id 菜单ID
    */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, MenuForm>({
       url: `${MENU_BASE_URL}/${id}/form`,
       method: "get",
@@ -118,11 +118,11 @@ export interface MenuVO {
   /** ICON */
   icon?: string;
   /** 菜单ID */
-  id?: number;
+  id?: string;
   /** 菜单名称 */
   name?: string;
   /** 父菜单ID */
-  parentId?: number;
+  parentId?: string;
   /** 按钮权限标识 */
   perm?: string;
   /** 跳转路径 */
@@ -144,7 +144,7 @@ export interface MenuForm {
   /** 菜单ID */
   id?: string;
   /** 父菜单ID */
-  parentId?: number;
+  parentId?: string;
   /** 菜单名称 */
   name?: string;
   /** 菜单是否可见(1-是 0-否) */
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b06202f3..9a96e710 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -23,7 +23,7 @@
           v-hasPerm="['sys:menu:add']"
           type="success"
           icon="plus"
-          @click="handleOpenDialog(0)"
+          @click="handleOpenDialog('0')"
         >
           新增
         </el-button>
@@ -357,7 +357,7 @@ const menuOptions = ref<OptionType[]>([]);
 // 初始菜单表单数据
 const initialMenuFormData = ref<MenuForm>({
   id: undefined,
-  parentId: 0,
+  parentId: "0",
   visible: 1,
   sort: 1,
   type: MenuTypeEnum.MENU, // 默认菜单
@@ -379,7 +379,7 @@ const rules = reactive({
 });
 
 // 选择表格的行菜单ID
-const selectedMenuId = ref<number | undefined>();
+const selectedMenuId = ref<string | undefined>();
 
 // 查询菜单
 function handleQuery() {
@@ -401,7 +401,6 @@ function handleResetQuery() {
 
 // 行点击事件
 function handleRowClick(row: MenuVO) {
-  // 记录表格选择的菜单ID，新增子菜单作为父菜单ID
   selectedMenuId.value = row.id;
 }
 
@@ -411,10 +410,10 @@ function handleRowClick(row: MenuVO) {
  * @param parentId 父菜单ID
  * @param menuId 菜单ID
  */
-function handleOpenDialog(parentId?: number, menuId?: number) {
+function handleOpenDialog(parentId?: string, menuId?: string) {
   MenuAPI.getOptions(true)
     .then((data) => {
-      menuOptions.value = [{ value: 0, label: "顶级菜单", children: data }];
+      menuOptions.value = [{ value: "0", label: "顶级菜单", children: data }];
     })
     .then(() => {
       dialog.visible = true;
@@ -501,12 +500,16 @@ function handleDelete(menuId: number) {
   );
 }
 
+function resetRorm() {
+  menuFormRef.value.resetFields();
+  menuFormRef.value.clearValidate();
+  formData.value = { ...initialMenuFormData.value };
+}
+
 // 关闭弹窗
 function handleCloseDialog() {
   dialog.visible = false;
-  menuFormRef.value.resetFields();
-  menuFormRef.value.clearValidate();
-  formData.value.id = undefined;
+  resetRorm();
 }
 
 onMounted(() => {

From 239781788ee51f37d37502664e9058413e2d9e1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Wed, 27 Nov 2024 17:46:00 +0800
Subject: [PATCH 082/497] =?UTF-8?q?feat:=20:sparkles:=20=E5=A2=9E=E5=88=A0?=
 =?UTF-8?q?=E6=94=B9=E6=9F=A5=E6=BC=94=E7=A4=BA=E5=A2=9E=E5=8A=A0=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增删改查演示增加详情功能
---
 src/components/CURD/PageModal.vue     | 22 ++++++++++++++++++++--
 src/views/demo/curd/config/content.ts | 17 +++++++++++++++--
 src/views/demo/curd/index.vue         | 23 +++++++++++++++++++++--
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index da5a2daf..87465d69 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -101,10 +101,13 @@
       </el-form>
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
-        <div>
+        <div v-if="!formDisable">
           <el-button type="primary" @click="handleSubmit">确 定</el-button>
           <el-button @click="handleClose">取 消</el-button>
         </div>
+        <div v-else>
+          <el-button @click="handleClose">关闭</el-button>
+        </div>
       </template>
     </el-drawer>
   </template>
@@ -247,6 +250,7 @@ const formRef = ref<FormInstance>();
 const formItems = reactive(props.modalConfig.formItems);
 const formData = reactive<IObject>({});
 const formRules: FormRules = {};
+const formDisable = ref(false);
 const prepareFuncs = [];
 for (const item of formItems) {
   item.initFn && item.initFn(item);
@@ -352,8 +356,22 @@ function handleCloseModal() {
   });
 }
 
+// 禁用表单--用于详情时候用
+function handleDisabled(disable: boolean) {
+  formDisable.value = disable;
+  props.modalConfig.formItems.forEach((item) => {
+    if (item) {
+      if (item.attrs) {
+        item.attrs.disabled = disable;
+      } else {
+        item.attrs = { disabled: disable };
+      }
+    }
+  });
+}
+
 // 暴露的属性和方法
-defineExpose({ setModalVisible, getFormData, setFormData, setFormItemData });
+defineExpose({ setModalVisible, getFormData, setFormData, setFormItemData, handleDisabled });
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 3cb11ea8..e9fc2e18 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -56,7 +56,14 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     { label: "用户名", align: "center", prop: "username" },
     { label: "头像", align: "center", prop: "avatar", templet: "image" },
     { label: "用户昵称", align: "center", prop: "nickname", width: 120 },
-    { label: "性别", align: "center", prop: "genderLabel", width: 100 },
+    {
+      label: "性别",
+      align: "center",
+      prop: "gender",
+      width: 100,
+      templet: "custom",
+      slotName: "gender",
+    },
     { label: "部门", align: "center", prop: "deptName", width: 120 },
     {
       label: "角色",
@@ -94,9 +101,15 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       label: "操作",
       align: "center",
       fixed: "right",
-      width: 220,
+      width: 280,
       templet: "tool",
       operat: [
+        {
+          auth: "password:reset",
+          icon: "Document",
+          name: "detail",
+          text: "详情",
+        },
         {
           name: "reset_pwd",
           auth: "password:reset",
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 495ae850..d1499d9d 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -38,6 +38,9 @@
             {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
           </el-tag>
         </template>
+        <template #gender="scope">
+          <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+        </template>
         <template #mobile="scope">
           <el-text>{{ scope.row[scope.prop] }}</el-text>
           <copy-button
@@ -66,7 +69,7 @@
         @submit-click="handleSubmitClick"
       >
         <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" />
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
         </template>
       </page-modal>
     </template>
@@ -123,6 +126,7 @@ async function handleAddClick() {
 }
 // 编辑
 async function handleEditClick(row: IObject) {
+  editModalRef.value?.handleDisabled(false);
   editModalRef.value?.setModalVisible();
   // 加载部门下拉数据源
   editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
@@ -140,7 +144,7 @@ function handleToolbarClick(name: string) {
   }
 }
 // 其他操作列
-function handleOperatClick(data: IOperatData) {
+async function handleOperatClick(data: IOperatData) {
   console.log(data);
   // 重置密码
   if (data.name === "reset_pwd") {
@@ -156,6 +160,21 @@ function handleOperatClick(data: IOperatData) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       });
     });
+  } else if (data.name === "detail") {
+    // 禁用表单编辑
+    editModalRef.value?.handleDisabled(true);
+    // 打开抽屉
+    editModalRef.value?.setModalVisible();
+    // 修改抽屉标题
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "用户详情" };
+    // 加载部门下拉数据源
+    editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+    // 加载角色下拉数据源
+    editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+    // 根据id获取数据进行填充
+    const formData = await UserAPI.getFormData(data.row.id);
+    // 设置表单数据
+    editModalRef.value?.setFormData(formData);
   }
 }
 

From 64a6adad96cbb9686c451ee7485a3dd30aa15d47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Wed, 27 Nov 2024 17:53:51 +0800
Subject: [PATCH 083/497] =?UTF-8?q?refactor:=20:recycle:=20cURD=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=A2=9D=E5=A4=96=E7=9A=84=E6=93=8D=E4=BD=9C=E5=88=97?=
 =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E9=9C=80=E8=A6=81auth=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CURD组件额外的操作列可以不需要auth属性
---
 src/components/CURD/PageContent.vue   | 4 +++-
 src/components/CURD/types.ts          | 2 +-
 src/views/demo/curd/config/content.ts | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 5e420119..e8a408f7 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -284,7 +284,9 @@
                 <template v-else-if="typeof item === 'object'">
                   <el-button
                     v-if="item.render === undefined || item.render(scope.row)"
-                    v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                    v-bind="
+                      item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
+                    "
                     :icon="item.icon"
                     :type="item.type ?? 'primary'"
                     size="small"
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 1e2a25cc..7ed66edb 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -174,7 +174,7 @@ export interface IContentConfig<T = any> {
       | "edit"
       | "delete"
       | {
-          auth: string;
+          auth?: string;
           icon?: string;
           name: string;
           text: string;
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index e9fc2e18..c1c2f908 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -105,7 +105,6 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       templet: "tool",
       operat: [
         {
-          auth: "password:reset",
           icon: "Document",
           name: "detail",
           text: "详情",

From 0f57cdf6f3d4ce94b16f790cd65703e78dc5b1d9 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 2 Dec 2024 13:48:59 +0800
Subject: [PATCH 084/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20vite=20=E7=89=88=E6=9C=AC(6.0.1)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   | 52 +++++++++++++++++++++++++-------------------------
 vite.config.ts | 16 +++-------------
 2 files changed, 29 insertions(+), 39 deletions(-)

diff --git a/package.json b/package.json
index cfe4a8b2..6bbd00a7 100644
--- a/package.json
+++ b/package.json
@@ -50,54 +50,54 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "5.1.10",
     "animate.css": "^4.1.1",
-    "axios": "^1.7.7",
+    "axios": "^1.7.8",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "echarts": "^5.5.1",
-    "element-plus": "^2.8.7",
+    "element-plus": "^2.9.0",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.3.0",
-    "pinia": "^2.2.6",
-    "qs": "^6.13.0",
-    "sortablejs": "^1.15.3",
-    "vue": "^3.5.12",
+    "pinia": "^2.2.8",
+    "qs": "^6.13.1",
+    "sortablejs": "^1.15.6",
+    "vue": "^3.5.13",
     "vue-i18n": "9.9.1",
     "vue-picture-cropper": "^0.7.0",
-    "vue-router": "^4.4.5"
+    "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.5.0",
-    "@commitlint/config-conventional": "^19.5.0",
-    "@eslint/js": "^9.14.0",
+    "@commitlint/cli": "^19.6.0",
+    "@commitlint/config-conventional": "^19.6.0",
+    "@eslint/js": "^9.16.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash": "^4.17.13",
-    "@types/node": "^22.9.0",
+    "@types/node": "^22.10.1",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.14.0",
-    "@typescript-eslint/parser": "^8.14.0",
-    "@vitejs/plugin-vue": "^5.1.5",
+    "@typescript-eslint/eslint-plugin": "^8.16.0",
+    "@typescript-eslint/parser": "^8.16.0",
+    "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "1.9.4",
-    "eslint": "^9.14.0",
+    "eslint": "^9.16.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-vue": "^9.31.0",
-    "globals": "^15.12.0",
-    "husky": "^9.1.6",
+    "eslint-plugin-vue": "^9.32.0",
+    "globals": "^15.13.0",
+    "husky": "^9.1.7",
     "lint-staged": "^15.2.10",
     "postcss": "^8.4.49",
     "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.3.3",
-    "sass": "^1.80.6",
-    "stylelint": "^16.10.0",
+    "prettier": "^3.4.1",
+    "sass": "^1.81.0",
+    "stylelint": "^16.11.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-scss": "^14.1.0",
@@ -105,11 +105,11 @@
     "stylelint-config-standard": "^36.0.1",
     "terser": "^5.36.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.14.0",
-    "unocss": "^0.63.6",
-    "unplugin-auto-import": "^0.18.3",
-    "unplugin-vue-components": "^0.27.4",
-    "vite": "^5.4.11",
+    "typescript-eslint": "^8.16.0",
+    "unocss": "0.65.0-beta.3",
+    "unplugin-auto-import": "^0.18.6",
+    "unplugin-vue-components": "^0.27.5",
+    "vite": "^6.0.1",
     "vite-plugin-mock-dev-server": "^1.8.0",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
diff --git a/vite.config.ts b/vite.config.ts
index aa6468e6..440429a1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,13 +10,7 @@ import mockDevServerPlugin from "vite-plugin-mock-dev-server";
 
 import UnoCSS from "unocss/vite";
 import { resolve } from "path";
-import {
-  name,
-  version,
-  engines,
-  dependencies,
-  devDependencies,
-} from "./package.json";
+import { name, version, engines, dependencies, devDependencies } from "./package.json";
 
 // 平台的名称、版本、运行所需的 node 版本、依赖、构建时间的类型提示
 const __APP_INFO__ = {
@@ -38,7 +32,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       preprocessorOptions: {
         // 定义全局 SCSS 变量
         scss: {
-          javascriptEnabled: true,
           api: "modern-compiler",
           additionalData: `
             @use "@/styles/variables.scss" as *;
@@ -56,8 +49,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
           changeOrigin: true,
           // 代理目标地址：https://api.youlai.tech
           target: env.VITE_APP_API_URL,
-          rewrite: (path) =>
-            path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
+          rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
         },
       },
     },
@@ -216,9 +208,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
             const info = assetInfo.name.split(".");
             let extType = info[info.length - 1];
             // console.log('文件信息', assetInfo.name)
-            if (
-              /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/i.test(assetInfo.name)
-            ) {
+            if (/\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/i.test(assetInfo.name)) {
               extType = "media";
             } else if (/\.(png|jpe?g|gif|svg)(\?.*)?$/.test(assetInfo.name)) {
               extType = "img";

From c2b05bac6c7677c0d06e4daa5816afa05b755319 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 2 Dec 2024 13:57:56 +0800
Subject: [PATCH 085/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20vue-picture-cropper=20=E6=8F=92=E4=BB=B6=EF=BC=88ts=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                |   1 -
 src/components/ImgCorpper/compressUtil.js   |  92 ---------
 src/components/ImgCorpper/corpperDialog.vue | 205 -------------------
 src/components/ImgCorpper/index.vue         | 211 --------------------
 src/types/components.d.ts                   |   1 -
 src/views/demo/upload.vue                   |  16 --
 6 files changed, 526 deletions(-)
 delete mode 100644 src/components/ImgCorpper/compressUtil.js
 delete mode 100644 src/components/ImgCorpper/corpperDialog.vue
 delete mode 100644 src/components/ImgCorpper/index.vue

diff --git a/package.json b/package.json
index 6bbd00a7..52c43ec3 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,6 @@
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-i18n": "9.9.1",
-    "vue-picture-cropper": "^0.7.0",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
diff --git a/src/components/ImgCorpper/compressUtil.js b/src/components/ImgCorpper/compressUtil.js
deleted file mode 100644
index f9f83d84..00000000
--- a/src/components/ImgCorpper/compressUtil.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * 图片压缩类
- * @param minSize
- * @param maxSize
- * @constructor
- */
-export function PhotoCompress(minSize, maxSize) {
-  var nextQ = 0.5; // 压缩比例
-  var maxQ = 1;
-  var minQ = 0;
-
-  /**
-   * 将base64转换为文件
-   * @param base64Codes base64编码
-   * @param fileName 文件名称
-   * @returns {*}
-   */
-  PhotoCompress.prototype.dataUrlToFile = function (base64Codes, fileName = new Date().getTime()) {
-    var arr = base64Codes.split(","),
-      mime = arr[0].match(/:(.*?);/)[1],
-      bStr = atob(arr[1]),
-      n = bStr.length,
-      u8arr = new Uint8Array(n);
-    while (n--) {
-      u8arr[n] = bStr.charCodeAt(n);
-    }
-    return new File([u8arr], fileName, { type: mime });
-  };
-
-  /**
-   * 图片压缩
-   * @param file 文件
-   * @param callback 回调函数
-   */
-  PhotoCompress.prototype.compress = function (file, callback) {
-    var self = this;
-    self.imgBase64(file, function (image, canvas) {
-      var base64Codes = canvas.toDataURL(file.type, nextQ); // y压缩
-      var compressFile = self.dataUrlToFile(base64Codes, file.name.split(".")[0]); // 转成file文件
-      var compressFileSize = compressFile.size; // 压缩后文件大小 k
-      // console.log("图片质量：" + nextQ);
-      // console.log("压缩后文件大小：" + compressFileSize / 1024);
-      if (compressFileSize > maxSize) {
-        // 压缩后文件大于最大值
-        maxQ = nextQ;
-        nextQ = (nextQ + minQ) / 2; // 质量降低
-        self.compress(file, callback);
-      } else if (compressFileSize < minSize) {
-        // 压缩以后文件小于最小值
-        minQ = nextQ;
-        nextQ = (nextQ + maxQ) / 2; // 质量提高
-        self.compress(file, callback);
-      } else {
-        callback(compressFile);
-      }
-    });
-  };
-
-  /**
-   * 将图片转化为base64
-   * @param file 文件
-   * @param callback 回调函数
-   */
-  PhotoCompress.prototype.imgBase64 = function (file, callback) {
-    // 看支持不支持FileReader
-    if (!file || !window.FileReader) return;
-    var image = new Image();
-    // 绑定 load 事件处理器，加载完成后执行
-    image.onload = function () {
-      var canvas = document.createElement("canvas");
-      var ctx = canvas.getContext("2d");
-      ctx.clearRect(0, 0, canvas.width, canvas.height);
-      canvas.width = image.width * nextQ;
-      canvas.height = image.height * nextQ;
-      ctx.drawImage(image, 0, 0, canvas.width, canvas.height);
-      callback(image, canvas);
-    };
-    if (/^image/.test(file.type)) {
-      // 创建一个reader
-      var reader = new FileReader();
-      // 将图片将转成 base64 格式
-      reader.readAsDataURL(file);
-      // 读取成功后的回调
-      reader.onload = function () {
-        // self.imgUrls.push(this.result);
-        // 设置src属性，浏览器会自动加载。
-        // 记住必须先绑定事件，才能设置src属性，否则会出同步问题。
-        image.src = this.result;
-      };
-    }
-  };
-}
diff --git a/src/components/ImgCorpper/corpperDialog.vue b/src/components/ImgCorpper/corpperDialog.vue
deleted file mode 100644
index 98c41fe4..00000000
--- a/src/components/ImgCorpper/corpperDialog.vue
+++ /dev/null
@@ -1,205 +0,0 @@
-<template>
-  <el-dialog
-    v-model="isShowModal"
-    title="裁剪图片"
-    width="50%"
-    :close-on-press-escape="false"
-    :close-on-click-modal="false"
-    align-center
-    @close="cancel"
-  >
-    <div class="modal-content">
-      <VuePictureCropper
-        :img="pic"
-        :boxStyle="corpBoxStyle"
-        :options="corpOptions"
-        :presetMode="corpPresetMode"
-        @ready="ready"
-      />
-    </div>
-    <div class="m-t-10 btns">
-      <el-button class="default-btn" @click="cancel">取消</el-button>
-      <el-button v-if="showClear" class="default-btn" @click="clear">关闭</el-button>
-      <el-button v-if="showReset" class="default-btn" @click="reset">重置</el-button>
-      <el-button class="default-btn primary" @click="getResult">确定</el-button>
-    </div>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-// 组件文档：https://cropper.chengpeiquan.com/zh/quick-start.html
-import VuePictureCropper, { cropper } from "vue-picture-cropper";
-import { PhotoCompress } from "./compressUtil.js";
-
-const props = defineProps({
-  visible: {
-    type: Boolean,
-  },
-  image: {
-    type: [String, File],
-  },
-  presetMode: {
-    type: Object,
-  },
-  options: {
-    type: Object,
-  },
-  boxStyle: {
-    type: Object,
-  },
-  showClear: {
-    // 是否显示 Clear 按钮
-    type: Boolean,
-  },
-  showReset: {
-    // 是否显示 Reset 按钮
-    type: Boolean,
-  },
-  isCompress: {
-    // 是否压缩裁剪后的图片大小
-    type: Boolean,
-  },
-  compressSize: {
-    // 压缩图片大小限制
-    type: Object,
-    default: {
-      maxSize: 0.3 * 1024 * 1024, // 300k
-      minSize: 0.03 * 1024 * 1024, // 30k
-    },
-  },
-});
-
-/** 裁剪组件属性配置 */
-const corpOptions = computed(() => {
-  return {
-    viewMode: 1, // 裁剪框范围 1-只能在图片区域内活动
-    dragMode: "move", // 可选值 crop(可绘制裁剪框) | move(仅移动)
-    // aspectRatio: 1 / 1,// 裁剪框的宽高比
-    cropBoxResizable: false, // 是否可以调整裁剪区的大小
-    ...props.options,
-  };
-});
-/** 裁剪区域的样式 */
-const corpBoxStyle = computed(() => {
-  return {
-    width: "auto",
-    height: "400px",
-    backgroundColor: "#f8f8f8",
-    margin: "auto",
-    ...props.boxStyle,
-  };
-});
-
-/** 预设模式配置 */
-const corpPresetMode = computed(() => {
-  return {
-    mode: "fixedSize",
-    width: 200,
-    height: 200,
-    ...props.presetMode,
-  };
-});
-const emits = defineEmits(["close"]);
-
-watch(
-  () => props.visible,
-  (val) => {
-    isShowModal.value = val;
-    if (!val) {
-      pic.value = "";
-      result.dataURL = "";
-      result.blobURL = "";
-      reset();
-    }
-  }
-);
-
-watch(
-  () => props.image,
-  (val) => {
-    pic.value = val;
-  }
-);
-
-const isShowModal = ref(false);
-const pic = ref("");
-const result = reactive({
-  dataURL: "",
-  blobURL: "",
-});
-
-async function getResult() {
-  if (!cropper) return;
-  const base64 = cropper.getDataURL();
-  const blob = await cropper.getBlob();
-  if (!blob) return;
-
-  let file = await cropper.getFile({
-    fileName: "locales.fileName",
-  });
-
-  result.dataURL = base64;
-  result.blobURL = URL.createObjectURL(blob);
-  const { minSize, maxSize } = props.compressSize;
-  // console.log(file.size, maxSize)
-  // 是否限制文件大小
-  if (props.isCompress && file.size > maxSize) {
-    // console.log("compress")
-    const photoCompress = new PhotoCompress(minSize, maxSize);
-    photoCompress.compress(file, function (f) {
-      const r = new FileReader();
-      r.readAsDataURL(f);
-      r.onload = function (e) {
-        emits("close", { result, file: f });
-      };
-    });
-  } else {
-    // console.log("crop")
-    emits("close", { result, file });
-  }
-}
-
-/**
- * Clear the crop box
- */
-function clear() {
-  if (!cropper) return;
-  cropper.clear();
-}
-
-/**
- * Reset the default cropping area
- */
-function reset() {
-  if (!cropper) return;
-  cropper.reset();
-}
-
-/**
- * The ready event passed to Cropper.js
- */
-function ready() {
-  // console.log('Cropper is ready.')
-}
-
-function cancel() {
-  emits("close");
-}
-</script>
-
-<style lang="scss" scoped>
-.modal-wrap {
-  position: fixed;
-  top: 0;
-  left: 0;
-  z-index: 99;
-  width: 100%;
-  height: 100%;
-  overflow: hidden;
-}
-
-.btns {
-  display: flex;
-  justify-content: flex-end;
-}
-</style>
diff --git a/src/components/ImgCorpper/index.vue b/src/components/ImgCorpper/index.vue
deleted file mode 100644
index d80ad2ae..00000000
--- a/src/components/ImgCorpper/index.vue
+++ /dev/null
@@ -1,211 +0,0 @@
-<template>
-  <el-upload
-    v-model:file-list="fileList"
-    list-type="picture-card"
-    :auto-upload="true"
-    :class="fileList.length >= 1 || !props.showUploadBtn ? 'hide' : 'show'"
-    :before-upload="handleBeforeUpload"
-    :data="props.data"
-    :name="props.name"
-    :accept="props.accept"
-    :limit="1"
-  >
-    <i-ep-plus />
-    {{ title }}
-    <template #file="{ file }">
-      <div style="width: 100%">
-        <img class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" alt="" />
-        <span class="el-upload-list__item-actions">
-          <span class="el-upload-list__item-preview" @click="previewImg(file)">
-            <el-icon><zoom-in /></el-icon>
-          </span>
-          <span
-            v-if="props.showDelBtn"
-            class="el-upload-list__item-delete"
-            @click="handleRemove(file)"
-          >
-            <el-icon><Delete /></el-icon>
-          </span>
-        </span>
-      </div>
-    </template>
-  </el-upload>
-
-  <el-image-viewer
-    v-if="viewVisible"
-    :zoom-rate="1.2"
-    :initialIndex="initialIndex"
-    :url-list="[viewFile]"
-    @close="closePreview"
-  />
-
-  <CorpperDialog
-    :visible="isShowCorpper"
-    :image="selectPic"
-    :isCompress="true"
-    :showReset="true"
-    :presetMode="presetMode"
-    @close="hideCorpper"
-  />
-</template>
-
-<script setup lang="ts">
-import CorpperDialog from "./corpperDialog.vue";
-
-import { UploadRawFile, UploadUserFile, UploadFile, UploadProps } from "element-plus";
-const emit = defineEmits(["update:modelValue"]);
-
-const props = defineProps({
-  /**
-   * 文件路径
-   */
-  modelValue: {
-    type: String,
-    default: "",
-  },
-  title: {
-    type: String,
-    default: "上传图片",
-  },
-
-  /**
-   * 上传文件的参数名
-   */
-  name: {
-    type: String,
-    default: "file",
-  },
-  /**
-   * 文件上传数量限制
-   */
-  limit: {
-    type: Number,
-    default: 1,
-  },
-  /**
-   * 是否显示删除按钮
-   */
-  showDelBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否显示上传按钮
-   */
-  showUploadBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 单张图片最大大小
-   */
-  uploadMaxSize: {
-    type: Number,
-    default: 2 * 1024 * 1024,
-  },
-  /**
-   * 上传文件类型
-   */
-  accept: {
-    type: String,
-    default: "image/*",
-  },
-
-  presetMode: {
-    type: Object,
-    default: "{ width: 200, height: 200 }",
-  },
-});
-
-const selectPic = ref("");
-const isShowCorpper = ref(false);
-
-const viewVisible = ref(false);
-const initialIndex = ref(0);
-
-const fileList = ref([] as UploadUserFile[]);
-const viewFile = ref(props.modelValue as string);
-
-watch(
-  () => props.modelValue,
-  (newVal: string) => {
-    if (!newVal) {
-      fileList.value = [];
-      return;
-    }
-
-    fileList.value = [{ url: newVal } as UploadUserFile];
-
-    viewFile.value = newVal;
-  },
-  { immediate: true }
-);
-/**
- * 删除图片
- */
-function handleRemove(removeFile: UploadFile) {
-  const filePath = removeFile.url;
-  if (filePath) {
-    emit("update:modelValue", "");
-  }
-}
-
-/**
- * 限制用户上传文件的格式和大小
- */
-function handleBeforeUpload(file: UploadRawFile) {
-  const reader = new FileReader();
-  reader.readAsDataURL(file);
-  reader.onload = () => {
-    selectPic.value = String(reader.result);
-    isShowCorpper.value = true;
-  };
-
-  if (file.size > props.uploadMaxSize) {
-    ElMessage.warning("上传图片不能大于 " + Math.trunc(props.uploadMaxSize / 1024 / 1024) + "M");
-    return false;
-  }
-  return true;
-}
-
-/**
- * 预览图片
- */
-const previewImg: UploadProps["onPreview"] = (uploadFile: UploadFile) => {
-  viewFile.value = uploadFile.url!;
-  initialIndex.value = 0;
-  viewVisible.value = true;
-};
-
-/**
- * 关闭预览
- */
-const closePreview = () => {
-  viewVisible.value = false;
-};
-
-function hideCorpper(data: any) {
-  isShowCorpper.value = false;
-  if (data) {
-    const {
-      result: { dataURL },
-      file,
-    } = data;
-    emit("update:modelValue", dataURL);
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.hide {
-  :deep(.el-upload--picture-card) {
-    display: none;
-  }
-}
-
-.show {
-  :deep(.el-upload--picture-card) {
-    display: flex;
-  }
-}
-</style>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index f84deedf..fcc072db 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -91,7 +91,6 @@ declare module "vue" {
     ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
     SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
-    ImgCorpper: (typeof import("./../components/ImgCorpper/index.vue"))["default"];
   }
   export interface ComponentCustomProperties {
     vLoading: (typeof import("element-plus/es"))["ElLoadingDirective"];
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index b01c4ed9..e248fc12 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -23,22 +23,6 @@
         </el-table>
       </el-form-item>
 
-      <el-form-item label="单图裁剪">
-        <ImgCorpper
-          v-model="cprpperValue"
-          :presetMode="{ width: 295, height: 413 }"
-          :title="'上传图片'"
-        />
-      </el-form-item>
-      <el-form-item label="参数说明">
-        <el-table :data="imageCprpperUploadArgData" border>
-          <el-table-column prop="argsName" label="参数名称" width="300" />
-          <el-table-column prop="type" label="参数类型" width="200" />
-          <el-table-column prop="default" label="默认值" width="400" />
-          <el-table-column prop="desc" label="描述" width="300" />
-        </el-table>
-      </el-form-item>
-
       <el-form-item label="多图上传">
         <MultiImageUpload v-model="picUrls" />
       </el-form-item>

From 4901b548920da9838c4c935ed15b7ce628e1e8ee Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 2 Dec 2024 14:00:32 +0800
Subject: [PATCH 086/497] chore: :hammer: bump version to 2.19.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 52c43ec3..ae0689c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.19.1",
+  "version": "2.19.2",
   "private": true,
   "type": "module",
   "scripts": {

From 8ad225923d5033281142f2085bccdbe7ed64d370 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Thu, 5 Dec 2024 22:07:06 +0800
Subject: [PATCH 087/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E8=8F=9C=E5=8D=95=E6=97=B6=EF=BC=8C=E7=A6=81=E6=AD=A2?=
 =?UTF-8?q?=E9=A1=B6=E7=BA=A7=E8=8F=9C=E5=8D=95=E9=80=89=E7=94=A8=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改菜单时，禁止顶级菜单选用自己
---
 src/views/system/menu/index.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 9a96e710..ef260a55 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -34,7 +34,6 @@
         :data="menuTableData"
         highlight-current-row
         row-key="id"
-        :expand-row-keys="['1']"
         :tree-props="{
           children: 'children',
           hasChildren: 'hasChildren',
@@ -369,13 +368,13 @@ const initialMenuFormData = ref<MenuForm>({
 const formData = ref({ ...initialMenuFormData.value });
 // 表单验证规则
 const rules = reactive({
-  parentId: [{ required: true, message: "请选择顶级菜单", trigger: "blur" }],
+  parentId: [{ required: true, message: "请选择父级菜单", trigger: "blur" }],
   name: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
   routeName: [{ required: true, message: "请输入路由名称", trigger: "blur" }],
   routePath: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
   component: [{ required: true, message: "请输入组件路径", trigger: "blur" }],
-  visible: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
+  visible: [{ required: true, message: "请选择显示状态", trigger: "change" }],
 });
 
 // 选择表格的行菜单ID
@@ -425,7 +424,7 @@ function handleOpenDialog(parentId?: string, menuId?: string) {
         });
       } else {
         dialog.title = "新增菜单";
-        formData.value.parentId = parentId;
+        formData.value.parentId = parentId?.toString();
       }
     });
 }
@@ -455,6 +454,11 @@ function handleSubmit() {
     if (isValid) {
       const menuId = formData.value.id;
       if (menuId) {
+        //修改时父级菜单不能为当前菜单
+        if (formData.value.parentId == menuId) {
+          ElMessage.error("父级菜单不能为当前菜单");
+          return;
+        }
         MenuAPI.update(menuId, formData.value).then(() => {
           ElMessage.success("修改成功");
           handleCloseDialog();

From ab18a34538f4475604941daf5e15e0e46699dbee Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 6 Dec 2024 21:47:30 +0800
Subject: [PATCH 088/497] =?UTF-8?q?chore:=20:hammer:=20=E4=BC=98=E5=8C=96L?=
 =?UTF-8?q?ogo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/favicon.ico  | Bin 4286 -> 4286 bytes
 src/assets/logo.png | Bin 16841 -> 2530 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/public/favicon.ico b/public/favicon.ico
index 8ed8d998756a7a0dedfb37ee153ce305d9f35f10..5e82ccc5d9e7108c5a4f9728da4db50a424db60e 100644
GIT binary patch
literal 4286
zcmdVcTWl3Y9LMn~N2!2VKqMN#R%#RoL5NUJt5TGLklsj56a`d3<Ys~>Ap|voqJor5
z@$#U-3mPF}f`PV&f+dYS*eVyr#HbGj)F=Uzh8pDB@%x+I*>h~5T!aUgeAwxpJ@fzX
z{AXs5F=_nE$};-jtm|Y<H)Bk1aLEjVuDgTJ{%?m(3^BI472)TX<GE}iCpGr<<S__?
zLqj;<1Y@h>#wKzvc?z!Y;MuRCJpqqmCZ50)%)pI^^1M_@M9&_KZvinTVGn-AA^e2d
z7>~AaIb4ePHo<r%pXnCb_n{gMn1v&-*ont*52yk4BH#adxW0n;SJNJa7jOWhZOxE0
z&MTq#@-9@1Yy^3e|HU53`JSUVag4(+Sj6+S;j9=v@Ff(#33D+K?Qqd`h-x16(UZPL
zpcdQE6{&S8;_pT%2hEFV7!6kg^>v|#`)&|J&!M&UGW6`ZFsG|>O;cro&mqROWl(%s
zi|Oct;GPSpgPU`j>j_uiUi480&Gk7aEAKGV-rQ%3E37kcsr5N@=ko?A{@-{Olc9Oz
z?m3?^aQjDfH0Lw;?f}$b13GT{s9bS-AiH>_%_yy~F*7U5p^$qHLpgkpsnE4>49;B#
z>tZW@JjU~1$9G@BkLbVs<N1o+6~i$ZbCCmMH}_Wz&B<5c>+lKfNl2+f>p2AR$+s$=
z&i6|3oBH_q(+5mpg>6f$0?fb>Sk$9?;YxBy3|0=>o3}$b9LGXD0*$2`ht}#4>^HaT
zz7ALdJx{yEt84Y_xfqMDq1eYm<<ufJY<W}%t(8Mi4%!<ZM^Ut<TG^MP{Vu^+CUV+0
zC*oH;^VSZ<&cryZhGNSql%o-aFt(;I<KXs-7sL3<VIv+!Ke#bC+uoQm_uY6ddFM05
zz6#?p2Tf4y26RU^e1Wg@cTk5xiqQ>qQ2dj431e|ybtqk7O$jxnPZ<HtH$U!w&>jW<
zx#pv;EmIxxlXVzQyn|2<TEE&C3&M4+^?k;vFoxJEeP`32iud5heNpiW+a|n6W25!B
z2q|^wqcPCFt@)?;QiCzjdn~8}=axs<uX1RIiI@jJ?%QZ<%uVqsm*)i9Rp^J$(XtL&
z!`ibI|1=h3B=kGN<&YY`lrb+!j;qF9&%OtG_Wc+NKR&%_|A23B1BT%sTpflki`GLv
zvGzkb=-sK`FWS>JK2Z)u{~q^V^rM=ufnuM=yt22W*czJ;@fXTqn0slQ7vM00^|0k;
zW7p>@#(e1cl|vowMo+l-TAS)4q?&4-YkyP!ioXe+;KzLmZLR<1nse@Y@O|x%b#Qek
z;+jpk_0WY_o1yr!6a&#7E(hk6kDtf)Ro8E!*!wUD{__FhHNOV^b$`z1^8;9p*j>r>
zkVh=-r;7h49zqse9k^HDR~<|7J{0=|X2SQ~k@f~?j7R$Gg~{Aa=^O6e=lD$Pp+xuC
zE!oCay7$^V;`ut%)7Cub4E28{;&>8Aq4;aj0jBsh*Y9lF%4q@fMfG-hX%3f^pYS>A
zd@ZzAG&i$c9fEOIEd74;b*P}Ncemaxnb7;?J1Dl!x5D?U+<wPasQ)OoUqdNtN1w%c
zXRR5&!j5QIKgTpD-|KqjePIqqI6ugHPvfdsA3(9C78(mZ^HZpY)?hANY&}=YLpj|4
z`cYH6ZlO6=nLqGE)tyfhV|EMvw~EGL4{oE+d!apK7j|Mt*w){&8`F#YzRdYdhxVlb
z<<^|4&SPHZ^ri2u*o|E&cF@*uc5gm?tIl1}IXtVKO4p;crv2h<hkMuRH{3?IwmK3=
z>#sHH+t>Nr=d(O}YCgmZ_LlQHxBj~*wcpFtwmM9{Z8n+6u%~d$q$6e<vDc)**g7mQ
m=6U3YGC60+USrbhjEM<<r<s<AuILlpp*z#}@~uXr(Ek81b72?&

literal 4286
zcmb{04``LuAII@?oo?F1&D52kZKWfb%c7#7+MjzjNmpTEnW^P6CJ{!UNl|25n?ga6
z1S^x=?2jz7W+r-@5DTMhRz#u}m0VqgOD%^jr_MdSKWERmKF$5P*V>O)=X9QP&i9=2
zoO7Q0%a{=V%gHhNr)kJECd(Kz1r(WLsNDYX>_Yy$`eKua3+X$NHi6jV$lr(?{PcR#
z5wPP+q_1S_xV}k;VGbVjm6I+)81eN<w*P_Z*UY{=-Y+roumrmi!$G`+1;~P}J5Ybg
zK68DN4#zBPL<_dT!(mjQ4Dqoh8>g@O!T!ik#bap2Y-kVs4vnD!4<H-=+ZwpONYkPD
zY0iz%ej9>Up!n^06dISx|MM7JAAYL2FGCDPewkwA`(+wK6bq3D8^3JYn7)=Zp)%J8
z=}1h+PP~c~*#7;rid6AC@dV}}6}C=7!FpA4ZT)mI=~MUt`Q7xJ+fri2e^u(nkVE-i
zXbihh4&4dvd9U6F|JOiUz4u%2HCCK>v)Ht~U2LkOks$~@^ht@)czC9LdDd4=s`IFI
zvtt-M;<*~Gjh|jhs{RyzLhCy=b}q5=Fa{|djEQGD`(Hq7un*b?1xR`g0&R5H>5OS@
zEA}^pHE+ed3zc{pS#UA#r`{=O468987bB@Pu=RW9r1jJJ+JOx7^Yjq0B6t~|ZyBjM
z*;9WM^>hXl{}6OXm%@$j+#(N<^XlUDub}N_%-Frr&izVaJ%S(o*j=RGWAby+_!`_!
z{S(j_>Tw^&BjGjh*2m-P42||`i$awjM@A559_pdF|BY2RfEN&oZLsZhN9!(B{9{;*
znFt}FF?er;<Ljk1FK&zIz2A)G_zjBx5k_JKe#LcxHPF603XMVQcMo!qP<;1l=u>fJ
zEEZ!E6#Gw<K+h&(59%<i>3utP-A}rw6u$$ymuDb;Z@C!#r8UubY{i%b?RCXf{52Q~
zH@=6-A3<qg4X!4h_Mpb_Degor;%nPq>_ETje-f6U35tCX)1YTM584xYH_h0J^fg-}
z=FIv+#aRi(KZ7TsvoPqrOdoDun&W&_;v^LR8Mx<D$;Y5Gs5Lr<d*S9diFo^=F?@?V
zFa_@Uc}t+S0oRb%d*21c{st4EIw`1yViq6`AK-J0eSUj<3`>dE4UJ(H3eoRxMcTUf
z7m;6pl{kyjSOoXHh`jd0YUo>_@<Oyh@5^-coMYYJEl~Ue=ywg&CP43WA@)IYk0JxA
zla3Fev#&eJwbPoshP}vEx!1GSx(81~W2lAh^z*(=s_z?3dN<rX+fIIl|4en}q63cy
z%3Ry4DAOLT(phMK%f9PO;^_`o{5I$;=x%l6b8TIE6YUkF6`K1xq(aa2z4_9oylWFo
zt0<2lKX4uu^Dk%&x*zp>O5b)nhCn~#$cIq}#r_4?!u7wDyykBAxyltoe}Ouek=HwT
z9Ygo<-6W3o+<Q=beIMpRdm|WM=UMAF2kx$^B=7pxcmF3eLi^K}yF*mH-F~C&cz9M`
z6^(3Oz9W+J-MjJoT)$(EKx1fv-obFV{xfNphb_?D4@2i)??d}>EsmlPu8j+CQ<ZON
z44a*s!l{Qg6c_N@Btrj+D`7N4@wFc-pm(5o%P8o*AIB+ZofS`X&UFWAPimk4Ywm6k
zD)-j0rfco@u7<w<fWAeJey8g<itfbEFcFHa{*>xYyA3l@){D--CFpbRZVdEi-zllS
z`}+3k|2G7=vRf&)zmI}_CYpEgdZ+a1;wP9E8Lu+ivrLB9ZKZi#MpC>^6S9sQ<4Mez
kXMIJak}aLaWbizVyreYu2vzc*9^n6xvn9=bjhL<d55xY|{r~^~

diff --git a/src/assets/logo.png b/src/assets/logo.png
index ffa62f3c600e6bc07573320d20c6db8557a1071f..524fb1331eaf563613d2f32cbca742d5f1934aee 100644
GIT binary patch
delta 2465
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

literal 16841
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
FO#sUaRy6<s


From 2916c5dae518e40d72dc182c6c6ae94f7b44626b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 8 Dec 2024 18:38:03 +0800
Subject: [PATCH 089/497] =?UTF-8?q?fix:=20:bug:=20variables.scss=20?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=20element-plus=20=E4=B8=BB=E9=A2=98?=
 =?UTF-8?q?=E8=89=B2=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vite.config.ts b/vite.config.ts
index 440429a1..0a7f00bd 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -35,6 +35,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
           api: "modern-compiler",
           additionalData: `
             @use "@/styles/variables.scss" as *;
+            @use "element-plus/theme-chalk/src/index.scss" as *; 
           `,
         },
       },

From e3e0bec22ebccf13c78ffdd6703b89ce787dfb69 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 8 Dec 2024 18:46:30 +0800
Subject: [PATCH 090/497] =?UTF-8?q?docs:=20:memo:=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=9A=97=E9=BB=91=E4=B8=BB=E9=A2=98=E5=BC=95=E5=85=A5=E7=9A=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main.ts b/src/main.ts
index b3ba592f..ce19b13b 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,8 +4,7 @@ import setupPlugins from "@/plugins";
 
 // 本地SVG图标
 import "virtual:svg-icons-register";
-
-// 样式
+// 暗黑主题样式
 import "element-plus/theme-chalk/dark/css-vars.css";
 // 暗黑模式自定义变量
 import "@/styles/dark/css-vars.css";

From a7c1c4e14a3935bc4c6a2c62fa6a0cd149eccb1e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 8 Dec 2024 18:57:52 +0800
Subject: [PATCH 091/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E7=B2=BE=E7=AE=80=E9=87=8D=E6=9E=84=EF=BC=88?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E7=BB=9F=E8=AE=A1=E8=B0=83=E6=95=B4=E5=92=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=9B=B8=E5=85=B3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/log.mock.ts                              |  34 +-
 src/api/system/log.ts                         |  23 +-
 src/assets/icons/bilibili.svg                 |   1 +
 src/assets/icons/browser.svg                  |   1 +
 src/assets/icons/cnblogs.svg                  |   1 +
 src/assets/icons/csdn.svg                     |   6 +
 src/assets/icons/gitcode.svg                  |   1 +
 src/assets/icons/ip.svg                       |   1 -
 src/assets/icons/juejin.svg                   |   1 +
 src/assets/icons/pv.svg                       |   1 -
 src/assets/icons/uv.svg                       |   1 -
 src/assets/icons/visitor.svg                  |   1 +
 .../NavBar/components/Notification.vue        | 112 ++++---
 .../NavBar/components/UserProfile.vue         |   6 -
 src/utils/index.ts                            |  17 +
 .../{VisitTrend.vue => visit-trend.vue}       |   0
 src/views/dashboard/index.vue                 | 290 +++++++++++-------
 src/views/demo/api/knife4j.vue                |  22 --
 src/views/demo/api/swagger.vue                |  27 --
 src/views/demo/other.vue                      |  16 -
 20 files changed, 283 insertions(+), 279 deletions(-)
 create mode 100644 src/assets/icons/bilibili.svg
 create mode 100644 src/assets/icons/browser.svg
 create mode 100644 src/assets/icons/cnblogs.svg
 create mode 100644 src/assets/icons/csdn.svg
 create mode 100644 src/assets/icons/gitcode.svg
 delete mode 100644 src/assets/icons/ip.svg
 create mode 100644 src/assets/icons/juejin.svg
 delete mode 100644 src/assets/icons/pv.svg
 delete mode 100644 src/assets/icons/uv.svg
 create mode 100644 src/assets/icons/visitor.svg
 rename src/views/dashboard/components/{VisitTrend.vue => visit-trend.vue} (100%)
 delete mode 100644 src/views/demo/api/knife4j.vue
 delete mode 100644 src/views/demo/api/swagger.vue
 delete mode 100644 src/views/demo/other.vue

diff --git a/mock/log.mock.ts b/mock/log.mock.ts
index 08e63f2e..b75963e7 100644
--- a/mock/log.mock.ts
+++ b/mock/log.mock.ts
@@ -193,32 +193,14 @@ export default defineMock([
     method: ["GET"],
     body: {
       code: "00000",
-      data: [
-        {
-          type: "pv",
-          title: "浏览量",
-          todayCount: 1003,
-          totalCount: 36193,
-          growthRate: -0.35,
-          granularityLabel: "日",
-        },
-        {
-          type: "uv",
-          title: "访客数",
-          todayCount: 100,
-          totalCount: 2000,
-          growthRate: 0,
-          granularityLabel: "日",
-        },
-        {
-          type: "ip",
-          title: "IP数",
-          todayCount: 152,
-          totalCount: 3234,
-          growthRate: -0.2,
-          granularityLabel: "日",
-        },
-      ],
+      data: {
+        todayPvCount: 1629,
+        totalPvCount: 286086,
+        pvGrowthRate: -0.65,
+        todayIpCount: 169,
+        totalIpCount: 19985,
+        ipGrowthRate: -0.57,
+      },
       msg: "一切ok",
     },
   },
diff --git a/src/api/system/log.ts b/src/api/system/log.ts
index 5107264f..32dbc881 100644
--- a/src/api/system/log.ts
+++ b/src/api/system/log.ts
@@ -37,7 +37,7 @@ const LogAPI = {
    * @returns
    */
   getVisitStats() {
-    return request<any, VisitStatsVO[]>({
+    return request<any, VisitStatsVO>({
       url: `${LOG_BASE_URL}/visit-stats`,
       method: "get",
     });
@@ -106,15 +106,16 @@ export interface VisitTrendQuery {
 
 /**  访问统计 */
 export interface VisitStatsVO {
-  /** 标题 */
-  title: string;
-  /** 类型 */
-  type: "pv" | "uv" | "ip";
-
-  /** 今日访问量 */
-  todayCount: number;
-  /** 总访问量 */
-  totalCount: number;
+  /** 今日访客数(UV) */
+  todayUvCount: number;
+  /** 总访客数 */
+  totalUvCount: number;
+  /** 访客数同比增长率（相对于昨天同一时间段的增长率） */
+  uvGrowthRate: number;
+  /** 今日浏览量(PV) */
+  todayPvCount: number;
+  /** 总浏览量 */
+  totalPvCount: number;
   /** 同比增长率（相对于昨天同一时间段的增长率） */
-  growthRate: number;
+  pvGrowthRate: number;
 }
diff --git a/src/assets/icons/bilibili.svg b/src/assets/icons/bilibili.svg
new file mode 100644
index 00000000..b86747cc
--- /dev/null
+++ b/src/assets/icons/bilibili.svg
@@ -0,0 +1 @@
+<svg t="1733556119022" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="60026" width="128" height="128"><path d="M0 0m184.32 0l655.36 0q184.32 0 184.32 184.32l0 655.36q0 184.32-184.32 184.32l-655.36 0q-184.32 0-184.32-184.32l0-655.36q0-184.32 184.32-184.32Z" fill="#EC5D85" p-id="60027"></path><path d="M512 241.96096h52.224l65.06496-96.31744c49.63328-50.31936 89.64096 0.43008 63.85664 45.71136l-34.31424 51.5072c257.64864 5.02784 257.64864 43.008 257.64864 325.03808 0 325.94944 0 336.46592-404.48 336.46592S107.52 893.8496 107.52 567.90016c0-277.69856 0-318.80192 253.14304-324.95616l-39.43424-58.368c-31.26272-54.90688 37.33504-90.40896 64.68608-42.37312l60.416 99.80928c18.18624-0.0512 41.18528-0.0512 65.66912-0.0512z" fill="#EF85A7" p-id="60028"></path><path d="M512 338.5856c332.8 0 332.8 0 332.8 240.64s0 248.39168-332.8 248.39168-332.8-7.75168-332.8-248.39168 0-240.64 332.8-240.64z" fill="#EC5D85" p-id="60029"></path><path d="M281.6 558.08a30.72 30.72 0 0 1-27.47392-16.97792 30.72 30.72 0 0 1 13.73184-41.216l122.88-61.44a30.72 30.72 0 0 1 41.216 13.74208 30.72 30.72 0 0 1-13.74208 41.216l-122.88 61.44a30.59712 30.59712 0 0 1-13.73184 3.23584zM752.64 558.08a30.60736 30.60736 0 0 1-12.8512-2.83648l-133.12-61.44a30.72 30.72 0 0 1-15.04256-40.7552 30.72 30.72 0 0 1 40.76544-15.02208l133.12 61.44A30.72 30.72 0 0 1 752.64 558.08zM454.656 666.88a15.36 15.36 0 0 1-12.288-6.1952 15.36 15.36 0 0 1 3.072-21.49376l68.5056-50.91328 50.35008 52.62336a15.36 15.36 0 0 1-22.20032 21.23776l-31.5904-33.024-46.71488 34.72384a15.28832 15.28832 0 0 1-9.13408 3.04128z" fill="#EF85A7" p-id="60030"></path><path d="M65.536 369.31584c15.03232 101.90848 32.84992 147.17952 44.544 355.328 14.63296 2.18112 177.70496 10.04544 204.05248-74.62912a16.14848 16.14848 0 0 0 1.64864-10.87488c-30.60736-80.3328-169.216-60.416-169.216-60.416s-10.36288-146.50368-11.49952-238.83776zM362.25024 383.03744l34.816 303.17568h34.64192L405.23776 381.1328zM309.52448 536.28928h45.48608l16.09728 158.6176-31.82592 1.85344zM446.86336 542.98624h45.80352V705.3312h-33.87392zM296.6016 457.97376h21.39136l5.2736 58.99264-18.91328 2.26304zM326.99392 457.97376h21.39136l2.53952 55.808-17.408 1.61792zM470.62016 459.88864h19.456v62.27968h-19.456zM440.23808 459.88864h22.20032v62.27968h-16.62976z" fill="#FFFFFF" p-id="60031"></path><path d="M243.56864 645.51936a275.456 275.456 0 0 1-28.4672 23.74656 242.688 242.688 0 0 1-29.53216 17.52064 2.70336 2.70336 0 0 1-4.4032-1.95584 258.60096 258.60096 0 0 1-5.12-29.57312c-1.41312-12.1856-1.95584-25.68192-2.16064-36.36224 0-0.3072 0-2.5088 3.01056-1.90464a245.92384 245.92384 0 0 1 34.22208 9.5744 257.024 257.024 0 0 1 32.3584 15.17568c0.52224 0.256 2.51904 1.4848 0.09216 3.77856z" fill="#EB5480" p-id="60032"></path><path d="M513.29024 369.31584c15.03232 101.90848 32.84992 147.17952 44.544 355.328 14.63296 2.18112 177.70496 10.04544 204.05248-74.62912a16.14848 16.14848 0 0 0 1.64864-10.87488c-30.60736-80.3328-169.216-60.416-169.216-60.416s-10.36288-146.50368-11.49952-238.83776zM810.00448 383.03744l34.816 303.17568h34.64192L852.992 381.1328zM757.27872 536.28928h45.48608l16.09728 158.6176-31.82592 1.85344zM894.6176 542.98624h45.80352V705.3312H906.5472zM744.35584 457.97376h21.39136l5.2736 58.99264-18.91328 2.26304zM774.74816 457.97376h21.39136l2.53952 55.808-17.408 1.61792zM918.3744 459.88864h19.456v62.27968h-19.456zM887.99232 459.88864h22.20032v62.27968h-16.62976z" fill="#FFFFFF" p-id="60033"></path><path d="M691.32288 645.51936a275.456 275.456 0 0 1-28.4672 23.74656 242.688 242.688 0 0 1-29.53216 17.52064 2.70336 2.70336 0 0 1-4.4032-1.95584 258.60096 258.60096 0 0 1-5.12-29.57312c-1.41312-12.1856-1.95584-25.68192-2.16064-36.36224 0-0.3072 0-2.5088 3.01056-1.90464a245.92384 245.92384 0 0 1 34.22208 9.5744 257.024 257.024 0 0 1 32.3584 15.17568c0.52224 0.256 2.51904 1.4848 0.09216 3.77856z" fill="#EB5480" p-id="60034"></path></svg>
diff --git a/src/assets/icons/browser.svg b/src/assets/icons/browser.svg
new file mode 100644
index 00000000..15c3927c
--- /dev/null
+++ b/src/assets/icons/browser.svg
@@ -0,0 +1 @@
+<svg t="1733620744216" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13366" width="128" height="128"><path d="M512.956 741.549c24.671-8.545 73.221-25.811 120.072-46.486 12.131-5.394 24.087-12.036 47.412-25.31a109.078 109.078 0 0 0 37.94-29.11 83.344 83.344 0 0 0 12.227-23.053V219.281c-0.096-24.831-20.211-44.936-45.045-45.043-9.34 1.573-22.76 4.209-38.757 8.543 24.439 62.406 18.146 132.708-17.021 189.792-34.498 55.993-92.88 92.712-158.098 99.992-1.275 0.137-2.499 0.463-3.776 0.585v223.354c0.11 24.835 20.213 44.934 45.046 45.045zM378.672 741.549c24.833-0.108 44.939-20.21 45.046-45.047V472.779a213.556 213.556 0 0 1-158.787-101.461c-34.357-56.592-40.495-125.929-16.655-187.697a423.782 423.782 0 0 0-42.873-9.482c-24.833 0.098-44.938 20.214-45.047 45.047v398.308a82.748 82.748 0 0 0 12.242 23.039c10.5 12.524 23.704 22.495 38.591 29.219 23.801 13.273 35.756 20.011 47.424 25.311 46.84 20.673 95.405 37.942 120.059 46.486z" fill="#FFBA00" opacity=".4" p-id="13367"></path><path d="M744.827 708.729a57 57 0 0 0 32.919-11.275 53.974 53.974 0 0 0 17.343-27.226V271.907c-0.066-23.054-17.548-42.33-40.493-44.667 0.528 2.635 0.815 5.297 0.855 7.974v398.309a82.915 82.915 0 0 1-12.227 23.037 108.602 108.602 0 0 1-37.941 29.126c-22.944 12.799-34.805 19.428-46.568 24.752 12.528 0.003 49.706 0.761 86.112-1.709zM141.202 227.432c-22.861 2.335-40.317 21.49-40.495 44.475V670.23a53.882 53.882 0 0 0 17.362 27.4 56.9 56.9 0 0 0 32.902 11.291c36.421 2.471 73.585 1.984 86.112 1.711-11.764-5.324-23.61-11.958-46.565-24.751a108.597 108.597 0 0 1-37.928-29.128 82.787 82.787 0 0 1-12.242-23.036V235.404c0.041-2.676 0.327-5.338 0.854-7.972z" fill="#FFBA00" opacity=".4" p-id="13368"></path><path d="M629.782 372.569c35.172-57.083 41.463-127.383 17.023-189.792-0.007-0.026-0.016-0.066-0.029-0.096-51.497 13.939-127.844 45.508-165.674 117.207a189.132 189.132 0 0 0-13.288 31.87v141.388c1.307-0.123 2.569-0.447 3.872-0.585 65.218-7.28 123.598-44 158.096-99.992zM248.658 183.62c-23.842 61.769-17.701 131.105 16.639 187.697 34.357 56.608 93.013 94.084 158.8 101.461h0.099v-141.02a190.385 190.385 0 0 0-13.273-31.87c-36.989-70.079-110.861-101.855-162.265-116.268z" fill="#FEC744" opacity=".4" p-id="13369"></path><path d="M593.104 570.52v223.357c0.105 24.83 20.215 44.938 45.05 45.046 24.668-8.544 73.218-25.811 120.071-46.488 12.127-5.392 24.086-12.036 47.409-25.306a109.116 109.116 0 0 0 37.941-29.114 83.408 83.408 0 0 0 12.225-23.051v-398.31c-0.092-24.833-20.21-44.938-45.045-45.047-9.481 1.602-23.134 4.265-39.446 8.723 24.355 62.297 18.091 132.42-16.915 189.423a213.388 213.388 0 0 1-161.29 100.767zM330.601 271.513c-24.833 0.094-44.939 20.214-45.048 45.045v398.31a82.678 82.678 0 0 0 12.24 23.039c10.502 12.524 23.708 22.493 38.595 29.22 23.799 13.271 35.753 20.013 47.422 25.307 46.841 20.677 95.404 37.944 120.062 46.488 24.831-0.109 44.938-20.216 45.045-45.046v-223.72c-65.791-7.377-124.448-44.86-158.79-101.463-34.354-56.591-40.496-125.93-16.655-187.696a423.057 423.057 0 0 0-42.871-9.484z" fill="#FFBA00" p-id="13370"></path><path d="M868.422 753.937a108.626 108.626 0 0 1-37.943 29.126c-22.944 12.796-34.805 19.428-46.567 24.75 12.526 0 49.702 0.765 86.112-1.71a56.988 56.988 0 0 0 32.916-11.274 54.009 54.009 0 0 0 17.346-27.228v-398.32c-0.069-23.053-17.552-42.328-40.496-44.667 0.529 2.635 0.815 5.299 0.855 7.974v398.31a83.035 83.035 0 0 1-12.223 23.039zM266.399 324.804c-22.863 2.338-40.319 21.491-40.496 44.477v398.323a53.886 53.886 0 0 0 17.361 27.4 56.879 56.879 0 0 0 32.901 11.291c36.419 2.471 73.587 1.983 86.111 1.708-11.764-5.323-23.608-11.953-46.566-24.75a108.578 108.578 0 0 1-37.928-29.124 82.698 82.698 0 0 1-12.238-23.039V332.779c0.039-2.675 0.326-5.338 0.855-7.975z" fill="#FFBA00" p-id="13371"></path><path d="M771.97 280.058c-51.497 13.939-127.844 45.508-165.675 117.207a188.947 188.947 0 0 0-13.289 31.871v141.386c66.797-6.206 126.786-43.472 161.969-100.58 35.184-57.11 41.473-127.45 16.995-189.884z" fill="#FFBA00" p-id="13372"></path><path d="M771.97 280.058c-51.497 13.939-127.844 45.508-165.675 117.207a188.947 188.947 0 0 0-13.289 31.871v141.386c66.797-6.206 126.786-43.472 161.969-100.58 35.184-57.11 41.473-127.45 16.995-189.884z" fill="#FEC744" p-id="13373"></path><path d="M549.294 570.155h0.095V429.132a189.948 189.948 0 0 0-13.271-31.871c-36.992-70.081-110.863-101.856-162.266-116.268-23.839 61.769-17.701 131.105 16.642 187.696 34.352 56.608 93.012 94.089 158.8 101.466z" fill="#FFBA00" p-id="13374"></path><path d="M549.294 570.155h0.095V429.132a189.948 189.948 0 0 0-13.271-31.871c-36.992-70.081-110.863-101.856-162.266-116.268-23.839 61.769-17.701 131.105 16.642 187.696 34.352 56.608 93.012 94.089 158.8 101.466z" fill="#FEC744" p-id="13375"></path></svg>
diff --git a/src/assets/icons/cnblogs.svg b/src/assets/icons/cnblogs.svg
new file mode 100644
index 00000000..4920a4c1
--- /dev/null
+++ b/src/assets/icons/cnblogs.svg
@@ -0,0 +1 @@
+<svg t="1733555747788" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10924" width="128" height="128"><path d="M851.404 172.596c-187.462-187.461-491.346-187.461-678.808 0-187.461 187.462-187.461 491.346 0 678.808 187.462 187.461 491.346 187.461 678.808 0 187.461-187.462 187.461-491.346 0-678.808zM387.33 728.087a47.084 47.084 0 1 1-66.633-66.502 47.084 47.084 0 0 1 66.633 66.502z m205.527 1.397a38.75 38.75 0 0 1-76.625-11.52h-0.044a6.545 6.545 0 0 0-0.044 0.305v-0.349c0.306-2.618 2.051-20.727-2.967-44.99a174.24 174.24 0 0 0-48.567-89.28 172.102 172.102 0 0 0-88.8-48.305 156.698 156.698 0 0 0-42.458-2.923 38.662 38.662 0 0 1-35.39-65.324 38.618 38.618 0 0 1 21.12-10.822v-0.218c4.452-0.742 111.142-16.45 200.335 72.742 89.018 89.018 74.182 196.145 73.44 200.727z m175.2 7.592a38.75 38.75 0 0 1-65.673 21.382 39.49 39.49 0 0 1-11.65-33.73c0.087-0.35 5.105-37.484-5.062-88.975-13.31-67.375-45.295-126.895-94.953-176.902-50.007-49.702-109.527-81.644-176.945-94.953-51.491-10.167-88.582-5.193-89.019-5.149h0.219-0.044a39.927 39.927 0 0 1-44.684-32.902 38.836 38.836 0 0 1 32.204-44.378c1.92-0.305 47.869-7.33 111.273 4.364a411.753 411.753 0 0 1 106.254 34.952 425.76 425.76 0 0 1 114.633 82.255l0.916 0.96 0.96 0.873a425.89 425.89 0 0 1 82.255 114.72c16.407 33.6 28.145 69.294 34.996 106.21 11.651 63.404 4.67 109.353 4.32 111.273z" fill="#1296DB" p-id="10925"></path></svg>
diff --git a/src/assets/icons/csdn.svg b/src/assets/icons/csdn.svg
new file mode 100644
index 00000000..e16bad0d
--- /dev/null
+++ b/src/assets/icons/csdn.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="30px" height="30px" viewBox="0 0 30 30" version="1.1">
+    <title>ic/csdn</title>
+    <g id="ic/csdn" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M24.7385612,21.818791 C24.4728206,21.5662432 24.1090763,21.4267765 23.7575825,21.4343152 C23.3966653,21.4399693 23.0696724,21.5907441 22.8378562,21.8555424 C20.7581061,24.2349574 17.1347988,24.4922169 15.6732254,24.4922169 C12.9611634,24.4922169 10.886125,23.8043069 9.50559315,22.4501605 C8.19385225,21.1638629 7.50594216,19.2678696 7.46070972,16.8168365 C7.35516735,11.1345107 10.5732673,5.25806226 16.139685,5.25806226 C18.7980335,5.25806226 20.8627061,7.14368979 21.6260036,7.95410443 C21.8917442,8.23586486 22.2583155,8.39794779 22.6352525,8.39983247 C23.0131319,8.4092559 23.362741,8.24151892 23.599269,7.96164317 L23.8160078,7.70532598 C24.2607935,7.18232584 24.4605701,6.50572386 24.380471,5.80179394 C24.2984872,5.09126763 23.9422817,4.44293592 23.3778185,3.97459165 C22.0133064,2.84472288 19.6951436,1.5 16.3969445,1.5 C12.9715292,1.5 9.58757695,3.07465447 7.1129853,5.82441016 C4.51306208,8.71269021 3.1240491,12.6441435 3.20320588,16.895051 C3.26634283,20.3063311 4.38490349,23.1729373 6.44015269,25.1886081 C8.64806138,27.3550537 11.8821812,28.5 15.7947876,28.5 C20.3849384,28.5 23.2289283,27.1401996 24.8082945,26.0009074 C25.4198749,25.5608334 25.7845615,24.8644423 25.8128317,24.093606 C25.8392173,23.3190004 25.5225902,22.5604146 24.9430495,22.0119712 L24.7385612,21.818791 Z" id="Fill-1" fill="#FC5533"/>
+    </g>
+<script xmlns=""/></svg>
diff --git a/src/assets/icons/gitcode.svg b/src/assets/icons/gitcode.svg
new file mode 100644
index 00000000..7a02760a
--- /dev/null
+++ b/src/assets/icons/gitcode.svg
@@ -0,0 +1 @@
+<svg width="24" height="24" class="icon" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M15.4791 4.97677C15.6201 4.89789 15.7691 4.8145 15.93 4.72314C15.9494 4.82848 15.9683 4.92046 15.9854 5.00383C16.0157 5.15091 16.0406 5.2719 16.0525 5.39144C16.1479 6.4296 16.6697 7.1933 17.4092 7.36527C18.4908 7.61639 19.5106 7.20133 20.06 6.28555C20.72 5.18673 20.4334 3.84099 19.3097 3.03098C16.1851 0.777435 12.7523 0.155888 9.05448 1.24127C1.08137 3.59371 -1.64675 13.3884 4.01196 19.3949C6.43291 21.9642 9.50695 23.0727 12.9963 22.9889C17.4663 22.8839 20.6857 20.6563 22.7408 16.7954C24.1978 14.0561 22.6139 11.0619 19.5805 10.4396C17.8481 10.0908 16.0765 9.97756 14.3137 10.103C13.7272 10.1594 13.1579 10.3325 12.6394 10.6124C12.0592 10.9135 11.8915 11.5383 11.9565 12.1575C12.0171 12.7217 12.4498 13.0601 12.965 13.1453C14.0024 13.3077 15.0522 13.402 16.1 13.4881C16.4032 13.5136 16.7093 13.5166 17.0149 13.5197C17.4534 13.5241 17.8912 13.5285 18.3187 13.5991C19.5385 13.8007 19.9574 14.7905 19.33 15.8495C19.1763 16.1041 18.9971 16.3424 18.7951 16.5607C17.9745 17.4632 16.9014 18.0981 15.7152 18.3827C13.55 18.9127 11.3827 18.9425 9.22755 18.2617C6.77347 17.4875 5.31042 15.6849 5.25902 13.2584C5.2398 11.7619 5.61972 10.2874 6.35969 8.9865C6.694 8.38013 6.87751 7.75562 6.82593 7.06851C6.80422 6.77557 6.79219 6.48231 6.77927 6.16716C6.77239 5.99944 6.76526 5.82551 6.75628 5.64214C7.00484 5.69431 7.25032 5.76016 7.49161 5.83943C8.43027 6.21622 9.35415 6.38811 10.3702 6.11155C10.9481 5.97335 11.5455 5.93511 12.1363 5.9985C13.0877 6.07606 14.0387 5.84361 14.847 5.33586C15.0488 5.2176 15.2539 5.10279 15.4791 4.97677Z" fill="currentColor"></path></svg>
diff --git a/src/assets/icons/ip.svg b/src/assets/icons/ip.svg
deleted file mode 100644
index 087f3bbb..00000000
--- a/src/assets/icons/ip.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1719843722868" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="226927" width="200" height="200"><path d="M276.854606 340.74413h468.523178v298.151114H276.854606z" fill="#0ee41c" p-id="226928"></path><path d="M511.116195 1.76761c-282.285215 0-511.116195 228.83098-511.116195 511.116195s228.83098 511.116195 511.116195 511.116195 511.116195-228.83098 511.116195-511.116195c0-282.263919-228.83098-511.116195-511.116195-511.116195z m276.854605 670.712227C787.9708 686.343864 759.284404 724.081276 745.420377 724.081276H575.005719v15.354782l42.593017 33.478111V787.9708H404.633654v-15.077927l42.593017-33.478111V724.081276h-170.414658C262.926689 724.081276 234.261589 686.343864 234.261589 672.479837V337.762619c0-13.864027 28.6651-39.611505 42.550424-39.611505h468.608364C759.284404 298.151114 787.9708 323.898592 787.9708 337.762619v334.717218z" fill="#0ee41c" p-id="226929"></path></svg>
diff --git a/src/assets/icons/juejin.svg b/src/assets/icons/juejin.svg
new file mode 100644
index 00000000..937ace37
--- /dev/null
+++ b/src/assets/icons/juejin.svg
@@ -0,0 +1 @@
+<svg t="1733555774238" class="icon" viewBox="0 0 1316 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="46620" width="128" height="128"><path d="M643.181714 247.698286l154.916572-123.172572L643.181714 0.256 643.072 0l-154.660571 124.269714 154.660571 123.245715 0.109714 0.182857z m0 388.461714h0.109715l399.579428-315.245714-108.361143-87.04-291.218285 229.888h-0.146286l-0.109714 0.146285L351.817143 234.093714l-108.251429 87.04 399.433143 315.136 0.146286-0.146285z m-0.146285 215.552l0.146285-0.146286 534.893715-422.034285 108.397714 87.04-243.309714 192L643.145143 1024 10.422857 525.056 0 516.754286l108.251429-86.893715L643.035429 851.748571z" fill="#1E80FF" p-id="46621"></path></svg>
diff --git a/src/assets/icons/pv.svg b/src/assets/icons/pv.svg
deleted file mode 100644
index cd7da060..00000000
--- a/src/assets/icons/pv.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1719843111735" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="146261" width="200" height="200"><path d="M512 42.7C252.8 42.7 42.7 252.8 42.7 512c0 259.2 210.1 469.3 469.3 469.3S981.3 771.2 981.3 512c0-259.2-210.1-469.3-469.3-469.3z m93.3 225.9c16.1 0 29.1 13 29.1 29.1s-13.1 29.1-29.1 29.1c-16.1 0-29.1-13.1-29.1-29.1-0.1-16 13-29.1 29.1-29.1zM506.2 257c19.3 0 35 15.7 35 35s-15.7 35-35 35-35-15.7-35-35c0-19.4 15.7-35 35-35zM343 321.1c0-29 23.5-52.5 52.5-52.5s52.5 23.5 52.5 52.5-23.5 52.5-52.5 52.5c-29.1 0-52.5-23.5-52.5-52.5z m303.1 247.7c-11.7 35 11.7 81.6-11.7 128.2-23.3 46.6-58.3 69.9-93.3 69.9s-104.9 0-104.9-93.3c0-70 35-58.3 35-104.9s-23.3-23.3-58.3-81.6 0-93.3 0-93.3 58.3-58.3 174.9-23.3c116.6 35.1 69.9 163.4 58.3 198.3z m11.6-198.2c-12.9 0-23.3-10.4-23.3-23.3s10.4-23.3 23.3-23.3 23.3 10.4 23.3 23.3-10.4 23.3-23.3 23.3z" fill="#FFBD27" p-id="146262"></path></svg>
diff --git a/src/assets/icons/uv.svg b/src/assets/icons/uv.svg
deleted file mode 100644
index c5be7ebd..00000000
--- a/src/assets/icons/uv.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg t="1719764607585" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="61790" width="200" height="200"><path d="M597.8 316.59c-8.82 0-17.64 1.26-25.2 3.78 18.9 27.72 28.98 60.48 28.98 97.03 0 39.06-13.86 76.87-37.8 108.37l-2.52 2.52v1.26c-2.52 2.52-6.3 6.3-7.56 10.08 0 1.26 0 1.26 1.26 1.26 2.52 1.26 6.3 2.52 10.08 2.52h1.26l5.04 2.52c51.66 16.38 95.77 45.36 124.75 81.91 12.6 16.38 20.16 35.28 20.16 55.44 0 11.34-2.52 20.16-6.3 30.24h36.54c28.98 0 51.66-21.42 51.66-49.14-1.26-13.86-5.04-23.94-12.6-32.76-21.42-26.46-54.18-49.14-95.77-61.74 0 0-16.38-3.78-21.42-6.3-8.82-6.3-13.86-16.38-13.86-27.72 0-12.6 10.08-22.68 16.38-28.98 16.38-20.16 26.46-46.62 26.46-76.87 0-61.76-44.1-113.42-99.54-113.42z m-142.4-27.72c-61.74 0-112.15 57.96-112.15 128.53 0 34.02 11.34 64.26 28.98 86.95 11.34 6.3 18.9 20.16 18.9 34.02 0 12.6-6.3 23.94-16.38 31.5v1.26c-1.26 0-2.52 1.26-2.52 1.26-6.3 3.78-12.6 6.3-20.16 6.3-47.88 16.38-88.21 41.58-112.15 73.09h1.26c-6.3 8.82-8.82 18.9-8.82 28.98 0 30.24 25.2 55.44 56.7 55.44h332.67c32.76 0 57.96-23.94 57.96-55.44 0-12.6-5.04-23.94-11.34-34.02-23.94-31.5-61.74-55.44-108.37-70.57 0 0-3.47-0.93-7.84-2.18l-9.15-2.78c-2.94-0.96-5.51-1.88-6.95-2.6-10.08-6.3-16.38-18.9-16.38-31.5 0-13.86 11.34-25.2 18.9-34.02 18.9-22.68 28.98-52.92 28.98-86.95 0.01-70.57-50.39-127.27-112.14-127.27zM511.95 65.2c247.06 0 447.33 200.28 447.33 447.33S759.01 959.87 511.95 959.87 64.62 759.59 64.62 512.53 264.9 65.2 511.95 65.2z" fill="#FF6800" p-id="61791"></path></svg>
diff --git a/src/assets/icons/visitor.svg b/src/assets/icons/visitor.svg
new file mode 100644
index 00000000..1fd8dbe6
--- /dev/null
+++ b/src/assets/icons/visitor.svg
@@ -0,0 +1 @@
+<svg t="1733620604471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1596" width="128" height="128"><path d="M604.766 304.391c55.072 0 101.33 31.359 125.567 76.137v-94.054c0-51.505-41.856-91.812-92.513-91.812H250.118c-50.659 0-92.518 40.307-92.518 91.812v423.255c0 49.268 41.859 89.574 92.518 89.574h171.824c-30.848-11.195-48.466-33.586-50.672-71.662-4.402-85.105 48.465-161.231 90.321-197.066 6.608-6.728 11.01-11.194 17.616-15.685-8.813-20.149-15.421-42.548-15.421-67.176 0-78.385 61.679-143.323 140.98-143.323z" fill="#C4F7F0" p-id="1597"></path><path d="M804.423 349.242c0-51.507-41.855-91.814-92.515-91.814H324.204c-50.658 0-92.514 40.308-92.514 91.814v423.254c0 49.268 41.855 89.576 92.514 89.576h171.828c-30.846-11.197-48.466-33.587-50.67-71.668-4.404-85.101 48.462-161.239 90.319-197.063 6.608-6.727 11.009-11.196 17.617-15.682-8.813-20.152-15.422-42.549-15.422-67.182 0-78.384 61.68-143.318 140.977-143.318 55.071 0 101.336 31.356 125.57 76.133v-94.05zM394.702 638.123h-66.081c-6.612 0-11.024-4.474-11.024-11.187 0-6.729 4.413-11.2 11.024-11.2h66.081c6.608 0 11.008 4.471 11.008 11.2 0 6.713-4.4 11.187-11.008 11.187z m66.081-89.572H328.62c-4.417 0-11.025-4.477-11.025-11.199 0-6.707 4.413-11.189 11.025-11.189h132.163c6.609 0 11.01 4.482 11.01 11.189 0.001 6.72-4.401 11.199-11.01 11.199z m0-89.577H328.62c-4.417 0-11.025-4.481-11.025-11.2s6.608-11.198 11.025-11.198h132.163c6.609 0 11.01 4.481 11.01 11.198 0.001 6.719-4.401 11.2-11.01 11.2z" fill="#00DFC1" p-id="1598"></path><path d="M566.516 620.21c-33.043 26.875-72.692 85.096-70.484 152.288 2.193 67.177 72.686 67.177 176.216 67.177 103.535 0 174.03 0 176.228-67.177 2.205-67.192-39.651-123.183-70.485-152.288-24.239-22.396-44.066-26.868-50.672-26.868 28.64-15.683 46.256-47.039 46.256-82.861 0-53.743-41.841-96.294-94.722-96.294-52.863 0-94.707 42.551-92.511 96.294 0 35.822 17.628 64.951 46.253 82.861H621.59c-0.002 0-22.034 0-55.074 26.868z" fill="#00DFC1" p-id="1599"></path></svg>
diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index 0fa69a48..bc6069b0 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -1,49 +1,37 @@
 <template>
   <div>
-    <el-dropdown class="flex-center wh-full align-middle">
-      <div class="wh-full">
-        <el-badge
-          v-if="notices.length > 0"
-          :offset="[-10, 15]"
-          :value="notices.length"
-          :max="99"
-          class="wh-full"
-        >
-          <el-icon class="notification-icon h-full">
-            <Bell />
-          </el-icon>
-        </el-badge>
-        <el-badge v-else class="wh-full">
-          <el-icon class="notification-icon h-full">
-            <Bell />
-          </el-icon>
-        </el-badge>
-      </div>
+    <el-dropdown class="wh-full">
+      <el-badge v-if="notices.length > 0" :offset="[-10, 15]" :value="notices.length" :max="99">
+        <el-icon>
+          <Bell />
+        </el-icon>
+      </el-badge>
+      <el-badge v-else>
+        <el-icon>
+          <Bell />
+        </el-icon>
+      </el-badge>
 
       <template #dropdown>
         <div class="p-2">
           <el-tabs v-model="activeTab">
             <el-tab-pane label="通知" name="notice">
               <template v-if="notices.length > 0">
-                <div
-                  v-for="(item, index) in notices"
-                  :key="index"
-                  class="w400px flex-x-between p-1"
-                >
-                  <div class="flex-center">
-                    <DictLabel v-model="item.type" code="notice_type" size="small" class="mr-1" />
+                <div v-for="(item, index) in notices" :key="index" class="w500px py-3">
+                  <div class="flex-y-center">
+                    <DictLabel v-model="item.type" code="notice_type" size="small" />
                     <el-text
-                      type="primary"
                       size="small"
-                      class="w200px cursor-pointer"
+                      class="w200px cursor-pointer !ml-2 !flex-1"
                       truncated
-                      @click="readNotice(item.id)"
+                      @click="handleReadNotice(item.id)"
                     >
                       {{ item.title }}
                     </el-text>
-                  </div>
-                  <div>
-                    {{ item.publishTime }}
+
+                    <div class="text-xs text-gray">
+                      {{ item.publishTime }}
+                    </div>
                   </div>
                 </div>
               </template>
@@ -54,7 +42,7 @@
               </template>
               <el-divider />
               <div class="flex-x-between">
-                <el-link type="primary" :underline="false" @click="viewMore">
+                <el-link type="primary" :underline="false" @click="handleViewMore">
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
                     <ArrowRight />
@@ -77,14 +65,19 @@
                   :key="index"
                   class="w400px flex-x-between p-1"
                 >
-                  <div>
+                  <div class="flex-y-center">
                     <DictLabel v-model="item.type" code="notice_type" size="small" />
-                    <el-link type="primary" class="ml-1" @click="readNotice(item.id)">
+                    <el-link
+                      type="primary"
+                      class="w200px cursor-pointer !ml-2 !flex-1"
+                      @click="handleReadNotice(item.id)"
+                    >
                       {{ item.title }}
                     </el-link>
-                  </div>
-                  <div>
-                    {{ item.publishTime }}
+
+                    <div class="text-xs text-gray-400">
+                      {{ item.publishTime }}
+                    </div>
                   </div>
                 </div>
               </template>
@@ -95,7 +88,12 @@
               </template>
               <el-divider />
               <div class="flex-x-between">
-                <el-link type="primary" :underline="false" @click="viewMore">
+                <el-link
+                  v-if="tasks.length > 5"
+                  type="primary"
+                  :underline="false"
+                  @click="handleViewMore"
+                >
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
                     <ArrowRight />
@@ -114,15 +112,19 @@
 
             <el-tab-pane label="待办" name="task">
               <template v-if="tasks.length > 0">
-                <div v-for="(item, index) in tasks" :key="index" class="w400px flex-x-between p-1">
-                  <div>
+                <div v-for="(item, index) in tasks" :key="index" class="w500px py-3">
+                  <div class="flex-y-center">
                     <DictLabel v-model="item.type" code="notice_type" size="small" />
-                    <el-link type="primary" class="ml-1" @click="readNotice(item.id)">
+                    <el-link
+                      type="primary"
+                      class="w200px cursor-pointer !ml-2 !flex-1"
+                      @click="handleReadNotice(item.id)"
+                    >
                       {{ item.title }}
                     </el-link>
-                  </div>
-                  <div>
-                    {{ item.publishTime }}
+                    <div class="text-xs text-gray-400">
+                      {{ item.publishTime }}
+                    </div>
                   </div>
                 </div>
               </template>
@@ -133,7 +135,12 @@
               </template>
               <el-divider />
               <div class="flex-x-between">
-                <el-link type="primary" :underline="false" @click="viewMore">
+                <el-link
+                  v-if="tasks.length > 5"
+                  type="primary"
+                  :underline="false"
+                  @click="handleViewMore"
+                >
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
                     <ArrowRight />
@@ -198,7 +205,7 @@ onMounted(() => {
 });
 
 // 阅读通知公告
-function readNotice(id: string) {
+function handleReadNotice(id: string) {
   noticeDetailRef.value.openNotice(id);
   const index = notices.value.findIndex((notice) => notice.id === id);
   if (index >= 0) {
@@ -207,7 +214,7 @@ function readNotice(id: string) {
 }
 
 // 查看更多
-function viewMore() {
+function handleViewMore() {
   router.push({ path: "/myNotice" });
 }
 
@@ -220,8 +227,11 @@ function markAllAsRead() {
 </script>
 
 <style lang="scss" scoped>
-.layout-top .notification-icon,
-.layout-mix .notification-icon {
-  color: #fff;
+:deep(.el-badge) {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
 }
 </style>
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
index 28dbb40e..32c3e706 100644
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -9,12 +9,6 @@
         <el-dropdown-item @click="handleOpenUserProfile">
           {{ $t("navbar.profile") }}
         </el-dropdown-item>
-        <a target="_blank" href="https://gitee.com/youlaiorg/vue3-element-admin">
-          <el-dropdown-item>{{ $t("navbar.gitee") }}</el-dropdown-item>
-        </a>
-        <a target="_blank" href="https://juejin.cn/post/7228990409909108793">
-          <el-dropdown-item>{{ $t("navbar.document") }}</el-dropdown-item>
-        </a>
         <el-dropdown-item divided @click="logout">
           {{ $t("navbar.logout") }}
         </el-dropdown-item>
diff --git a/src/utils/index.ts b/src/utils/index.ts
index 44bb588b..67fce789 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -39,3 +39,20 @@ export function isExternal(path: string) {
   const isExternal = /^(https?:|http?:|mailto:|tel:)/.test(path);
   return isExternal;
 }
+
+/**
+ * 格式化增长率，保留两位小数 ，并且去掉末尾的0  取绝对值
+ *
+ * @param growthRate
+ * @returns
+ */
+export function formatGrowthRate(growthRate: number) {
+  if (growthRate === 0) {
+    return "-";
+  }
+
+  const formattedRate = Math.abs(growthRate * 100)
+    .toFixed(2)
+    .replace(/\.?0+$/, "");
+  return formattedRate + "%";
+}
diff --git a/src/views/dashboard/components/VisitTrend.vue b/src/views/dashboard/components/visit-trend.vue
similarity index 100%
rename from src/views/dashboard/components/VisitTrend.vue
rename to src/views/dashboard/components/visit-trend.vue
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 88a5191d..3dae76b5 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,47 +1,147 @@
 <template>
   <div class="dashboard-container">
+    <!-- github 角标 -->
     <github-corner class="github-corner" />
 
     <el-card shadow="never">
-      <el-row justify="space-between">
+      <el-row class="h-80px">
         <el-col :span="18" :xs="24">
-          <div class="flex h-full items-center">
+          <div class="flex-x-start">
             <img
-              class="w-20 h-20 mr-5 rounded-full"
+              class="wh-80px rounded-full"
               :src="http://github.com/userStore.userInfo.avatar%20+'?imageView2/1/w/80/h/80'"
             />
-            <div>
+            <div class="ml-5">
               <p>{{ greetings }}</p>
               <p class="text-sm text-gray">今日天气晴朗，气温在15℃至25℃之间，东南风。</p>
             </div>
           </div>
         </el-col>
+
+        <el-col :span="6" :xs="24">
+          <el-row class="h-80px flex-y-center" :gutter="10">
+            <el-col :span="10">
+              <div class="font-bold color-#ff9a2e text-sm flex-y-center">
+                <el-icon class="mr-2px"><Folder /></el-icon>
+                仓库
+              </div>
+              <div class="mt-3">
+                <el-link href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
+                  <SvgIcon icon-class="gitee" class="text-lg color-#f76560" />
+                </el-link>
+                <el-divider direction="vertical" />
+                <el-link href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
+                  <SvgIcon icon-class="github" class="text-lg color-#4080ff" />
+                </el-link>
+                <el-divider direction="vertical" />
+                <el-link href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
+                  <SvgIcon icon-class="gitcode" class="text-lg color-#ff9a2e" />
+                </el-link>
+              </div>
+            </el-col>
+
+            <el-col :span="10">
+              <div class="font-bold color-#4080ff text-sm flex-y-center">
+                <el-icon class="mr-2px"><Document /></el-icon>
+                文档
+              </div>
+              <div class="mt-3">
+                <el-link href="https://juejin.cn/post/7228990409909108793" target="_blank">
+                  <SvgIcon icon-class="juejin" class="text-lg" />
+                </el-link>
+                <el-divider direction="vertical" />
+                <el-link
+                  href="https://youlai.blog.csdn.net/article/details/130191394"
+                  target="_blank"
+                >
+                  <SvgIcon icon-class="csdn" class="text-lg" />
+                </el-link>
+                <el-divider direction="vertical" />
+                <el-link href="https://www.cnblogs.com/haoxianrui/p/17331952.html" target="_blank">
+                  <SvgIcon icon-class="cnblogs" class="text-lg" />
+                </el-link>
+              </div>
+            </el-col>
+
+            <el-col :span="4">
+              <div class="font-bold color-#f76560 text-sm flex-y-center">
+                <el-icon class="mr-2px"><VideoCamera /></el-icon>
+                视频
+              </div>
+              <div class="mt-3">
+                <el-link
+                  href="https://space.bilibili.com/1731537706/channel/seriesdetail?sid=4459672"
+                  target="_blank"
+                >
+                  <SvgIcon icon-class="bilibili" class="text-lg" />
+                </el-link>
+              </div>
+            </el-col>
+          </el-row>
+        </el-col>
       </el-row>
     </el-card>
 
-    <!-- 数据卡片 -->
+    <!-- 数据统计 -->
     <el-row :gutter="10" class="mt-5">
-      <el-col :xs="24" :sm="12" :lg="6">
-        <el-card shadow="never">
-          <template #header>
-            <div class="flex-x-between">
-              <span class="text-[var(--el-text-color-secondary)]">在线用户</span>
-              <el-tag type="success" size="small">-</el-tag>
-            </div>
+      <!-- 访客数(UV) -->
+      <el-col :span="12">
+        <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
+          <template #template>
+            <el-card>
+              <template #header>
+                <div>
+                  <el-skeleton-item variant="h3" style="width: 40%" />
+                  <el-skeleton-item variant="rect" style="float: right; width: 1em; height: 1em" />
+                </div>
+              </template>
+
+              <div class="flex-x-between">
+                <el-skeleton-item variant="text" style="width: 30%" />
+                <el-skeleton-item variant="circle" style="width: 2em; height: 2em" />
+              </div>
+              <div class="mt-5 flex-x-between">
+                <el-skeleton-item variant="text" style="width: 50%" />
+                <el-skeleton-item variant="text" style="width: 1em" />
+              </div>
+            </el-card>
           </template>
+          <template v-if="!visitStatsLoading">
+            <el-card shadow="never">
+              <template #header>
+                <div class="flex-x-between">
+                  <span class="text-gray">访客数(UV)</span>
+                  <el-tag type="success" size="small">日</el-tag>
+                </div>
+              </template>
 
-          <div class="flex-x-between mt-2">
-            <span class="text-lg">{{ onlineUserCount }}</span>
-            <svg-icon icon-class="user" size="2em" />
-          </div>
-          <div class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]">
-            <span>总用户数</span>
-            <span>5</span>
-          </div>
-        </el-card>
+              <div class="flex-x-between mt-2">
+                <div class="flex-y-center">
+                  <span class="text-lg">{{ visitStatsData.todayUvCount }}</span>
+                  <span
+                    :class="['text-xs', 'ml-2', getGrowthRateClass(visitStatsData.uvGrowthRate)]"
+                  >
+                    <el-icon>
+                      <Top v-if="visitStatsData.uvGrowthRate > 0" />
+                      <Bottom v-else-if="visitStatsData.uvGrowthRate < 0" />
+                    </el-icon>
+                    {{ formatGrowthRate(visitStatsData.uvGrowthRate) }}
+                  </span>
+                </div>
+                <svg-icon icon-class="visitor" size="2em" />
+              </div>
+
+              <div class="flex-x-between mt-2 text-sm text-gray">
+                <span>总访客数</span>
+                <span>{{ visitStatsData.totalUvCount }}</span>
+              </div>
+            </el-card>
+          </template>
+        </el-skeleton>
       </el-col>
 
-      <el-col v-for="(item, index) in visitStatsList" :key="index" :xs="24" :sm="12" :lg="6">
+      <!-- 浏览量(PV) -->
+      <el-col :span="12">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
@@ -66,32 +166,30 @@
             <el-card shadow="never">
               <template #header>
                 <div class="flex-x-between">
-                  <span class="text-[var(--el-text-color-secondary)]">
-                    {{ item.title }}
-                  </span>
-                  <el-tag :type="item.tagType" size="small">
-                    {{ item.granularity }}
-                  </el-tag>
+                  <span class="text-gray">浏览量(PV)</span>
+                  <el-tag type="primary" size="small">日</el-tag>
                 </div>
               </template>
 
               <div class="flex-x-between mt-2">
                 <div class="flex-y-center">
-                  <span class="text-lg">{{ item.todayCount }}</span>
-                  <span :class="['text-xs', 'ml-2', getGrowthRateClass(item.growthRate)]">
+                  <span class="text-lg">{{ visitStatsData.todayPvCount }}</span>
+                  <span
+                    :class="['text-xs', 'ml-2', getGrowthRateClass(visitStatsData.pvGrowthRate)]"
+                  >
                     <el-icon>
-                      <Top v-if="item.growthRate > 0" />
-                      <Bottom v-else-if="item.growthRate < 0" />
+                      <Top v-if="visitStatsData.pvGrowthRate > 0" />
+                      <Bottom v-else-if="visitStatsData.pvGrowthRate < 0" />
                     </el-icon>
-                    {{ formatGrowthRate(item.growthRate) }}
+                    {{ formatGrowthRate(visitStatsData.pvGrowthRate) }}
                   </span>
                 </div>
-                <svg-icon :icon-class="item.icon" size="2em" />
+                <svg-icon icon-class="browser" size="2em" />
               </div>
 
-              <div class="flex-x-between mt-2 text-sm text-[var(--el-text-color-secondary)]">
-                <span>总{{ item.title }}</span>
-                <span>{{ item.totalCount }}</span>
+              <div class="flex-x-between mt-2 text-sm text-gray">
+                <span>总浏览量</span>
+                <span>{{ visitStatsData.totalPvCount }}</span>
               </div>
             </el-card>
           </template>
@@ -100,32 +198,30 @@
     </el-row>
 
     <el-row :gutter="10" class="mt-5">
+      <!-- 访问趋势统计图 -->
       <el-col :xs="24" :span="16">
-        <!-- 访问趋势统计图 -->
         <VisitTrend id="VisitTrend" width="100%" height="400px" />
       </el-col>
+      <!-- 通知公告 -->
       <el-col :xs="24" :span="8">
         <el-card>
           <template #header>
             <div class="flex-x-between">
               <div class="flex-y-center">通知公告</div>
               <el-link type="primary">
-                <span class="text-xs" @click="viewMoreNotice">查看更多</span>
+                <span class="text-xs" @click="handleViewMoreNotice">查看更多</span>
                 <el-icon class="text-xs"><ArrowRight /></el-icon>
               </el-link>
             </div>
           </template>
 
           <el-scrollbar height="400px">
-            <div v-for="(item, index) in notices" :key="index" class="flex-y-center py-3">
+            <div v-for="(item, index) in notices" :key="index" class="flex-y-center py-4">
               <DictLabel v-model="item.type" code="notice_type" size="small" />
-              <el-text
-                truncated
-                class="!mx-2 flex-1 !text-xs !text-[var(--el-text-color-secondary)]"
-              >
+              <el-text truncated class="!mx-2 flex-1 !text-xs !text-gray">
                 {{ item.title }}
               </el-text>
-              <el-link @click="viewNoticeDetail(item.id)">
+              <el-link @click="handleOpenNoticeDetail(item.id)">
                 <el-icon class="text-sm"><View /></el-icon>
               </el-link>
             </div>
@@ -144,29 +240,20 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import VisitTrend from "./components/VisitTrend.vue";
+import VisitTrend from "./components/visit-trend.vue";
 
-import WebSocketManager from "@/utils/websocket";
 import router from "@/router";
 
-import { useUserStore } from "@/store/modules/user";
 import StatsAPI, { VisitStatsVO } from "@/api/system/log";
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 
-interface VisitStats {
-  title: string;
-  icon: string;
-  tagType: "primary" | "success" | "warning";
-  growthRate: number;
-  // 粒度
-  granularity: string;
-  // 今日数量
-  todayCount: number;
-  totalCount: number;
-}
+import { useUserStore } from "@/store/modules/user";
+import { formatGrowthRate } from "@/utils";
 
 const noticeDetailRef = ref();
 
+const notices = ref<NoticePageVO[]>([]);
+
 const userStore = useUserStore();
 const date: Date = new Date();
 const greetings = computed(() => {
@@ -184,45 +271,33 @@ const greetings = computed(() => {
   }
 });
 
-const onlineUserCount = ref(0);
-
 const visitStatsLoading = ref(true);
-const visitStatsList = ref<VisitStats[] | null>(Array(3).fill({}));
+const visitStatsData = ref<VisitStatsVO>({
+  todayUvCount: 0,
+  uvGrowthRate: 0,
+  totalUvCount: 0,
+  todayPvCount: 0,
+  pvGrowthRate: 0,
+  totalPvCount: 0,
+});
 
 // 加载访问统计数据
 const loadVisitStatsData = async () => {
-  const list: VisitStatsVO[] = await StatsAPI.getVisitStats();
-
-  if (list) {
-    const tagTypes: ("primary" | "success" | "warning")[] = ["primary", "success", "warning"];
-    const transformedList: VisitStats[] = list.map((item, index) => ({
-      title: item.title,
-      icon: getVisitStatsIcon(item.type),
-      tagType: tagTypes[index % tagTypes.length],
-      growthRate: item.growthRate,
-      granularity: "日",
-      todayCount: item.todayCount,
-      totalCount: item.totalCount,
-    }));
-    visitStatsList.value = transformedList;
-    visitStatsLoading.value = false;
-  }
+  StatsAPI.getVisitStats()
+    .then((data) => {
+      visitStatsData.value = data;
+    })
+    .finally(() => {
+      visitStatsLoading.value = false;
+    });
 };
 
-// 格式化增长率
-const formatGrowthRate = (growthRate: number): string => {
-  if (growthRate === 0) {
-    return "-";
+// 根据增长率获取样式
+const getGrowthRateClass = (growthRate?: number): string => {
+  if (!growthRate) {
+    return "color-[--el-color-info]";
   }
 
-  const formattedRate = Math.abs(growthRate * 100)
-    .toFixed(2)
-    .replace(/\.?0+$/, "");
-  return formattedRate + "%";
-};
-
-/** 获取增长率文本颜色类 */
-const getGrowthRateClass = (growthRate: number): string => {
   if (growthRate > 0) {
     return "color-[--el-color-danger]";
   } else if (growthRate < 0) {
@@ -232,44 +307,25 @@ const getGrowthRateClass = (growthRate: number): string => {
   }
 };
 
-/** 获取访问统计图标 */
-const getVisitStatsIcon = (type: string) => {
-  switch (type) {
-    case "pv":
-      return "pv";
-    case "uv":
-      return "uv";
-    case "ip":
-      return "ip";
-    default:
-      return "pv";
-  }
+const loadMyNotice = () => {
+  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 10 }).then((data) => {
+    notices.value = data.list;
+  });
 };
 
-const notices = ref<NoticePageVO[]>([]);
-
 // 查看更多
-function viewMoreNotice() {
+function handleViewMoreNotice() {
   router.push({ path: "/myNotice" });
 }
 
-// 阅读通知公告
-function viewNoticeDetail(id: string) {
+// 打开通知公告
+function handleOpenNoticeDetail(id: string) {
   noticeDetailRef.value.openNotice(id);
 }
 
 onMounted(() => {
   loadVisitStatsData();
-
-  // 获取我的通知公告
-  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 10 }).then((data) => {
-    notices.value = data.list;
-  });
-
-  WebSocketManager.subscribeToTopic("/topic/onlineUserCount", (data) => {
-    console.log("收到在线用户数量：", data);
-    onlineUserCount.value = JSON.parse(data);
-  });
+  loadMyNotice();
 });
 </script>
 
diff --git a/src/views/demo/api/knife4j.vue b/src/views/demo/api/knife4j.vue
deleted file mode 100644
index 9238b726..00000000
--- a/src/views/demo/api/knife4j.vue
+++ /dev/null
@@ -1,22 +0,0 @@
-<!-- 接口文档 -->
-<template>
-  <div class="app-container">
-    <iframe src="http://vapi.youlai.tech/doc.html" width="100%" height="100%" frameborder="0" />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-/** 关闭tag标签  */
-.app-container {
-  /* 50px = navbar = 50px */
-  height: calc(100vh - 50px);
-}
-
-/** 开启tag标签  */
-.hasTagsView {
-  .app-container {
-    /* 84px = navbar + tags-view = 50px + 34px */
-    height: calc(100vh - 84px);
-  }
-}
-</style>
diff --git a/src/views/demo/api/swagger.vue b/src/views/demo/api/swagger.vue
deleted file mode 100644
index 59637ecf..00000000
--- a/src/views/demo/api/swagger.vue
+++ /dev/null
@@ -1,27 +0,0 @@
-<!-- 接口文档 -->
-<template>
-  <div class="app-container">
-    <iframe
-      src="http://vapi.youlai.tech/swagger-ui.html"
-      width="100%"
-      height="100%"
-      frameborder="0"
-    />
-  </div>
-</template>
-
-<style lang="scss" scoped>
-/** 关闭tag标签  */
-.app-container {
-  /* 50px = navbar = 50px */
-  height: calc(100vh - 50px);
-}
-
-/** 开启tag标签  */
-.hasTagsView {
-  .app-container {
-    /* 84px = navbar + tags-view = 50px + 34px */
-    height: calc(100vh - 84px);
-  }
-}
-</style>
diff --git a/src/views/demo/other.vue b/src/views/demo/other.vue
deleted file mode 100644
index 45792d6d..00000000
--- a/src/views/demo/other.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <div>路由参数：{{ query }}</div>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: "Other",
-  inheritAttrs: false,
-});
-import { useRoute } from "vue-router";
-
-// 获取query参数
-const query = useRoute().query.type as string;
-</script>
-
-<style lang="scss" scoped></style>

From a95bfe4756fa921372e282a9c613cdb83d0c3e28 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 8 Dec 2024 19:01:58 +0800
Subject: [PATCH 092/497] chore: :hammer: bump version to 2.20.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae0689c0..c88c4429 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.19.2",
+  "version": "2.20.0",
   "private": true,
   "type": "module",
   "scripts": {

From 5ee348c9191560019fd024e79d6a448a5145e121 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 14 Dec 2024 20:30:16 +0800
Subject: [PATCH 093/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index c88c4429..1aafaf03 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.20.0",
+  "version": "2.20.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -50,17 +50,17 @@
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "5.1.10",
     "animate.css": "^4.1.1",
-    "axios": "^1.7.8",
+    "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "echarts": "^5.5.1",
-    "element-plus": "^2.9.0",
+    "element-plus": "^2.9.1",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.3.0",
-    "pinia": "^2.2.8",
+    "pinia": "^2.3.0",
     "qs": "^6.13.1",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
@@ -70,46 +70,46 @@
   "devDependencies": {
     "@commitlint/cli": "^19.6.0",
     "@commitlint/config-conventional": "^19.6.0",
-    "@eslint/js": "^9.16.0",
+    "@eslint/js": "^9.17.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash": "^4.17.13",
-    "@types/node": "^22.10.1",
+    "@types/node": "^22.10.2",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.16.0",
-    "@typescript-eslint/parser": "^8.16.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.0",
+    "@typescript-eslint/parser": "^8.18.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "1.9.4",
-    "eslint": "^9.16.0",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-vue": "^9.32.0",
     "globals": "^15.13.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.10",
+    "lint-staged": "^15.2.11",
     "postcss": "^8.4.49",
     "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.4.1",
-    "sass": "^1.81.0",
+    "prettier": "^3.4.2",
+    "sass": "^1.83.0",
     "stylelint": "^16.11.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.5.0",
     "stylelint-config-standard": "^36.0.1",
-    "terser": "^5.36.0",
+    "terser": "^5.37.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.16.0",
+    "typescript-eslint": "^8.18.0",
     "unocss": "0.65.0-beta.3",
     "unplugin-auto-import": "^0.18.6",
     "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.0.1",
-    "vite-plugin-mock-dev-server": "^1.8.0",
+    "vite": "^6.0.3",
+    "vite-plugin-mock-dev-server": "^1.8.2",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.1.10"

From d7ff3f23797de04a05d82997b857c040cbbcb8ee Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 14 Dec 2024 20:32:01 +0800
Subject: [PATCH 094/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=97=A5=E5=BF=97=E6=8E=A5=E5=8F=A3=E5=88=AB=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 3dae76b5..71292695 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -244,7 +244,7 @@ import VisitTrend from "./components/visit-trend.vue";
 
 import router from "@/router";
 
-import StatsAPI, { VisitStatsVO } from "@/api/system/log";
+import LogAPI, { VisitStatsVO } from "@/api/system/log";
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 
 import { useUserStore } from "@/store/modules/user";
@@ -283,7 +283,7 @@ const visitStatsData = ref<VisitStatsVO>({
 
 // 加载访问统计数据
 const loadVisitStatsData = async () => {
-  StatsAPI.getVisitStats()
+  LogAPI.getVisitStats()
     .then((data) => {
       visitStatsData.value = data;
     })

From c25a8d50aa164460835c001345a35463d5bcd998 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 14 Dec 2024 20:32:53 +0800
Subject: [PATCH 095/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20401=20=E5=92=8C=20404=20=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/401.gif       | Bin 162867 -> 0 bytes
 src/assets/images/401.svg       | 398 ++++++++++++++++++++++++++++++++
 src/assets/images/404.png       | Bin 20613 -> 0 bytes
 src/assets/images/404.svg       | 340 +++++++++++++++++++++++++++
 src/assets/images/404_cloud.png | Bin 2644 -> 0 bytes
 src/views/error/401.vue         |  52 ++---
 src/views/error/404.vue         | 162 ++-----------
 7 files changed, 776 insertions(+), 176 deletions(-)
 delete mode 100644 src/assets/images/401.gif
 create mode 100644 src/assets/images/401.svg
 delete mode 100644 src/assets/images/404.png
 create mode 100644 src/assets/images/404.svg
 delete mode 100644 src/assets/images/404_cloud.png

diff --git a/src/assets/images/401.gif b/src/assets/images/401.gif
deleted file mode 100644
index 4c930e72a698889a0f5666d8599652c5808cfc70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162867
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

diff --git a/src/assets/images/401.svg b/src/assets/images/401.svg
new file mode 100644
index 00000000..6096d41a
--- /dev/null
+++ b/src/assets/images/401.svg
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g id="Background_Complete">
+	<g>
+		<rect y="382.398" style="fill:#EBEBEB;" width="500" height="0.25"/>
+		<rect x="78.545" y="390.788" style="fill:#EBEBEB;" width="33.122" height="0.25"/>
+		<rect x="133.333" y="398" style="fill:#EBEBEB;" width="30.167" height="0.25"/>
+		<rect x="56.854" y="400.074" style="fill:#EBEBEB;" width="38.251" height="0.25"/>
+		<rect x="434" y="399.528" style="fill:#EBEBEB;" width="15.901" height="0.25"/>
+		<rect x="391.471" y="399.528" style="fill:#EBEBEB;" width="39.321" height="0.25"/>
+		<rect x="250" y="390.663" style="fill:#EBEBEB;" width="30.333" height="0.25"/>
+		<rect x="284.667" y="390.663" style="fill:#EBEBEB;" width="72.095" height="0.25"/>
+		<path style="fill:#EBEBEB;" d="M237.014,337.8H43.915c-3.147,0-5.708-2.561-5.708-5.708V60.66c0-3.147,2.561-5.708,5.708-5.708
+			h193.099c3.146,0,5.707,2.561,5.707,5.708v271.432C242.721,335.239,240.16,337.8,237.014,337.8z M43.915,55.203
+			c-3.01,0-5.458,2.448-5.458,5.458v271.432c0,3.01,2.448,5.458,5.458,5.458h193.099c3.009,0,5.457-2.448,5.457-5.458V60.66
+			c0-3.009-2.448-5.458-5.457-5.458H43.915z"/>
+		<path style="fill:#EBEBEB;" d="M453.31,337.8H260.212c-3.147,0-5.707-2.561-5.707-5.708V60.66c0-3.147,2.561-5.708,5.707-5.708
+			H453.31c3.148,0,5.708,2.561,5.708,5.708v271.432C459.019,335.239,456.458,337.8,453.31,337.8z M260.212,55.203
+			c-3.009,0-5.457,2.448-5.457,5.458v271.432c0,3.01,2.448,5.458,5.457,5.458H453.31c3.01,0,5.458-2.448,5.458-5.458V60.66
+			c0-3.009-2.448-5.458-5.458-5.458H260.212z"/>
+	</g>
+	<g>
+		<g>
+			
+				<rect x="340.186" y="199.199" transform="matrix(0.7071 0.7071 -0.7071 0.7071 314.2608 -160.6245)" style="fill:#EBEBEB;" width="21.672" height="199.671"/>
+			<polygon style="fill:#E0E0E0;" points="361.931,303.448 346.607,288.124 325.718,309.013 339.771,331.418 			"/>
+			
+				<rect x="357.626" y="209.415" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 397.998 783.3564)" style="fill:#E0E0E0;" width="7.224" height="199.671"/>
+			
+				<rect x="340.186" y="204.307" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -112.2491 337.2923)" style="fill:#EBEBEB;" width="21.672" height="199.671"/>
+			
+				<rect x="357.626" y="194.091" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 824.5084 246.3343)" style="fill:#E0E0E0;" width="7.224" height="199.671"/>
+		</g>
+		<g>
+			
+				<rect x="106.857" y="239.821" transform="matrix(0.7071 0.7071 -0.7071 0.7071 258.2875 11.4772)" style="fill:#EBEBEB;" width="16.866" height="155.396"/>
+			<polygon style="fill:#E0E0E0;" points="123.78,320.954 111.854,309.028 95.597,325.285 106.534,342.722 			"/>
+			
+				<rect x="120.429" y="247.772" transform="matrix(-0.7071 -0.7071 0.7071 -0.7071 -19.7576 642.7559)" style="fill:#E0E0E0;" width="5.622" height="155.396"/>
+			
+				<rect x="106.857" y="243.797" transform="matrix(0.7071 -0.7071 0.7071 0.7071 -193.5634 175.6856)" style="fill:#EBEBEB;" width="16.866" height="155.396"/>
+			
+				<rect x="120.429" y="235.846" transform="matrix(-0.7071 0.7071 -0.7071 -0.7071 432.0933 448.1087)" style="fill:#E0E0E0;" width="5.622" height="155.396"/>
+		</g>
+		<g>
+			<g>
+				<rect x="301.262" y="275.115" style="fill:#F5F5F5;" width="17.606" height="107.284"/>
+				<polygon style="fill:#EBEBEB;" points="318.868,319.695 301.262,319.695 301.262,332.561 318.868,328.757 				"/>
+				
+					<rect x="318.868" y="275.115" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 643.605 657.5133)" style="fill:#EBEBEB;" width="5.869" height="107.284"/>
+			</g>
+			<g>
+				<rect x="116.786" y="275.115" style="fill:#F5F5F5;" width="17.606" height="107.284"/>
+				<polygon style="fill:#EBEBEB;" points="134.392,319.695 116.786,319.695 116.786,332.561 134.392,328.757 				"/>
+				
+					<rect x="134.392" y="275.115" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 274.6532 657.5133)" style="fill:#EBEBEB;" width="5.869" height="107.284"/>
+			</g>
+			<g>
+				<rect x="103.361" y="290.835" style="fill:#F5F5F5;" width="224.751" height="33.021"/>
+				
+					<rect x="328.113" y="290.835" transform="matrix(-1 -1.224647e-16 1.224647e-16 -1 659.5233 614.6917)" style="fill:#EBEBEB;" width="3.298" height="33.021"/>
+			</g>
+			<polygon style="fill:#FAFAFA;" points="242.731,257.173 198.792,257.173 167.722,288.243 167.722,332.183 198.792,363.253 
+				242.731,363.253 273.801,332.183 273.801,288.243 			"/>
+			<polygon style="fill:#E0E0E0;" points="240.722,262.023 200.801,262.023 172.571,290.252 172.571,330.174 200.801,358.403 
+				240.722,358.403 268.952,330.174 268.952,290.252 			"/>
+			<g>
+				<path style="fill:#FFFFFF;" d="M182.189,314.819l5.622-0.501c0.121,1.3,0.369,2.29,0.743,2.97
+					c0.608,1.102,1.477,1.653,2.608,1.653c0.843,0,1.493-0.281,1.95-0.846c0.457-0.563,0.685-1.216,0.685-1.958
+					c0-0.706-0.218-1.337-0.652-1.894c-0.435-0.558-1.444-1.083-3.026-1.579c-2.591-0.828-4.438-1.93-5.542-3.305
+					c-1.114-1.374-1.67-3.125-1.67-5.254c0-1.399,0.285-2.72,0.854-3.965c0.57-1.243,1.426-2.221,2.57-2.933
+					c1.143-0.712,2.71-1.069,4.702-1.069c2.443,0,4.306,0.647,5.589,1.941c1.282,1.294,2.045,3.352,2.288,6.173l-5.568,0.465
+					c-0.148-1.226-0.459-2.117-0.933-2.675c-0.474-0.556-1.128-0.835-1.963-0.835c-0.687,0-1.204,0.207-1.552,0.622
+					c-0.348,0.415-0.522,0.918-0.522,1.513c0,0.432,0.144,0.822,0.431,1.169c0.278,0.358,0.939,0.693,1.983,1.003
+					c2.582,0.792,4.432,1.594,5.549,2.405c1.117,0.811,1.93,1.817,2.439,3.018c0.508,1.201,0.763,2.543,0.763,4.028
+					c0,1.746-0.339,3.355-1.017,4.828c-0.678,1.474-1.627,2.59-2.844,3.352c-1.217,0.761-2.751,1.141-4.603,1.141
+					c-3.253,0-5.504-0.891-6.756-2.673C183.063,319.832,182.354,317.566,182.189,314.819z"/>
+				<path style="fill:#FFFFFF;" d="M201.166,296.603h17.959v6.722h-6.026v20.499h-5.908v-20.499h-6.026V296.603z"/>
+				<path style="fill:#FFFFFF;" d="M220.142,310.233c0-4.445,0.869-7.904,2.608-10.381c1.739-2.475,4.16-3.714,7.264-3.714
+					c3.183,0,5.634,1.216,7.356,3.649c1.722,2.433,2.582,5.84,2.582,10.222c0,3.181-0.376,5.79-1.129,7.827
+					c-0.752,2.037-1.839,3.621-3.26,4.753c-1.422,1.133-3.193,1.699-5.314,1.699c-2.156,0-3.941-0.489-5.354-1.466
+					c-1.413-0.978-2.559-2.526-3.436-4.643C220.58,316.064,220.142,313.414,220.142,310.233z M226.05,310.269
+					c0,2.749,0.358,4.723,1.076,5.924c0.717,1.201,1.693,1.801,2.928,1.801c1.269,0,2.252-0.588,2.948-1.763
+					c0.695-1.176,1.044-3.286,1.044-6.332c0-2.562-0.363-4.435-1.089-5.617c-0.726-1.182-1.711-1.773-2.954-1.773
+					c-1.191,0-2.148,0.6-2.87,1.801C226.41,305.51,226.05,307.497,226.05,310.269z"/>
+				<path style="fill:#FFFFFF;" d="M243.109,296.603h9.821c2.139,0,3.741,0.725,4.806,2.172c1.065,1.449,1.598,3.51,1.598,6.183
+					c0,2.749-0.581,4.897-1.741,6.444c-1.161,1.548-2.933,2.321-5.315,2.321h-3.235v10.101h-5.935V296.603z M249.044,308.208h1.448
+					c1.139,0,1.939-0.281,2.4-0.845c0.46-0.563,0.691-1.284,0.691-2.163c0-0.853-0.2-1.578-0.6-2.172
+					c-0.4-0.594-1.152-0.891-2.256-0.891h-1.683V308.208z"/>
+			</g>
+		</g>
+		<path style="fill:#F0F0F0;" d="M411.347,102.747c-1.03,0-2.067,0.129-3.096,0.374c-0.004,0.001-0.009,0.002-0.013,0.004
+			c-1.316-2.951-4.247-4.872-8.203-4.872c-2.897,0-5.857,1.027-8.436,2.735l0,0c-1.678-5.634-6.708-9.404-13.734-9.404
+			c-9.986,0-20.447,7.632-24.228,17.392c-0.878-0.202-1.814-0.313-2.813-0.313c-0.313,0-0.627,0.011-0.941,0.031
+			c-8.616,0.571-7.969,13.572,0.666,13.572h61.4c2.155,0,4.203-1.007,5.471-2.749c1.062-1.459,1.886-3.068,2.385-4.76
+			C421.764,108.123,417.974,102.747,411.347,102.747z"/>
+		<path style="fill:#F0F0F0;" d="M171.359,45.129c-1.341-8.879-8.42-15.07-18.771-15.07c-8.481,0-17.218,4.154-23.723,10.545
+			c-0.002,0.002-0.004,0.004-0.006,0.006c-1.681-1.534-4.02-2.447-6.848-2.447c-7.178,0-14.713,5.819-16.832,12.996
+			c-0.333,1.13-0.496,2.219-0.533,3.264c-0.005,0.003-0.01,0.007-0.015,0.01c-0.049,0.033-0.098,0.066-0.146,0.099
+			c-5.945,4.043-2.958,13.385,4.232,13.385h63.231c2.447,0,4.775-1.189,6.104-3.243c0.989-1.529,1.768-3.173,2.273-4.886
+			C182.582,52.136,178.606,45.845,171.359,45.129z"/>
+		<path style="fill:#F5F5F5;" d="M246.884,144.296c-1.844-12.208-11.576-20.72-25.809-20.72c-11.66,0-23.674,5.711-32.617,14.498
+			c-0.003,0.003-0.005,0.005-0.008,0.008c-2.311-2.109-5.528-3.364-9.416-3.364c-9.869,0-20.23,8-23.142,17.869
+			c-0.458,1.553-0.682,3.051-0.733,4.488c-0.007,0.005-0.014,0.009-0.021,0.013c-0.067,0.045-0.134,0.09-0.201,0.136
+			c-8.182,5.565-4.124,18.403,5.771,18.403h83.321c6.914,0,13.153-4.432,15.146-11.053c0.012-0.041,0.025-0.083,0.037-0.124
+			C262.316,153.931,256.849,145.282,246.884,144.296z"/>
+	</g>
+</g>
+<g id="Background_Simple" style="display:none;">
+	<g style="display:inline;">
+		<path style="fill:#407BFF;" d="M312.63,195.478c-16.424-28.295-22.446-56.696-48.459-80.939
+			c-20.391-19.004-44.801-36.364-80.735-36.049c-34.237,0.299-66.685,11.37-81.895,37.85c-15.031,26.168-12.386,61.452,1.454,84.648
+			c7.376,12.362,20.103,21.206,30.93,31.538c11.94,11.394,17.783,24.454,21.425,39.256c6.396,25.996,9.831,51.906,37.977,68.233
+			c27.571,15.994,63.867,13.722,98.977,11.881c32.105-1.684,78.098,3.508,101.174-22.134c21.826-24.253,16.347-63.719-3.388-83.319
+			C368.11,224.611,328.379,222.61,312.63,195.478z"/>
+		<path style="opacity:0.9;fill:#FFFFFF;" d="M312.63,195.478c-16.424-28.295-22.446-56.696-48.459-80.939
+			c-20.391-19.004-44.801-36.364-80.735-36.049c-34.237,0.299-66.685,11.37-81.895,37.85c-15.031,26.168-12.386,61.452,1.454,84.648
+			c7.376,12.362,20.103,21.206,30.93,31.538c11.94,11.394,17.783,24.454,21.425,39.256c6.396,25.996,9.831,51.906,37.977,68.233
+			c27.571,15.994,63.867,13.722,98.977,11.881c32.105-1.684,78.098,3.508,101.174-22.134c21.826-24.253,16.347-63.719-3.388-83.319
+			C368.11,224.611,328.379,222.61,312.63,195.478z"/>
+	</g>
+</g>
+<g id="Shadow_1_">
+	<ellipse id="_x3C_Path_x3E__371_" style="fill:#F5F5F5;" cx="250" cy="416.238" rx="193.889" ry="11.323"/>
+</g>
+<g id="_x34__1">
+	<path style="fill:#263238;" d="M128.743,128.923H78.545v-22.664l50.198-59.671h24.017v60.955h12.448v21.379H152.76v18.536h-24.017
+		V128.923z M128.743,107.544V76.331l-26.524,31.213H128.743z"/>
+	<path style="fill:#263238;" d="M364.91,46.588v100.871h-27.873V81.363c-4.511,3.428-8.874,6.202-13.091,8.321
+		c-4.218,2.12-9.505,4.151-15.865,6.09V73.176c9.38-3.021,16.665-6.653,21.852-10.893c5.186-4.239,9.246-9.471,12.178-15.695H364.91
+		z"/>
+</g>
+<g id="Character_1_">
+	<g>
+		<g>
+			<path style="fill:#FF8B7B;" d="M311.817,173.193c-0.44,0.786-0.776,1.354-1.168,2.008c-0.379,0.632-0.777,1.242-1.171,1.855
+				c-0.788,1.224-1.624,2.409-2.473,3.586c-1.712,2.344-3.533,4.622-5.512,6.803c-1.975,2.185-4.083,4.294-6.41,6.255
+				c-2.313,1.974-4.829,3.816-7.669,5.377c-0.583,0.337-1.722,0.941-2.695,1.294c-1.001,0.377-1.999,0.654-2.977,0.833
+				c-1.959,0.357-3.798,0.38-5.528,0.264c-3.457-0.244-6.49-1.14-9.338-2.162c-2.833-1.077-5.472-2.355-7.983-3.797
+				c-2.525-1.463-4.852-2.986-7.203-4.861c-1.508-1.203-1.756-3.4-0.553-4.909c0.97-1.216,2.587-1.612,3.967-1.09l0.186,0.071
+				c4.739,1.8,9.795,3.522,14.527,4.406c2.357,0.473,4.685,0.664,6.656,0.557c0.978-0.066,1.865-0.224,2.552-0.471
+				c0.344-0.122,0.645-0.247,0.896-0.39c0.283-0.161,0.333-0.216,0.897-0.602c3.612-2.524,7.03-6.045,10.176-9.859
+				c1.566-1.922,3.096-3.915,4.551-5.972c0.735-1.022,1.439-2.07,2.145-3.108l1.03-1.564l0.941-1.469l0.158-0.247
+				c2.085-3.254,6.413-4.202,9.667-2.117C312.615,165.89,313.601,169.989,311.817,173.193z"/>
+			<path style="fill:#FF8B7B;" d="M256.74,185.461l-7.67-5.076l-3.247,10.199c0,0,4.951,2.86,9.856-0.503L256.74,185.461z"/>
+			<path style="fill:#FF8B7B;" d="M242.027,181.913l-0.599,3.245c-0.217,1.178,0.257,2.376,1.221,3.087l3.174,2.339l3.247-10.199
+				l-3.083-0.906C244.206,178.955,242.363,180.088,242.027,181.913z"/>
+			<g>
+				<path style="fill:#407BFF;" d="M312.06,156.937c-7.809,1.237-15.711,10.407-20.459,18.954
+					c5.221,9.095,13.533,12.417,13.533,12.417s9.26-8.763,13.011-15.234C321.897,166.602,319.407,155.773,312.06,156.937z"/>
+				<path style="opacity:0.2;" d="M312.06,156.937c-7.809,1.237-15.711,10.407-20.459,18.954
+					c5.221,9.095,13.533,12.417,13.533,12.417s9.26-8.763,13.011-15.234C321.897,166.602,319.407,155.773,312.06,156.937z"/>
+			</g>
+			<path style="fill:#263238;" d="M291.901,173.93c0,0-1.474,1.725-1.669,2.789c1.949,3.001,6.575,11.029,15.223,12.706
+				c1.467-0.888,1.801-2.132,1.801-2.132S297.32,182.387,291.901,173.93z"/>
+			<path style="fill:#407BFF;" d="M343.53,156.666c-9.197-1.495-19.781-1.942-28.566-0.816c-7.1,0.91-12.408,7.436-12.35,14.594
+				c0.051,6.261,0.476,13.994,1.971,22.243c-2.608,13.757-3.546,32.438-0.796,36.559c0.001,0.004,49.196,0.696,49.196,0.696
+				c2.104-5.887-0.541-31.327,2.265-57.898C356.035,164.612,350.908,157.865,343.53,156.666z"/>
+			<path style="opacity:0.2;" d="M324.96,229.309c-2.807-22.131-0.031-59.143-0.003-59.514l0.997,0.076
+				c-0.028,0.37-2.797,37.282-0.003,59.313L324.96,229.309z"/>
+			<path style="fill:#263238;" d="M319.647,156.542c1.694-0.632,1.062-1.572,1.062-1.572s-7.682,0-12.991,1.432
+				c-0.812,0.862,0.063,1.959,0.063,1.959S314.62,158.419,319.647,156.542z"/>
+			<path style="opacity:0.2;" d="M322.789,155c0,0-3.167,5.861,1.073,11.19c-3.359,0.022-5.531,5.727-5.531,5.727
+				s-6.563-9.119,1.833-16.411C320.631,154.784,322.789,155,322.789,155z"/>
+			<path style="fill:#FFFFFF;" d="M319.405,157.841c-0.824,3.576,6.385,10.329,6.385,10.329s12.75-6.159,13.556-9.693
+				L319.405,157.841z"/>
+			<path style="opacity:0.2;" d="M348.179,178.79c-1.36,2.62,0.45,14.03,5.7,18.81c0.06-4.7,0.2-9.69,0.5-14.82L348.179,178.79z"/>
+			<path style="fill:#FF8B7B;" d="M336.694,137.247l-13.164,8.638c1.558,3.826,2.286,7.807-2.212,9.644
+				c-2.606,1.064-2.653,4.772-0.03,5.792c1.055,0.411,2.408,0.716,4.124,0.874c4.526,0.417,9.266-0.43,12.383-1.969
+				c1.751-0.865,2.248-3.06,1.135-4.665C335.514,150.635,335.931,142.158,336.694,137.247z"/>
+			<path style="opacity:0.2;" d="M331.327,140.772l-7.792,5.109c0.447,1.085,0.818,2.181,1.015,3.237
+				c3.108-0.178,7.164-2.641,7.248-5.208C331.841,142.63,331.653,141.387,331.327,140.772z"/>
+			<g>
+				<path style="fill:#263238;" d="M322.076,120.772c3.356-0.068,4.266,4.742,3.038,6.366c2.539,0.553,3.765,3.524,3.034,5.032
+					c-0.73,1.508-3.703,3.154-6.328,2.494c-4.486-1.128-5.265-4.854-4.036-6.553C315.345,126.096,316.566,120.026,322.076,120.772z"
+					/>
+				<path style="opacity:0.2;fill:#FFFFFF;" d="M322.076,120.772c3.356-0.068,4.266,4.742,3.038,6.366
+					c2.539,0.553,3.765,3.524,3.034,5.032c-0.73,1.508-3.703,3.154-6.328,2.494c-4.486-1.128-5.265-4.854-4.036-6.553
+					C315.345,126.096,316.566,120.026,322.076,120.772z"/>
+			</g>
+			<path style="fill:#FF8B7B;" d="M340.962,128.696c-1.006,7.893-1.193,12.568-5.466,16.339c-6.428,5.674-15.985,1.314-17.361-6.742
+				c-1.238-7.251,0.614-18.941,8.587-21.519C334.578,114.235,341.968,120.803,340.962,128.696z"/>
+			<g>
+				<path style="fill:#263238;" d="M340.054,134.734c-3.357-0.049-4.097-4.888-2.814-6.468c-2.518-0.642-3.639-3.653-2.857-5.135
+					c0.783-1.481,3.811-3.022,6.411-2.271c4.443,1.284,5.092,5.035,3.805,6.69C346.966,129.649,345.533,135.673,340.054,134.734z"/>
+				<path style="opacity:0.2;fill:#FFFFFF;" d="M340.054,134.734c-3.357-0.049-4.097-4.888-2.814-6.468
+					c-2.518-0.642-3.639-3.653-2.857-5.135c0.783-1.481,3.811-3.022,6.411-2.271c4.443,1.284,5.092,5.035,3.805,6.69
+					C346.966,129.649,345.533,135.673,340.054,134.734z"/>
+			</g>
+			<path style="opacity:0.2;" d="M331.999,129.96c0,0,1.415-0.398,2.415,0.311C333.07,130.365,331.999,129.96,331.999,129.96z"/>
+			<path style="opacity:0.2;" d="M331.964,130.54c0,0,1.338-0.087,2.049,0.819C332.81,131.164,331.964,130.54,331.964,130.54z"/>
+			<path style="opacity:0.2;" d="M319.467,129.391c0,0-0.644-0.398-1.099,0.311C318.98,129.795,319.467,129.391,319.467,129.391z"/>
+			<path style="opacity:0.2;" d="M319.484,129.971c0,0-0.609-0.087-0.932,0.819C319.099,130.595,319.484,129.971,319.484,129.971z"
+				/>
+			<path style="fill:#FF8B7B;" d="M343.383,136.739c-1.049,1.845-2.715,3.038-4.227,3.479c-2.275,0.663-3.185-1.613-2.361-3.981
+				c0.741-2.132,2.818-5.045,5.01-4.66C343.964,131.956,344.583,134.629,343.383,136.739z"/>
+			<path style="fill:#263238;" d="M330.405,130.017c-0.042,0.646-0.419,1.143-0.841,1.112s-0.73-0.58-0.688-1.226
+				c0.042-0.646,0.419-1.144,0.841-1.112C330.139,128.823,330.447,129.371,330.405,130.017z"/>
+			<path style="fill:#263238;" d="M327.202,141.752c-0.826,0.156-1.573-0.157-1.67-0.698c-0.097-0.541,0.494-1.106,1.319-1.262
+				c0.825-0.155,1.573,0.157,1.67,0.698C328.618,141.031,328.027,141.596,327.202,141.752z"/>
+			<path style="fill:#263238;" d="M321.646,129.308c-0.042,0.646-0.419,1.144-0.841,1.112c-0.422-0.031-0.731-0.58-0.688-1.226
+				c0.042-0.646,0.419-1.143,0.841-1.112C321.38,128.113,321.688,128.662,321.646,129.308z"/>
+			<g>
+				<path style="fill:#263238;" d="M323.642,135.748c-4.685,0.32-5.578,2.605-4.762,3.604c0.816,0.999,2.823,0.017,2.823,0.017
+					s3.783,0.808,4.898-0.395c1.788,0.761,4.514-0.662,3.749-1.742C329.584,136.152,327.645,135.474,323.642,135.748z"/>
+				<path style="opacity:0.2;fill:#FFFFFF;" d="M323.642,135.748c-4.685,0.32-5.578,2.605-4.762,3.604
+					c0.816,0.999,2.823,0.017,2.823,0.017s3.783,0.808,4.898-0.395c1.788,0.761,4.514-0.662,3.749-1.742
+					C329.584,136.152,327.645,135.474,323.642,135.748z"/>
+			</g>
+			<path style="fill:#FF5652;" d="M323.78,129.968c0,0-1.713,3.615-3.447,5.292c1.073,1.151,3.049,0.808,3.049,0.808L323.78,129.968
+				z"/>
+			<path style="fill:#263238;" d="M331.812,126.638c0.063-0.004,0.126-0.023,0.183-0.06c0.175-0.114,0.224-0.349,0.108-0.526
+				c-1.157-1.767-2.913-1.795-2.987-1.795c-0.21-0.001-0.379,0.169-0.378,0.379c0.001,0.209,0.171,0.38,0.38,0.382l0,0
+				c0.058,0.001,1.426,0.037,2.35,1.447C331.546,126.584,331.68,126.646,331.812,126.638z"/>
+			<path style="fill:#263238;" d="M318.779,125.89c0.123,0.001,0.244-0.057,0.318-0.166c0.933-1.387,2.302-1.389,2.36-1.388
+				c0.209,0.002,0.38-0.165,0.382-0.374c0.001-0.209-0.166-0.382-0.375-0.386c-0.076,0-1.831-0.017-2.999,1.72
+				c-0.117,0.174-0.07,0.41,0.105,0.528C318.634,125.868,318.707,125.89,318.779,125.89z"/>
+			<g>
+				<path style="fill:#263238;" d="M331.689,310.8c2.237-36.078,1.743-73.102-2.149-81.16l-25.75-0.394
+					c0,0,3.191,60.325,4.204,84.357c1.05,24.988,3.284,89.963,3.284,89.963l14.898,0.184
+					C326.175,403.75,334.931,338.71,331.689,310.8z"/>
+				<path style="opacity:0.2;" d="M332.799,255.65c-8.79,9.6-4.68,36.18-0.85,50.82C332.969,288.16,333.279,269.93,332.799,255.65z"
+					/>
+				<path style="fill:#263238;" d="M325.972,405.663l-13.106-0.169c-0.801-0.013-1.661,0.17-2.319,0.689
+					c-3.793,2.994-6.688,3.09-10.999,3.862c-5.168,0.926-2.612,6.123,1.198,6.183c6.301,0.099,5.778-0.133,11.15-0.048
+					c1.213,0.019,3.726,0.048,3.726,0.048l1.683-1.712l1.484,1.712c0,0,4.125,0,6.876,0c0.761,0,1.365-0.628,1.284-1.385
+					L325.972,405.663z"/>
+				<path style="fill:#407BFF;" d="M327.032,406.958c-0.232-0.041-17.188-0.541-17.188-0.541l-0.694-6.083l18.806,0.417
+					L327.032,406.958z"/>
+			</g>
+			<g>
+				<path style="fill:#263238;" d="M361.927,310.8c-2.759-36.078-3.935-72.8-8.943-80.858l-31.057-0.4
+					c0,0,12.352,60.029,16.692,84.061c4.51,24.988,16.652,89.963,16.652,89.963l14.923,0.184
+					C370.195,403.75,369.034,338.71,361.927,310.8z"/>
+				<path style="fill:#263238;" d="M370.93,405.663l-13.106-0.169c-0.801-0.013-1.661,0.17-2.319,0.689
+					c-3.793,2.994-2.059,3.09-6.37,3.862c-5.168,0.926-2.612,6.123,1.198,6.183c6.301,0.099,5.777-0.133,11.15-0.048
+					c1.213,0.019,5.833,0.048,5.833,0.048l0.778-1.712l1.028,1.712h1.536c0.746,0,1.328-0.647,1.249-1.389L370.93,405.663z"/>
+				<path style="fill:#407BFF;" d="M371.915,406.958c-0.238-0.041-17.269-0.541-17.269-0.541l-1.605-6.083l18.868,0.417
+					L371.915,406.958z"/>
+			</g>
+			<path style="fill:#407BFF;" d="M323.315,154.294c0,0-3.692,6.567,0.547,11.895c-3.359,0.022-5.559,3.643-5.559,3.643
+				s-4.472-8.979,2.132-14.958C320.902,154.153,323.315,154.294,323.315,154.294z"/>
+			<g>
+				<path style="fill:#263238;" d="M354.333,232.684c-17.573,0.727-37.725,0.95-50.327-0.001c-0.139-0.011-0.267-0.076-0.347-0.19
+					c-0.788-1.118-1.176-3.041-1.086-4.645c0.014-0.246,0.231-0.431,0.478-0.424c16.633,0.446,33.161,0.423,50.537-0.004
+					c0.195-0.005,0.378,0.111,0.45,0.292c0.555,1.405,0.851,2.931,0.745,4.536C354.767,232.486,354.57,232.675,354.333,232.684z"/>
+				<path style="opacity:0.2;" d="M354.333,232.684c-17.573,0.727-37.725,0.95-50.327-0.001c-0.139-0.011-0.267-0.076-0.347-0.19
+					c-0.788-1.118-1.176-3.041-1.086-4.645c0.014-0.246,0.231-0.431,0.478-0.424c16.633,0.446,33.161,0.423,50.537-0.004
+					c0.195-0.005,0.378,0.111,0.45,0.292c0.555,1.405,0.851,2.931,0.745,4.536C354.767,232.486,354.57,232.675,354.333,232.684z"/>
+			</g>
+			<path style="fill:#FFFFFF;" d="M319.998,227.143c0,0-0.378,4.025,0.532,6.589c3.813,0.589,11.635,0.148,11.635,0.148
+				s0.208-3.722-0.248-6.644C325.92,226.958,319.998,227.143,319.998,227.143z"/>
+			<g>
+				<path style="fill:#FF8B7B;" d="M355.133,166.724l0.567,0.505l0.452,0.42l0.845,0.816c0.552,0.541,1.055,1.087,1.563,1.636
+					c1.003,1.094,1.95,2.214,2.848,3.354c1.796,2.283,3.466,4.631,4.961,7.069c1.5,2.434,2.908,4.913,4.138,7.47
+					c1.275,2.534,2.396,5.133,3.396,7.769c0.264,0.705,0.474,1.135,0.858,2.346c0.324,1.036,0.522,2.048,0.634,3.009
+					c0.221,1.936,0.129,3.701-0.07,5.354c-0.401,3.306-1.353,6.174-2.391,8.912c-1.091,2.715-2.342,5.267-3.747,7.702
+					c-1.417,2.452-2.887,4.732-4.672,7.034c-1.184,1.527-3.381,1.804-4.908,0.621c-1.217-0.944-1.641-2.533-1.162-3.912l0.06-0.17
+					c1.652-4.731,3.302-9.697,4.238-14.389c0.491-2.332,0.775-4.657,0.756-6.646c-0.015-0.989-0.132-1.89-0.321-2.575
+					c-0.221-0.792-0.265-0.738-0.975-2.171c-2.244-4.443-4.704-8.741-7.481-12.763c-1.373-2.023-2.837-3.96-4.338-5.827
+					c-0.744-0.941-1.529-1.831-2.294-2.71l-1.158-1.264l-0.561-0.589l-0.264-0.268c-0.066-0.066-0.195-0.191-0.165-0.169
+					c-2.917-2.537-3.224-6.958-0.687-9.876C347.795,164.494,352.216,164.186,355.133,166.724z"/>
+				<path style="fill:#407BFF;" d="M346.506,158.059c7.79,1.35,15.558,10.634,20.182,19.248c-5.352,9.018-13.712,12.22-13.712,12.22
+					s-9.132-8.896-12.789-15.421C336.53,167.581,339.177,156.789,346.506,158.059z"/>
+				<path style="fill:#263238;" d="M366.416,175.342c0,0,1.449,1.746,1.629,2.813c-1.992,2.973-6.734,10.933-15.405,12.484
+					c-1.454-0.909-1.77-2.157-1.77-2.157S360.875,183.721,366.416,175.342z"/>
+				<path style="fill:#263238;" d="M340.868,157.364c-1.611-0.69-0.969-1.607-0.969-1.607s7.41,0.262,12.48,1.874
+					c0.753,0.889-0.129,1.956-0.129,1.956S345.651,159.411,340.868,157.364z"/>
+				<path style="opacity:0.2;" d="M338.929,155.561c0,0-1.681,5.856-9.36,10.639c3.359,0.022,5.614,6.133,5.614,6.133
+					s6.957-8.222,5.379-16.333C340.095,155.278,338.929,155.561,338.929,155.561z"/>
+				<path style="fill:#407BFF;" d="M338.706,154.5c0,0-1.996,6.344-9.137,11.7c3.359,0.022,5.693,3.633,5.693,3.633
+					s6.878-5.722,5.3-13.833C340.095,155.278,338.706,154.5,338.706,154.5z"/>
+				<path style="fill:#FFFFFF;" d="M345.91,178.571c-0.464,8.64-5.925,10.696-6.697,10.696c-0.772,0-6.012-2.056-5.547-10.696
+					l6.254-2.46L345.91,178.571z"/>
+				<path style="fill:#FF8B7B;" d="M359.372,226.102l-6.157,5.297l8.167,5.309c0,0,4.993-5.473,2.514-8.596L359.372,226.102z"/>
+				<path style="fill:#FF8B7B;" d="M352.517,239.806l3.176,1.378c1.264,0.549,2.74,0.101,3.486-1.058l2.202-3.419l-8.167-5.309
+					l-2.135,4.651C350.421,237.484,351.069,239.178,352.517,239.806z"/>
+			</g>
+			<g>
+				<path style="fill:#263238;" d="M317.695,119.135c-5.488,0.741-3.643,2.486,8.597,4.049c12.24,1.563,15.303,0.33,15.303,0.33
+					S327.541,119.098,317.695,119.135z"/>
+				<path style="fill:#407BFF;" d="M345.387,125.89c0,0-10.749-4.374-27.692-6.755c-0.208-2.49,1.844-5.13,1.844-5.13
+					s-3.776-1.895-2.604-5.509s6.571-3.133,12.88-6.035c2.313,2.544,8.661,6.671,12.993,7.201c1.074,2.207,3.873,7.734,8.41,9.87
+					c-0.065,2.409-4.577,3.034-4.577,3.034S346.854,124.188,345.387,125.89z"/>
+				<path style="opacity:0.3;" d="M346.642,122.565c-3.928-3.57-17.894-10.084-27.103-8.56c0,0-2.052,2.64-1.844,5.13
+					c16.943,2.381,27.692,6.756,27.692,6.756C346.854,124.188,346.642,122.565,346.642,122.565z"/>
+				<path style="fill:#FFFFFF;" d="M331.439,109.84c-1.209,6.164-5.413,7.267-5.978,7.215c-0.565-0.053-4.194-1.883-2.986-8.047
+					l4.826-1.339L331.439,109.84z"/>
+			</g>
+		</g>
+		<g>
+			<path style="fill:#263238;" d="M251.749,210.779c-1.245,0-2.323-0.929-2.479-2.195l-7.138-58.197
+				c-0.168-1.371,0.807-2.618,2.177-2.786c1.368-0.177,2.618,0.807,2.786,2.177l7.138,58.197c0.168,1.371-0.807,2.618-2.177,2.786
+				C251.954,210.773,251.851,210.779,251.749,210.779z"/>
+			<path style="fill:#FF8B7B;" d="M250.156,184.604c-0.604-2.24,0.541-2.576-0.566-5.753c-0.589-1.69,1.346-2.994,1.591-1.638
+				c0.894,4.947,7.473,7.717,5.187,10.844C254.045,191.232,250.761,186.844,250.156,184.604z"/>
+			
+				<ellipse transform="matrix(0.0626 -0.998 0.998 0.0626 126.183 328.814)" style="fill:#407BFF;" cx="238.132" cy="97.235" rx="56.714" ry="56.714"/>
+			
+				<ellipse transform="matrix(0.334 -0.9426 0.9426 0.334 66.9429 289.2134)" style="fill:#FFFFFF;" cx="238.132" cy="97.235" rx="45.801" ry="45.801"/>
+			<path style="fill:#263238;" d="M267.872,89.486c-3.763-5.072-10.971,0.003-13.17,5.347c-0.583,1.416-1.15,3.24-1.157,4.149
+				l-2.382-16.317l-1.896-15.454c-0.378-3.078-3.373-5.126-6.378-4.359c-2.508,0.639-4.151,3.043-3.836,5.612l-0.472-3.851
+				c-0.378-3.079-3.373-5.126-6.378-4.359c-2.508,0.639-4.151,3.043-3.836,5.612l0.658,5.368c-0.378-3.078-3.373-5.126-6.378-4.359
+				l0,0c-2.508,0.64-4.151,3.043-3.836,5.612l0.821,6.69c-0.378-3.078-3.373-5.126-6.378-4.359l0,0
+				c-2.508,0.64-4.151,3.043-3.836,5.612l1.64,13.373l1.176,9.588l1.545,12.594c1.098,8.951,4.61,14.072,9.824,16.361
+				c8.012,3.518,22.645,3.559,29.227-1.782c5.756-4.672,9.462-15.926,10.354-22.891C264.072,100.743,269.397,91.541,267.872,89.486z
+				"/>
+			
+				<rect x="232.208" y="42.469" transform="matrix(0.7879 0.6158 -0.6158 0.7879 110.3727 -126.0115)" style="fill:#407BFF;" width="11.848" height="109.533"/>
+		</g>
+	</g>
+</g>
+<g id="Error_Unauthorized">
+	<g>
+		<g>
+			<path style="fill:#263238;" d="M80.441,180.083v-18.207h13.165v2.149H82.851v5.576h10.072v2.137H82.851v6.197h11.178v2.149
+				H80.441z"/>
+			<path style="fill:#263238;" d="M97.047,180.083v-13.19h2.012v1.999c0.513-0.936,0.987-1.553,1.422-1.85
+				c0.435-0.298,0.913-0.448,1.434-0.448c0.754,0,1.52,0.241,2.298,0.721l-0.77,2.074c-0.547-0.324-1.093-0.485-1.639-0.485
+				c-0.489,0-0.928,0.147-1.317,0.44c-0.39,0.294-0.667,0.702-0.832,1.224c-0.249,0.795-0.373,1.664-0.373,2.608v6.906H97.047z"/>
+			<path style="fill:#263238;" d="M105.517,180.083v-13.19h2.012v1.999c0.513-0.936,0.987-1.553,1.422-1.85
+				c0.435-0.298,0.913-0.448,1.434-0.448c0.754,0,1.52,0.241,2.298,0.721l-0.77,2.074c-0.547-0.324-1.093-0.485-1.639-0.485
+				c-0.489,0-0.928,0.147-1.317,0.44c-0.39,0.294-0.667,0.702-0.832,1.224c-0.249,0.795-0.373,1.664-0.373,2.608v6.906H105.517z"/>
+			<path style="fill:#263238;" d="M113.179,173.488c0-2.442,0.679-4.251,2.037-5.427c1.134-0.977,2.517-1.465,4.148-1.465
+				c1.813,0,3.296,0.595,4.446,1.783c1.151,1.188,1.727,2.83,1.727,4.924c0,1.698-0.255,3.033-0.764,4.005
+				c-0.509,0.973-1.25,1.729-2.223,2.268c-0.973,0.538-2.035,0.807-3.186,0.807c-1.846,0-3.339-0.592-4.477-1.777
+				C113.749,177.421,113.179,175.715,113.179,173.488z M115.477,173.488c0,1.689,0.368,2.954,1.105,3.795
+				c0.737,0.84,1.664,1.26,2.782,1.26c1.11,0,2.033-0.423,2.769-1.267s1.105-2.132,1.105-3.862c0-1.631-0.37-2.868-1.111-3.708
+				c-0.741-0.84-1.662-1.26-2.764-1.26c-1.118,0-2.045,0.418-2.782,1.254C115.845,170.537,115.477,171.799,115.477,173.488z"/>
+			<path style="fill:#263238;" d="M128.133,180.083v-13.19h2.012v1.999c0.513-0.936,0.987-1.553,1.422-1.85
+				c0.435-0.298,0.913-0.448,1.434-0.448c0.754,0,1.52,0.241,2.298,0.721l-0.77,2.074c-0.547-0.324-1.093-0.485-1.639-0.485
+				c-0.489,0-0.928,0.147-1.317,0.44c-0.389,0.294-0.667,0.702-0.832,1.224c-0.249,0.795-0.373,1.664-0.373,2.608v6.906H128.133z"/>
+			<path style="fill:#263238;" d="M88.75,202.688v-1.937c-1.027,1.491-2.422,2.236-4.185,2.236c-0.778,0-1.505-0.149-2.18-0.448
+				c-0.675-0.298-1.176-0.673-1.503-1.124c-0.327-0.451-0.557-1.004-0.69-1.658c-0.091-0.439-0.137-1.134-0.137-2.087v-8.172h2.236
+				v7.315c0,1.167,0.045,1.954,0.137,2.359c0.14,0.589,0.438,1.05,0.894,1.385c0.455,0.335,1.018,0.503,1.689,0.503
+				s1.3-0.171,1.888-0.515c0.588-0.344,1.004-0.812,1.248-1.403c0.244-0.592,0.366-1.451,0.366-2.578v-7.066h2.236v13.19H88.75z"/>
+			<path style="fill:#263238;" d="M94.252,202.688v-13.19h2.012v1.875c0.969-1.449,2.368-2.174,4.198-2.174
+				c0.795,0,1.525,0.143,2.192,0.429c0.666,0.286,1.165,0.66,1.496,1.124c0.331,0.464,0.563,1.014,0.696,1.652
+				c0.083,0.413,0.124,1.139,0.124,2.173v8.11h-2.235v-8.023c0-0.911-0.087-1.592-0.261-2.044c-0.174-0.451-0.482-0.812-0.925-1.081
+				c-0.443-0.268-0.962-0.404-1.558-0.404c-0.952,0-1.775,0.303-2.466,0.907c-0.691,0.604-1.037,1.751-1.037,3.441v7.203H94.252z"/>
+			<path style="fill:#263238;" d="M117.005,201.061c-0.828,0.704-1.625,1.201-2.391,1.491s-1.588,0.435-2.465,0.435
+				c-1.449,0-2.563-0.354-3.341-1.063c-0.778-0.707-1.167-1.611-1.167-2.713c0-0.645,0.147-1.236,0.44-1.77
+				c0.294-0.534,0.679-0.962,1.155-1.285c0.476-0.324,1.012-0.568,1.608-0.734c0.439-0.116,1.101-0.227,1.987-0.335
+				c1.805-0.214,3.134-0.471,3.987-0.77c0.008-0.306,0.012-0.5,0.012-0.583c0-0.911-0.211-1.553-0.633-1.926
+				c-0.571-0.505-1.42-0.757-2.546-0.757c-1.052,0-1.827,0.184-2.328,0.552c-0.502,0.369-0.871,1.021-1.112,1.956l-2.186-0.297
+				c0.199-0.936,0.526-1.691,0.981-2.266c0.455-0.576,1.113-1.019,1.975-1.33c0.861-0.31,1.859-0.466,2.993-0.466
+				c1.126,0,2.041,0.132,2.745,0.397c0.704,0.266,1.222,0.599,1.553,1.001c0.331,0.402,0.563,0.908,0.695,1.521
+				c0.075,0.38,0.112,1.068,0.112,2.061v2.981c0,2.078,0.047,3.392,0.143,3.943c0.095,0.551,0.283,1.079,0.565,1.583h-2.335
+				C117.22,202.225,117.072,201.682,117.005,201.061z M116.819,196.069c-0.812,0.331-2.029,0.613-3.651,0.844
+				c-0.919,0.132-1.569,0.282-1.95,0.448c-0.381,0.165-0.675,0.408-0.882,0.726c-0.207,0.319-0.311,0.673-0.311,1.062
+				c0,0.596,0.226,1.093,0.677,1.491c0.451,0.397,1.112,0.596,1.981,0.596c0.861,0,1.627-0.188,2.298-0.566
+				c0.671-0.376,1.163-0.891,1.478-1.546c0.24-0.505,0.36-1.25,0.36-2.235V196.069z"/>
+			<path style="fill:#263238;" d="M131.189,202.688v-1.937c-1.027,1.491-2.422,2.236-4.185,2.236c-0.778,0-1.505-0.149-2.18-0.448
+				c-0.675-0.298-1.176-0.673-1.503-1.124c-0.327-0.451-0.557-1.004-0.69-1.658c-0.091-0.439-0.137-1.134-0.137-2.087v-8.172h2.236
+				v7.315c0,1.167,0.045,1.954,0.137,2.359c0.14,0.589,0.438,1.05,0.894,1.385c0.455,0.335,1.018,0.503,1.689,0.503
+				s1.3-0.171,1.888-0.515c0.588-0.344,1.004-0.812,1.248-1.403c0.244-0.592,0.366-1.451,0.366-2.578v-7.066h2.235v13.19H131.189z"
+				/>
+			<path style="fill:#263238;" d="M141.572,200.689l0.323,1.974c-0.63,0.133-1.193,0.199-1.689,0.199
+				c-0.812,0-1.441-0.128-1.888-0.385c-0.447-0.257-0.762-0.594-0.943-1.012c-0.182-0.417-0.273-1.297-0.273-2.639v-7.589h-1.639
+				v-1.739h1.639v-3.266l2.223-1.341v4.607h2.248v1.739h-2.248v7.713c0,0.637,0.039,1.047,0.118,1.229
+				c0.078,0.183,0.207,0.328,0.385,0.435c0.178,0.107,0.433,0.162,0.764,0.162C140.839,200.776,141.166,200.747,141.572,200.689z"/>
+			<path style="fill:#263238;" d="M143.758,202.688v-18.207h2.236v6.532c1.043-1.209,2.36-1.813,3.949-1.813
+				c0.977,0,1.826,0.192,2.546,0.578c0.721,0.385,1.236,0.917,1.546,1.596c0.311,0.679,0.466,1.664,0.466,2.956v8.358h-2.235v-8.358
+				c0-1.118-0.242-1.931-0.726-2.441c-0.485-0.509-1.17-0.763-2.056-0.763c-0.662,0-1.286,0.171-1.869,0.515
+				c-0.584,0.344-1,0.809-1.248,1.397c-0.249,0.588-0.373,1.399-0.373,2.435v7.215H143.758z"/>
+			<path style="fill:#263238;" d="M157.072,196.093c0-2.442,0.679-4.251,2.037-5.427c1.134-0.977,2.517-1.465,4.148-1.465
+				c1.813,0,3.296,0.595,4.446,1.783c1.151,1.188,1.727,2.83,1.727,4.924c0,1.698-0.255,3.033-0.764,4.005
+				c-0.509,0.973-1.25,1.729-2.223,2.268c-0.973,0.538-2.035,0.807-3.186,0.807c-1.846,0-3.339-0.592-4.477-1.777
+				C157.641,200.027,157.072,198.321,157.072,196.093z M159.37,196.093c0,1.689,0.368,2.954,1.105,3.795
+				c0.737,0.84,1.664,1.26,2.782,1.26c1.109,0,2.033-0.423,2.769-1.267c0.737-0.844,1.105-2.132,1.105-3.862
+				c0-1.632-0.371-2.868-1.111-3.708c-0.741-0.84-1.662-1.26-2.764-1.26c-1.118,0-2.045,0.418-2.782,1.254
+				C159.738,193.142,159.37,194.405,159.37,196.093z"/>
+			<path style="fill:#263238;" d="M172.026,202.688v-13.19h2.012v1.999c0.513-0.936,0.987-1.553,1.422-1.85
+				c0.435-0.299,0.913-0.448,1.434-0.448c0.754,0,1.52,0.241,2.298,0.721l-0.77,2.074c-0.547-0.324-1.093-0.485-1.639-0.485
+				c-0.489,0-0.928,0.147-1.317,0.44c-0.389,0.294-0.667,0.702-0.832,1.224c-0.249,0.795-0.373,1.664-0.373,2.608v6.905H172.026z"/>
+			<path style="fill:#263238;" d="M180.533,187.052v-2.57h2.235v2.57H180.533z M180.533,202.688v-13.19h2.235v13.19H180.533z"/>
+			<path style="fill:#263238;" d="M184.991,202.688v-1.813l8.396-9.638c-0.952,0.049-1.792,0.075-2.521,0.075h-5.378v-1.813h10.78
+				v1.478l-7.141,8.371l-1.379,1.527c1.002-0.075,1.942-0.111,2.819-0.111h6.098v1.925H184.991z"/>
+			<path style="fill:#263238;" d="M207.918,198.441l2.31,0.286c-0.364,1.35-1.039,2.397-2.024,3.142
+				c-0.985,0.745-2.244,1.118-3.775,1.118c-1.93,0-3.459-0.595-4.589-1.783c-1.131-1.188-1.696-2.854-1.696-4.999
+				c0-2.219,0.571-3.941,1.714-5.167c1.143-1.226,2.625-1.839,4.446-1.839c1.764,0,3.205,0.601,4.322,1.801
+				c1.118,1.202,1.677,2.89,1.677,5.068c0,0.133-0.004,0.331-0.012,0.596h-9.837c0.082,1.449,0.492,2.559,1.23,3.328
+				c0.736,0.771,1.656,1.155,2.757,1.155c0.82,0,1.52-0.215,2.099-0.645C207.119,200.072,207.578,199.385,207.918,198.441z
+				 M200.578,194.826h7.365c-0.099-1.109-0.381-1.942-0.845-2.496c-0.712-0.861-1.635-1.292-2.769-1.292
+				c-1.027,0-1.89,0.344-2.59,1.031C201.039,192.757,200.652,193.676,200.578,194.826z"/>
+			<path style="fill:#263238;" d="M221.592,202.688v-1.664c-0.836,1.308-2.066,1.963-3.688,1.963c-1.052,0-2.018-0.29-2.9-0.869
+				c-0.882-0.58-1.565-1.39-2.049-2.428c-0.484-1.04-0.726-2.234-0.726-3.584c0-1.316,0.219-2.51,0.658-3.583
+				c0.439-1.072,1.098-1.894,1.975-2.465c0.878-0.572,1.859-0.858,2.944-0.858c0.795,0,1.503,0.168,2.123,0.503
+				c0.621,0.335,1.126,0.772,1.515,1.31v-6.532h2.223v18.207H221.592z M214.525,196.106c0,1.689,0.356,2.952,1.068,3.789
+				c0.712,0.836,1.552,1.254,2.521,1.254c0.977,0,1.807-0.399,2.49-1.198c0.683-0.799,1.024-2.018,1.024-3.658
+				c0-1.805-0.347-3.13-1.043-3.974c-0.695-0.845-1.552-1.267-2.571-1.267c-0.993,0-1.824,0.406-2.49,1.217
+				C214.859,193.08,214.525,194.359,214.525,196.106z"/>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/assets/images/404.png b/src/assets/images/404.png
deleted file mode 100644
index 4e098298787749e55a6dc0321642690b882d130e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20613
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
RAD1R`%-z%NxyyxH{|8NN4M_k1

diff --git a/src/assets/images/404.svg b/src/assets/images/404.svg
new file mode 100644
index 00000000..b9bf23cf
--- /dev/null
+++ b/src/assets/images/404.svg
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 27.5.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 500 500" style="enable-background:new 0 0 500 500;" xml:space="preserve">
+<g id="Background_Complete">
+	<g>
+		<path style="fill:#EBEBEB;" d="M238.401,445.047H45.302c-3.147,0-5.708-2.56-5.708-5.708V60.66c0-3.147,2.561-5.708,5.708-5.708
+			h193.099c3.146,0,5.707,2.561,5.707,5.708v378.679C244.108,442.487,241.547,445.047,238.401,445.047z M45.302,55.203
+			c-3.01,0-5.458,2.448-5.458,5.458v378.679c0,3.01,2.448,5.458,5.458,5.458h193.099c3.009,0,5.457-2.448,5.457-5.458V60.66
+			c0-3.009-2.448-5.458-5.457-5.458H45.302z"/>
+		<path style="fill:#EBEBEB;" d="M454.698,445.047H261.599c-3.146,0-5.707-2.56-5.707-5.708V60.66c0-3.147,2.561-5.708,5.707-5.708
+			h193.099c3.148,0,5.708,2.561,5.708,5.708v378.679C460.406,442.487,457.845,445.047,454.698,445.047z M261.599,55.203
+			c-3.009,0-5.457,2.448-5.457,5.458v378.679c0,3.01,2.448,5.458,5.457,5.458h193.099c3.01,0,5.458-2.448,5.458-5.458V60.66
+			c0-3.009-2.448-5.458-5.458-5.458H261.599z"/>
+	</g>
+	<g>
+		<g>
+			<polygon style="fill:#EBEBEB;" points="113.054,168.247 114.671,171.523 118.286,172.049 115.67,174.599 116.288,178.2 
+				113.054,176.5 109.82,178.2 110.438,174.599 107.821,172.049 111.437,171.523 			"/>
+			<polygon style="fill:#F5F5F5;" points="436.705,322.483 438.322,325.759 441.937,326.285 439.321,328.835 439.939,332.436 
+				436.705,330.736 433.471,332.436 434.088,328.835 431.472,326.285 435.088,325.759 			"/>
+			<polygon style="fill:#F5F5F5;" points="372.599,417.566 374.216,420.842 377.832,421.367 375.215,423.918 375.833,427.519 
+				372.599,425.819 369.365,427.519 369.983,423.918 367.366,421.367 370.982,420.842 			"/>
+			<path style="fill:#EBEBEB;" d="M225.945,110.154l0.6,1.216l1.342,0.195c0.335,0.049,0.469,0.46,0.226,0.697l-0.971,0.947
+				l0.229,1.337c0.057,0.334-0.293,0.588-0.592,0.431l-1.201-0.631l-1.201,0.631c-0.3,0.158-0.65-0.097-0.592-0.431l0.229-1.337
+				l-0.971-0.947c-0.242-0.236-0.109-0.648,0.226-0.697l1.342-0.195l0.6-1.216C225.362,109.85,225.795,109.85,225.945,110.154z"/>
+			<path style="fill:#F5F5F5;" d="M60.777,402.008l0.6,1.216l1.342,0.195c0.335,0.049,0.469,0.46,0.226,0.697l-0.971,0.947
+				l0.229,1.337c0.057,0.334-0.293,0.588-0.592,0.431l-1.201-0.631l-1.201,0.631c-0.3,0.157-0.65-0.097-0.592-0.431l0.229-1.337
+				l-0.971-0.947c-0.242-0.236-0.109-0.648,0.226-0.697l1.342-0.195l0.6-1.216C60.194,401.704,60.627,401.704,60.777,402.008z"/>
+			<path style="fill:#EBEBEB;" d="M87.755,97.301l0.6,1.216l1.342,0.195c0.335,0.049,0.469,0.46,0.226,0.697l-0.971,0.947
+				l0.229,1.337c0.057,0.334-0.293,0.588-0.593,0.43l-1.201-0.631l-1.2,0.631c-0.3,0.158-0.65-0.097-0.593-0.43l0.229-1.337
+				l-0.971-0.947c-0.242-0.236-0.109-0.648,0.226-0.697l1.342-0.195l0.6-1.216C87.172,96.997,87.605,96.997,87.755,97.301z"/>
+			<path style="fill:#EBEBEB;" d="M86.131,338.319c0,0.733-0.594,1.327-1.327,1.327c-0.733,0-1.327-0.594-1.327-1.327
+				c0-0.733,0.594-1.327,1.327-1.327C85.536,336.992,86.131,337.586,86.131,338.319z"/>
+			<path style="fill:#EBEBEB;" d="M275.671,171.894c0,0.733-0.594,1.327-1.327,1.327c-0.733,0-1.327-0.594-1.327-1.327
+				c0-0.733,0.594-1.327,1.327-1.327C275.077,170.567,275.671,171.161,275.671,171.894z"/>
+			<path style="fill:#F5F5F5;" d="M206.707,98.4c0,0.733-0.594,1.327-1.327,1.327c-0.733,0-1.327-0.594-1.327-1.327
+				c0-0.733,0.594-1.327,1.327-1.327C206.113,97.073,206.707,97.668,206.707,98.4z"/>
+		</g>
+		<g>
+			
+				<ellipse transform="matrix(0.9732 -0.2298 0.2298 0.9732 -89.8924 58.7029)" style="fill:#F0F0F0;" cx="207.142" cy="415.377" rx="7.348" ry="7.348"/>
+		</g>
+		<path style="fill:#E6E6E6;" d="M204.597,411.09c-1.56,0-3.01,0.5-4.19,1.36c-0.39,0.9-0.61,1.89-0.61,2.93
+			c0,4.06,3.29,7.34,7.35,7.34c1.37,0,2.66-0.38,3.76-1.039c-0.01-0.01-0.01-0.01,0-0.01c0.55-1.02,0.86-2.18,0.86-3.42
+			C211.767,414.3,208.557,411.09,204.597,411.09z"/>
+	</g>
+</g>
+<g id="Background_Simple" style="display:none;">
+	<g style="display:inline;">
+		<path style="fill:#407BFF;" d="M104.695,145.876c-15.325,40.812-2.099,95.899,21.577,138.996
+			c60.957,111.899,209.435,48.626,206.875-2.188c3.485-48.487-40.113-62.884-54.906-90.068
+			C195.42,39.207,117.023,111.471,104.695,145.876z"/>
+		<path style="opacity:0.9;fill:#FFFFFF;" d="M104.695,145.876c-15.325,40.812-2.099,95.899,21.577,138.996
+			c60.957,111.899,209.435,48.626,206.875-2.188c3.485-48.487-40.113-62.884-54.906-90.068
+			C195.42,39.207,117.023,111.471,104.695,145.876z"/>
+	</g>
+</g>
+<g id="_x34_04">
+	<g>
+		<path style="fill:#407BFF;" d="M147.68,287.645H86.825V260.17l60.855-72.337h29.115v73.895h15.09v25.917h-15.09v22.472H147.68
+			V287.645z M147.68,261.728V223.89l-32.156,37.838H147.68z"/>
+		<path style="fill:#407BFF;" d="M202.302,249.508c0-22.854,4.113-38.846,12.343-47.978c8.229-9.131,20.762-13.697,37.604-13.697
+			c8.091,0,14.735,0.999,19.929,2.994c5.194,1.996,9.432,4.593,12.712,7.791c3.28,3.199,5.864,6.561,7.75,10.088
+			c1.887,3.526,3.404,7.641,4.552,12.344c2.241,8.967,3.362,18.317,3.362,28.049c0,21.815-3.691,37.782-11.072,47.896
+			c-7.382,10.116-20.094,15.172-38.137,15.172c-10.116,0-18.29-1.614-24.522-4.839c-6.234-3.225-11.347-7.955-15.337-14.188
+			c-2.9-4.428-5.155-10.484-6.766-18.166C203.107,267.292,202.302,258.804,202.302,249.508z M235.436,249.59
+			c0,15.31,1.353,25.767,4.059,31.372c2.707,5.604,6.63,8.406,11.769,8.406c3.39,0,6.329-1.189,8.817-3.568
+			c2.488-2.378,4.319-6.136,5.496-11.276c1.175-5.139,1.763-13.15,1.763-24.031c0-15.964-1.353-26.695-4.059-32.19
+			c-2.707-5.496-6.766-8.243-12.18-8.243c-5.523,0-9.514,2.803-11.975,8.407C236.666,224.071,235.436,234.446,235.436,249.59z"/>
+		<path style="fill:#407BFF;" d="M371.744,287.645h-60.855V260.17l60.855-72.337h29.115v73.895h15.09v25.917h-15.09v22.472h-29.115
+			V287.645z M371.744,261.728V223.89l-32.155,37.838H371.744z"/>
+	</g>
+</g>
+<g id="Planets">
+	<g>
+		<g style="opacity:0.3;">
+			<path style="fill:#407BFF;" d="M200.952,145.618c0,1.03-0.835,1.865-1.865,1.865c-1.03,0-1.865-0.835-1.865-1.865
+				c0-1.03,0.835-1.865,1.865-1.865C200.117,143.753,200.952,144.588,200.952,145.618z"/>
+			<circle style="fill:#407BFF;" cx="72.966" cy="216.129" r="1.323"/>
+			<circle style="fill:#407BFF;" cx="291.054" cy="408.333" r="1.893"/>
+			<circle style="fill:#407BFF;" cx="336.498" cy="332" r="1.323"/>
+			<path style="fill:#407BFF;" d="M424.173,95.619c0,0.731-0.592,1.323-1.323,1.323c-0.731,0-1.323-0.592-1.323-1.323
+				c0-0.731,0.592-1.323,1.323-1.323C423.581,94.296,424.173,94.888,424.173,95.619z"/>
+			<path style="fill:#407BFF;" d="M172.754,68.963c0,0.731-0.592,1.323-1.323,1.323c-0.731,0-1.323-0.592-1.323-1.323
+				s0.592-1.323,1.323-1.323C172.162,67.64,172.754,68.232,172.754,68.963z"/>
+			<circle style="fill:#407BFF;" cx="277.695" cy="136.943" r="1.323"/>
+		</g>
+		<g>
+			<g>
+				<circle style="fill:#407BFF;" cx="141.233" cy="116.361" r="21.91"/>
+				<circle style="opacity:0.7;fill:#FFFFFF;" cx="141.233" cy="116.361" r="21.91"/>
+			</g>
+			<path style="opacity:0.2;fill:#407BFF;" d="M133.682,99.83c-3.071,0-5.986,0.635-8.641,1.77
+				c-3.55,3.893-5.716,9.078-5.716,14.762c0,12.097,9.807,21.904,21.904,21.904c3.081,0,6.017-0.635,8.683-1.78c0,0,0,0,0-0.01
+				c3.529-3.894,5.684-9.058,5.684-14.731C155.597,109.637,145.79,99.83,133.682,99.83z"/>
+			<path style="opacity:0.2;fill:#407BFF;" d="M131.504,105.623c0,1.106-0.897,2.003-2.003,2.003c-1.106,0-2.003-0.897-2.003-2.003
+				c0-1.106,0.897-2.003,2.003-2.003C130.607,103.62,131.504,104.517,131.504,105.623z"/>
+			<path style="opacity:0.2;fill:#407BFF;" d="M155.064,103.62c0,1.106-0.897,2.003-2.003,2.003c-1.106,0-2.003-0.897-2.003-2.003
+				c0-1.106,0.897-2.003,2.003-2.003C154.167,101.618,155.064,102.514,155.064,103.62z"/>
+			<path style="opacity:0.2;fill:#407BFF;" d="M151.058,117.901c0,1.81-1.467,3.278-3.278,3.278c-1.81,0-3.278-1.468-3.278-3.278
+				c0-1.81,1.467-3.278,3.278-3.278C149.59,114.623,151.058,116.091,151.058,117.901z"/>
+			<path style="opacity:0.2;fill:#407BFF;" d="M140.642,127.246c0,2.42-1.962,4.381-4.381,4.381c-2.42,0-4.381-1.962-4.381-4.381
+				c0-2.42,1.962-4.381,4.381-4.381C138.68,122.865,140.642,124.827,140.642,127.246z"/>
+		</g>
+		<g>
+			<g>
+				
+					<ellipse transform="matrix(0.2298 -0.9732 0.9732 0.2298 -71.7981 661.7775)" style="fill:#407BFF;" cx="382.197" cy="376.249" rx="19.226" ry="19.226"/>
+				
+					<ellipse transform="matrix(0.2298 -0.9732 0.9732 0.2298 -71.7981 661.7775)" style="opacity:0.3;fill:#FFFFFF;" cx="382.197" cy="376.249" rx="19.226" ry="19.226"/>
+			</g>
+			<path style="opacity:0.4;fill:#407BFF;" d="M394.333,361.339c-1.749-0.531-3.612-0.812-5.538-0.812
+				c-10.619,0-19.229,8.61-19.229,19.228c0,6.018,2.759,11.379,7.09,14.908c1.749,0.531,3.612,0.812,5.539,0.812
+				c10.619,0,19.228-8.61,19.228-19.228C401.423,370.23,398.664,364.858,394.333,361.339z"/>
+			<path style="fill:#407BFF;" d="M363.83,381.948c-20.534,9.662-5.216,17.109,23.712,6.713
+				c26.784-9.626,36.967-21.769,13.052-18.006C401.828,375.763,368.282,388.834,363.83,381.948z"/>
+		</g>
+	</g>
+</g>
+<g id="Astronaut">
+	<g>
+		<path style="opacity:0.2;" d="M394.097,187.83c-26.89,18.17-61.7,42.13-71.31,99.81h-2.05c9.35-56.98,42.89-81.57,69.79-99.81
+			H394.097z"/>
+		<g>
+			<path style="fill:#407BFF;" d="M255.019,368.267c-16.97,0.001-33.809-7.662-41.986-20.186c-5.053-7.739-10.92-23.95,6.555-45.578
+				l1.556,1.258c-12.362,15.299-14.648,30.65-6.436,43.227c9.994,15.309,33.596,23.006,53.73,17.528
+				c20.628-5.613,33.152-23.557,34.361-49.228c4.135-87.807,50.784-114.855,84.846-134.605
+				c21.162-12.27,36.452-21.136,33.091-39.838c-0.466-2.595-1.501-4.388-3.163-5.481c-4.353-2.868-12.853-0.886-22.694,1.408
+				c-19.306,4.497-45.746,10.657-61.497-16.134l1.724-1.014c15.006,25.523,39.577,19.8,59.319,15.199
+				c10.29-2.396,19.177-4.467,24.248-1.131c2.145,1.412,3.464,3.636,4.032,6.799c3.609,20.082-13.013,29.72-34.057,41.922
+				c-33.664,19.519-79.768,46.251-83.852,132.968c-1.252,26.596-14.313,45.208-35.834,51.064
+				C264.427,367.679,259.716,368.266,255.019,368.267z"/>
+			<path style="opacity:0.2;fill:#FFFFFF;" d="M255.019,368.267c-16.97,0.001-33.809-7.662-41.986-20.186
+				c-5.053-7.739-10.92-23.95,6.555-45.578l1.556,1.258c-12.362,15.299-14.648,30.65-6.436,43.227
+				c9.994,15.309,33.596,23.006,53.73,17.528c20.628-5.613,33.152-23.557,34.361-49.228c4.135-87.807,50.784-114.855,84.846-134.605
+				c21.162-12.27,36.452-21.136,33.091-39.838c-0.466-2.595-1.501-4.388-3.163-5.481c-4.353-2.868-12.853-0.886-22.694,1.408
+				c-19.306,4.497-45.746,10.657-61.497-16.134l1.724-1.014c15.006,25.523,39.577,19.8,59.319,15.199
+				c10.29-2.396,19.177-4.467,24.248-1.131c2.145,1.412,3.464,3.636,4.032,6.799c3.609,20.082-13.013,29.72-34.057,41.922
+				c-33.664,19.519-79.768,46.251-83.852,132.968c-1.252,26.596-14.313,45.208-35.834,51.064
+				C264.427,367.679,259.716,368.266,255.019,368.267z"/>
+		</g>
+		<g>
+			<g>
+				<path style="fill:#407BFF;" d="M312.758,96.949c6.855-0.125,13.582,2.134,13.582,2.134s10.965,18.771,12.302,23.067
+					c-0.461,4.24-7.615,11.191-7.615,11.191L312.758,96.949z"/>
+				<path style="opacity:0.3;fill:#FFFFFF;" d="M312.758,96.949c6.855-0.125,13.582,2.134,13.582,2.134s10.965,18.771,12.302,23.067
+					c-0.461,4.24-7.615,11.191-7.615,11.191L312.758,96.949z"/>
+			</g>
+			<g>
+				<g>
+					<path style="fill:#407BFF;" d="M345.339,188.133c-4.136-5.248-8.197-10.594-11.559-16.385c-0.84-1.447-1.636-2.921-2.389-4.415
+						c-0.428-0.849-0.842-1.705-1.244-2.567c-0.351-0.753-1.126-1.862-1.204-2.684c-1.201-12.672,3.137-22-1.028-32.172
+						l-16.471,6.437c0,0,1.401,18.122,4.598,28.963c1.984,6.726,6.475,12.549,10.803,17.937c1.354,1.686,2.659,3.41,4.01,5.098
+						c1.279,1.598,2.712,3.064,3.994,4.654c1.947,2.413,2.595,4.716,1.115,7.561c-0.079,0.152-0.162,0.303-0.247,0.453
+						c-0.42,0.741,1.546,1.581,2.781,0.021c2.042-2.581,1.721-2.422,3.462-4.623c1.057-1.336,2.271-2.779,3.319-4.033
+						C346.303,191.155,346.326,189.385,345.339,188.133z"/>
+					<path style="opacity:0.7;fill:#FFFFFF;" d="M345.339,188.133c-4.136-5.248-8.197-10.594-11.559-16.385
+						c-0.84-1.447-1.636-2.921-2.389-4.415c-0.428-0.849-0.842-1.705-1.244-2.567c-0.351-0.753-1.126-1.862-1.204-2.684
+						c-1.201-12.672,3.137-22-1.028-32.172l-16.471,6.437c0,0,1.401,18.122,4.598,28.963c1.984,6.726,6.475,12.549,10.803,17.937
+						c1.354,1.686,2.659,3.41,4.01,5.098c1.279,1.598,2.712,3.064,3.994,4.654c1.947,2.413,2.595,4.716,1.115,7.561
+						c-0.079,0.152-0.162,0.303-0.247,0.453c-0.42,0.741,1.546,1.581,2.781,0.021c2.042-2.581,1.721-2.422,3.462-4.623
+						c1.057-1.336,2.271-2.779,3.319-4.033C346.303,191.155,346.326,189.385,345.339,188.133z"/>
+				</g>
+				<path style="opacity:0.3;fill:#407BFF;" d="M341.312,182.918c-2.205,2.665-6.688,6.122-8.664,7.523
+					c0.43,0.479,0.856,0.968,1.283,1.457c4.068-2.657,7.284-6.104,8.504-7.504C342.058,183.909,341.685,183.413,341.312,182.918z"/>
+				<path style="opacity:0.3;fill:#407BFF;" d="M345.335,188.135c-0.038-0.052-0.078-0.094-0.116-0.145
+					c-0.694,0.723-1.183,1.876-1.265,3.17c-0.066,0.894,0.084,1.712,0.377,2.351c0.333-0.386,0.644-0.768,0.949-1.131
+					C346.308,191.156,346.322,189.387,345.335,188.135z"/>
+			</g>
+			<g>
+				<g>
+					<path style="fill:#407BFF;" d="M308.842,108.951c-1.723,2.506-3.754,4.976-6.375,7.194c-1.301,1.115-2.786,2.124-4.417,2.98
+						c-0.823,0.42-1.688,0.784-2.583,1.085l-0.675,0.217l-0.218,0.068c-0.158,0.048-0.317,0.091-0.477,0.129
+						c-0.302,0.068-0.605,0.114-0.873,0.136c-1.083,0.082-1.868-0.072-2.515-0.233c-1.277-0.348-2.13-0.813-2.937-1.264
+						c-0.795-0.459-1.493-0.929-2.154-1.414c-1.302-0.991-2.48-1.986-3.578-3.048c-2.21-2.11-4.17-4.298-5.99-6.735
+						c-0.83-1.111-0.602-2.684,0.509-3.513c0.857-0.641,1.99-0.651,2.843-0.112l0.076,0.049c2.36,1.498,4.741,3.078,7.064,4.492
+						c1.173,0.692,2.319,1.388,3.446,1.93c0.554,0.28,1.097,0.535,1.587,0.716c0.477,0.186,0.953,0.292,1.077,0.267
+						c0.052-0.003-0.01-0.074-0.378-0.061c-0.089,0.005-0.215,0.017-0.343,0.045c-0.074,0.014-0.146,0.033-0.218,0.056
+						c-0.069,0.023,0.029-0.019,0.035-0.025l0.331-0.169c0.44-0.224,0.862-0.504,1.29-0.789c0.856-0.579,1.671-1.314,2.503-2.12
+						c1.646-1.635,3.23-3.67,4.902-5.786l0.022-0.029c1.712-2.168,4.858-2.537,7.026-0.825
+						C309.898,103.831,310.315,106.8,308.842,108.951z"/>
+					<path style="opacity:0.7;fill:#FFFFFF;" d="M308.842,108.951c-1.723,2.506-3.754,4.976-6.375,7.194
+						c-1.301,1.115-2.786,2.124-4.417,2.98c-0.823,0.42-1.688,0.784-2.583,1.085l-0.675,0.217l-0.218,0.068
+						c-0.158,0.048-0.317,0.091-0.477,0.129c-0.302,0.068-0.605,0.114-0.873,0.136c-1.083,0.082-1.868-0.072-2.515-0.233
+						c-1.277-0.348-2.13-0.813-2.937-1.264c-0.795-0.459-1.493-0.929-2.154-1.414c-1.302-0.991-2.48-1.986-3.578-3.048
+						c-2.21-2.11-4.17-4.298-5.99-6.735c-0.83-1.111-0.602-2.684,0.509-3.513c0.857-0.641,1.99-0.651,2.843-0.112l0.076,0.049
+						c2.36,1.498,4.741,3.078,7.064,4.492c1.173,0.692,2.319,1.388,3.446,1.93c0.554,0.28,1.097,0.535,1.587,0.716
+						c0.477,0.186,0.953,0.292,1.077,0.267c0.052-0.003-0.01-0.074-0.378-0.061c-0.089,0.005-0.215,0.017-0.343,0.045
+						c-0.074,0.014-0.146,0.033-0.218,0.056c-0.069,0.023,0.029-0.019,0.035-0.025l0.331-0.169c0.44-0.224,0.862-0.504,1.29-0.789
+						c0.856-0.579,1.671-1.314,2.503-2.12c1.646-1.635,3.23-3.67,4.902-5.786l0.022-0.029c1.712-2.168,4.858-2.537,7.026-0.825
+						C309.898,103.831,310.315,106.8,308.842,108.951z"/>
+				</g>
+				<g>
+					<path style="fill:#407BFF;" d="M272.285,102.416l1.172,1.966c0,0,0.895,2.616,2.686,3.1l4.854-1.572l-0.243-0.408
+						c0.002,0.001,0.005,0.001,0.007,0.001c-0.622-0.947-0.555-2.773-0.336-4.292c0.218-1.519-0.57-1.573-1.152-1.195
+						c-0.336,0.218-0.574,0.911-0.847,1.658c-0.239-0.329-0.495-0.646-0.784-0.934l-1.483-1.477c-0.64-0.637-1.665-0.666-2.34-0.066
+						l-1.202,1.068C272.005,100.809,271.866,101.712,272.285,102.416z"/>
+					<path style="opacity:0.7;fill:#FFFFFF;" d="M272.285,102.416l1.172,1.966c0,0,0.895,2.616,2.686,3.1l4.854-1.572l-0.243-0.408
+						c0.002,0.001,0.005,0.001,0.007,0.001c-0.622-0.947-0.555-2.773-0.336-4.292c0.218-1.519-0.57-1.573-1.152-1.195
+						c-0.336,0.218-0.574,0.911-0.847,1.658c-0.239-0.329-0.495-0.646-0.784-0.934l-1.483-1.477c-0.64-0.637-1.665-0.666-2.34-0.066
+						l-1.202,1.068C272.005,100.809,271.866,101.712,272.285,102.416z"/>
+				</g>
+			</g>
+			<g>
+				<path style="fill:#407BFF;" d="M317.674,95.224c-4.649,1.128-11.036,3.781-15.349,6.468c-1.529,0.952-2.292,2.76-1.932,4.525
+					c1.924,9.44,6.314,22.085,11.053,30.129l22.111-9.147c0.152-3.9-5.216-16.52-10.684-28.717
+					C321.891,96.288,320.01,94.658,317.674,95.224z"/>
+				<path style="opacity:0.8;fill:#FFFFFF;" d="M317.674,95.224c-4.649,1.128-11.036,3.781-15.349,6.468
+					c-1.529,0.952-2.292,2.76-1.932,4.525c1.924,9.44,6.314,22.085,11.053,30.129l22.111-9.147c0.152-3.9-5.216-16.52-10.684-28.717
+					C321.891,96.288,320.01,94.658,317.674,95.224z"/>
+			</g>
+			<path style="opacity:0.3;fill:#407BFF;" d="M326.296,106.214l-4.388-1.471c0.982,2.567,4.533,5.821,7.03,7.732
+				C328.115,110.469,327.223,108.372,326.296,106.214z"/>
+			<g>
+				<path style="fill:#407BFF;" d="M316.217,85.32c-1.825-3.481-5.774-5.233-10.516-4.837c-3.998,0.334-7.544,4.416-7.123,6.622
+					c0.42,2.206,3.785,3.14,4.394,3.906l-2.773,2.01c-1.38,1.001-1.65,2.947-0.596,4.287c1.167,1.482,2.703,3.03,3.598,4.123
+					c7.664-0.199,13.332-3.123,15.374-5.936C317.841,91.916,318.032,88.782,316.217,85.32z"/>
+				<path style="opacity:0.8;fill:#FFFFFF;" d="M316.217,85.32c-1.825-3.481-5.774-5.233-10.516-4.837
+					c-3.998,0.334-7.544,4.416-7.123,6.622c0.42,2.206,3.785,3.14,4.394,3.906l-2.773,2.01c-1.38,1.001-1.65,2.947-0.596,4.287
+					c1.167,1.482,2.703,3.03,3.598,4.123c7.664-0.199,13.332-3.123,15.374-5.936C317.841,91.916,318.032,88.782,316.217,85.32z"/>
+			</g>
+			<path style="fill:#263238;" d="M312.461,87.476c1.522,3.896-0.401,8.288-4.297,9.81c-3.896,1.522-8.288-0.401-9.81-4.297
+				c-1.522-3.895,0.401-8.288,4.297-9.81C306.546,81.657,310.938,83.581,312.461,87.476z"/>
+			<g>
+				<g>
+					<path style="fill:#407BFF;" d="M377.388,177.596c-0.111-3.289-0.253-2.96-0.349-5.764c-0.058-1.703-0.065-3.589-0.076-5.223
+						c-0.011-1.595-1.138-2.96-2.701-3.277c-1.325-0.269-2.654-0.525-3.977-0.807c-1.726-0.368-3.432-0.764-5.127-1.256
+						c-1.314-0.382-2.617-0.803-3.905-1.267c-1.38-0.497-2.741-1.042-4.089-1.62c-1.576-0.676-3.133-1.396-4.678-2.138
+						c-1.725-0.828-3.437-1.684-5.143-2.551c-6.581-10.895-6.723-18.074-13.786-26.495l-15.16,6.858
+						c0,0,11.139,19.765,18.725,28.145c4.367,4.823,11.218,6.997,17.328,8.575c4.408,1.138,8.878,2.009,13.353,2.831
+						c1.74,0.319,3.631,0.443,5.128,1.482c1.179,0.818,1.789,2.095,2.137,3.452c0.071,0.277,0.131,0.557,0.185,0.839
+						C375.413,180.217,377.456,179.585,377.388,177.596z"/>
+					<path style="opacity:0.8;fill:#FFFFFF;" d="M377.388,177.596c-0.111-3.289-0.253-2.96-0.349-5.764
+						c-0.058-1.703-0.065-3.589-0.076-5.223c-0.011-1.595-1.138-2.96-2.701-3.277c-1.325-0.269-2.654-0.525-3.977-0.807
+						c-1.726-0.368-3.432-0.764-5.127-1.256c-1.314-0.382-2.617-0.803-3.905-1.267c-1.38-0.497-2.741-1.042-4.089-1.62
+						c-1.576-0.676-3.133-1.396-4.678-2.138c-1.725-0.828-3.437-1.684-5.143-2.551c-6.581-10.895-6.723-18.074-13.786-26.495
+						l-15.16,6.858c0,0,11.139,19.765,18.725,28.145c4.367,4.823,11.218,6.997,17.328,8.575c4.408,1.138,8.878,2.009,13.353,2.831
+						c1.74,0.319,3.631,0.443,5.128,1.482c1.179,0.818,1.789,2.095,2.137,3.452c0.071,0.277,0.131,0.557,0.185,0.839
+						C375.413,180.217,377.456,179.585,377.388,177.596z"/>
+				</g>
+				<path style="opacity:0.3;fill:#407BFF;" d="M369.7,162.4c-0.597-0.131-1.203-0.265-1.806-0.408
+					c0.047,3.453-1.572,9.417-2.167,11.224c0.631,0.119,1.271,0.241,1.902,0.361C369.384,168.832,369.66,163.809,369.7,162.4z"/>
+				<path style="opacity:0.3;fill:#407BFF;" d="M376.961,166.61c-0.011-1.599-1.134-2.961-2.694-3.281
+					c-0.314-0.064-0.638-0.132-0.954-0.186c0.066,0.94,0.65,2.031,1.628,2.897c0.641,0.578,1.366,0.962,2.032,1.143
+					C376.963,166.984,376.962,166.797,376.961,166.61z"/>
+			</g>
+			<path style="fill:#FFFFFF;" d="M311.046,87.54c0.405,1.516-1.292,3.11-2.65,1.799c-1.102-1.064-2.762-2.846-4.117-3.693
+				c-1.392-0.871,0.464-2.387,2.65-1.799C308.97,84.397,310.641,86.023,311.046,87.54z"/>
+			<g>
+				<path style="fill:#407BFF;" d="M311.161,135.86c-0.705,0.26,0.583,1.456,0.583,1.456s13.97-4.787,22.495-9.716
+					c0.072-1.031-0.678-1.578-0.678-1.578S323.189,131.426,311.161,135.86z"/>
+				<path style="opacity:0.5;fill:#FFFFFF;" d="M311.161,135.86c-0.705,0.26,0.583,1.456,0.583,1.456s13.97-4.787,22.495-9.716
+					c0.072-1.031-0.678-1.578-0.678-1.578S323.189,131.426,311.161,135.86z"/>
+			</g>
+			<g>
+				<g>
+					<path style="fill:#407BFF;" d="M321.46,94.563c2.758,1.393,5.354,2.868,7.947,4.501c1.291,0.813,2.576,1.648,3.842,2.549
+						c1.276,0.883,2.535,1.814,3.798,2.862l0.474,0.388l0.591,0.533c0.42,0.37,0.728,0.711,1.037,1.051
+						c0.324,0.351,0.591,0.689,0.854,1.026c0.273,0.339,0.532,0.676,0.765,1.008c0.989,1.328,1.795,2.679,2.586,4.019
+						c1.537,2.717,2.868,5.43,3.966,8.349c0.49,1.302-0.168,2.754-1.471,3.245c-0.978,0.368-2.042,0.088-2.718-0.626l-0.049-0.054
+						c-2.009-2.128-3.936-4.373-5.875-6.458c-1.897-2.079-3.912-4.213-5.537-5.141c-2.27-1.416-4.798-2.822-7.31-4.207l-7.563-4.198
+						l-0.019-0.01c-2.415-1.34-3.286-4.384-1.946-6.799C316.141,94.246,319.077,93.363,321.46,94.563z"/>
+					<path style="opacity:0.8;fill:#FFFFFF;" d="M321.46,94.563c2.758,1.393,5.354,2.868,7.947,4.501
+						c1.291,0.813,2.576,1.648,3.842,2.549c1.276,0.883,2.535,1.814,3.798,2.862l0.474,0.388l0.591,0.533
+						c0.42,0.37,0.728,0.711,1.037,1.051c0.324,0.351,0.591,0.689,0.854,1.026c0.273,0.339,0.532,0.676,0.765,1.008
+						c0.989,1.328,1.795,2.679,2.586,4.019c1.537,2.717,2.868,5.43,3.966,8.349c0.49,1.302-0.168,2.754-1.471,3.245
+						c-0.978,0.368-2.042,0.088-2.718-0.626l-0.049-0.054c-2.009-2.128-3.936-4.373-5.875-6.458
+						c-1.897-2.079-3.912-4.213-5.537-5.141c-2.27-1.416-4.798-2.822-7.31-4.207l-7.563-4.198l-0.019-0.01
+						c-2.415-1.34-3.286-4.384-1.946-6.799C316.141,94.246,319.077,93.363,321.46,94.563z"/>
+				</g>
+				<g>
+					<path style="fill:#407BFF;" d="M349.733,125.738l-0.849-2.125c0,0-0.474-2.724-2.167-3.483l-5.04,0.792l0.176,0.441
+						c-0.002-0.001-0.004-0.002-0.007-0.002c0.466,1.032,0.113,2.826-0.341,4.291c-0.454,1.466,0.316,1.643,0.95,1.361
+						c0.366-0.163,0.71-0.81,1.096-1.505c0.185,0.363,0.388,0.716,0.628,1.045l1.233,1.691c0.532,0.729,1.54,0.919,2.301,0.432
+						l1.354-0.867C349.758,127.368,350.038,126.499,349.733,125.738z"/>
+					<path style="opacity:0.8;fill:#FFFFFF;" d="M349.733,125.738l-0.849-2.125c0,0-0.474-2.724-2.167-3.483l-5.04,0.792
+						l0.176,0.441c-0.002-0.001-0.004-0.002-0.007-0.002c0.466,1.032,0.113,2.826-0.341,4.291c-0.454,1.466,0.316,1.643,0.95,1.361
+						c0.366-0.163,0.71-0.81,1.096-1.505c0.185,0.363,0.388,0.716,0.628,1.045l1.233,1.691c0.532,0.729,1.54,0.919,2.301,0.432
+						l1.354-0.867C349.758,127.368,350.038,126.499,349.733,125.738z"/>
+				</g>
+			</g>
+			<g>
+				<g>
+					<path style="opacity:0.3;fill:#407BFF;" d="M317.236,106.057l-1.219,0.099l-7.485,18.084c0.44,0.03,0.844-0.007,1.218-0.099
+						c0,0,9.76-3.637,12.714-4.97C320.476,115.051,317.236,106.057,317.236,106.057z"/>
+					<path style="fill:#FFFFFF;" d="M303.568,110.802c0.417,3.257,2.859,10.179,4.965,13.438c3.655-1.26,9.76-3.637,12.714-4.97
+						c-1.989-4.119-4.083-9.795-5.229-13.113C312.869,106.366,306.006,108.951,303.568,110.802z"/>
+				</g>
+				<path style="opacity:0.3;fill:#407BFF;" d="M311,114.713c-0.408,1.365-1.846,2.14-3.21,1.731s-2.14-1.846-1.731-3.21
+					c0.409-1.365,1.846-2.14,3.21-1.731C310.633,111.911,311.408,113.348,311,114.713z"/>
+				<path style="opacity:0.6;fill:#407BFF;" d="M312.913,111.268c-0.134,0.447-0.605,0.701-1.052,0.567
+					c-0.447-0.134-0.701-0.605-0.568-1.052c0.134-0.447,0.605-0.701,1.052-0.567C312.793,110.349,313.047,110.82,312.913,111.268z"
+					/>
+				<path style="opacity:0.6;fill:#407BFF;" d="M315.145,110.399c-0.134,0.447-0.605,0.701-1.052,0.567
+					c-0.447-0.134-0.701-0.605-0.567-1.052c0.134-0.447,0.605-0.701,1.052-0.567C315.025,109.481,315.279,109.952,315.145,110.399z"
+					/>
+				<polygon style="opacity:0.5;fill:#407BFF;" points="318.291,118.187 309.044,121.841 308.485,120.023 317.732,116.368 				"/>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="Rocket">
+	<g>
+		<path style="opacity:0.2;" d="M267.257,257.17c-0.2,7.54-0.76,13.33-1.68,17.35c-1.18,5.14-3.01,8.9-5.5,11.28
+			c-2.48,2.38-5.42,3.57-8.81,3.57c-5.14,0-9.07-2.8-11.77-8.41c-0.44-0.91-0.84-1.95-1.21-3.11c-5.71,4.91-11.03,10.27-15.92,16.03
+			l-5.31,6.26c2.87,2.91,6.13,5.3,9.77,7.19c6.23,3.22,14.4,4.84,24.52,4.84c1.78,0,3.5-0.05,5.17-0.15
+			c6.12-9.06,11.19-18.8,15.1-29.02l14.85-38.72L267.257,257.17z"/>
+		<g>
+			<g>
+				<path style="fill:#263238;" d="M133.388,309.958c5.597,5.597,17.502,17.502,17.502,17.502l49.011-46.167
+					C183.035,274.881,150.159,293.188,133.388,309.958z"/>
+				<path style="fill:#263238;" d="M194.422,370.992c-5.597-5.597-17.502-17.502-17.502-17.502l46.167-49.01
+					C229.499,321.345,211.193,354.221,194.422,370.992z"/>
+				<g>
+					<path style="fill:#407BFF;" d="M261.399,260.699l19.091-36.809l-36.809,19.091c-11.826,6.134-22.744,13.877-32.444,23.008
+						l-62.747,59.07l30.83,30.83l59.07-62.747C247.522,283.443,255.265,272.525,261.399,260.699z"/>
+					<path style="opacity:0.6;fill:#FFFFFF;" d="M261.399,260.699l19.091-36.809l-36.809,19.091
+						c-11.826,6.134-22.744,13.877-32.444,23.008l-62.747,59.07l30.83,30.83l59.07-62.747
+						C247.522,283.443,255.265,272.525,261.399,260.699z"/>
+				</g>
+				<circle style="fill:#FFFFFF;" cx="222.198" cy="282.183" r="12.899"/>
+				<circle style="fill:#407BFF;" cx="222.197" cy="282.183" r="8.285"/>
+				<polygon style="opacity:0.3;fill:#407BFF;" points="189.746,344.816 159.564,314.635 184.275,291.371 213.009,320.105 				"/>
+				<g>
+					<path style="fill:#407BFF;" d="M140.22,337.616c-22.605,1.839-30.093,16.306-32.647,35.539
+						c-1.302,9.809-1.88,19.733-10.117,25.475c-2.286,1.594-1.151,5.147,1.635,5.06c30.339-0.947,44.49-15.804,46.267-22.025
+						c-0.612,3.933-1.504,7.035-2.492,9.475c-1.016,2.507,1.737,4.827,4.029,3.391c8.517-5.336,19.199-15.155,19.909-31.078
+						C160.507,354.603,140.22,337.616,140.22,337.616z"/>
+					<path style="opacity:0.2;fill:#FFFFFF;" d="M140.22,337.616c-22.605,1.839-30.093,16.306-32.647,35.539
+						c-1.302,9.809-1.88,19.733-10.117,25.475c-2.286,1.594-1.151,5.147,1.635,5.06c30.339-0.947,44.49-15.804,46.267-22.025
+						c-0.612,3.933-1.504,7.035-2.492,9.475c-1.016,2.507,1.737,4.827,4.029,3.391c8.517-5.336,19.199-15.155,19.909-31.078
+						C160.507,354.603,140.22,337.616,140.22,337.616z"/>
+				</g>
+				<polygon style="fill:#407BFF;" points="170.276,370.3 134.08,334.104 153.363,329.933 174.448,351.017 				"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>
diff --git a/src/assets/images/404_cloud.png b/src/assets/images/404_cloud.png
deleted file mode 100644
index a81d8daa2c5a025f0137a27d81ed61ce7064039f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2644
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
bK!gZE4LN0Z)*J`_eh3F!7n?GxfXjaa@eGby

diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index c379ff00..cb7231d9 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -1,35 +1,9 @@
-<script setup lang="ts">
-import { reactive, toRefs } from "vue";
-import { useRouter } from "vue-router";
-
-defineOptions({
-  name: "Page401",
-});
-
-const state = reactive({
-  errGif: new URL("../../assets/images/401.gif", import.meta.url).href,
-  ewizardClap: "https://wpimg.wallstcn.com/007ef517-bafd-4066-aae4-6883632d9646",
-  dialogVisible: false,
-});
-
-const { errGif, ewizardClap, dialogVisible } = toRefs(state);
-
-const router = useRouter();
-
-function back() {
-  router.back();
-}
-</script>
-
 <template>
   <div class="page-container">
-    <el-button icon="el-icon-arrow-left" class="pan-back-btn" @click="back">返回</el-button>
+    <el-button icon="arrow-left" @click="back">返回</el-button>
     <el-row>
       <el-col :span="12">
         <h1 class="text-jumbo text-ginormous">Oops!</h1>
-        gif来源
-        <a href="https://zh.airbnb.com/" target="_blank">airbnb</a>
-        页面
         <h2>你没有权限去该页面</h2>
         <h6>如有不满请联系你领导</h6>
         <ul class="list-unstyled">
@@ -38,23 +12,31 @@ function back() {
             <router-link to="/dashboard">回首页</router-link>
           </li>
           <li class="link-type">
-            <a href="https://www.taobao.com/">随便看看</a>
-          </li>
-          <li>
-            <a href="#" @click.prevent="dialogVisible = true">点我看图</a>
+            <a href="https://www.youlai.tech/">随便看看</a>
           </li>
         </ul>
       </el-col>
       <el-col :span="12">
-        <img :src="http://github.com/errGif" width="313" height="428" alt="Girl has dropped her ice cream." />
+        <img src="http://github.com/@/assets/images/401.svg" width="400" height="500" />
       </el-col>
     </el-row>
-    <el-dialog v-model="dialogVisible" title="随便看">
-      <img :src="http://github.com/ewizardClap" class="pan-img" />
-    </el-dialog>
   </div>
 </template>
 
+<script setup lang="ts">
+import { useRouter } from "vue-router";
+
+defineOptions({
+  name: "Page401",
+});
+
+const router = useRouter();
+
+function back() {
+  router.back();
+}
+</script>
+
 <style lang="scss" scoped>
 .page-container {
   width: 100%;
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 33345074..005c09eb 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -1,3 +1,23 @@
+<template>
+  <div class="page-container">
+    <div class="pic-404">
+      <img class="pic-404__parent" src="http://github.com/@/assets/images/404.svg" alt="404" />
+    </div>
+    <div class="bullshit">
+      <div class="bullshit__oops">OOPS！</div>
+      <div class="bullshit__info">
+        该页面无法访问。
+        <a style="color: #20a0ff" href="https://www.youlai.tech.com/" target="_blank">
+          有来开源官网
+        </a>
+      </div>
+      <div class="bullshit__headline">抱歉，您访问的页面不存在。</div>
+      <div class="bullshit__info">请确认您输入的网址是否正确，或者点击下方按钮返回首页。</div>
+      <a href="#" class="bullshit__return-home" @click.prevent="back">返回首页</a>
+    </div>
+  </div>
+</template>
+
 <script setup lang="ts">
 import { useRouter } from "vue-router";
 
@@ -12,30 +32,6 @@ function back() {
 }
 </script>
 
-<template>
-  <div class="page-container">
-    <div class="pic-404">
-      <img class="pic-404__parent" src="http://github.com/@/assets/images/404.png" alt="404" />
-      <img class="pic-404__child left" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
-      <img class="pic-404__child mid" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
-      <img class="pic-404__child right" src="http://github.com/@/assets/images/404_cloud.png" alt="404" />
-    </div>
-    <div class="bullshit">
-      <div class="bullshit__oops">OOPS!</div>
-      <div class="bullshit__info">
-        All rights reserved
-        <a style="color: #20a0ff" href="https://wallstreetcn.com/" target="_blank">wallstreetcn</a>
-      </div>
-      <div class="bullshit__headline">The webmaster said that you can not enter this page...</div>
-      <div class="bullshit__info">
-        Please check that the URL you entered is correct, or click the button below to return to the
-        homepage.
-      </div>
-      <a href="#" class="bullshit__return-home" @click.prevent="back">Back to home</a>
-    </div>
-  </div>
-</template>
-
 <style lang="scss" scoped>
 .page-container {
   display: flex;
@@ -48,127 +44,11 @@ function back() {
     &__parent {
       width: 100%;
     }
-
-    &__child {
-      &.left {
-        top: 17px;
-        left: 220px;
-        width: 80px;
-        opacity: 0;
-        animation-name: cloudLeft;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-delay: 1s;
-        animation-fill-mode: forwards;
-      }
-
-      &.mid {
-        top: 10px;
-        left: 420px;
-        width: 46px;
-        opacity: 0;
-        animation-name: cloudMid;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-delay: 1.2s;
-        animation-fill-mode: forwards;
-      }
-
-      &.right {
-        top: 100px;
-        left: 500px;
-        width: 62px;
-        opacity: 0;
-        animation-name: cloudRight;
-        animation-duration: 2s;
-        animation-timing-function: linear;
-        animation-delay: 1s;
-        animation-fill-mode: forwards;
-      }
-
-      @keyframes cloudLeft {
-        0% {
-          top: 17px;
-          left: 220px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 33px;
-          left: 188px;
-          opacity: 1;
-        }
-
-        80% {
-          top: 81px;
-          left: 92px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 97px;
-          left: 60px;
-          opacity: 0;
-        }
-      }
-
-      @keyframes cloudMid {
-        0% {
-          top: 10px;
-          left: 420px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 40px;
-          left: 360px;
-          opacity: 1;
-        }
-
-        70% {
-          top: 130px;
-          left: 180px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 160px;
-          left: 120px;
-          opacity: 0;
-        }
-      }
-
-      @keyframes cloudRight {
-        0% {
-          top: 100px;
-          left: 500px;
-          opacity: 0;
-        }
-
-        20% {
-          top: 120px;
-          left: 460px;
-          opacity: 1;
-        }
-
-        80% {
-          top: 180px;
-          left: 340px;
-          opacity: 1;
-        }
-
-        100% {
-          top: 200px;
-          left: 300px;
-          opacity: 0;
-        }
-      }
-    }
   }
 
   .bullshit {
     width: 300px;
-    padding: 30px 0;
+    padding: 50px 0;
     overflow: hidden;
 
     &__oops {

From 957814af7bba8caa1917f6b16cabee27a92f5d13 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 15 Dec 2024 20:51:25 +0800
Subject: [PATCH 096/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/login-image.svg |  2 +-
 src/views/login/index.vue         | 57 +++++++++++++++++++++++++------
 2 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/src/assets/images/login-image.svg b/src/assets/images/login-image.svg
index f42e56b6..bedf1758 100644
--- a/src/assets/images/login-image.svg
+++ b/src/assets/images/login-image.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="596.91213" height="505.57464" viewBox="0 0 596.91213 505.57464" xmlns:xlink="http://www.w3.org/1999/xlink"><g><path d="M575.42701,413.69586H21.48512c-11.84669,0-21.48512-9.63791-21.48512-21.48512v-66.67087H596.91213v66.67087c0,11.84721-9.63791,21.48512-21.48512,21.48512Z" fill="#e6e6e6"/><rect x="228.88706" y="402.54358" width="141.262" height="100.90143" fill="#e6e6e6"/><rect x="220.3901" y="490.69956" width="158.25592" height="12.74544" fill="#e6e6e6"/><path d="M596.38107,353.68606H0V14.74418C0,6.6144,6.6144,0,14.74418,0H581.63689c8.12978,0,14.74418,6.6144,14.74418,14.74418V353.68606Z" fill="#3f3d56"/><rect x="13.8077" y="15.40073" width="568.23436" height="319.69821" fill="#fff"/></g><g><path id="uuid-25324785-d0f2-4f1c-ad19-f4bb5410ff47-828" d="M123.85295,205.94936c4.34915-3.59367,9.72872-4.26258,12.0153-1.49438,2.28658,2.7682,.6142,7.92447-3.73698,11.51883-1.71842,1.45964-3.76141,2.48653-5.95805,2.99474l-18.6198,14.99379-6.8499-8.8877,19.08307-13.83763c.91372-2.06202,2.30808-3.87516,4.06637-5.28765Z" fill="#ffb6b6"/><path d="M16.2326,239.77936c-.00944-.66307-.00322-6.44713,4.27885-10.10294,4.91893-4.1995,11.85979-2.49972,14.29424-1.90355,5.62362,1.37718,6.08483,3.78959,11.36601,6.2683,9.8805,4.63743-2.4994,2.26379,3.3798,.77675,2.03505-.51473,31.31216-2.54515,38.59979-7.03056,14.17354-8.72353,23.83086-14.01349,23.83086-14.01349l6.31321,12.62642s-9.1289,12.69357-21.97706,22.09716c-13.17929,9.64592-19.76894,14.46893-29.78342,16.33239-.8624,.16048-22.07229,3.78187-39.15515-8.98085-3.89654-2.91112-11.03588-8.24498-11.14714-16.06965Z" fill="#6c63ff"/><circle cx="35.81649" cy="185.67486" r="21.99265" fill="#ffb6b6"/><g><polygon points="208.05472 333.43009 185.4053 310.24577 173.7135 322.44168 190.58814 344.67132 207.32613 346.58567 208.05472 333.43009" fill="#ffb6b6"/><path d="M78.72568,289.95422c1.32477,.11007,5.53464,.95349,9.55849-1.26037,2.74614-1.51087,4.15455-3.75738,4.63022-4.4718,5.90139-8.86325,28.55224-22.68449,48.88084-23.53504,4.60357-.1926,7.63375,.34082,10.38795,1.77648,3.90537,2.03574,5.46449,4.95183,10.4203,11.78292,2.71086,3.73663,5.7104,7.25691,8.45393,10.96962,16.06194,21.7362,22.15102,23.44259,21.52868,30.41109-.6905,7.73164-9.02898,15.06697-14.5711,14.22018-2.26965-.34678-3.14862-1.92498-6.18099-5.1199-8.89113-9.36767-12.56963-7.63699-18.89978-14.81212-7.39056-8.37709-6.42307-15.32303-10.27892-15.59132-3.57571-.24879-5.09524,5.67668-12.72906,13.54826-3.49306,3.60187-5.98049,5.25419-13.55853,10.51141-29.51063,20.4729-29.98163,21.91164-35.9372,23.54443-2.60568,.71437-21.09954,5.78468-27.68759-2.28408-10.30952-12.6267,14.04589-50.68156,25.98276-49.68978Z" fill="#2f2e41"/><path d="M201.13025,338.66919c1.66577-.74799,3.61352-1.62258,4.24018-3.63382,.42403-1.3609,.17985-3.03892-.69661-4.19845-1.01127-1.33788-2.50808-1.51421-2.44753-1.75092,.09221-.36043,3.6317-.21954,7.51717,1.15395,.73321,.25919,4.0549,1.47292,8.28021,4.7716,3.38533,2.64291,2.92976,3.17274,5.0526,4.69665,6.51637,4.67782,12.62816,.99108,16.15421,5.37796,1.36082,1.69307,1.94121,4.09684,1.36853,6.04048-1.15007,3.90324-6.74285,5.24648-9.7995,5.93997-7.3615,1.67019-12.93347,.30673-18.75163-.67366-19.78659-3.33419-30.90389-.29752-32.39188-4.8815-.28162-.86758,.1759-.7937,1.70153-7.16035,1.50577-6.2838,1.45637-8.0095,2.7388-8.5127,1.9304-.75745,3.22657,2.68803,8.08945,3.86718,4.30931,1.04492,7.86513-.55173,8.94448-1.03639Z" fill="#2f2e41"/></g><g><polygon points="167.78776 409.27485 162.06533 377.37247 145.54248 380.8986 147.02265 408.7683 159.79754 419.75133 167.78776 409.27485" fill="#ffb6b6"/><path d="M85.1876,300.67759c1.03437,.83499,4.04422,3.89687,8.61693,4.32456,3.1207,.29189,5.5476-.77612,6.34237-1.10016,9.86016-4.02006,36.36378-2.73717,53.66232,7.97432,3.91739,2.42571,6.12517,4.56865,7.59796,7.30318,2.08836,3.87748,1.74096,7.16592,2.00574,15.60118,.14485,4.61413,.65006,9.21134,.83536,13.82403,1.08478,27.00503,5.165,31.83623,.73697,37.25285-4.91296,6.00981-15.93171,7.39707-20.04204,3.58429-1.6833-1.56144-1.52438-3.36089-2.23945-7.70732-2.09668-12.74399-6.1123-13.37756-7.3211-22.86924-1.41128-11.08171,3.28968-16.28586,.2498-18.67306-2.81902-2.21375-7.40373,1.83601-18.14054,4.06268-4.91292,1.01889-7.89899,.98932-17.12157,1.08406-35.91491,.369-37.11255,1.29501-42.95736-.69821-2.55722-.87208-20.70715-7.06164-21.62754-17.43758-1.44026-16.23716,40.08188-34.04923,49.40214-26.52558Z" fill="#2f2e41"/><path d="M159.11615,409.72161c1.79837,.31647,3.90115,.68652,5.54907-.62579,1.11506-.88797,1.85529-2.41356,1.78117-3.86518-.08551-1.6749-1.22503-2.66132-1.042-2.82318,.2787-.24646,3.12834,1.85768,5.57211,5.17601,.46116,.62619,2.52813,3.49574,4.17204,8.59791,1.3171,4.08786,.64262,4.27045,1.54344,6.72347,2.76521,7.52985,9.89266,7.91126,10.3469,13.52119,.17529,2.16508-.69427,4.48-2.25957,5.76669-3.14344,2.58393-8.52547,.55484-11.44413-.58775-7.02916-2.75176-10.87405-7.00882-15.13778-11.08716-14.50016-13.86979-25.4044-17.59987-24.06156-22.22846,.25415-.87602,.59124-.55798,5.42874-4.96936,4.77454-4.35399,5.70271-5.80966,7.04642-5.50591,2.02264,.45724,1.1604,4.03605,4.52206,7.74243,2.97899,3.28446,6.81783,3.96004,7.98309,4.16509Z" fill="#2f2e41"/></g><path d="M38.81486,189.87923c.85618-3.06269-.2192-4.1788,.87688-5.55356,.00002-.00004,.44108-.55322,4.38439-2.04605h0c-1.16344-6.75042-.29231-7.89186-.29229-7.8919,1.00399-1.31553,3.0152-1.63355,4.38439-1.46146,2.89579,.36397,3.40837,2.98166,5.26127,2.92293,2.55961-.08114,5.62956-5.20482,4.67668-9.64566-.77729-3.62247-4.12881-6.31266-4.96897-5.84585-.83301,.46284-3.83172-1.5781-4.96897-1.16917-.77665,.27927-4.43236-.09227-5.26127,.29229-.90523,.41999-3.49763,3.03482-3.74548,2.70535-1.72237-2.28946-1.6857-3.0888-2.68496-3.58223-1.77067-.87434-3.69571,.74172-7.01502,2.33834-6.82959,3.28508-8.8294,1.32549-11.984,4.0921-1.59355,1.39756-2.44808,4.06851-4.0921,9.35336-2.29915,7.39081-3.44871,11.08621-2.33834,14.61463,1.13238,3.59835,2.79995,2.81517,5.26127,7.8919,2.73983,5.65125,1.79552,8.93605,4.38439,10.23024,2.00086,1.00026,5.21638,.36365,6.43044-1.46146,2.07861-3.12477-3.29393-7.35177-1.46146-12.27629,1.12484-3.02287,4.59478-5.31493,6.72273-4.67668,2.40606,.72167,2.58325,5.03573,4.0921,4.96897,1.29207-.05716,2.18914-3.2661,2.33834-3.7998Z" fill="#2f2e41"/><path d="M22.15418,210.9243c4.50049-5.04615,22.83197,.17676,24.55258,8.18419,.7077,3.29357-1.9049,4.68425-1.16917,8.47649,1.0761,5.54667,7.16909,5.16857,11.6917,10.81483,6.42075,8.016-.19392,15.85188,7.01502,29.22926,1.54044,2.85856,2.83881,5.26787,5.55356,7.59961,6.22959,5.35068,12.02717,3.51565,15.19922,8.47649,2.37209,3.70978,1.39747,8.28224,1.16917,9.35336-.93616,4.39206-3.47342,5.46222-5.26127,9.06107-2.97456,5.98761,.39336,10.38356,.58459,17.53756,.23927,8.95093-4.51735,21.35848-14.03005,25.42946-10.68707,4.57357-23.57658-3.00132-29.81385-10.52253-3.72182-4.488-4.8022-8.62788-6.43044-13.73775-7.27695-22.83729-11.38807-20.77183-16.95297-38.87492-6.3617-20.69512-7.61233-44.94052,0-52.61267,1.00898-1.01692,3.78571-3.36736,5.55356-7.59961,2.37887-5.69507,.32374-8.55598,2.33834-10.81483Z" fill="#6c63ff"/><g><path id="uuid-91308677-eda7-42a2-9f2e-a07e84038198-829" d="M88.65331,328.39105c3.48927,4.43334,4.03014,9.82729,1.20837,12.04743-2.82177,2.22013-7.93683,.42567-11.42675-4.00971-1.41838-1.75263-2.39643-3.81945-2.85228-6.02755l-14.54698-18.97093,7.51668-5.73344,14.91146,18.50331c2.03972,.96247,3.81921,2.39954,5.18951,4.1909Z" fill="#ffb6b6"/><path d="M35.37742,230.15543c.64719-.14454,6.31083-1.31867,10.76347,2.12736,5.11484,3.95855,4.86707,11.10022,4.78019,13.60509-.20073,5.78631-2.46827,6.73006-3.81723,12.40591-2.52378,10.61887,2.28253,20.4873,4.93792,25.93939,.91914,1.88721,3.87205,7.66186,9.7501,13.88094,11.43206,12.09534,21.6324,18.45987,21.6324,18.45987l-10.95803,9.74043s-17.45493-5.3202-29.2823-15.97929c-12.13217-10.9338-30.78935-49.61903-34.65703-59.04258-.33308-.81151,4.38498,12.38209,13.39349-6.94555,2.0548-4.40857,5.81969-12.48606,13.45703-14.19157Z" fill="#6c63ff"/></g></g><g><path d="M315.83751,221.08136l-13.08365-6.1978c5.36634,7.4891,9.99038,19.18539,12.46595,28.49257,4.19148-8.66968,10.94828-19.27767,17.63647-25.61422l-13.82798,3.55737c8.52074-41.7599,40.56942-71.73938,77.2696-71.73938l.51953-1.50838c-38.33429,0-72.27996,29.56391-80.97992,73.00984Z" fill="#3f3d56"/><path d="M376.05662,284.71011h-82.66786c-3.50634,0-6.35907-2.85273-6.35907-6.35907s2.85273-6.35907,6.35907-6.35907h82.66786c3.50634,0,6.35907,2.85273,6.35907,6.35907s-2.85273,6.35907-6.35907,6.35907Z" fill="#6c63ff"/><path d="M486.05662,284.71011h-82.66786c-3.50634,0-6.35907-2.85273-6.35907-6.35907s2.85273-6.35907,6.35907-6.35907h82.66786c3.50634,0,6.35907,2.85273,6.35907,6.35907s-2.85273,6.35907-6.35907,6.35907Z" fill="#e6e6e6"/></g><g><path d="M437.11815,111.71741h-80.3571c-2.02587,0-3.67427-1.64841-3.67427-3.67428s1.64841-3.67351,3.67427-3.67351h80.3571c2.02587,0,3.67351,1.64765,3.67351,3.67351s-1.64764,3.67427-3.67351,3.67427Z" fill="#3f3d56"/><path d="M480.23862,150.91545h-166.59803c-2.02587,0-3.67427-1.64842-3.67427-3.67428s1.64841-3.67351,3.67427-3.67351h166.59803c2.02587,0,3.67351,1.64765,3.67351,3.67352,0,2.02587-1.64764,3.67427-3.67351,3.67427Z" fill="#3f3d56"/></g><path d="M36.12104,504.38463c0,.66003,.53003,1.19,1.19006,1.19H559.60108c.65997,0,1.19-.52997,1.19-1.19,0-.65997-.53003-1.19-1.19-1.19H37.3111c-.66003,0-1.19006,.53003-1.19006,1.19Z" fill="#3f3d56"/><path d="M164.36892,222.29651c-.14159,0-.28281-.00519-.42513-.01408-8.36889-.53744-37.00488-4.58938-54.10034-34.14792-1.40884-2.43368-1.13122-5.52786,.69015-7.69839l31.66012-37.72172c1.29468-1.54264,3.2947-2.43146,5.3203-2.407,1.39994,.03336,4.71466,.38696,5.35848,2.94221,3.80323,15.09655,19.8631,32.84694,39.17726,35.19982,1.95777,.23796,3.52932,1.98446,4.2039,4.67166,.52632,2.09194,.04003,4.24838-1.33471,5.9163l-25.36242,30.79799c-1.28838,1.56414-3.17906,2.46111-5.18761,2.46111Zm-16.97648-80.47167c-1.54709,0-3.05193,.69311-4.03563,1.86511l-31.65975,37.72172c-1.41292,1.68349-1.62937,4.07937-.53967,5.96226,16.71851,28.90694,44.70512,32.8677,52.88424,33.39328,1.67015,.11194,3.27395-.59971,4.3429-1.89698l25.36279-30.79799c1.06488-1.29208,1.44146-2.96149,1.03411-4.58123-.39808-1.58564-1.37326-3.34696-2.91553-3.53525-19.95242-2.42998-36.53972-20.75265-40.46564-36.33549-.31802-1.26169-2.23242-1.75465-3.91776-1.79468-.03002-.00074-.06005-.00074-.09007-.00074Z" fill="#3f3d56"/><path d="M129.02956,189.37601l22.82552-23.27322c1.5603-1.59089-.88415-4.0393-2.44639-2.44641l-22.82552,23.27322c-1.5603,1.59089,.88415,4.0393,2.44639,2.44641h0Z" fill="#e6e6e6"/><path d="M142.80616,195.93278c6.29954-5.64633,11.77383-12.18399,16.25639-19.35766,1.18327-1.89361-1.80885-3.6323-2.9874-1.7462-4.33369,6.93544-9.62593,13.19938-15.71542,18.65747-1.66149,1.48921,.79191,3.92934,2.44639,2.44639h.00004Z" fill="#e6e6e6"/><path d="M155.22261,203.78396c5.73555-6.35342,10.61777-13.4443,14.46148-21.09311,.99713-1.98424-1.9864-3.73813-2.9874-1.7462-3.7137,7.39012-8.37772,14.25303-13.92048,20.39292-1.48868,1.64906,.9506,4.10334,2.44639,2.44639h0Z" fill="#e6e6e6"/><g><ellipse cx="145.44339" cy="139.35715" rx="23.01268" ry="22.52779" fill="#6c63ff"/><path d="M157.41747,150.04337c-3.53924-8.70173-7.07853-17.40341-10.61777-26.10509-.48882-1.20182-2.02009-1.2445-2.49716,0-3.49698,9.12301-5.78219,18.64254-6.8808,28.34862-.18709,1.65324,2.40401,1.63991,2.58962,0,.42992-3.79819,1.06816-7.56798,1.88753-11.29757,2.91638,.153,5.85674-.17418,8.67112-.9533,1.45013,3.56526,2.90026,7.13048,4.35034,10.69574,.61964,1.52347,3.12576,.8572,2.49711-.6884Zm-14.93138-11.61416c.87227-3.57038,1.91798-7.09834,3.13134-10.56966l3.969,9.75819c-2.32472,.61016-4.70218,.8816-7.10034,.81147Z" fill="#fff"/></g></svg>
\ No newline at end of file
+<svg height="8887" node-id="1" sillyvg="true" template-height="8887" template-width="11927" version="1.1" viewBox="0 0 11927 8887" width="11927" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="176"></defs><path d="M 11926.20 7809.20 L 0.00 7809.20 L 0.00 7815.20 L 11926.20 7815.20 L 11926.20 7809.20 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="178" stroke="none" target-height="6" target-width="11926.2" target-x="0" target-y="7809.2"/><path d="M 2977.20 8170.10 L 2187.30 8170.10 L 2187.30 8176.10 L 2977.20 8176.10 L 2977.20 8170.10 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="180" stroke="none" target-height="6" target-width="789.8999" target-x="2187.3" target-y="8170.1"/><path d="M 1937.30 8170.10 L 1479.60 8170.10 L 1479.60 8176.10 L 1937.30 8176.10 L 1937.30 8170.10 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="182" stroke="none" target-height="6" target-width="457.70007" target-x="1479.6" target-y="8170.1"/><path d="M 5022.10 8257.90 L 4564.40 8257.90 L 4564.40 8263.90 L 5022.10 8263.90 L 5022.10 8257.90 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="184" stroke="none" target-height="6" target-width="457.7002" target-x="4564.4" target-y="8257.9"/><path d="M 7408.80 8391.00 L 6378.60 8391.00 L 6378.60 8397.00 L 7408.80 8397.00 L 7408.80 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="186" stroke="none" target-height="6" target-width="1030.1997" target-x="6378.6" target-y="8391"/><path d="M 6166.30 8391.00 L 6015.30 8391.00 L 6015.30 8397.00 L 6166.30 8397.00 L 6166.30 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="188" stroke="none" target-height="6" target-width="151" target-x="6015.3" target-y="8391"/><path d="M 10813.40 8257.90 L 8579.00 8257.90 L 8579.00 8263.90 L 10813.40 8263.90 L 10813.40 8257.90 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="190" stroke="none" target-height="6" target-width="2234.4004" target-x="8579" target-y="8257.9"/><path d="M 5653.00 6745.40 L 1047.40 6745.40 L 1038.30 6745.10 L 1029.40 6744.20 L 1020.70 6742.80 L 1012.10 6740.70 L 1003.60 6738.10 L 995.30 6735.00 L 987.30 6731.30 L 979.40 6727.20 L 971.90 6722.50 L 964.70 6717.30 L 957.80 6711.60 L 951.20 6705.50 L 945.00 6698.90 L 939.40 6691.90 L 934.20 6684.70 L 929.60 6677.20 L 925.40 6669.30 L 921.70 6661.30 L 918.60 6653.00 L 916.10 6644.50 L 914.00 6635.90 L 912.60 6627.20 L 911.70 6618.30 L 911.40 6609.20 L 911.40 135.00 L 911.80 126.00 L 912.70 117.20 L 914.20 108.50 L 916.30 99.90 L 918.90 91.50 L 922.10 83.30 L 925.70 75.30 L 929.90 67.60 L 934.60 60.10 L 939.80 52.90 L 945.50 46.10 L 951.60 39.60 L 958.20 33.40 L 965.10 27.80 L 972.30 22.70 L 979.80 18.10 L 987.60 13.90 L 995.60 10.30 L 1003.80 7.20 L 1012.20 4.70 L 1020.80 2.60 L 1029.50 1.20 L 1038.40 0.30 L 1047.40 0.00 L 5653.00 0.00 L 5662.00 0.30 L 5670.90 1.20 L 5679.70 2.60 L 5688.30 4.70 L 5696.80 7.30 L 5705.10 10.40 L 5713.20 14.00 L 5721.00 18.20 L 5728.60 22.90 L 5735.80 28.00 L 5742.70 33.70 L 5749.30 39.90 L 5755.50 46.50 L 5761.10 53.40 L 5766.30 60.60 L 5771.00 68.20 L 5775.20 76.00 L 5778.80 84.10 L 5781.90 92.30 L 5784.50 100.90 L 5786.60 109.50 L 5788.00 118.30 L 5788.90 127.20 L 5789.20 136.20 L 5789.20 6609.20 L 5788.90 6618.30 L 5786.60 6635.90 L 5784.50 6644.60 L 5778.80 6661.40 L 5775.20 6669.40 L 5771.00 6677.20 L 5766.30 6684.80 L 5761.10 6692.00 L 5755.50 6698.90 L 5749.30 6705.50 L 5742.70 6711.70 L 5735.80 6717.40 L 5728.60 6722.60 L 5721.00 6727.20 L 5713.20 6731.40 L 5705.10 6735.10 L 5688.30 6740.80 L 5679.70 6742.80 L 5670.90 6744.20 L 5662.00 6745.10 L 5653.00 6745.40 Z M 1047.40 4.80 L 1038.70 5.10 L 1030.20 5.90 L 1021.90 7.30 L 1013.60 9.30 L 1005.50 11.80 L 997.60 14.80 L 989.90 18.20 L 982.40 22.30 L 975.20 26.70 L 968.30 31.70 L 961.70 37.10 L 955.40 43.00 L 949.50 49.30 L 944.10 55.90 L 939.20 62.80 L 934.70 70.00 L 930.70 77.50 L 927.30 85.20 L 924.30 93.10 L 921.80 101.20 L 919.90 109.50 L 918.50 117.90 L 917.70 126.40 L 917.40 135.00 L 917.40 6609.20 L 917.70 6617.90 L 918.50 6626.40 L 919.90 6634.70 L 921.80 6643.00 L 924.30 6651.10 L 927.30 6659.00 L 930.70 6666.70 L 934.70 6674.20 L 939.20 6681.40 L 944.10 6688.30 L 949.50 6694.90 L 955.40 6701.20 L 961.70 6707.20 L 968.30 6712.60 L 975.20 6717.50 L 982.40 6722.00 L 989.90 6726.00 L 997.60 6729.50 L 1005.50 6732.50 L 1013.60 6735.00 L 1021.90 6736.90 L 1030.20 6738.30 L 1038.70 6739.20 L 1047.40 6739.50 L 5653.00 6739.50 L 5661.60 6739.20 L 5670.10 6738.30 L 5678.50 6736.90 L 5686.80 6735.00 L 5694.90 6732.50 L 5702.80 6729.50 L 5710.50 6726.00 L 5718.00 6722.00 L 5725.20 6717.50 L 5738.70 6707.20 L 5745.00 6701.30 L 5750.90 6694.90 L 5756.30 6688.30 L 5761.30 6681.40 L 5765.80 6674.20 L 5769.80 6666.70 L 5773.30 6659.00 L 5776.20 6651.10 L 5778.70 6643.00 L 5780.70 6634.70 L 5782.10 6626.40 L 5782.90 6617.90 L 5783.20 6609.20 L 5783.20 135.00 L 5782.90 126.40 L 5782.10 117.90 L 5780.70 109.50 L 5778.70 101.20 L 5776.20 93.10 L 5773.30 85.20 L 5769.80 77.50 L 5765.80 70.00 L 5761.30 62.80 L 5756.30 55.90 L 5750.90 49.30 L 5745.00 43.00 L 5738.70 37.10 L 5732.10 31.70 L 5725.20 26.70 L 5718.00 22.20 L 5710.50 18.20 L 5702.80 14.70 L 5694.90 11.80 L 5686.80 9.30 L 5678.50 7.30 L 5670.10 5.90 L 5661.60 5.10 L 5653.00 4.80 L 1047.40 4.80 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="192" stroke="none" target-height="6745.4" target-width="4877.8003" target-x="911.4" target-y="0"/><path d="M 10812.50 6745.40 L 6206.60 6745.40 L 6197.60 6745.10 L 6188.70 6744.20 L 6179.90 6742.80 L 6171.30 6740.70 L 6162.80 6738.10 L 6154.50 6735.00 L 6146.50 6731.40 L 6138.60 6727.20 L 6123.90 6717.30 L 6117.00 6711.60 L 6110.40 6705.50 L 6104.20 6698.90 L 6098.50 6692.00 L 6093.40 6684.70 L 6088.70 6677.20 L 6084.50 6669.40 L 6080.80 6661.30 L 6077.70 6653.10 L 6075.10 6644.60 L 6073.10 6635.90 L 6071.60 6627.20 L 6070.70 6618.30 L 6070.40 6609.20 L 6070.40 135.00 L 6070.80 126.00 L 6071.80 117.20 L 6073.30 108.50 L 6075.40 99.90 L 6078.00 91.50 L 6081.20 83.30 L 6084.90 75.30 L 6089.10 67.50 L 6093.80 60.10 L 6099.00 52.90 L 6104.60 46.10 L 6110.80 39.50 L 6117.40 33.40 L 6124.30 27.80 L 6131.50 22.70 L 6139.00 18.10 L 6146.80 13.90 L 6154.80 10.30 L 6163.00 7.20 L 6171.50 4.70 L 6180.10 2.60 L 6188.80 1.20 L 6197.60 0.30 L 6206.60 0.00 L 10812.50 0.00 L 10821.50 0.30 L 10830.30 1.20 L 10839.00 2.70 L 10847.60 4.70 L 10856.00 7.30 L 10864.20 10.40 L 10872.20 14.00 L 10880.00 18.20 L 10887.50 22.80 L 10894.70 27.90 L 10901.50 33.50 L 10908.10 39.60 L 10914.20 46.20 L 10919.90 53.00 L 10925.00 60.20 L 10929.70 67.60 L 10933.90 75.40 L 10937.60 83.40 L 10940.70 91.50 L 10943.30 100.00 L 10945.40 108.50 L 10946.90 117.20 L 10947.80 126.00 L 10948.20 135.00 L 10948.20 6609.20 L 10947.90 6618.30 L 10945.60 6635.90 L 10943.60 6644.50 L 10937.90 6661.20 L 10930.10 6677.10 L 10925.40 6684.60 L 10914.60 6698.80 L 10908.50 6705.40 L 10901.90 6711.50 L 10895.00 6717.20 L 10887.80 6722.40 L 10880.30 6727.10 L 10872.50 6731.30 L 10864.40 6734.90 L 10856.20 6738.10 L 10847.70 6740.70 L 10839.10 6742.70 L 10830.40 6744.20 L 10821.50 6745.10 L 10812.50 6745.40 Z M 6206.60 4.80 L 6198.00 5.10 L 6189.50 5.90 L 6181.10 7.30 L 6172.80 9.30 L 6164.70 11.80 L 6156.80 14.70 L 6149.10 18.20 L 6141.60 22.20 L 6134.40 26.70 L 6127.50 31.70 L 6120.90 37.10 L 6114.60 43.00 L 6108.70 49.30 L 6103.30 55.90 L 6098.30 62.80 L 6093.80 70.00 L 6089.80 77.50 L 6086.40 85.20 L 6083.40 93.10 L 6080.90 101.20 L 6078.90 109.50 L 6077.50 117.90 L 6076.70 126.40 L 6076.40 135.00 L 6076.40 6609.20 L 6076.70 6617.90 L 6077.50 6626.40 L 6078.90 6634.70 L 6080.90 6643.00 L 6083.40 6651.10 L 6086.40 6659.00 L 6089.80 6666.70 L 6093.80 6674.20 L 6098.30 6681.40 L 6103.30 6688.30 L 6108.70 6694.90 L 6114.60 6701.30 L 6120.90 6707.20 L 6127.50 6712.60 L 6134.40 6717.50 L 6141.60 6722.00 L 6149.10 6726.00 L 6156.80 6729.50 L 6164.70 6732.50 L 6172.80 6735.00 L 6181.10 6736.90 L 6189.50 6738.30 L 6198.00 6739.20 L 6206.60 6739.50 L 10812.50 6739.50 L 10821.10 6739.20 L 10838.00 6736.90 L 10846.30 6735.00 L 10854.40 6732.50 L 10862.30 6729.50 L 10870.00 6726.00 L 10877.50 6722.00 L 10884.70 6717.50 L 10891.60 6712.60 L 10898.20 6707.20 L 10904.50 6701.30 L 10910.40 6694.90 L 10915.80 6688.30 L 10920.80 6681.40 L 10925.20 6674.20 L 10929.30 6666.70 L 10932.80 6659.00 L 10938.20 6643.00 L 10940.20 6634.70 L 10942.40 6617.90 L 10942.70 6609.20 L 10942.70 135.00 L 10942.40 126.40 L 10941.60 117.90 L 10940.20 109.50 L 10938.20 101.20 L 10935.70 93.10 L 10932.70 85.20 L 10929.30 77.50 L 10925.20 70.00 L 10920.80 62.80 L 10915.80 55.90 L 10910.40 49.30 L 10904.50 43.00 L 10898.20 37.10 L 10891.60 31.70 L 10884.70 26.70 L 10877.50 22.20 L 10870.00 18.20 L 10862.30 14.70 L 10854.40 11.80 L 10846.30 9.30 L 10838.00 7.30 L 10829.60 5.90 L 10821.10 5.10 L 10812.50 4.80 L 6206.60 4.80 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="194" stroke="none" target-height="6745.4" target-width="4877.8003" target-x="6070.4" target-y="0"/><path d="M 6378.10 5771.80 L 5853.60 5771.80 L 5853.60 7852.40 L 6378.10 7852.40 L 6378.10 5771.80 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="196" stroke="none" target-height="2080.6" target-width="524.5" target-x="5853.6" target-y="5771.8"/><path d="M 6278.40 7852.40 L 6378.10 7852.40 L 6378.10 7569.00 L 6173.90 7569.00 L 6278.40 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="198" stroke="none" target-height="283.3999" target-width="204.2002" target-x="6173.9" target-y="7569"/><path d="M 4079.70 5771.80 L 3555.20 5771.80 L 3555.20 7852.40 L 4079.70 7852.40 L 4079.70 5771.80 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="200" stroke="none" target-height="2080.6" target-width="524.5" target-x="3555.2" target-y="5771.8"/><path d="M 6378.10 5771.80 L 3992.90 5771.80 L 3992.90 7678.50 L 6378.10 7678.50 L 6378.10 5771.80 Z" fill="#fafafa" fill-rule="nonzero" node-id="202" stroke="none" target-height="1906.7002" target-width="2385.2002" target-x="3992.9" target-y="5771.8"/><path d="M 6291.50 5865.50 L 6291.50 6370.00 L 4078.70 6370.00 L 4078.70 5865.50 L 6290.80 5865.50 M 6300.10 5856.20 L 4070.20 5856.20 L 4070.20 6379.10 L 6300.80 6379.10 L 6300.80 5856.20 L 6300.10 5856.20 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="204" stroke="none" target-height="522.8999" target-width="2230.5999" target-x="4070.2" target-y="5856.2"/><path d="M 4092.30 7852.40 L 3992.90 7852.40 L 3992.90 7569.00 L 4196.80 7569.00 L 4092.30 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="206" stroke="none" target-height="283.3999" target-width="203.8999" target-x="3992.9" target-y="7569"/><path d="M 5132.80 6117.60 L 5133.80 6127.90 L 5135.00 6132.90 L 5136.80 6137.80 L 5139.00 6142.50 L 5141.70 6146.90 L 5148.20 6154.90 L 5152.10 6158.40 L 5156.20 6161.50 L 5160.60 6164.10 L 5165.30 6166.30 L 5175.20 6169.30 L 5180.30 6170.10 L 5185.50 6170.40 L 5190.60 6170.10 L 5195.80 6169.30 L 5200.80 6168.10 L 5205.70 6166.30 L 5210.30 6164.10 L 5214.80 6161.50 L 5218.90 6158.40 L 5222.80 6154.90 L 5229.30 6146.90 L 5232.00 6142.50 L 5234.20 6137.80 L 5235.90 6133.00 L 5237.20 6127.90 L 5238.00 6122.80 L 5238.20 6117.60 L 5238.00 6112.50 L 5237.20 6107.40 L 5235.90 6102.40 L 5234.20 6097.50 L 5232.00 6092.80 L 5229.30 6088.30 L 5222.80 6080.40 L 5219.00 6076.90 L 5214.80 6073.80 L 5210.30 6071.10 L 5205.70 6068.90 L 5200.80 6067.20 L 5195.80 6065.90 L 5190.70 6065.20 L 5185.50 6064.90 L 5175.10 6066.00 L 5170.20 6067.20 L 5165.30 6068.90 L 5156.30 6073.80 L 5152.10 6076.80 L 5148.20 6080.40 L 5144.70 6084.30 L 5141.60 6088.40 L 5136.80 6097.50 L 5133.80 6107.30 L 5132.80 6117.60 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="208" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="6064.9"/><path d="M 6291.50 6472.80 L 6291.50 6977.30 L 4078.70 6977.30 L 4078.70 6472.80 L 6290.80 6472.80 M 6300.10 6463.70 L 4070.20 6463.70 L 4070.20 6986.60 L 6300.80 6986.60 L 6300.80 6464.00 L 6300.10 6463.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="210" stroke="none" target-height="522.8999" target-width="2230.5999" target-x="4070.2" target-y="6463.7"/><path d="M 5132.80 6726.40 L 5133.00 6731.60 L 5133.80 6736.70 L 5135.00 6741.70 L 5136.80 6746.50 L 5141.70 6755.60 L 5144.80 6759.80 L 5148.20 6763.60 L 5152.10 6767.10 L 5156.20 6770.20 L 5165.30 6775.10 L 5170.20 6776.80 L 5175.20 6778.10 L 5180.30 6778.80 L 5185.50 6779.10 L 5190.60 6778.80 L 5195.80 6778.10 L 5200.80 6776.80 L 5205.70 6775.00 L 5210.30 6772.80 L 5214.80 6770.20 L 5222.80 6763.60 L 5226.30 6759.80 L 5229.30 6755.60 L 5234.20 6746.50 L 5235.90 6741.70 L 5237.20 6736.60 L 5238.00 6731.50 L 5238.20 6726.30 L 5238.00 6721.20 L 5237.20 6716.10 L 5234.20 6706.20 L 5232.00 6701.50 L 5229.30 6697.10 L 5226.20 6692.90 L 5222.80 6689.10 L 5219.00 6685.60 L 5214.80 6682.50 L 5210.30 6679.80 L 5205.70 6677.60 L 5195.80 6674.70 L 5190.70 6673.90 L 5185.50 6673.60 L 5175.10 6674.70 L 5165.30 6677.70 L 5156.30 6682.50 L 5152.10 6685.60 L 5148.20 6689.10 L 5144.70 6693.00 L 5141.60 6697.10 L 5139.00 6701.50 L 5136.80 6706.20 L 5135.10 6711.00 L 5133.80 6716.00 L 5133.00 6721.10 L 5132.80 6726.40 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="212" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="6673.6"/><path d="M 6291.50 7080.30 L 6291.50 7585.00 L 4078.70 7585.00 L 4078.70 7080.30 L 6290.80 7080.30 M 6300.10 7071.00 L 4070.20 7071.00 L 4070.20 7594.10 L 6300.80 7594.10 L 6300.80 7071.00 L 6300.10 7071.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="214" stroke="none" target-height="523.1001" target-width="2230.5999" target-x="4070.2" target-y="7071"/><path d="M 5132.80 7332.70 L 5133.10 7337.90 L 5133.80 7343.00 L 5135.10 7348.00 L 5136.90 7352.80 L 5139.10 7357.40 L 5141.80 7361.90 L 5144.90 7366.10 L 5148.40 7369.90 L 5152.20 7373.30 L 5156.40 7376.40 L 5160.80 7379.00 L 5165.50 7381.20 L 5175.40 7384.20 L 5185.60 7385.20 L 5190.80 7384.90 L 5195.90 7384.10 L 5201.00 7382.80 L 5205.80 7381.10 L 5210.50 7378.90 L 5214.90 7376.20 L 5222.90 7369.60 L 5226.30 7365.80 L 5229.40 7361.60 L 5234.20 7352.50 L 5235.90 7347.70 L 5237.20 7342.60 L 5238.20 7332.30 L 5237.20 7322.10 L 5235.90 7317.10 L 5234.20 7312.20 L 5229.30 7303.10 L 5222.70 7295.10 L 5218.90 7291.70 L 5214.80 7288.60 L 5205.60 7283.70 L 5200.80 7282.00 L 5195.80 7280.70 L 5190.70 7280.00 L 5185.50 7279.70 L 5175.20 7280.70 L 5170.20 7282.00 L 5165.30 7283.80 L 5160.50 7286.00 L 5156.10 7288.70 L 5148.10 7295.30 L 5141.60 7303.30 L 5138.90 7307.70 L 5136.70 7312.40 L 5135.00 7317.40 L 5133.80 7322.40 L 5132.80 7332.70 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="216" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="7279.7"/><path d="M 3759.40 4563.40 L 3234.90 4563.40 L 3234.90 7852.70 L 3759.40 7852.70 L 3759.40 4563.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="218" stroke="none" target-height="3289.3003" target-width="524.5" target-x="3234.9" target-y="4563.4"/><path d="M 3659.70 7852.40 L 3759.40 7852.40 L 3759.40 7569.00 L 3555.40 7569.00 L 3659.70 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="220" stroke="none" target-height="283.3999" target-width="204" target-x="3555.4" target-y="7569"/><path d="M 1799.20 4563.40 L 1274.70 4563.40 L 1274.70 7852.70 L 1799.20 7852.70 L 1799.20 4563.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="222" stroke="none" target-height="3289.3003" target-width="524.5" target-x="1274.7" target-y="4563.4"/><path d="M 3759.40 4563.40 L 1712.10 4563.40 L 1712.10 7678.80 L 3759.40 7678.80 L 3759.40 4563.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="224" stroke="none" target-height="3115.4" target-width="2047.2999" target-x="1712.1" target-y="4563.4"/><path d="M 3671.10 4651.20 L 3671.10 5356.50 L 1800.40 5356.50 L 1800.40 4651.20 L 3671.10 4651.20 Z M 3682.10 4640.50 L 1788.90 4640.50 L 1788.90 5366.80 L 3681.60 5366.80 L 3681.60 4640.70 L 3682.10 4640.50 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="226" stroke="none" target-height="726.2998" target-width="1893.2001" target-x="1788.9" target-y="4640.5"/><path d="M 3671.10 5442.60 L 3671.10 7313.40 L 2780.00 7313.40 L 2780.00 5442.60 L 3671.10 5442.60 Z M 3682.10 5431.70 L 2769.30 5431.70 L 2769.30 7324.30 L 3682.10 7324.30 L 3682.10 5431.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="228" stroke="none" target-height="1892.5996" target-width="912.80005" target-x="2769.3" target-y="5431.7"/><path d="M 2691.50 5442.60 L 2691.50 7313.40 L 1800.40 7313.40 L 1800.40 5442.60 L 2691.50 5442.60 Z M 2702.20 5431.70 L 1788.90 5431.70 L 1788.90 7324.30 L 2701.80 7324.30 L 2701.80 5431.70 L 2702.20 5431.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="230" stroke="none" target-height="1892.5996" target-width="913.2999" target-x="1788.9" target-y="5431.7"/><path d="M 1811.80 7852.40 L 1712.10 7852.40 L 1712.10 7569.00 L 1916.30 7569.00 L 1811.80 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="232" stroke="none" target-height="283.3999" target-width="204.20007" target-x="1712.1" target-y="7569"/><path d="M 2682.90 5004.20 L 2683.10 5009.40 L 2683.90 5014.60 L 2685.10 5019.60 L 2686.80 5024.50 L 2689.00 5029.20 L 2691.70 5033.70 L 2694.80 5037.90 L 2698.30 5041.80 L 2702.10 5045.30 L 2706.30 5048.40 L 2710.70 5051.00 L 2715.40 5053.30 L 2720.40 5055.10 L 2725.40 5056.40 L 2730.50 5057.10 L 2735.70 5057.40 L 2740.90 5057.20 L 2746.00 5056.40 L 2751.10 5055.20 L 2756.00 5053.40 L 2760.70 5051.20 L 2765.20 5048.60 L 2769.30 5045.50 L 2773.20 5042.00 L 2776.70 5038.10 L 2779.80 5033.90 L 2782.50 5029.50 L 2784.70 5024.80 L 2786.50 5020.00 L 2787.80 5014.90 L 2788.60 5009.70 L 2788.80 5004.50 L 2788.60 4999.30 L 2787.80 4994.20 L 2786.60 4989.20 L 2784.80 4984.20 L 2782.60 4979.50 L 2776.80 4970.90 L 2773.30 4967.00 L 2769.50 4963.60 L 2765.30 4960.40 L 2760.80 4957.70 L 2756.10 4955.50 L 2751.20 4953.80 L 2741.10 4951.80 L 2730.60 4951.80 L 2725.50 4952.50 L 2720.50 4953.80 L 2711.00 4957.70 L 2706.60 4960.30 L 2702.40 4963.40 L 2698.50 4966.90 L 2695.00 4970.80 L 2691.90 4975.00 L 2689.20 4979.40 L 2687.00 4984.00 L 2685.20 4988.90 L 2684.00 4993.80 L 2683.20 4998.90 L 2682.90 5004.20 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="234" stroke="none" target-height="105.6001" target-width="105.90015" target-x="2682.9" target-y="4951.8"/><path d="M 2871.80 6333.50 L 2872.10 6338.70 L 2872.80 6343.90 L 2874.10 6348.90 L 2875.90 6353.80 L 2878.10 6358.50 L 2880.80 6362.90 L 2887.40 6371.00 L 2891.20 6374.50 L 2895.40 6377.60 L 2899.80 6380.20 L 2904.60 6382.50 L 2909.50 6384.20 L 2914.50 6385.50 L 2919.70 6386.20 L 2924.80 6386.50 L 2930.00 6386.20 L 2935.20 6385.40 L 2940.30 6384.10 L 2945.10 6382.40 L 2949.80 6380.20 L 2954.30 6377.50 L 2958.40 6374.40 L 2962.30 6370.90 L 2965.80 6367.00 L 2968.90 6362.80 L 2971.50 6358.30 L 2973.70 6353.70 L 2975.50 6348.80 L 2976.70 6343.70 L 2977.50 6338.50 L 2977.70 6333.30 L 2977.50 6328.20 L 2976.70 6323.00 L 2973.60 6313.10 L 2971.40 6308.30 L 2968.70 6303.90 L 2965.60 6299.80 L 2962.10 6295.90 L 2954.00 6289.40 L 2949.50 6286.70 L 2944.80 6284.50 L 2939.90 6282.80 L 2934.90 6281.50 L 2924.50 6280.50 L 2919.30 6280.80 L 2914.20 6281.60 L 2904.30 6284.60 L 2899.60 6286.80 L 2895.20 6289.50 L 2891.00 6292.60 L 2887.20 6296.10 L 2883.70 6300.00 L 2880.60 6304.10 L 2878.00 6308.50 L 2875.80 6313.30 L 2874.00 6318.20 L 2872.80 6323.20 L 2871.80 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="236" stroke="none" target-height="106" target-width="105.8999" target-x="2871.8" target-y="6280.5"/><path d="M 2494.20 6333.50 L 2495.30 6343.80 L 2498.30 6353.60 L 2500.50 6358.30 L 2503.20 6362.70 L 2509.80 6370.70 L 2513.70 6374.10 L 2517.80 6377.20 L 2522.20 6379.80 L 2526.90 6382.00 L 2531.90 6383.80 L 2536.80 6385.00 L 2547.10 6386.00 L 2552.20 6385.70 L 2557.40 6384.90 L 2562.40 6383.70 L 2567.30 6381.90 L 2571.90 6379.70 L 2576.30 6377.00 L 2580.50 6374.00 L 2584.30 6370.50 L 2587.80 6366.60 L 2590.80 6362.40 L 2593.50 6358.00 L 2595.70 6353.40 L 2597.40 6348.50 L 2598.70 6343.50 L 2599.40 6338.30 L 2599.70 6333.20 L 2599.40 6328.00 L 2598.60 6322.90 L 2597.40 6317.90 L 2595.60 6313.00 L 2593.40 6308.30 L 2590.70 6303.90 L 2587.70 6299.80 L 2584.20 6296.00 L 2580.40 6292.50 L 2576.20 6289.40 L 2571.70 6286.70 L 2567.10 6284.60 L 2562.20 6282.80 L 2557.20 6281.60 L 2552.10 6280.80 L 2547.00 6280.50 L 2541.80 6280.80 L 2536.60 6281.60 L 2531.60 6282.80 L 2526.70 6284.60 L 2522.00 6286.80 L 2517.60 6289.50 L 2513.50 6292.60 L 2509.60 6296.10 L 2506.10 6300.00 L 2503.00 6304.10 L 2498.20 6313.30 L 2495.20 6323.20 L 2494.50 6328.30 L 2494.20 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="238" stroke="none" target-height="105.5" target-width="105.5" target-x="2494.2" target-y="6280.5"/><path d="M 2434.60 3646.30 L 2213.50 3646.30 L 2219.40 3678.50 L 2224.80 3710.80 L 2229.80 3743.20 L 2234.30 3775.60 L 2238.40 3808.10 L 2242.00 3840.60 L 2245.20 3873.20 L 2247.90 3905.80 L 2250.10 3938.50 L 2251.90 3971.20 L 2251.60 3979.70 L 2250.90 3989.90 L 2249.50 4001.80 L 2246.90 4020.10 L 2239.10 4063.80 L 2224.10 4140.70 L 2213.70 4196.60 L 2208.90 4225.30 L 2204.50 4254.30 L 2199.60 4293.00 L 2196.20 4331.10 L 2195.10 4349.70 L 2194.60 4367.90 L 2194.50 4381.60 L 2195.40 4407.70 L 2196.30 4420.10 L 2197.70 4432.60 L 2199.50 4444.60 L 2201.70 4456.00 L 2204.30 4466.90 L 2206.80 4475.60 L 2209.60 4483.90 L 2212.70 4491.80 L 2216.10 4499.30 L 2219.80 4506.40 L 2223.90 4513.40 L 2228.40 4519.90 L 2233.20 4526.00 L 2238.40 4531.60 L 2243.90 4536.90 L 2249.80 4541.70 L 2256.20 4546.00 L 2263.00 4550.00 L 2270.30 4553.40 L 2278.10 4556.50 L 2285.90 4558.90 L 2294.20 4560.80 L 2303.30 4562.20 L 2313.00 4563.10 L 2323.50 4563.40 L 2333.90 4563.10 L 2343.60 4562.20 L 2352.70 4560.80 L 2361.00 4558.90 L 2368.80 4556.50 L 2376.70 4553.50 L 2383.90 4550.00 L 2390.70 4546.10 L 2397.10 4541.70 L 2403.00 4536.90 L 2408.50 4531.70 L 2413.70 4526.00 L 2418.50 4520.00 L 2423.00 4513.50 L 2427.10 4506.50 L 2430.80 4499.40 L 2434.20 4492.00 L 2437.30 4484.10 L 2440.10 4475.80 L 2442.60 4467.10 L 2445.20 4456.20 L 2447.40 4444.80 L 2449.20 4432.90 L 2450.60 4420.40 L 2451.50 4408.00 L 2452.40 4381.90 L 2452.40 4368.20 L 2451.80 4350.10 L 2450.80 4331.50 L 2447.30 4293.40 L 2442.40 4254.80 L 2438.00 4225.90 L 2433.20 4197.20 L 2422.80 4141.30 L 2407.80 4064.20 L 2400.00 4020.50 L 2397.40 4002.10 L 2396.00 3990.10 L 2395.30 3979.80 L 2395.00 3971.20 L 2396.90 3938.50 L 2399.30 3905.80 L 2402.10 3873.20 L 2405.40 3840.60 L 2409.10 3808.00 L 2413.30 3775.60 L 2417.90 3743.10 L 2423.00 3710.80 L 2428.60 3678.50 L 2434.60 3646.30 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="240" stroke="none" target-height="917.09985" target-width="257.8999" target-x="2194.5" target-y="3646.3"/><path d="M 1593.30 4130.00 L 1593.30 4273.10 L 1593.60 4284.70 L 1594.30 4296.10 L 1595.50 4307.40 L 1597.10 4318.70 L 1599.10 4329.80 L 1601.60 4340.90 L 1604.50 4351.90 L 1607.80 4362.60 L 1611.50 4373.30 L 1615.60 4383.80 L 1620.20 4394.20 L 1625.10 4404.30 L 1630.40 4414.20 L 1636.20 4424.00 L 1642.30 4433.60 L 1648.80 4442.90 L 1655.60 4451.90 L 1662.80 4460.70 L 1670.40 4469.30 L 1678.40 4477.60 L 1686.70 4485.60 L 1695.30 4493.20 L 1704.10 4500.40 L 1713.20 4507.30 L 1722.50 4513.80 L 1732.00 4519.90 L 1741.80 4525.60 L 1761.90 4535.90 L 1772.20 4540.40 L 1782.80 4544.60 L 1793.40 4548.30 L 1804.20 4551.60 L 1815.10 4554.50 L 1826.20 4556.90 L 1837.40 4559.00 L 1848.60 4560.60 L 1859.90 4561.70 L 1871.40 4562.40 L 1882.90 4562.70 L 2026.00 4562.70 L 2037.50 4562.40 L 2049.00 4561.70 L 2060.30 4560.60 L 2071.50 4559.00 L 2082.70 4556.90 L 2093.80 4554.50 L 2104.70 4551.60 L 2115.50 4548.30 L 2126.20 4544.60 L 2136.70 4540.40 L 2147.00 4535.90 L 2157.20 4530.90 L 2167.10 4525.60 L 2176.90 4519.90 L 2186.40 4513.80 L 2195.80 4507.30 L 2204.80 4500.40 L 2213.60 4493.20 L 2222.20 4485.60 L 2230.50 4477.60 L 2238.50 4469.30 L 2246.10 4460.70 L 2253.30 4451.90 L 2260.20 4442.90 L 2266.60 4433.60 L 2272.80 4424.00 L 2278.50 4414.20 L 2283.80 4404.30 L 2288.70 4394.20 L 2293.30 4383.80 L 2297.40 4373.30 L 2301.10 4362.60 L 2304.40 4351.90 L 2307.30 4340.90 L 2309.80 4329.80 L 2311.80 4318.70 L 2313.40 4307.40 L 2314.60 4296.10 L 2315.30 4284.70 L 2315.60 4273.10 L 2315.60 4130.00 L 1593.30 4130.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="242" stroke="none" target-height="432.7002" target-width="722.30005" target-x="1593.3" target-y="4130"/><path d="M 4667.20 5468.40 L 4667.40 5478.80 L 4668.20 5489.20 L 4669.30 5499.40 L 4671.00 5509.50 L 4673.10 5519.50 L 4675.70 5529.40 L 4679.30 5541.10 L 4683.50 5552.60 L 4688.40 5564.00 L 4693.80 5575.20 L 4699.90 5586.20 L 4706.50 5596.90 L 4713.60 5607.40 L 4721.30 5617.70 L 4729.50 5627.80 L 4738.30 5637.80 L 4747.40 5647.20 L 4757.10 5656.40 L 4767.20 5665.40 L 4777.90 5674.20 L 4789.10 5682.70 L 4800.50 5690.70 L 4812.30 5698.40 L 4824.60 5705.90 L 4837.30 5713.00 L 4850.60 5719.80 L 4863.90 5726.10 L 4877.60 5732.10 L 4891.70 5737.70 L 4906.20 5743.00 L 4921.10 5747.90 L 4936.00 5752.20 L 4951.20 5756.20 L 4966.70 5759.80 L 4982.60 5762.90 L 4998.80 5765.60 L 5015.00 5767.80 L 5031.40 5769.50 L 5048.10 5770.80 L 5065.00 5771.50 L 5082.20 5771.80 L 5288.30 5771.80 L 5305.50 5771.50 L 5322.40 5770.80 L 5339.10 5769.50 L 5355.50 5767.80 L 5371.70 5765.60 L 5387.90 5762.90 L 5403.80 5759.80 L 5434.50 5752.20 L 5449.40 5747.90 L 5464.30 5743.00 L 5478.80 5737.70 L 5492.90 5732.10 L 5519.90 5719.80 L 5533.20 5713.00 L 5545.90 5705.90 L 5558.20 5698.40 L 5570.00 5690.70 L 5581.40 5682.70 L 5592.60 5674.20 L 5603.30 5665.40 L 5613.40 5656.40 L 5623.10 5647.20 L 5632.20 5637.80 L 5641.00 5627.80 L 5649.20 5617.70 L 5656.90 5607.40 L 5664.00 5596.90 L 5670.60 5586.20 L 5676.70 5575.20 L 5682.10 5564.00 L 5687.00 5552.60 L 5691.20 5541.10 L 5694.80 5529.40 L 5697.40 5519.50 L 5699.50 5509.50 L 5701.20 5499.40 L 5702.30 5489.20 L 5703.10 5478.80 L 5703.30 5468.40 L 4667.20 5468.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="244" stroke="none" target-height="303.3999" target-width="1036.0996" target-x="4667.2" target-y="5468.4"/><path d="M 10127.90 5223.70 L 10096.40 5250.30 L 10061.70 5281.70 L 10026.80 5315.30 L 10008.40 5333.90 L 9989.30 5353.60 L 9970.90 5373.30 L 9951.90 5394.10 L 9932.40 5416.10 L 9893.10 5462.30 L 9873.40 5486.50 L 9853.30 5511.70 L 9832.90 5538.20 L 9813.00 5564.60 L 9793.00 5592.00 L 9772.70 5620.60 L 9752.20 5650.30 L 9732.40 5680.00 L 9712.40 5710.70 L 9692.40 5742.50 L 9672.40 5775.40 L 9659.40 5797.30 L 9646.80 5819.40 L 9634.70 5841.50 L 9623.10 5863.80 L 9611.90 5886.20 L 9590.70 5931.80 L 9580.70 5954.90 L 9571.20 5978.20 L 9562.00 6001.80 L 9553.30 6025.90 L 9544.90 6050.30 L 9537.00 6074.70 L 9529.50 6099.70 L 9522.30 6125.20 L 9515.60 6151.20 L 9509.30 6177.20 L 9503.30 6203.90 L 9497.80 6231.30 L 9492.50 6259.30 L 9487.80 6287.20 L 9483.40 6315.90 L 9479.30 6345.50 L 9475.60 6376.00 L 9475.80 6209.20 L 9478.20 5529.00 L 9536.60 5395.50 L 9586.30 5279.30 L 9623.10 5190.30 L 9655.90 5108.70 L 9695.00 5012.60 L 9747.30 4888.10 L 9779.10 4814.50 L 9809.20 4746.20 L 9925.80 4485.50 L 9957.50 4413.10 L 9991.50 4333.70 L 10028.70 4245.20 L 10052.70 4187.20 L 10076.70 4128.30 L 10124.10 4010.20 L 10170.20 3892.70 L 10214.20 3778.10 L 10235.30 3722.00 L 10274.70 3615.00 L 10310.10 3515.80 L 10340.70 3426.30 L 10353.70 3386.60 L 10365.80 3348.50 L 10375.70 3315.60 L 10381.90 3294.10 L 10391.00 3259.30 L 10394.70 3243.00 L 10398.80 3219.70 L 10399.60 3211.50 L 10399.70 3205.60 L 10398.50 3198.90 L 10397.60 3197.40 L 10396.50 3196.50 L 10395.30 3196.20 L 10393.70 3196.30 L 10391.70 3197.10 L 10389.10 3198.80 L 10383.90 3203.20 L 10377.90 3208.70 L 10371.20 3215.50 L 10363.60 3223.80 L 10354.20 3234.90 L 10343.60 3248.10 L 10331.80 3263.50 L 10307.90 3296.50 L 10274.50 3345.60 L 10252.80 3379.00 L 10230.80 3413.60 L 10184.10 3489.50 L 10135.30 3571.50 L 10110.30 3614.30 L 10060.20 3701.70 L 10010.40 3790.30 L 9985.80 3834.70 L 9938.10 3921.80 L 9872.10 4044.80 L 9814.90 4154.50 L 9770.60 4242.20 L 9749.40 4286.40 L 9741.20 4304.30 L 9736.00 4316.60 L 9718.70 4359.30 L 9702.00 4402.30 L 9685.90 4445.40 L 9670.30 4488.70 L 9655.30 4532.20 L 9640.80 4575.90 L 9626.90 4619.80 L 9613.60 4663.80 L 9600.80 4708.00 L 9588.60 4752.40 L 9577.00 4796.80 L 9566.00 4841.50 L 9555.50 4886.30 L 9545.60 4931.20 L 9536.30 4976.20 L 9527.60 5021.30 L 9519.40 5066.60 L 9511.80 5112.00 L 9504.80 5157.50 L 9498.40 5203.10 L 9492.60 5248.70 L 9487.40 5294.50 L 9482.70 5340.40 L 9478.70 5386.30 L 9479.40 5084.80 L 9482.20 4601.60 L 9484.60 4355.40 L 9486.70 4222.80 L 9489.00 4113.60 L 9491.40 4025.70 L 9493.80 3956.80 L 9496.20 3904.70 L 9498.30 3867.10 L 9500.10 3841.70 L 9530.00 3794.80 L 9543.90 3773.60 L 9569.30 3736.10 L 9582.30 3716.20 L 9594.50 3696.60 L 9606.40 3676.70 L 9628.70 3637.40 L 9639.20 3617.60 L 9659.40 3577.50 L 9674.00 3547.00 L 9688.30 3515.40 L 9702.50 3483.30 L 9716.90 3449.60 L 9779.30 3300.60 L 9826.70 3190.00 L 9847.90 3137.50 L 9868.40 3082.80 L 9878.70 3054.20 L 9898.40 2996.50 L 9922.30 2922.20 L 9936.00 2877.20 L 9949.30 2832.10 L 9962.00 2787.40 L 9974.20 2742.80 L 9985.80 2699.30 L 10006.90 2614.90 L 10016.60 2574.30 L 10033.40 2499.10 L 10040.40 2465.30 L 10052.00 2403.90 L 10056.50 2376.70 L 10059.80 2354.30 L 10062.80 2327.80 L 10063.70 2308.50 L 10063.40 2301.90 L 10062.70 2297.70 L 10061.80 2295.40 L 10060.90 2294.20 L 10059.90 2293.80 L 10057.10 2294.80 L 10044.00 2305.90 L 10030.90 2317.80 L 10017.80 2330.50 L 10004.80 2344.00 L 9991.70 2358.40 L 9979.30 2372.80 L 9966.80 2388.00 L 9954.30 2404.00 L 9929.10 2438.60 L 9914.00 2460.70 L 9898.80 2484.00 L 9883.50 2508.50 L 9868.00 2534.30 L 9853.10 2560.00 L 9838.00 2586.90 L 9807.20 2644.20 L 9787.10 2683.20 L 9766.50 2724.20 L 9745.50 2767.10 L 9714.10 2832.40 L 9681.40 2901.80 L 9613.90 3046.90 L 9601.90 3073.40 L 9590.70 3099.00 L 9580.50 3123.80 L 9571.10 3147.60 L 9562.00 3172.10 L 9553.70 3195.70 L 9546.00 3218.70 L 9539.10 3241.00 L 9532.50 3263.60 L 9526.50 3285.70 L 9521.10 3307.30 L 9516.20 3328.30 L 9511.70 3349.60 L 9503.90 3391.00 L 9500.70 3411.10 L 9496.80 3438.10 L 9493.60 3464.70 L 9490.80 3490.90 L 9486.50 3543.30 L 9482.80 3608.20 L 9477.70 3727.10 L 9475.70 3767.60 L 9471.10 3837.70 L 9464.00 3912.90 L 9462.30 3939.00 L 9460.90 3968.30 L 9459.30 4006.50 L 9456.60 4096.80 L 9454.10 4207.80 L 9451.80 4337.20 L 9449.80 4483.00 L 9445.10 4447.90 L 9434.90 4381.20 L 9429.50 4349.60 L 9423.50 4317.70 L 9417.30 4286.80 L 9410.80 4257.00 L 9404.10 4228.10 L 9396.80 4199.10 L 9389.20 4171.00 L 9381.30 4143.60 L 9373.10 4117.20 L 9364.40 4090.60 L 9355.30 4064.80 L 9345.90 4039.60 L 9336.20 4015.00 L 9325.90 3990.60 L 9315.20 3966.60 L 9304.20 3943.10 L 9292.70 3920.10 L 9280.80 3897.30 L 9268.40 3874.80 L 9255.60 3852.70 L 9242.30 3830.80 L 9228.60 3809.30 L 9214.30 3787.90 L 9199.60 3766.60 L 9184.30 3745.50 L 9162.60 3716.50 L 9141.20 3688.40 L 9099.40 3635.50 L 9078.90 3610.50 L 9052.40 3579.00 L 9026.50 3549.20 L 9001.30 3520.90 L 8976.70 3494.20 L 8951.30 3467.40 L 8926.60 3442.30 L 8902.80 3418.70 L 8879.70 3396.70 L 8855.80 3374.60 L 8832.90 3354.10 L 8811.00 3335.20 L 8789.90 3317.80 L 8768.00 3300.40 L 8747.30 3284.60 L 8727.70 3270.30 L 8709.20 3257.50 L 8703.60 3254.00 L 8695.40 3250.20 L 8690.10 3249.20 L 8688.00 3249.50 L 8686.30 3250.20 L 8685.00 3251.20 L 8682.90 3254.60 L 8682.00 3260.90 L 8683.10 3271.90 L 8684.80 3279.60 L 8687.40 3289.30 L 8691.20 3300.90 L 8696.30 3314.60 L 8708.10 3343.50 L 8727.70 3386.40 L 8741.90 3415.40 L 8756.90 3445.30 L 8773.60 3477.60 L 8809.80 3545.30 L 8849.30 3616.60 L 8891.00 3689.70 L 8933.60 3763.00 L 8997.00 3869.30 L 9037.10 3935.00 L 9074.10 3994.50 L 9197.80 4188.70 L 9231.50 4242.50 L 9275.10 4313.50 L 9316.10 4383.10 L 9335.60 4417.50 L 9354.20 4451.40 L 9367.90 4477.00 L 9381.00 4502.50 L 9393.60 4527.70 L 9405.60 4552.70 L 9417.30 4578.00 L 9428.30 4603.10 L 9438.80 4628.10 L 9448.60 4652.90 L 9446.00 4983.10 L 9444.10 5340.90 L 9443.50 5525.80 L 9442.70 6084.00 L 9436.20 6046.90 L 9429.20 6009.40 L 9421.80 5971.50 L 9405.80 5895.90 L 9397.10 5858.10 L 9388.00 5820.30 L 9378.50 5782.90 L 9368.60 5745.80 L 9358.30 5708.70 L 9347.50 5672.30 L 9336.50 5636.50 L 9324.80 5600.80 L 9312.90 5566.10 L 9300.70 5532.30 L 9291.10 5507.00 L 9281.30 5482.40 L 9271.40 5458.50 L 9230.20 5365.00 L 9196.40 5289.70 L 9160.50 5211.40 L 9141.80 5171.80 L 9103.50 5092.80 L 9084.00 5054.10 L 9070.80 5028.50 L 9044.50 4979.20 L 9017.90 4931.80 L 8991.50 4887.60 L 8965.60 4847.40 L 8945.80 4819.20 L 8927.10 4794.60 L 8917.30 4782.70 L 8907.90 4771.90 L 8890.00 4753.30 L 8888.90 4752.60 L 8888.20 4752.50 L 8887.60 4752.90 L 8887.00 4754.10 L 8886.60 4756.60 L 8886.50 4760.70 L 8886.80 4767.10 L 8887.70 4776.30 L 8889.70 4790.90 L 8892.90 4810.40 L 8901.60 4856.60 L 8907.10 4883.10 L 8920.60 4943.80 L 8936.60 5011.40 L 8954.80 5083.90 L 8964.60 5121.40 L 8985.10 5197.10 L 8995.90 5235.00 L 9017.90 5309.30 L 9029.00 5345.00 L 9040.40 5380.10 L 9051.50 5413.10 L 9062.90 5445.20 L 9073.80 5474.50 L 9081.40 5493.60 L 9088.60 5511.10 L 9095.50 5527.00 L 9102.80 5542.80 L 9109.70 5556.60 L 9148.50 5627.30 L 9186.30 5698.90 L 9207.60 5740.20 L 9266.90 5857.40 L 9284.90 5892.60 L 9302.80 5926.70 L 9319.50 5957.70 L 9330.70 5977.80 L 9341.50 5996.30 L 9359.90 6027.10 L 9371.30 6047.40 L 9399.80 6099.40 L 9442.70 6178.90 L 9443.10 6564.10 L 9443.70 6743.20 L 9445.50 7062.80 L 9448.00 7315.90 L 9449.60 7411.80 L 9451.20 7484.10 L 9477.00 7484.10 L 9476.00 7403.50 L 9475.40 7241.10 L 9475.60 6730.90 L 9482.50 6707.60 L 9490.00 6684.00 L 9498.10 6659.90 L 9506.80 6635.50 L 9525.40 6587.00 L 9535.50 6562.30 L 9546.10 6537.20 L 9560.50 6504.20 L 9591.40 6437.10 L 9624.10 6369.70 L 9666.90 6285.20 L 9797.30 6035.30 L 9825.40 5980.80 L 9857.60 5917.20 L 9892.80 5846.60 L 9948.70 5732.30 L 9986.40 5653.30 L 10023.10 5574.80 L 10040.60 5536.60 L 10073.40 5462.80 L 10102.40 5394.60 L 10115.20 5362.70 L 10126.20 5334.30 L 10133.00 5315.60 L 10138.80 5298.80 L 10143.70 5283.90 L 10148.20 5268.80 L 10151.50 5256.10 L 10153.80 5245.50 L 10155.20 5237.10 L 10155.80 5230.40 L 10155.30 5221.20 L 10154.60 5218.50 L 10153.50 5216.40 L 10149.10 5213.40 L 10147.10 5213.30 L 10144.70 5213.60 L 10138.10 5216.50 L 10133.50 5219.40 L 10127.90 5223.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="246" stroke="none" target-height="5190.3" target-width="1717.7002" target-x="8682" target-y="2293.8"/><path d="M 9837.60 7852.40 L 9090.10 7852.40 L 9033.60 7119.70 L 9894.20 7119.70 L 9837.60 7852.40 Z" fill="#f0f0f0" fill-rule="nonzero" node-id="248" stroke="none" target-height="732.6997" target-width="860.6006" target-x="9033.6" target-y="7119.7"/><path d="M 9949.80 7205.10 L 8977.80 7205.10 L 8950.10 6957.70 L 9977.70 6957.70 L 9949.80 7205.10 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="250" stroke="none" target-height="247.3999" target-width="1027.6006" target-x="8950.1" target-y="6957.7"/><path d="M 2963.90 489.00 L 1627.00 489.00 L 1627.00 1957.10 L 2963.90 1957.10 L 2963.90 489.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="252" stroke="none" target-height="1468.1" target-width="1336.8999" target-x="1627" target-y="489"/><path d="M 3108.70 489.00 L 1727.60 489.00 L 1727.60 1957.10 L 3108.70 1957.10 L 3108.70 489.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="254" stroke="none" target-height="1468.1" target-width="1381.1" target-x="1727.6" target-y="489"/><path d="M 2993.00 1841.40 L 2993.00 604.70 L 1843.30 604.70 L 1843.30 1841.40 L 2993.00 1841.40 Z" fill="#ffffff" fill-rule="nonzero" node-id="256" stroke="none" target-height="1236.7" target-width="1149.7" target-x="1843.3" target-y="604.7"/><path d="M 2714.20 1541.30 L 2714.20 904.20 L 2121.90 904.20 L 2121.90 1541.30 L 2714.20 1541.30 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="258" stroke="none" target-height="637.10004" target-width="592.30005" target-x="2121.9" target-y="904.2"/><path d="M 9780.60 660.00 L 8538.70 660.00 L 8538.70 2023.90 L 9780.60 2023.90 L 9780.60 660.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="260" stroke="none" target-height="1363.9" target-width="1241.8994" target-x="8538.7" target-y="660"/><path d="M 9915.20 660.00 L 8632.40 660.00 L 8632.40 2023.90 L 9915.20 2023.90 L 9915.20 660.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="262" stroke="none" target-height="1363.9" target-width="1282.7998" target-x="8632.4" target-y="660"/><path d="M 9807.80 1916.30 L 9807.80 767.60 L 8740.00 767.60 L 8740.00 1916.30 L 9807.80 1916.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="264" stroke="none" target-height="1148.7001" target-width="1067.7998" target-x="8740" target-y="767.6"/><path d="M 9273.80 1675.20 L 9287.60 1674.90 L 9301.30 1674.00 L 9314.70 1672.70 L 9327.90 1670.80 L 9340.90 1668.40 L 9353.90 1665.40 L 9366.70 1662.00 L 9379.20 1658.10 L 9391.40 1653.80 L 9403.50 1649.00 L 9415.40 1643.70 L 9427.00 1637.90 L 9438.30 1631.80 L 9449.30 1625.20 L 9460.10 1618.20 L 9470.60 1610.80 L 9480.80 1603.10 L 9490.60 1594.90 L 9500.20 1586.40 L 9509.40 1577.60 L 9518.30 1568.30 L 9526.80 1558.80 L 9534.90 1548.90 L 9542.70 1538.70 L 9550.10 1528.20 L 9557.10 1517.50 L 9563.60 1506.40 L 9569.80 1495.10 L 9575.50 1483.50 L 9580.80 1471.60 L 9585.60 1459.60 L 9590.00 1447.30 L 9593.90 1434.80 L 9597.30 1422.10 L 9600.20 1409.10 L 9602.60 1396.10 L 9604.50 1382.80 L 9605.90 1369.40 L 9606.70 1355.80 L 9607.00 1341.90 L 9606.70 1328.10 L 9605.90 1314.40 L 9604.50 1301.00 L 9602.60 1287.80 L 9600.20 1274.80 L 9597.30 1261.80 L 9593.90 1249.00 L 9590.00 1236.50 L 9585.60 1224.30 L 9580.80 1212.20 L 9575.50 1200.30 L 9569.80 1188.80 L 9563.60 1177.40 L 9557.10 1166.40 L 9550.10 1155.60 L 9542.70 1145.10 L 9534.90 1134.90 L 9526.80 1125.10 L 9518.30 1115.50 L 9509.40 1106.30 L 9500.20 1097.40 L 9490.60 1088.90 L 9480.80 1080.80 L 9470.60 1073.00 L 9460.10 1065.60 L 9449.30 1058.60 L 9438.30 1052.10 L 9427.00 1045.90 L 9415.40 1040.20 L 9403.50 1034.90 L 9391.40 1030.10 L 9379.20 1025.70 L 9366.70 1021.80 L 9353.90 1018.40 L 9340.90 1015.50 L 9327.90 1013.10 L 9314.70 1011.20 L 9301.30 1009.80 L 9287.60 1009.00 L 9273.80 1008.70 L 9259.90 1009.00 L 9246.30 1009.80 L 9232.90 1011.20 L 9219.70 1013.10 L 9206.60 1015.50 L 9193.60 1018.40 L 9180.90 1021.80 L 9168.40 1025.70 L 9156.10 1030.10 L 9144.10 1034.90 L 9132.20 1040.20 L 9120.60 1045.90 L 9109.30 1052.10 L 9098.20 1058.60 L 9087.50 1065.60 L 9077.00 1073.00 L 9066.80 1080.80 L 9056.90 1088.90 L 9047.40 1097.40 L 9038.20 1106.30 L 9029.30 1115.50 L 9020.80 1125.10 L 9012.60 1134.90 L 9004.90 1145.10 L 8997.50 1155.60 L 8990.50 1166.40 L 8983.90 1177.40 L 8977.80 1188.80 L 8972.10 1200.30 L 8966.70 1212.20 L 8961.90 1224.30 L 8957.60 1236.50 L 8953.70 1249.00 L 8950.30 1261.80 L 8947.30 1274.80 L 8944.90 1287.80 L 8943.00 1301.00 L 8941.70 1314.40 L 8940.90 1328.10 L 8940.60 1341.90 L 8940.90 1355.80 L 8941.70 1369.40 L 8943.00 1382.80 L 8944.90 1396.10 L 8947.30 1409.10 L 8950.30 1422.10 L 8953.70 1434.80 L 8957.60 1447.30 L 8961.90 1459.60 L 8966.70 1471.60 L 8972.10 1483.50 L 8977.80 1495.10 L 8983.90 1506.40 L 8990.50 1517.50 L 8997.50 1528.20 L 9004.90 1538.70 L 9012.60 1548.90 L 9020.80 1558.80 L 9029.30 1568.30 L 9038.20 1577.60 L 9047.40 1586.40 L 9056.90 1594.90 L 9066.80 1603.10 L 9077.00 1610.80 L 9087.50 1618.20 L 9098.20 1625.20 L 9109.30 1631.80 L 9120.60 1637.90 L 9132.20 1643.70 L 9144.10 1649.00 L 9156.10 1653.80 L 9168.40 1658.10 L 9180.90 1662.00 L 9193.60 1665.40 L 9206.60 1668.40 L 9219.70 1670.80 L 9232.90 1672.70 L 9246.30 1674.00 L 9259.90 1674.90 L 9273.80 1675.20 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="266" stroke="none" target-height="666.49994" target-width="666.4004" target-x="8940.6" target-y="1008.7"/><path d="M 4352.80 1364.40 L 3361.00 1364.40 L 3361.00 2453.50 L 4352.80 2453.50 L 4352.80 1364.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="268" stroke="none" target-height="1089.1" target-width="991.7998" target-x="3361" target-y="1364.4"/><path d="M 4460.10 1364.40 L 3435.70 1364.40 L 3435.70 2453.50 L 4460.10 2453.50 L 4460.10 1364.40 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="270" stroke="none" target-height="1089.1" target-width="1024.4001" target-x="3435.7" target-y="1364.4"/><path d="M 4374.30 2367.60 L 4374.30 1450.20 L 3521.60 1450.20 L 3521.60 2367.60 L 4374.30 2367.60 Z" fill="#ffffff" fill-rule="nonzero" node-id="272" stroke="none" target-height="917.40015" target-width="852.6997" target-x="3521.6" target-y="1450.2"/><path d="M 3948.00 1676.80 L 3714.80 2080.90 L 4181.30 2080.90 L 3948.00 1676.80 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="274" stroke="none" target-height="404.09985" target-width="466.49976" target-x="3714.8" target-y="1676.8"/><path d="M 5963.10 8886.40 L 6122.80 8886.30 L 6435.90 8885.00 L 6591.50 8883.90 L 6895.10 8880.90 L 7045.70 8879.00 L 7338.30 8874.30 L 7483.20 8871.50 L 7763.20 8865.20 L 7901.60 8861.60 L 8167.50 8853.80 L 8298.60 8849.50 L 8548.80 8840.30 L 8671.90 8835.30 L 8904.80 8824.80 L 9019.10 8819.10 L 9233.30 8807.30 L 9337.90 8801.00 L 9531.70 8788.20 L 9626.00 8781.30 L 9714.70 8774.30 L 9798.00 8767.40 L 9881.10 8759.90 L 9958.20 8752.50 L 10029.60 8745.10 L 10083.70 8739.10 L 10134.00 8733.20 L 10180.90 8727.30 L 10224.40 8721.50 L 10269.00 8715.10 L 10309.60 8708.90 L 10346.50 8702.70 L 10379.90 8696.70 L 10407.90 8691.20 L 10433.10 8685.90 L 10455.70 8680.70 L 10475.90 8675.70 L 10493.80 8670.80 L 10510.40 8665.90 L 10524.70 8661.10 L 10537.00 8656.60 L 10547.60 8652.20 L 10556.50 8648.00 L 10563.90 8644.00 L 10570.50 8639.90 L 10575.70 8636.10 L 10582.90 8629.00 L 10585.10 8625.70 L 10586.60 8622.50 L 10587.50 8619.40 L 10587.80 8616.40 L 10587.50 8613.40 L 10586.60 8610.30 L 10585.10 8607.10 L 10582.90 8603.80 L 10579.80 8600.40 L 10570.50 8592.90 L 10563.90 8588.80 L 10556.50 8584.80 L 10547.60 8580.60 L 10524.70 8571.70 L 10510.40 8566.90 L 10475.90 8557.10 L 10455.70 8552.10 L 10433.10 8546.90 L 10407.90 8541.60 L 10346.50 8530.10 L 10269.00 8517.70 L 10224.40 8511.30 L 10180.90 8505.50 L 10083.70 8493.70 L 10029.60 8487.70 L 9958.20 8480.30 L 9881.10 8472.90 L 9798.00 8465.40 L 9714.70 8458.50 L 9626.00 8451.60 L 9531.70 8444.70 L 9337.90 8431.80 L 9233.30 8425.50 L 9019.10 8413.70 L 8904.80 8408.10 L 8671.90 8397.50 L 8548.80 8392.50 L 8298.60 8383.30 L 8167.50 8379.00 L 7901.60 8371.20 L 7763.20 8367.60 L 7483.20 8361.30 L 7193.40 8356.10 L 7045.70 8353.80 L 6744.50 8350.20 L 6591.50 8348.90 L 6280.40 8347.00 L 6122.80 8346.60 L 5963.10 8346.40 L 5645.80 8347.00 L 5490.20 8347.80 L 5181.60 8350.20 L 5031.00 8351.90 L 4732.70 8356.10 L 4587.80 8358.50 L 4301.30 8364.40 L 4024.60 8371.20 L 3889.80 8375.00 L 3627.60 8383.30 L 3500.50 8387.80 L 3254.30 8397.50 L 3135.60 8402.70 L 2907.10 8413.70 L 2797.70 8419.60 L 2588.20 8431.80 L 2488.80 8438.20 L 2394.40 8444.70 L 2300.10 8451.60 L 2211.50 8458.50 L 2128.20 8465.40 L 2045.00 8472.90 L 1967.90 8480.30 L 1896.50 8487.70 L 1842.50 8493.70 L 1745.30 8505.50 L 1701.80 8511.30 L 1657.20 8517.70 L 1616.60 8524.00 L 1579.70 8530.10 L 1546.30 8536.10 L 1518.30 8541.60 L 1493.00 8546.90 L 1450.20 8557.10 L 1432.30 8562.00 L 1415.80 8566.90 L 1401.40 8571.70 L 1389.10 8576.30 L 1378.60 8580.60 L 1369.70 8584.80 L 1362.20 8588.80 L 1355.70 8592.90 L 1350.40 8596.70 L 1346.40 8600.40 L 1343.30 8603.80 L 1339.50 8610.30 L 1338.70 8613.40 L 1338.40 8616.40 L 1338.70 8619.40 L 1339.50 8622.50 L 1341.00 8625.70 L 1343.30 8629.00 L 1346.40 8632.40 L 1350.40 8636.10 L 1355.70 8639.90 L 1362.20 8644.00 L 1369.70 8648.00 L 1378.60 8652.20 L 1389.10 8656.60 L 1401.40 8661.10 L 1415.80 8665.90 L 1432.30 8670.80 L 1450.20 8675.70 L 1470.40 8680.70 L 1493.00 8685.90 L 1518.30 8691.20 L 1546.30 8696.70 L 1579.70 8702.70 L 1616.60 8708.90 L 1657.20 8715.10 L 1701.80 8721.50 L 1745.30 8727.30 L 1842.50 8739.10 L 1896.50 8745.10 L 1967.90 8752.50 L 2045.00 8759.90 L 2128.20 8767.40 L 2211.50 8774.30 L 2300.10 8781.30 L 2394.40 8788.20 L 2588.20 8801.00 L 2692.90 8807.30 L 2907.10 8819.10 L 3021.30 8824.80 L 3254.30 8835.30 L 3377.30 8840.30 L 3627.60 8849.50 L 3758.70 8853.80 L 4024.60 8861.60 L 4162.90 8865.20 L 4443.00 8871.50 L 4587.80 8874.30 L 4880.50 8879.00 L 5031.00 8880.90 L 5334.70 8883.90 L 5490.20 8885.00 L 5803.40 8886.30 L 5963.10 8886.40 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="276" stroke="none" target-height="540" target-width="9249.399" target-x="1338.4" target-y="8346.4"/><path d="M 8330.40 2586.30 L 8093.80 2490.90 L 8060.60 2550.30 L 8037.30 2591.30 L 7978.20 2693.20 L 7944.20 2750.10 L 7908.50 2808.40 L 7872.20 2866.10 L 7853.90 2894.30 L 7836.00 2921.20 L 7818.10 2947.50 L 7801.10 2971.80 L 7784.00 2995.10 L 7768.30 3015.80 L 7757.60 3029.20 L 7738.50 3051.40 L 7729.00 3061.50 L 7720.40 3069.80 L 7712.80 3076.50 L 7706.60 3081.30 L 7701.10 3084.90 L 7692.10 3089.10 L 7671.20 3096.10 L 7622.00 3113.60 L 7473.20 3168.60 L 7441.10 3180.10 L 7376.20 3202.50 L 7322.70 3219.70 L 7281.50 3231.80 L 7261.00 3237.40 L 7241.30 3242.30 L 7222.50 3246.60 L 7203.60 3250.50 L 7185.90 3253.70 L 7169.30 3256.10 L 7165.00 3261.70 L 7160.00 3269.10 L 7155.10 3277.20 L 7144.90 3296.40 L 7135.30 3317.40 L 7131.10 3328.10 L 7127.20 3338.70 L 7124.00 3348.70 L 7121.40 3358.40 L 7119.70 3366.90 L 7119.00 3372.50 L 7119.00 3381.10 L 7131.50 3385.00 L 7144.80 3388.50 L 7158.90 3391.80 L 7173.80 3394.70 L 7188.50 3397.10 L 7203.90 3399.20 L 7219.90 3400.90 L 7236.60 3402.40 L 7258.70 3403.70 L 7281.50 3404.60 L 7305.30 3404.80 L 7329.00 3404.60 L 7353.20 3403.80 L 7377.90 3402.60 L 7402.60 3400.90 L 7427.40 3398.80 L 7452.40 3396.20 L 7477.30 3393.30 L 7526.70 3386.50 L 7551.20 3382.50 L 7598.80 3373.80 L 7622.30 3369.00 L 7666.60 3358.90 L 7688.30 3353.50 L 7708.80 3347.90 L 7728.20 3342.40 L 7747.50 3336.50 L 7765.20 3330.60 L 7781.40 3324.80 L 7797.60 3318.60 L 7811.80 3312.60 L 7824.30 3306.80 L 7841.90 3297.40 L 7854.80 3289.00 L 7866.10 3280.30 L 7877.60 3270.80 L 7889.40 3260.50 L 7913.00 3238.00 L 7936.70 3213.40 L 7948.80 3200.00 L 7964.50 3181.90 L 7980.30 3162.90 L 7996.20 3142.90 L 8027.50 3101.70 L 8058.40 3058.30 L 8088.60 3013.70 L 8110.70 2979.70 L 8132.20 2945.60 L 8153.20 2911.50 L 8192.70 2844.70 L 8228.50 2781.40 L 8260.10 2723.50 L 8297.50 2652.10 L 8315.40 2616.90 L 8330.40 2586.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="278" stroke="none" target-height="913.90015" target-width="1211.4004" target-x="7119" target-y="2490.9"/><path d="M 8403.20 2456.80 L 8405.10 2464.90 L 8406.60 2473.40 L 8408.40 2491.20 L 8408.60 2500.70 L 8408.30 2512.30 L 8407.50 2524.30 L 8406.10 2536.80 L 8401.60 2562.40 L 8395.20 2588.60 L 8391.30 2602.20 L 8385.60 2620.00 L 8379.30 2638.10 L 8372.30 2656.40 L 8364.80 2674.50 L 8356.90 2692.60 L 8340.00 2728.50 L 8322.30 2763.20 L 8308.50 2788.50 L 8295.00 2812.40 L 8281.40 2835.50 L 8256.10 2876.40 L 8234.30 2909.80 L 8208.30 2947.40 L 7895.10 2771.90 L 7923.80 2708.00 L 7944.00 2664.60 L 7968.20 2613.80 L 7995.60 2558.20 L 8010.20 2529.40 L 8025.40 2500.00 L 8033.40 2485.10 L 8041.50 2471.10 L 8049.80 2458.00 L 8058.30 2445.60 L 8066.90 2434.00 L 8076.10 2422.40 L 8085.40 2411.60 L 8094.70 2401.60 L 8104.10 2392.30 L 8113.50 2383.70 L 8123.50 2375.40 L 8133.50 2367.70 L 8143.40 2360.80 L 8153.30 2354.60 L 8163.10 2349.00 L 8173.40 2343.80 L 8183.60 2339.30 L 8193.70 2335.40 L 8203.70 2332.20 L 8213.50 2329.60 L 8223.70 2327.50 L 8233.70 2326.10 L 8243.50 2325.20 L 8253.20 2325.00 L 8262.70 2325.40 L 8272.20 2326.30 L 8281.60 2327.90 L 8290.70 2330.10 L 8299.60 2332.80 L 8308.30 2336.20 L 8322.30 2343.00 L 8329.10 2347.00 L 8342.10 2356.40 L 8348.40 2361.80 L 8354.30 2367.30 L 8360.00 2373.40 L 8365.50 2379.80 L 8370.70 2386.70 L 8375.80 2394.10 L 8380.70 2402.00 L 8385.10 2409.90 L 8389.20 2418.20 L 8396.70 2436.40 L 8400.10 2446.30 L 8403.20 2456.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="280" stroke="none" target-height="622.3999" target-width="513.4995" target-x="7895.1" target-y="2325"/><g node-id="588"><path d="M 8403.20 2456.80 L 8405.10 2464.90 L 8406.60 2473.40 L 8408.40 2491.20 L 8408.60 2500.70 L 8408.30 2512.30 L 8407.50 2524.30 L 8406.10 2536.80 L 8401.60 2562.40 L 8395.20 2588.60 L 8391.30 2602.20 L 8385.60 2620.00 L 8379.30 2638.10 L 8372.30 2656.40 L 8364.80 2674.50 L 8356.90 2692.60 L 8340.00 2728.50 L 8322.30 2763.20 L 8308.50 2788.50 L 8295.00 2812.40 L 8281.40 2835.50 L 8256.10 2876.40 L 8234.30 2909.80 L 8208.30 2947.40 L 7895.10 2771.90 L 7923.80 2708.00 L 7944.00 2664.60 L 7968.20 2613.80 L 7995.60 2558.20 L 8010.20 2529.40 L 8025.40 2500.00 L 8033.40 2485.10 L 8041.50 2471.10 L 8049.80 2458.00 L 8058.30 2445.60 L 8066.90 2434.00 L 8076.10 2422.40 L 8085.40 2411.60 L 8094.70 2401.60 L 8104.10 2392.30 L 8113.50 2383.70 L 8123.50 2375.40 L 8133.50 2367.70 L 8143.40 2360.80 L 8153.30 2354.60 L 8163.10 2349.00 L 8173.40 2343.80 L 8183.60 2339.30 L 8193.70 2335.40 L 8203.70 2332.20 L 8213.50 2329.60 L 8223.70 2327.50 L 8233.70 2326.10 L 8243.50 2325.20 L 8253.20 2325.00 L 8262.70 2325.40 L 8272.20 2326.30 L 8281.60 2327.90 L 8290.70 2330.10 L 8299.60 2332.80 L 8308.30 2336.20 L 8322.30 2343.00 L 8329.10 2347.00 L 8342.10 2356.40 L 8348.40 2361.80 L 8354.30 2367.30 L 8360.00 2373.40 L 8365.50 2379.80 L 8370.70 2386.70 L 8375.80 2394.10 L 8380.70 2402.00 L 8385.10 2409.90 L 8389.20 2418.20 L 8396.70 2436.40 L 8400.10 2446.30 L 8403.20 2456.80 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="1" node-id="284" stroke="none" target-height="622.3999" target-width="513.4995" target-x="7895.1" target-y="2325"/></g><g node-id="589"><path d="M 8019.40 2842.00 L 8142.70 2911.20 L 8164.40 2532.60 L 8157.90 2538.00 L 8151.40 2544.00 L 8145.00 2550.70 L 8138.50 2558.10 L 8126.50 2573.80 L 8114.60 2591.80 L 8107.30 2604.30 L 8100.00 2617.50 L 8086.20 2645.60 L 8073.50 2674.90 L 8064.60 2697.30 L 8056.30 2719.90 L 8048.50 2742.40 L 8034.90 2785.70 L 8029.20 2805.60 L 8019.40 2842.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="2" node-id="289" stroke="none" target-height="378.59985" target-width="145" target-x="8019.4" target-y="2532.6"/></g><path d="M 8197.10 2334.20 L 8187.40 2358.10 L 8179.70 2379.00 L 8171.50 2402.80 L 8161.20 2434.70 L 8154.50 2457.10 L 8147.10 2482.80 L 8139.10 2512.20 L 8131.60 2541.80 L 8123.80 2574.70 L 8115.70 2611.30 L 8110.00 2638.50 L 8098.60 2698.60 L 8093.00 2731.60 L 8087.80 2764.10 L 8082.80 2798.40 L 8077.90 2834.70 L 8073.20 2873.00 L 8069.10 2910.70 L 8065.30 2950.20 L 8061.80 2991.70 L 8058.60 3035.20 L 8056.10 3078.00 L 8054.00 3122.70 L 8052.40 3169.30 L 8051.40 3217.90 L 8051.00 3256.10 L 8051.00 3295.40 L 8051.40 3336.00 L 8052.30 3377.80 L 8053.60 3420.80 L 8055.40 3463.00 L 8057.60 3506.40 L 8060.40 3550.90 L 8063.70 3596.70 L 8067.60 3643.80 L 8071.90 3689.90 L 8076.80 3737.20 L 8082.40 3785.70 L 8088.60 3835.50 L 8095.50 3886.50 L 9056.00 3886.50 L 9057.90 3858.10 L 9058.60 3838.10 L 9059.20 3806.80 L 9060.00 3627.40 L 9061.20 3511.70 L 9062.50 3447.50 L 9065.10 3358.60 L 9069.10 3263.40 L 9074.90 3163.10 L 9078.50 3112.10 L 9082.70 3059.70 L 9087.50 3005.90 L 9095.70 2924.90 L 9100.40 2883.40 L 9111.00 2799.60 L 9123.40 2714.80 L 9130.30 2671.70 L 9137.50 2628.90 L 9145.40 2585.80 L 9153.70 2542.50 L 9162.60 2498.90 L 9172.00 2455.60 L 9181.90 2412.20 L 9192.50 2368.70 L 9203.70 2325.10 L 9172.00 2319.20 L 9140.30 2313.60 L 9108.50 2308.50 L 9076.70 2303.80 L 9044.80 2299.50 L 9012.80 2295.60 L 8980.80 2292.20 L 8948.70 2289.10 L 8884.50 2284.30 L 8843.70 2282.20 L 8802.90 2280.60 L 8762.10 2279.40 L 8721.30 2278.70 L 8680.50 2278.40 L 8639.60 2278.70 L 8598.80 2279.40 L 8558.00 2280.60 L 8517.20 2282.20 L 8476.40 2284.30 L 8420.00 2290.90 L 8391.80 2294.90 L 8363.80 2299.20 L 8335.80 2304.00 L 8307.90 2309.20 L 8280.10 2314.80 L 8252.30 2320.90 L 8224.70 2327.30 L 8197.10 2334.20 Z" fill="#429cfd" fill-rule="nonzero" node-id="292" stroke="none" target-height="1608.1001" target-width="1152.7002" target-x="8051" target-y="2278.4"/><g node-id="590"><path d="M 8197.10 2334.20 L 8187.40 2358.10 L 8179.70 2379.00 L 8171.50 2402.80 L 8161.20 2434.70 L 8154.50 2457.10 L 8147.10 2482.80 L 8139.10 2512.20 L 8131.60 2541.80 L 8123.80 2574.70 L 8115.70 2611.30 L 8110.00 2638.50 L 8098.60 2698.60 L 8093.00 2731.60 L 8087.80 2764.10 L 8082.80 2798.40 L 8077.90 2834.70 L 8073.20 2873.00 L 8069.10 2910.70 L 8065.30 2950.20 L 8061.80 2991.70 L 8058.60 3035.20 L 8056.10 3078.00 L 8054.00 3122.70 L 8052.40 3169.30 L 8051.40 3217.90 L 8051.00 3256.10 L 8051.00 3295.40 L 8051.40 3336.00 L 8052.30 3377.80 L 8053.60 3420.80 L 8055.40 3463.00 L 8057.60 3506.40 L 8060.40 3550.90 L 8063.70 3596.70 L 8067.60 3643.80 L 8071.90 3689.90 L 8076.80 3737.20 L 8082.40 3785.70 L 8088.60 3835.50 L 8095.50 3886.50 L 9056.00 3886.50 L 9057.90 3858.10 L 9058.60 3838.10 L 9059.20 3806.80 L 9060.00 3627.40 L 9061.20 3511.70 L 9062.50 3447.50 L 9065.10 3358.60 L 9069.10 3263.40 L 9074.90 3163.10 L 9078.50 3112.10 L 9082.70 3059.70 L 9087.50 3005.90 L 9095.70 2924.90 L 9100.40 2883.40 L 9111.00 2799.60 L 9123.40 2714.80 L 9130.30 2671.70 L 9137.50 2628.90 L 9145.40 2585.80 L 9153.70 2542.50 L 9162.60 2498.90 L 9172.00 2455.60 L 9181.90 2412.20 L 9192.50 2368.70 L 9203.70 2325.10 L 9172.00 2319.20 L 9140.30 2313.60 L 9108.50 2308.50 L 9076.70 2303.80 L 9044.80 2299.50 L 9012.80 2295.60 L 8980.80 2292.20 L 8948.70 2289.10 L 8884.50 2284.30 L 8843.70 2282.20 L 8802.90 2280.60 L 8762.10 2279.40 L 8721.30 2278.70 L 8680.50 2278.40 L 8639.60 2278.70 L 8598.80 2279.40 L 8558.00 2280.60 L 8517.20 2282.20 L 8476.40 2284.30 L 8420.00 2290.90 L 8391.80 2294.90 L 8363.80 2299.20 L 8335.80 2304.00 L 8307.90 2309.20 L 8280.10 2314.80 L 8252.30 2320.90 L 8224.70 2327.30 L 8197.10 2334.20 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="3" node-id="296" stroke="none" target-height="1608.1001" target-width="1152.7002" target-x="8051" target-y="2278.4"/></g><g node-id="591"><path d="M 7974.30 8637.90 L 7974.50 8639.00 L 7975.10 8640.10 L 7976.40 8641.40 L 7987.00 8646.30 L 7995.70 8648.70 L 8007.90 8651.30 L 8041.00 8656.50 L 8084.40 8661.40 L 8121.00 8664.60 L 8164.60 8667.90 L 8210.50 8670.70 L 8262.60 8673.50 L 8316.70 8675.90 L 8376.20 8678.10 L 8437.40 8679.90 L 8503.10 8681.50 L 8570.30 8682.70 L 8641.10 8683.60 L 8787.70 8684.40 L 8934.40 8683.60 L 9072.60 8681.50 L 9138.50 8679.90 L 9199.90 8678.10 L 9314.10 8673.50 L 9366.50 8670.70 L 9412.80 8667.90 L 9456.80 8664.60 L 9493.70 8661.40 L 9537.70 8656.50 L 9554.50 8654.10 L 9571.30 8651.30 L 9583.80 8648.70 L 9598.90 8644.10 L 9602.70 8642.30 L 9605.00 8640.60 L 9606.10 8639.20 L 9606.50 8637.90 L 9606.30 8636.80 L 9605.70 8635.60 L 9604.40 8634.30 L 9602.20 8632.90 L 9598.80 8631.30 L 9593.80 8629.50 L 9572.90 8624.50 L 9556.40 8621.60 L 9520.00 8616.90 L 9496.50 8614.40 L 9459.90 8611.20 L 9416.30 8608.00 L 9370.40 8605.10 L 9318.30 8602.40 L 9264.20 8600.00 L 9204.70 8597.90 L 9077.80 8594.50 L 8939.80 8592.30 L 8793.20 8591.60 L 8646.40 8592.30 L 8575.50 8593.30 L 8508.20 8594.50 L 8442.30 8596.10 L 8380.90 8597.90 L 8321.10 8600.10 L 8266.70 8602.50 L 8214.30 8605.20 L 8168.00 8608.10 L 8124.10 8611.30 L 8087.20 8614.50 L 8043.20 8619.40 L 8026.40 8621.70 L 8009.60 8624.50 L 7997.00 8627.20 L 7988.00 8629.60 L 7982.00 8631.70 L 7978.10 8633.50 L 7975.90 8635.20 L 7974.70 8636.60 L 7974.30 8637.90 Z" fill="#e8ecf1" fill-rule="nonzero" group-id="4" node-id="301" stroke="none" target-height="92.80078" target-width="1632.2002" target-x="7974.3" target-y="8591.6"/></g><path d="M 8615.50 7961.00 L 8445.10 8027.00 L 8591.90 8406.10 L 8762.20 8340.10 L 8615.50 7961.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="304" stroke="none" target-height="445.0996" target-width="317.1006" target-x="8445.1" target-y="7961"/><path d="M 9375.20 8454.50 L 9195.50 8454.50 L 9129.70 8038.70 L 9309.30 8038.70 L 9375.20 8454.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="306" stroke="none" target-height="415.7998" target-width="245.5" target-x="9129.7" target-y="8038.7"/><path d="M 9183.10 8433.70 L 9384.90 8433.70 L 9387.50 8433.90 L 9390.00 8434.60 L 9394.50 8437.20 L 9396.30 8439.10 L 9397.80 8441.20 L 9398.80 8443.60 L 9399.50 8446.10 L 9425.50 8605.70 L 9425.70 8609.70 L 9424.50 8617.60 L 9423.10 8621.40 L 9415.80 8630.90 L 9412.60 8633.30 L 9409.10 8635.20 L 9405.30 8636.60 L 9401.40 8637.40 L 9397.30 8637.60 L 9369.10 8637.00 L 9269.10 8633.00 L 9239.30 8632.40 L 9204.40 8632.20 L 9177.70 8632.50 L 9145.60 8633.30 L 9033.30 8636.70 L 8996.00 8637.60 L 8961.60 8637.90 L 8954.40 8637.60 L 8941.80 8636.00 L 8930.90 8632.90 L 8925.90 8630.90 L 8921.40 8628.60 L 8917.40 8626.10 L 8913.50 8623.30 L 8910.00 8620.30 L 8907.00 8617.20 L 8904.30 8614.00 L 8898.50 8604.60 L 8896.60 8599.80 L 8895.10 8594.80 L 8894.30 8590.00 L 8894.10 8580.60 L 8894.70 8576.20 L 8895.80 8572.20 L 8897.50 8568.30 L 8899.50 8564.90 L 8904.10 8560.10 L 8906.50 8558.60 L 8909.10 8557.40 L 8911.90 8556.50 L 8935.20 8551.20 L 8956.30 8545.90 L 8975.30 8540.50 L 8994.10 8534.70 L 9011.20 8528.80 L 9041.60 8516.70 L 9067.70 8504.40 L 9079.90 8497.80 L 9101.10 8484.90 L 9111.10 8478.20 L 9128.90 8465.00 L 9153.30 8444.90 L 9156.50 8442.30 L 9159.90 8440.10 L 9163.50 8438.20 L 9171.10 8435.30 L 9179.00 8433.90 L 9183.10 8433.70 Z" fill="#263238" fill-rule="nonzero" node-id="308" stroke="none" target-height="204.2002" target-width="531.6006" target-x="8894.1" target-y="8433.7"/><path d="M 8586.80 8372.20 L 8777.70 8316.40 L 8782.80 8315.80 L 8785.40 8316.20 L 8787.90 8317.00 L 8790.30 8318.20 L 8792.30 8319.80 L 8795.50 8324.00 L 8867.10 8467.10 L 8868.50 8470.80 L 8869.60 8478.70 L 8869.30 8482.60 L 8868.40 8486.50 L 8867.00 8490.20 L 8865.00 8493.70 L 8859.70 8499.60 L 8856.50 8501.90 L 8853.00 8503.70 L 8849.20 8505.00 L 8722.20 8539.50 L 8646.50 8561.10 L 8631.50 8565.60 L 8601.40 8575.90 L 8578.80 8584.20 L 8511.10 8610.10 L 8488.60 8618.30 L 8466.40 8625.70 L 8460.40 8627.40 L 8453.60 8629.10 L 8445.70 8630.60 L 8433.60 8632.50 L 8406.00 8635.50 L 8376.10 8637.40 L 8360.80 8638.10 L 8330.90 8638.90 L 8303.10 8639.20 L 8279.10 8639.30 L 8272.20 8639.10 L 8259.70 8637.40 L 8254.20 8636.00 L 8248.60 8634.10 L 8243.50 8632.00 L 8234.50 8627.10 L 8224.10 8619.00 L 8216.10 8609.70 L 8212.90 8604.90 L 8210.40 8600.00 L 8208.30 8594.90 L 8206.80 8590.00 L 8205.80 8585.30 L 8205.40 8580.50 L 8205.50 8576.20 L 8206.10 8572.20 L 8206.90 8569.30 L 8208.00 8566.70 L 8209.40 8564.50 L 8211.10 8562.50 L 8213.00 8560.80 L 8215.20 8559.50 L 8217.80 8558.60 L 8220.70 8558.00 L 8293.40 8550.60 L 8309.10 8548.20 L 8316.30 8546.50 L 8323.40 8544.50 L 8330.60 8542.10 L 8338.30 8539.00 L 8373.40 8522.80 L 8391.00 8514.10 L 8408.30 8504.80 L 8425.30 8495.00 L 8441.90 8484.60 L 8458.20 8473.80 L 8474.20 8462.40 L 8489.80 8450.50 L 8505.00 8438.00 L 8519.80 8425.20 L 8534.20 8411.80 L 8552.20 8393.60 L 8556.50 8389.60 L 8561.00 8385.90 L 8565.80 8382.50 L 8575.90 8376.60 L 8586.80 8372.20 Z" fill="#263238" fill-rule="nonzero" node-id="310" stroke="none" target-height="323.5" target-width="664.1992" target-x="8205.4" target-y="8315.8"/><path d="M 7199.30 3255.10 L 7001.80 3172.40 L 6920.50 3391.30 L 6940.80 3394.10 L 6961.10 3396.50 L 6981.50 3398.30 L 7001.80 3399.50 L 7022.20 3400.30 L 7042.60 3400.60 L 7063.10 3400.30 L 7083.40 3399.50 L 7103.80 3398.30 L 7124.10 3396.50 L 7144.50 3394.10 L 7164.80 3391.30 L 7199.30 3255.10 Z" fill="#e58a7b" fill-rule="nonzero" node-id="312" stroke="none" target-height="228.2002" target-width="278.7998" target-x="6920.5" target-y="3172.4"/><path d="M 6854.90 3166.60 L 6849.70 3312.10 L 6920.50 3390.80 L 7001.80 3171.90 L 6854.90 3166.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="314" stroke="none" target-height="224.19995" target-width="152.09961" target-x="6849.7" target-y="3166.6"/><path d="M 8638.80 7993.20 L 8467.90 8059.20 L 8543.60 8255.20 L 8714.50 8189.20 L 8638.80 7993.20 Z" fill="#cf6f64" fill-rule="nonzero" node-id="316" stroke="none" target-height="262" target-width="246.59961" target-x="8467.9" target-y="7993.2"/><path d="M 9309.30 8038.70 L 9129.70 8038.70 L 9163.80 8253.10 L 9343.40 8253.10 L 9309.30 8038.70 Z" fill="#cf6f64" fill-rule="nonzero" node-id="318" stroke="none" target-height="214.39941" target-width="213.7002" target-x="9129.7" target-y="8038.7"/><g node-id="592"><path d="M 8064.90 3613.40 L 8070.80 3678.90 L 8077.80 3746.00 L 8808.60 3508.90 L 8825.00 3503.10 L 8841.10 3496.80 L 8857.00 3490.00 L 8872.60 3482.60 L 8888.00 3474.70 L 8903.00 3466.30 L 8917.80 3457.50 L 8932.20 3448.10 L 8946.30 3438.30 L 8960.10 3427.90 L 8973.50 3417.20 L 8986.50 3406.00 L 8999.20 3394.30 L 9011.50 3382.20 L 9023.40 3369.70 L 9034.90 3356.70 L 9045.90 3343.40 L 9056.50 3329.70 L 9066.70 3315.50 L 9071.70 3217.50 L 9074.90 3167.00 L 9082.60 3063.40 L 9087.00 3010.90 L 9090.50 2974.50 L 9098.90 2898.80 L 8064.90 3613.40 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="5" node-id="322" stroke="none" target-height="847.19995" target-width="1034.0005" target-x="8064.9" target-y="2898.8"/></g><path d="M 8298.20 2831.00 L 8274.40 2828.20 L 8276.20 2815.40 L 8278.50 2802.90 L 8281.40 2790.70 L 8284.80 2778.80 L 8288.70 2767.00 L 8293.10 2755.60 L 8297.90 2744.50 L 8303.10 2733.80 L 8308.90 2723.30 L 8315.00 2713.20 L 8321.40 2703.60 L 8328.20 2694.40 L 8335.50 2685.40 L 8343.00 2677.00 L 8350.70 2669.10 L 8358.80 2661.80 L 8367.20 2654.70 L 8375.80 2648.30 L 8384.60 2642.50 L 8393.60 2637.20 L 8402.90 2632.40 L 8412.30 2628.30 L 8421.80 2624.80 L 8431.50 2622.00 L 8439.30 2620.20 L 8447.20 2618.80 L 8463.10 2617.40 L 8471.20 2617.30 L 8471.20 2641.20 L 8462.90 2641.30 L 8454.80 2642.00 L 8446.80 2643.20 L 8438.70 2644.90 L 8430.70 2647.20 L 8422.90 2650.00 L 8415.20 2653.20 L 8407.60 2657.00 L 8400.10 2661.20 L 8392.70 2665.90 L 8385.50 2671.00 L 8378.60 2676.40 L 8371.80 2682.30 L 8358.70 2695.40 L 8346.70 2709.70 L 8335.60 2725.50 L 8330.40 2733.90 L 8325.70 2742.50 L 8321.20 2751.40 L 8317.10 2760.50 L 8309.70 2779.70 L 8306.60 2789.60 L 8303.90 2799.60 L 8301.60 2809.80 L 8299.70 2820.30 L 8298.20 2831.00 Z" fill="#ffffff" fill-rule="nonzero" node-id="325" stroke="none" target-height="213.69995" target-width="196.7998" target-x="8274.4" target-y="2617.3"/><path d="M 8425.40 3051.20 L 8421.30 3051.20 L 8421.30 3027.30 L 8435.30 3027.00 L 8449.10 3025.00 L 8456.00 3023.40 L 8464.40 3020.90 L 8472.70 3017.80 L 8480.90 3014.10 L 8489.00 3009.80 L 8496.80 3005.10 L 8504.50 2999.90 L 8512.00 2994.10 L 8526.30 2981.10 L 8539.60 2966.40 L 8546.00 2958.40 L 8551.90 2950.10 L 8562.80 2932.30 L 8572.40 2913.20 L 8576.60 2903.30 L 8580.40 2893.00 L 8583.80 2882.40 L 8586.80 2871.70 L 8589.30 2860.80 L 8591.40 2849.60 L 8593.00 2838.20 L 8616.90 2841.10 L 8615.20 2853.50 L 8613.10 2865.80 L 8610.40 2877.70 L 8607.20 2889.40 L 8603.40 2901.00 L 8599.30 2912.20 L 8594.70 2923.10 L 8589.60 2933.70 L 8584.10 2944.10 L 8578.20 2954.10 L 8572.00 2963.60 L 8565.40 2972.70 L 8558.40 2981.60 L 8551.10 2989.90 L 8543.50 2997.80 L 8535.70 3005.20 L 8527.50 3012.20 L 8519.10 3018.70 L 8510.50 3024.60 L 8501.70 3029.90 L 8492.60 3034.80 L 8483.30 3039.00 L 8474.00 3042.70 L 8464.50 3045.70 L 8456.80 3047.60 L 8449.00 3049.20 L 8441.20 3050.30 L 8433.30 3051.00 L 8425.40 3051.20 Z" fill="#ffffff" fill-rule="nonzero" node-id="327" stroke="none" target-height="213" target-width="195.60059" target-x="8421.3" target-y="2838.2"/><path d="M 8871.20 1824.70 L 8865.60 1847.20 L 8859.90 1872.20 L 8854.50 1898.00 L 8846.10 1944.30 L 8840.40 1982.80 L 8838.00 2002.40 L 8836.00 2022.00 L 8834.40 2041.60 L 8833.20 2061.30 L 8832.40 2080.80 L 8832.20 2099.90 L 8832.40 2114.30 L 8833.90 2142.10 L 8835.10 2155.50 L 8836.70 2168.90 L 8838.80 2181.90 L 8841.20 2194.30 L 8844.00 2206.20 L 8846.70 2215.80 L 8849.60 2224.90 L 8852.90 2233.60 L 8856.40 2241.90 L 8860.10 2249.80 L 8864.40 2257.70 L 8868.90 2265.00 L 8873.80 2271.90 L 8879.00 2278.30 L 8884.50 2284.30 L 8879.20 2293.80 L 8874.20 2301.20 L 8865.70 2312.10 L 8859.80 2318.90 L 8853.60 2325.40 L 8846.40 2332.40 L 8837.80 2339.90 L 8831.30 2345.30 L 8824.10 2350.70 L 8816.10 2356.30 L 8807.30 2362.10 L 8798.60 2367.40 L 8789.10 2372.60 L 8778.60 2377.90 L 8767.30 2383.10 L 8756.10 2387.80 L 8744.00 2392.30 L 8730.90 2396.70 L 8716.80 2400.80 L 8702.80 2404.40 L 8687.90 2407.70 L 8671.80 2410.60 L 8654.60 2413.10 L 8641.20 2414.70 L 8627.10 2415.90 L 8612.20 2416.90 L 8579.90 2417.70 L 8564.40 2417.40 L 8550.60 2416.80 L 8538.20 2415.80 L 8527.20 2414.60 L 8515.80 2412.80 L 8497.10 2408.50 L 8489.50 2406.00 L 8481.70 2403.00 L 8475.00 2399.90 L 8469.30 2396.60 L 8459.90 2389.50 L 8456.00 2385.50 L 8452.80 2381.60 L 8450.30 2377.60 L 8448.10 2373.30 L 8446.50 2368.90 L 8445.40 2364.50 L 8444.70 2360.10 L 8444.40 2354.00 L 8444.80 2348.00 L 8445.70 2341.90 L 8449.00 2330.10 L 8455.00 2316.20 L 8459.10 2308.70 L 8463.40 2301.70 L 8471.10 2290.80 L 8476.40 2284.30 L 8487.70 2281.50 L 8498.20 2278.40 L 8508.00 2275.10 L 8517.00 2271.60 L 8525.40 2268.00 L 8534.00 2263.80 L 8541.90 2259.50 L 8549.30 2255.00 L 8556.00 2250.40 L 8562.30 2245.70 L 8568.40 2240.50 L 8574.10 2235.10 L 8579.20 2229.70 L 8584.00 2224.10 L 8588.30 2218.30 L 8593.30 2210.80 L 8597.80 2203.00 L 8601.70 2195.10 L 8605.10 2186.90 L 8608.00 2178.50 L 8610.40 2170.00 L 8612.40 2161.20 L 8613.90 2152.30 L 8615.10 2143.30 L 8615.90 2134.20 L 8616.40 2115.40 L 8616.00 2102.80 L 8615.20 2090.10 L 8612.20 2064.40 L 8607.80 2038.70 L 8871.20 1824.70 Z" fill="#e58a7b" fill-rule="nonzero" node-id="329" stroke="none" target-height="593" target-width="440.0996" target-x="8444.4" target-y="1824.7"/><path d="M 8763.80 1912.00 L 8608.10 2038.70 L 8610.70 2052.90 L 8612.90 2067.10 L 8614.50 2081.40 L 8615.70 2095.80 L 8616.40 2110.20 L 8619.60 2113.10 L 8622.90 2115.40 L 8626.20 2117.30 L 8633.10 2119.70 L 8637.60 2120.40 L 8642.30 2120.50 L 8647.10 2120.10 L 8652.20 2119.10 L 8657.00 2117.60 L 8662.00 2115.70 L 8667.20 2113.20 L 8672.50 2110.20 L 8679.20 2105.80 L 8686.10 2100.60 L 8693.10 2094.80 L 8706.30 2081.80 L 8712.80 2074.60 L 8725.00 2059.40 L 8736.10 2043.30 L 8741.10 2035.20 L 8745.70 2027.20 L 8749.90 2018.90 L 8756.70 2003.50 L 8759.30 1995.70 L 8761.30 1988.60 L 8764.20 1973.40 L 8765.40 1964.70 L 8766.10 1955.90 L 8766.50 1947.10 L 8766.40 1938.30 L 8766.00 1929.50 L 8765.10 1920.80 L 8763.80 1912.00 Z" fill="#cf6f64" fill-rule="nonzero" node-id="331" stroke="none" target-height="208.5" target-width="158.40039" target-x="8608.1" target-y="1912"/><path d="M 8340.20 1823.00 L 8344.40 1830.00 L 8349.00 1836.70 L 8353.90 1843.10 L 8359.20 1849.30 L 8370.50 1860.70 L 8383.10 1871.10 L 8389.70 1875.70 L 8396.60 1880.00 L 8403.70 1883.90 L 8410.90 1887.50 L 8418.40 1890.70 L 8426.00 1893.50 L 8441.60 1897.90 L 8448.90 1899.20 L 8455.60 1899.80 L 8461.90 1899.70 L 8467.70 1899.10 L 8473.60 1897.90 L 8479.00 1896.10 L 8484.00 1893.90 L 8488.70 1891.20 L 8493.10 1888.00 L 8497.10 1884.40 L 8500.70 1880.40 L 8504.00 1876.00 L 8506.90 1871.30 L 8509.40 1866.30 L 8511.50 1861.00 L 8513.20 1855.40 L 8514.50 1849.60 L 8515.40 1843.70 L 8515.90 1837.50 L 8515.90 1831.10 L 8515.60 1824.70 L 8514.70 1818.20 L 8513.50 1811.60 L 8511.70 1804.90 L 8506.90 1791.00 L 8500.30 1776.50 L 8496.40 1769.30 L 8492.10 1762.10 L 8487.50 1755.10 L 8482.50 1748.30 L 8477.20 1741.70 L 8471.50 1735.40 L 8465.60 1729.50 L 8459.40 1724.10 L 8452.80 1719.10 L 8446.10 1714.70 L 8439.10 1710.90 L 8433.60 1708.40 L 8428.10 1706.40 L 8422.40 1704.80 L 8416.60 1703.60 L 8410.80 1703.00 L 8404.80 1702.80 L 8398.70 1703.10 L 8392.40 1704.00 L 8386.30 1705.50 L 8380.30 1707.50 L 8374.50 1710.00 L 8368.90 1712.90 L 8363.50 1716.30 L 8358.40 1720.10 L 8353.60 1724.30 L 8349.20 1728.80 L 8345.20 1733.70 L 8341.60 1738.90 L 8338.30 1744.30 L 8335.60 1750.00 L 8333.20 1755.90 L 8331.40 1762.00 L 8330.10 1768.20 L 8329.20 1774.40 L 8328.90 1780.70 L 8329.00 1787.10 L 8329.70 1793.40 L 8332.40 1805.70 L 8337.10 1817.40 L 8340.20 1823.00 Z" fill="#cf6f64" fill-rule="nonzero" node-id="333" stroke="none" target-height="197" target-width="187" target-x="8328.9" target-y="1702.8"/><path d="M 8434.90 1402.50 L 8430.60 1404.70 L 8426.40 1407.40 L 8422.20 1410.70 L 8418.00 1414.50 L 8413.80 1418.90 L 8409.20 1424.60 L 8404.50 1431.00 L 8400.00 1438.10 L 8395.50 1446.20 L 8391.50 1454.20 L 8387.60 1462.90 L 8380.10 1482.30 L 8375.80 1495.70 L 8371.80 1509.90 L 8368.10 1525.10 L 8364.90 1540.30 L 8362.10 1556.00 L 8359.70 1572.30 L 8357.70 1588.70 L 8356.20 1605.20 L 8355.10 1622.00 L 8354.50 1638.80 L 8354.40 1655.40 L 8354.70 1671.90 L 8355.60 1688.40 L 8357.00 1704.40 L 8358.90 1719.90 L 8360.70 1731.60 L 8365.20 1753.50 L 8370.90 1774.20 L 8374.30 1784.00 L 8377.90 1793.10 L 8381.80 1801.70 L 8386.30 1810.10 L 8391.00 1817.80 L 8396.00 1824.80 L 8401.20 1831.20 L 8405.80 1836.00 L 8410.70 1840.30 L 8415.70 1844.10 L 8420.90 1847.40 L 8426.30 1850.20 L 8430.90 1852.00 L 8435.40 1853.10 L 8439.70 1853.60 L 8443.90 1853.40 L 8448.00 1852.70 L 8452.10 1851.40 L 8456.10 1849.60 L 8460.10 1847.30 L 8464.10 1844.30 L 8468.20 1840.60 L 8472.70 1835.90 L 8477.30 1830.30 L 8481.90 1823.80 L 8486.50 1816.40 L 8494.60 1800.80 L 8502.50 1782.10 L 8507.10 1769.20 L 8511.60 1755.20 L 8515.90 1740.20 L 8519.70 1725.10 L 8523.20 1709.40 L 8526.40 1693.00 L 8529.20 1676.50 L 8531.60 1659.70 L 8533.70 1642.60 L 8535.30 1625.50 L 8537.30 1591.40 L 8537.70 1574.40 L 8537.60 1557.90 L 8537.10 1541.70 L 8536.10 1525.60 L 8534.60 1510.30 L 8532.60 1495.80 L 8530.80 1484.80 L 8526.20 1464.90 L 8523.60 1455.90 L 8520.40 1446.80 L 8517.10 1438.60 L 8513.40 1431.10 L 8509.60 1424.30 L 8506.10 1419.00 L 8498.50 1410.20 L 8494.50 1406.50 L 8490.40 1403.40 L 8485.90 1400.70 L 8481.20 1398.50 L 8476.30 1396.90 L 8471.10 1395.90 L 8465.60 1395.40 L 8460.30 1395.50 L 8454.60 1396.20 L 8448.50 1397.50 L 8441.90 1399.60 L 8434.90 1402.50 Z" fill="#263238" fill-rule="nonzero" node-id="335" stroke="none" target-height="458.19995" target-width="183.2998" target-x="8354.4" target-y="1395.4"/><path d="M 8898.30 1627.00 L 8886.00 1732.30 L 8882.00 1762.90 L 8879.00 1783.00 L 8875.80 1802.10 L 8872.40 1820.10 L 8869.50 1833.60 L 8863.00 1859.20 L 8855.20 1883.50 L 8850.80 1895.30 L 8845.90 1906.70 L 8840.70 1917.90 L 8835.00 1928.80 L 8828.80 1939.60 L 8822.00 1950.20 L 8814.60 1960.70 L 8806.80 1970.70 L 8798.40 1980.70 L 8789.10 1990.70 L 8771.50 2008.10 L 8755.50 2021.70 L 8747.10 2028.00 L 8738.40 2033.80 L 8729.40 2039.20 L 8710.80 2048.80 L 8701.20 2053.00 L 8681.40 2060.00 L 8671.20 2062.80 L 8660.80 2065.10 L 8650.50 2067.00 L 8640.10 2068.40 L 8629.70 2069.30 L 8619.20 2069.70 L 8598.30 2069.20 L 8587.80 2068.20 L 8577.40 2066.70 L 8567.10 2064.70 L 8556.90 2062.30 L 8546.70 2059.40 L 8536.70 2056.00 L 8526.90 2052.20 L 8517.30 2047.90 L 8498.80 2038.10 L 8489.90 2032.60 L 8481.20 2026.70 L 8472.80 2020.40 L 8464.80 2013.70 L 8457.00 2006.70 L 8449.50 1999.30 L 8442.40 1991.50 L 8435.60 1983.40 L 8429.20 1975.00 L 8423.30 1966.40 L 8417.70 1957.50 L 8412.60 1948.30 L 8407.90 1939.00 L 8403.60 1929.40 L 8399.70 1919.70 L 8396.30 1909.80 L 8393.40 1899.70 L 8390.90 1889.50 L 8386.20 1863.00 L 8384.10 1846.10 L 8382.30 1828.30 L 8381.10 1810.50 L 8380.50 1792.10 L 8380.30 1773.10 L 8380.80 1754.10 L 8381.70 1734.80 L 8383.30 1715.10 L 8385.50 1695.60 L 8388.30 1676.00 L 8391.70 1656.30 L 8398.00 1627.10 L 8401.70 1612.70 L 8405.80 1598.40 L 8410.30 1584.20 L 8415.20 1570.20 L 8420.50 1556.50 L 8426.20 1543.10 L 8432.30 1529.80 L 8438.90 1516.90 L 8445.80 1504.40 L 8453.20 1492.30 L 8461.10 1480.40 L 8469.40 1469.00 L 8478.10 1458.10 L 8487.30 1447.70 L 8495.00 1439.70 L 8503.00 1432.00 L 8511.30 1424.70 L 8519.90 1417.70 L 8528.80 1411.10 L 8538.00 1405.00 L 8547.50 1399.20 L 8557.40 1393.90 L 8567.60 1388.90 L 8587.70 1380.50 L 8597.30 1377.00 L 8607.00 1373.90 L 8616.80 1371.30 L 8626.80 1369.10 L 8636.70 1367.40 L 8646.80 1366.10 L 8656.90 1365.30 L 8667.10 1364.90 L 8677.30 1364.90 L 8687.40 1365.40 L 8697.70 1366.40 L 8707.80 1367.80 L 8717.80 1369.70 L 8727.70 1372.00 L 8737.50 1374.70 L 8747.20 1377.90 L 8756.70 1381.40 L 8766.00 1385.40 L 8775.20 1389.90 L 8784.10 1394.70 L 8792.90 1399.90 L 8801.40 1405.50 L 8809.70 1411.50 L 8817.70 1417.90 L 8825.40 1424.50 L 8832.80 1431.50 L 8839.80 1438.90 L 8846.60 1446.50 L 8852.90 1454.40 L 8858.90 1462.60 L 8864.60 1471.00 L 8869.90 1479.70 L 8874.70 1488.60 L 8879.20 1497.80 L 8883.40 1507.20 L 8887.00 1516.70 L 8890.30 1526.40 L 8895.50 1546.00 L 8897.40 1556.00 L 8898.90 1566.10 L 8899.90 1576.10 L 8900.50 1586.30 L 8900.60 1596.50 L 8900.30 1606.60 L 8899.60 1616.80 L 8898.30 1627.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="337" stroke="none" target-height="704.7999" target-width="520.2998" target-x="8380.3" target-y="1364.9"/><path d="M 8605.20 1494.60 L 8652.90 1482.70 L 8675.50 1477.50 L 8696.20 1473.30 L 8709.90 1470.90 L 8722.40 1469.00 L 8742.80 1467.10 L 8750.90 1466.80 L 8765.00 1467.50 L 8771.90 1468.40 L 8778.00 1469.90 L 8783.40 1471.70 L 8788.20 1473.90 L 8795.10 1478.70 L 8797.90 1481.60 L 8800.40 1484.90 L 8802.50 1488.50 L 8804.10 1492.30 L 8805.30 1496.50 L 8806.20 1501.30 L 8806.70 1506.70 L 8806.20 1518.40 L 8804.00 1531.60 L 8799.60 1548.00 L 8765.50 1655.30 L 8757.90 1680.70 L 8751.20 1704.40 L 8747.10 1720.10 L 8740.90 1748.50 L 8739.10 1758.90 L 8736.80 1777.60 L 8736.30 1785.90 L 8736.20 1794.60 L 8736.60 1802.30 L 8737.50 1809.20 L 8738.90 1815.30 L 8740.50 1820.30 L 8742.40 1824.70 L 8744.70 1828.60 L 8747.40 1832.00 L 8750.40 1835.00 L 8753.70 1837.60 L 8757.50 1839.70 L 8761.90 1841.40 L 8766.80 1842.70 L 8772.40 1843.50 L 8777.00 1843.70 L 8782.90 1843.30 L 8797.50 1840.70 L 8805.80 1838.70 L 8824.40 1833.00 L 8844.80 1825.50 L 8855.20 1821.20 L 8876.80 1811.30 L 8887.60 1805.90 L 8909.00 1793.90 L 8919.50 1787.40 L 8939.10 1773.70 L 8948.50 1766.40 L 8957.00 1758.90 L 8964.80 1751.40 L 8975.40 1739.40 L 8979.90 1733.40 L 8983.80 1727.40 L 8987.30 1721.10 L 8990.10 1714.80 L 8992.30 1708.50 L 8993.80 1702.30 L 8994.60 1697.20 L 8994.80 1692.10 L 8994.60 1687.00 L 8993.80 1681.80 L 8990.80 1669.40 L 8989.70 1662.80 L 8989.20 1656.60 L 8989.30 1650.90 L 8989.90 1645.10 L 8991.10 1639.60 L 8992.60 1634.40 L 8994.60 1629.50 L 8997.10 1624.70 L 8999.80 1620.10 L 9002.90 1615.70 L 9006.30 1611.50 L 9011.20 1606.10 L 9022.10 1596.00 L 9030.80 1589.00 L 9062.20 1565.20 L 9071.30 1556.80 L 9074.30 1553.40 L 9079.10 1546.70 L 9080.80 1543.20 L 9084.80 1533.60 L 9088.00 1524.80 L 9090.40 1516.80 L 9092.10 1509.40 L 9093.30 1501.70 L 9093.90 1494.70 L 9094.00 1488.20 L 9093.50 1482.20 L 9092.60 1476.10 L 9091.20 1470.50 L 9089.40 1465.20 L 9087.20 1460.30 L 9084.60 1455.60 L 9081.70 1451.00 L 9075.10 1442.70 L 9070.10 1437.60 L 9059.20 1428.10 L 9050.40 1421.60 L 9024.10 1403.60 L 9013.60 1395.50 L 9009.00 1391.30 L 9004.70 1386.90 L 9001.10 1382.30 L 8998.10 1377.50 L 8996.30 1373.70 L 8995.00 1369.70 L 8994.00 1365.50 L 8993.60 1360.90 L 8993.60 1356.50 L 8994.20 1351.70 L 8995.40 1346.30 L 8999.00 1335.40 L 9000.10 1330.30 L 9000.80 1325.00 L 9001.10 1319.70 L 9000.90 1314.20 L 9000.00 1307.40 L 8998.60 1300.50 L 8996.50 1293.50 L 8993.80 1286.30 L 8990.60 1279.40 L 8986.90 1272.40 L 8977.70 1258.40 L 8967.00 1245.00 L 8960.90 1238.50 L 8947.70 1225.80 L 8933.30 1214.10 L 8917.80 1203.30 L 8901.50 1193.90 L 8893.00 1189.70 L 8884.40 1185.80 L 8875.80 1182.40 L 8867.10 1179.40 L 8858.30 1176.80 L 8849.50 1174.70 L 8840.60 1173.10 L 8831.90 1172.00 L 8823.30 1171.50 L 8814.60 1171.50 L 8806.10 1172.10 L 8797.70 1173.40 L 8789.50 1175.20 L 8783.10 1177.10 L 8776.80 1179.50 L 8770.70 1182.40 L 8764.70 1185.70 L 8748.10 1196.70 L 8737.00 1203.60 L 8725.70 1210.10 L 8714.10 1216.30 L 8702.30 1222.10 L 8678.30 1232.60 L 8653.90 1241.60 L 8629.50 1249.10 L 8605.20 1255.00 L 8581.60 1259.30 L 8570.20 1260.80 L 8558.60 1262.00 L 8536.90 1262.90 L 8516.40 1262.20 L 8506.80 1261.10 L 8497.90 1259.60 L 8482.70 1255.80 L 8470.80 1251.20 L 8460.70 1245.50 L 8456.10 1242.10 L 8452.00 1238.40 L 8448.40 1234.50 L 8445.40 1230.20 L 8442.80 1225.70 L 8440.70 1221.00 L 8439.20 1215.90 L 8438.20 1210.40 L 8437.80 1204.50 L 8437.90 1198.00 L 8438.70 1192.00 L 8440.00 1185.40 L 8442.10 1178.30 L 8444.90 1170.60 L 8448.60 1162.20 L 8452.50 1154.60 L 8457.20 1146.50 L 8462.80 1137.70 L 8469.40 1128.20 L 8483.90 1109.00 L 8489.60 1100.80 L 8494.20 1093.50 L 8497.90 1086.90 L 8501.40 1079.80 L 8504.00 1073.40 L 8505.80 1067.80 L 8506.90 1062.70 L 8507.60 1057.40 L 8507.60 1052.60 L 8507.20 1048.30 L 8506.20 1044.50 L 8502.80 1037.30 L 8500.50 1034.20 L 8497.80 1031.40 L 8494.80 1028.90 L 8487.80 1024.50 L 8483.80 1022.70 L 8472.50 1018.90 L 8466.40 1017.50 L 8456.90 1016.00 L 8447.40 1015.10 L 8437.90 1014.70 L 8420.50 1014.90 L 8398.40 1016.80 L 8404.10 1020.90 L 8408.20 1024.30 L 8412.30 1028.30 L 8416.90 1033.40 L 8419.70 1037.10 L 8422.40 1041.20 L 8426.90 1050.50 L 8428.60 1055.70 L 8429.80 1061.30 L 8430.30 1070.00 L 8429.20 1079.80 L 8428.00 1084.70 L 8426.30 1089.80 L 8423.90 1095.30 L 8420.80 1101.20 L 8413.30 1112.40 L 8408.20 1118.50 L 8402.10 1125.10 L 8396.00 1131.10 L 8388.80 1137.50 L 8380.40 1144.30 L 8370.80 1151.50 L 8361.30 1158.10 L 8350.50 1165.10 L 8338.20 1172.40 L 8314.80 1185.90 L 8306.00 1191.70 L 8297.90 1197.70 L 8290.50 1203.80 L 8283.80 1210.10 L 8277.30 1217.00 L 8271.50 1223.90 L 8266.30 1231.00 L 8261.70 1238.20 L 8257.70 1245.60 L 8254.20 1253.20 L 8251.10 1261.00 L 8248.70 1268.80 L 8246.70 1276.70 L 8245.30 1284.70 L 8244.40 1292.80 L 8243.90 1300.90 L 8244.00 1309.10 L 8244.60 1317.40 L 8245.60 1325.70 L 8247.20 1333.90 L 8249.10 1342.10 L 8251.60 1350.20 L 8254.50 1358.40 L 8257.90 1366.60 L 8261.70 1374.60 L 8265.90 1382.40 L 8270.60 1390.20 L 8275.70 1398.00 L 8281.30 1405.60 L 8293.40 1420.20 L 8300.10 1427.20 L 8307.20 1434.10 L 8314.80 1440.90 L 8322.60 1447.20 L 8330.70 1453.40 L 8339.30 1459.30 L 8348.30 1465.00 L 8357.70 1470.40 L 8377.10 1480.20 L 8387.30 1484.60 L 8398.00 1488.70 L 8409.00 1492.50 L 8420.10 1495.80 L 8431.50 1498.70 L 8443.30 1501.20 L 8455.40 1503.30 L 8468.00 1505.10 L 8480.40 1506.30 L 8493.10 1507.10 L 8506.30 1507.30 L 8519.80 1507.10 L 8533.70 1506.40 L 8547.20 1505.20 L 8561.20 1503.40 L 8575.50 1501.10 L 8590.10 1498.20 L 8605.20 1494.60 Z" fill="#263238" fill-rule="nonzero" node-id="339" stroke="none" target-height="828.99994" target-width="850.0996" target-x="8243.9" target-y="1014.7"/><path d="M 8968.50 1823.00 L 8963.00 1830.50 L 8957.30 1837.60 L 8951.30 1844.30 L 8944.90 1850.80 L 8938.30 1856.90 L 8931.30 1862.70 L 8924.10 1868.10 L 8909.00 1877.90 L 8901.10 1882.30 L 8892.90 1886.20 L 8884.60 1889.70 L 8876.10 1892.90 L 8858.50 1897.90 L 8852.40 1899.00 L 8846.80 1899.60 L 8841.60 1899.80 L 8832.10 1899.10 L 8826.30 1897.90 L 8821.10 1896.10 L 8816.30 1893.90 L 8812.00 1891.20 L 8808.00 1888.00 L 8804.40 1884.40 L 8801.20 1880.40 L 8798.40 1876.00 L 8796.10 1871.40 L 8794.20 1866.40 L 8792.70 1861.10 L 8791.60 1855.40 L 8790.90 1849.70 L 8790.80 1843.70 L 8791.00 1837.50 L 8791.70 1831.10 L 8794.50 1818.30 L 8796.50 1811.70 L 8799.10 1804.90 L 8802.10 1798.10 L 8805.60 1791.10 L 8809.60 1783.70 L 8818.60 1769.30 L 8823.80 1762.10 L 8835.00 1748.30 L 8841.10 1741.70 L 8847.40 1735.40 L 8854.00 1729.50 L 8860.80 1724.10 L 8868.00 1719.10 L 8875.20 1714.70 L 8882.60 1710.90 L 8888.30 1708.40 L 8894.00 1706.40 L 8899.80 1704.80 L 8905.70 1703.60 L 8911.60 1702.90 L 8917.50 1702.80 L 8923.50 1703.10 L 8929.60 1704.00 L 8936.60 1705.70 L 8943.00 1707.90 L 8948.80 1710.40 L 8954.10 1713.40 L 8959.20 1716.90 L 8963.70 1720.70 L 8967.80 1724.90 L 8971.40 1729.40 L 8974.60 1734.20 L 8977.40 1739.20 L 8979.60 1744.50 L 8981.50 1750.10 L 8982.90 1755.80 L 8983.80 1761.60 L 8984.30 1767.60 L 8984.40 1773.80 L 8984.00 1780.00 L 8983.10 1786.20 L 8981.80 1792.40 L 8980.00 1798.70 L 8977.80 1804.90 L 8975.20 1811.00 L 8972.10 1817.00 L 8968.50 1823.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="341" stroke="none" target-height="197" target-width="193.60059" target-x="8790.8" target-y="1702.8"/><path d="M 8095.50 3886.50 L 8075.00 4074.60 L 8053.20 4280.90 L 8027.10 4536.30 L 8013.30 4676.50 L 7999.30 4821.70 L 7978.80 5043.80 L 7965.90 5191.30 L 7954.10 5335.50 L 7943.50 5473.90 L 7934.60 5604.10 L 7927.60 5723.80 L 7925.00 5778.00 L 7922.90 5830.50 L 7921.60 5877.20 L 7921.70 5921.00 L 7922.50 5945.30 L 7923.80 5971.30 L 7927.80 6023.50 L 7930.50 6051.70 L 7933.80 6081.30 L 7938.60 6120.40 L 7944.20 6161.60 L 7950.60 6205.00 L 7957.50 6248.20 L 7965.10 6293.20 L 7982.20 6386.70 L 8001.50 6484.20 L 8022.60 6583.90 L 8033.90 6635.30 L 8051.40 6712.50 L 8069.80 6791.10 L 8088.80 6870.00 L 8108.40 6949.40 L 8128.40 7028.70 L 8169.30 7186.60 L 8210.80 7341.30 L 8251.90 7490.60 L 8291.90 7632.30 L 8347.60 7824.80 L 8380.90 7937.40 L 8410.00 8034.70 L 8434.10 8114.20 L 8468.10 8224.00 L 8754.30 8104.80 L 8732.10 7993.90 L 8697.90 7816.40 L 8676.90 7703.60 L 8654.10 7578.00 L 8630.10 7441.80 L 8605.50 7297.40 L 8581.10 7147.30 L 8557.30 6993.60 L 8545.90 6916.20 L 8534.90 6838.80 L 8524.40 6761.60 L 8514.50 6685.30 L 8505.20 6609.40 L 8496.60 6535.30 L 8491.30 6486.10 L 8482.00 6391.30 L 8477.90 6344.40 L 8474.30 6299.20 L 8468.50 6211.90 L 8466.40 6170.20 L 8464.80 6130.50 L 8463.80 6090.70 L 8463.40 6053.30 L 8463.60 6018.30 L 8464.20 5991.80 L 8465.10 5966.80 L 8466.40 5943.50 L 8472.50 5869.80 L 8477.90 5812.80 L 8483.70 5754.10 L 8497.20 5626.90 L 8512.80 5490.30 L 8529.90 5346.70 L 8557.80 5123.10 L 8577.30 4972.20 L 8616.80 4675.80 L 8636.00 4534.90 L 8671.50 4279.30 L 8700.60 4073.90 L 8727.60 3887.50 L 8095.50 3886.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="343" stroke="none" target-height="4337.5" target-width="832.6997" target-x="7921.6" target-y="3886.5"/><g node-id="593"><path d="M 8496.20 4282.70 L 8489.50 4297.20 L 8483.20 4312.40 L 8477.20 4328.10 L 8471.60 4344.50 L 8466.30 4361.50 L 8461.60 4378.40 L 8457.20 4395.80 L 8453.10 4413.70 L 8449.40 4432.10 L 8446.00 4451.10 L 8442.40 4474.70 L 8439.20 4498.90 L 8436.50 4523.80 L 8434.30 4549.40 L 8432.60 4574.80 L 8431.40 4600.80 L 8430.50 4627.20 L 8430.10 4654.10 L 8430.50 4708.10 L 8432.40 4763.20 L 8434.50 4800.10 L 8437.00 4837.20 L 8440.20 4874.60 L 8443.80 4911.80 L 8447.80 4949.00 L 8452.30 4985.90 L 8457.20 5022.90 L 8467.80 5095.20 L 8473.60 5131.10 L 8485.60 5200.30 L 8495.10 5251.00 L 8504.60 5299.00 L 8514.40 5345.90 L 8523.90 5389.20 L 8540.30 5254.80 L 8557.60 5117.70 L 8575.50 4979.60 L 8611.60 4707.50 L 8611.00 4656.70 L 8610.00 4608.00 L 8608.60 4560.20 L 8605.30 4485.80 L 8601.70 4431.70 L 8597.10 4381.40 L 8594.60 4359.30 L 8591.60 4337.20 L 8588.40 4317.60 L 8585.10 4300.30 L 8579.20 4275.50 L 8576.20 4265.50 L 8573.20 4256.80 L 8570.20 4249.50 L 8567.20 4243.40 L 8564.30 4238.40 L 8561.40 4234.40 L 8558.60 4231.20 L 8555.70 4228.60 L 8552.80 4226.80 L 8550.00 4225.60 L 8547.10 4225.00 L 8544.10 4225.00 L 8541.00 4225.50 L 8538.20 4226.40 L 8535.10 4227.90 L 8531.90 4230.10 L 8528.30 4233.10 L 8524.50 4237.00 L 8520.30 4241.90 L 8511.80 4254.00 L 8507.00 4262.00 L 8496.20 4282.70 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="6" node-id="347" stroke="none" target-height="1164.2002" target-width="181.5" target-x="8430.1" target-y="4225"/></g><path d="M 8741.60 8010.30 L 8743.50 8014.20 L 8753.00 8039.20 L 8775.50 8101.40 L 8445.40 8240.30 L 8393.40 8143.40 L 8741.60 8010.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="350" stroke="none" target-height="230" target-width="382.0996" target-x="8393.4" target-y="8010.3"/><path d="M 8436.30 3886.50 L 8461.30 4156.40 L 8494.90 4503.90 L 8522.20 4774.80 L 8536.80 4915.00 L 8551.80 5055.40 L 8567.10 5193.70 L 8582.50 5327.60 L 8597.70 5454.80 L 8612.70 5572.90 L 8620.10 5628.60 L 8634.50 5729.10 L 8648.20 5816.50 L 8675.40 5978.10 L 8721.50 6242.80 L 8776.10 6548.10 L 8865.50 7040.00 L 8953.00 7515.40 L 9082.50 8211.60 L 9411.40 8211.60 L 9380.00 7917.00 L 9339.70 7531.80 L 9308.20 7226.90 L 9275.70 6905.40 L 9244.20 6585.70 L 9229.50 6432.30 L 9215.80 6286.50 L 9203.50 6150.40 L 9188.00 5968.70 L 9180.20 5867.10 L 9177.20 5824.00 L 9154.10 5470.50 L 9101.40 4628.40 L 9056.00 3886.50 L 8436.30 3886.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="352" stroke="none" target-height="4325.0996" target-width="975.1006" target-x="8436.3" target-y="3886.5"/><path d="M 9416.40 8126.00 L 9416.60 8126.50 L 9417.30 8129.90 L 9420.50 8155.10 L 9427.40 8217.80 L 9065.80 8217.80 L 9040.00 8112.40 L 9416.40 8126.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="354" stroke="none" target-height="105.3999" target-width="387.4004" target-x="9040" target-y="8112.4"/><g node-id="594"><path d="M 9290.50 8017.20 L 9289.40 8017.10 L 9288.40 8016.50 L 9287.70 8015.70 L 9287.40 8014.60 L 9285.70 7998.80 L 9255.20 7712.30 L 9215.40 7331.40 L 9169.40 6881.40 L 9139.10 6575.40 L 9124.90 6428.00 L 9111.70 6287.60 L 9099.70 6156.50 L 9084.70 5981.90 L 9077.20 5884.80 L 9074.40 5844.10 L 9052.30 5504.70 L 8994.40 4575.70 L 8964.40 4083.30 L 8965.20 4081.10 L 8966.10 4080.40 L 8967.30 4080.20 L 8969.40 4081.00 L 8970.10 4081.90 L 8970.40 4083.00 L 8973.30 4133.80 L 9015.90 4829.90 L 9058.30 5504.20 L 9080.30 5843.80 L 9083.20 5884.60 L 9090.70 5981.60 L 9105.70 6156.20 L 9117.60 6287.20 L 9145.10 6575.00 L 9175.40 6880.80 L 9221.30 7330.70 L 9261.00 7711.60 L 9293.10 8014.40 L 9293.10 8015.60 L 9292.50 8016.60 L 9291.60 8017.40 L 9290.50 8017.70 L 9290.50 8017.20 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="7" node-id="358" stroke="none" target-height="3937.5002" target-width="328.69922" target-x="8964.4" target-y="4080.2"/></g><path d="M 8625.50 1676.60 L 8625.30 1680.20 L 8623.90 1686.80 L 8622.70 1689.90 L 8619.70 1695.20 L 8617.90 1697.40 L 8615.90 1699.30 L 8613.80 1700.80 L 8611.50 1701.90 L 8609.20 1702.60 L 8606.90 1702.80 L 8604.50 1702.60 L 8600.30 1700.80 L 8598.40 1699.30 L 8596.20 1696.70 L 8594.40 1693.60 L 8592.80 1689.80 L 8591.80 1685.90 L 8591.30 1681.50 L 8591.40 1676.60 L 8592.00 1671.70 L 8593.00 1667.30 L 8594.50 1663.30 L 8596.50 1659.50 L 8598.70 1656.40 L 8603.20 1652.30 L 8605.40 1651.30 L 8607.60 1650.60 L 8610.00 1650.30 L 8612.30 1650.60 L 8616.50 1652.40 L 8618.40 1654.00 L 8620.60 1656.50 L 8622.50 1659.60 L 8624.00 1663.40 L 8625.00 1667.40 L 8625.50 1671.80 L 8625.50 1676.60 Z" fill="#263238" fill-rule="nonzero" node-id="361" stroke="none" target-height="52.5" target-width="34.200195" target-x="8591.3" target-y="1650.3"/><path d="M 8461.80 1676.60 L 8461.60 1680.20 L 8460.20 1686.80 L 8459.10 1689.90 L 8457.60 1692.70 L 8456.00 1695.20 L 8454.10 1697.40 L 8450.10 1700.80 L 8447.80 1701.90 L 8445.50 1702.60 L 8443.20 1702.80 L 8438.80 1701.90 L 8436.80 1700.80 L 8434.90 1699.30 L 8432.70 1696.80 L 8430.80 1693.70 L 8429.20 1689.80 L 8428.10 1685.90 L 8427.60 1681.50 L 8427.50 1676.60 L 8427.90 1672.90 L 8428.50 1669.50 L 8429.40 1666.30 L 8430.60 1663.20 L 8432.00 1660.50 L 8433.60 1658.00 L 8435.50 1655.70 L 8439.50 1652.40 L 8441.70 1651.30 L 8444.00 1650.60 L 8446.30 1650.30 L 8448.70 1650.60 L 8452.90 1652.40 L 8454.80 1654.00 L 8457.00 1656.50 L 8458.80 1659.60 L 8460.40 1663.40 L 8461.40 1667.40 L 8461.90 1671.80 L 8461.80 1676.60 Z" fill="#263238" fill-rule="nonzero" node-id="363" stroke="none" target-height="52.5" target-width="34.40039" target-x="8427.5" target-y="1650.3"/><path d="M 8513.40 1684.00 L 8505.60 1700.50 L 8497.40 1716.80 L 8488.60 1732.70 L 8479.30 1748.40 L 8469.50 1763.70 L 8459.10 1778.70 L 8448.30 1793.40 L 8437.00 1807.80 L 8441.20 1811.50 L 8445.70 1814.50 L 8450.40 1817.00 L 8455.30 1819.00 L 8460.30 1820.60 L 8465.40 1821.70 L 8475.50 1823.00 L 8487.20 1823.00 L 8498.40 1822.00 L 8505.50 1820.70 L 8513.40 1684.00 Z" fill="#df5753" fill-rule="nonzero" node-id="365" stroke="none" target-height="139" target-width="76.40039" target-x="8437" target-y="1684"/><path d="M 8517.70 1881.50 L 8516.80 1881.40 L 8516.10 1881.10 L 8515.30 1880.70 L 8514.70 1880.20 L 8513.60 1878.00 L 8513.60 1877.20 L 8514.00 1875.50 L 8515.00 1874.10 L 8516.50 1873.20 L 8531.80 1872.20 L 8538.50 1871.30 L 8545.20 1870.00 L 8551.80 1868.40 L 8564.70 1864.00 L 8570.90 1861.30 L 8577.00 1858.20 L 8588.60 1851.10 L 8594.10 1847.10 L 8604.30 1838.10 L 8613.50 1828.00 L 8616.50 1826.90 L 8618.10 1827.20 L 8619.50 1828.00 L 8620.40 1829.40 L 8620.70 1831.00 L 8620.40 1832.60 L 8619.50 1834.00 L 8614.70 1839.50 L 8609.70 1844.70 L 8598.70 1854.20 L 8592.90 1858.50 L 8580.50 1866.00 L 8574.00 1869.30 L 8567.30 1872.20 L 8553.50 1876.80 L 8546.50 1878.50 L 8532.20 1880.80 L 8525.00 1881.30 L 8517.70 1881.50 Z" fill="#263238" fill-rule="nonzero" node-id="367" stroke="none" target-height="54.599976" target-width="107.100586" target-x="8513.6" target-y="1826.9"/><path d="M 8654.60 1632.70 L 8652.80 1633.40 L 8649.00 1633.40 L 8647.20 1632.70 L 8642.60 1630.00 L 8637.90 1627.70 L 8633.00 1625.70 L 8627.90 1624.10 L 8622.80 1623.00 L 8617.50 1622.20 L 8612.20 1621.90 L 8601.70 1622.40 L 8596.50 1623.30 L 8591.40 1624.60 L 8584.80 1626.80 L 8583.30 1627.10 L 8580.10 1626.70 L 8577.30 1625.00 L 8576.20 1623.80 L 8575.40 1622.40 L 8574.90 1620.80 L 8574.70 1619.10 L 8574.80 1617.40 L 8575.30 1615.80 L 8576.10 1614.30 L 8577.10 1612.90 L 8578.40 1611.80 L 8579.90 1611.00 L 8586.20 1608.70 L 8592.70 1606.90 L 8599.30 1605.70 L 8605.90 1605.00 L 8612.60 1604.80 L 8619.30 1605.10 L 8626.00 1606.00 L 8632.50 1607.40 L 8638.90 1609.40 L 8645.10 1611.80 L 8651.20 1614.70 L 8658.20 1619.20 L 8660.00 1622.00 L 8660.50 1623.50 L 8660.40 1626.80 L 8659.10 1629.80 L 8657.80 1631.10 L 8656.30 1632.00 L 8654.60 1632.70 Z" fill="#263238" fill-rule="nonzero" node-id="369" stroke="none" target-height="28.599976" target-width="85.799805" target-x="8574.7" target-y="1604.8"/><path d="M 8398.60 1585.00 L 8395.30 1583.10 L 8393.40 1580.40 L 8393.00 1578.80 L 8393.00 1575.50 L 8394.20 1572.40 L 8400.10 1566.20 L 8405.20 1561.70 L 8410.60 1557.50 L 8416.30 1553.80 L 8422.30 1550.60 L 8428.60 1547.80 L 8435.00 1545.40 L 8441.60 1543.60 L 8448.30 1542.30 L 8455.10 1541.60 L 8461.90 1541.30 L 8468.80 1541.60 L 8470.40 1542.00 L 8473.20 1543.80 L 8475.00 1546.50 L 8475.50 1548.10 L 8475.60 1549.70 L 8475.40 1551.40 L 8474.90 1553.00 L 8474.10 1554.40 L 8473.10 1555.70 L 8471.80 1556.80 L 8470.30 1557.70 L 8468.80 1558.20 L 8467.10 1558.50 L 8460.00 1558.40 L 8449.30 1559.30 L 8438.80 1561.90 L 8433.70 1563.80 L 8428.80 1566.00 L 8419.50 1571.60 L 8415.20 1574.80 L 8411.20 1578.40 L 8406.30 1583.50 L 8404.90 1584.30 L 8401.80 1585.20 L 8400.20 1585.30 L 8398.60 1585.00 Z" fill="#263238" fill-rule="nonzero" node-id="371" stroke="none" target-height="44" target-width="82.59961" target-x="8393" target-y="1541.3"/><path d="M 9296.00 2559.80 L 9047.90 2493.80 L 9003.60 2599.60 L 8981.60 2650.50 L 8956.70 2707.10 L 8915.50 2798.00 L 8886.40 2859.90 L 8871.60 2890.30 L 8842.20 2948.90 L 8827.50 2977.00 L 8813.30 3003.00 L 8799.10 3028.00 L 8785.80 3050.30 L 8768.30 3077.60 L 8760.40 3088.90 L 8752.00 3100.00 L 8744.50 3109.20 L 8737.70 3116.70 L 8732.10 3122.10 L 8727.00 3126.30 L 8722.50 3129.40 L 8682.40 3149.20 L 8662.00 3160.00 L 8639.10 3172.40 L 8590.00 3200.00 L 8509.20 3247.50 L 8424.00 3299.30 L 8367.70 3334.50 L 8313.60 3368.90 L 8263.10 3401.60 L 8218.00 3431.50 L 8179.70 3457.60 L 8178.40 3464.40 L 8177.50 3473.10 L 8176.90 3482.30 L 8176.70 3492.70 L 8176.90 3503.40 L 8177.40 3514.70 L 8178.30 3525.90 L 8181.20 3547.90 L 8184.60 3564.50 L 8187.90 3575.60 L 8189.90 3580.70 L 8194.00 3588.10 L 8231.00 3580.60 L 8271.80 3571.00 L 8315.30 3559.50 L 8348.70 3550.00 L 8383.60 3539.50 L 8418.80 3528.40 L 8454.80 3516.60 L 8490.80 3504.30 L 8526.80 3491.40 L 8562.70 3478.20 L 8598.00 3464.80 L 8632.90 3451.00 L 8666.60 3437.20 L 8699.50 3423.20 L 8730.60 3409.50 L 8760.70 3395.60 L 8788.30 3382.30 L 8822.80 3364.50 L 8837.90 3356.20 L 8852.80 3347.60 L 8866.00 3339.60 L 8877.60 3332.10 L 8893.70 3320.40 L 8905.50 3310.50 L 8915.70 3300.50 L 8926.10 3289.70 L 8936.70 3278.10 L 8957.60 3253.10 L 8967.90 3239.80 L 8978.30 3225.80 L 8988.80 3211.10 L 9002.30 3191.40 L 9015.80 3170.70 L 9029.30 3149.00 L 9042.50 3127.20 L 9055.50 3104.60 L 9081.20 3058.10 L 9106.00 3010.40 L 9124.00 2974.20 L 9141.40 2938.00 L 9158.20 2901.80 L 9189.60 2831.20 L 9217.70 2764.40 L 9242.30 2703.50 L 9271.10 2628.60 L 9284.60 2591.80 L 9296.00 2559.80 Z" fill="#e58a7b" fill-rule="nonzero" node-id="373" stroke="none" target-height="1094.3" target-width="1119.2998" target-x="8176.7" target-y="2493.8"/><path d="M 9122.80 8465.20 L 9118.20 8465.30 L 9113.70 8465.10 L 9104.90 8463.50 L 9100.60 8462.10 L 9088.70 8455.90 L 9086.50 8453.70 L 9084.70 8451.20 L 9083.20 8448.50 L 9082.00 8445.70 L 9081.20 8442.60 L 9080.90 8439.60 L 9081.30 8433.50 L 9081.70 8431.00 L 9082.50 8428.60 L 9083.70 8426.40 L 9085.30 8424.40 L 9087.20 8422.80 L 9089.40 8421.50 L 9092.40 8420.40 L 9095.90 8419.80 L 9108.50 8420.90 L 9113.40 8422.20 L 9120.70 8424.50 L 9128.30 8427.50 L 9135.80 8430.80 L 9143.10 8434.40 L 9150.10 8438.10 L 9156.30 8441.50 L 9166.40 8447.40 L 9171.90 8450.90 L 9172.90 8451.70 L 9173.50 8452.70 L 9173.70 8453.90 L 9173.60 8455.20 L 9173.10 8456.40 L 9172.40 8457.40 L 9171.40 8458.20 L 9170.30 8458.70 L 9158.50 8461.30 L 9146.70 8463.20 L 9134.80 8464.50 L 9122.80 8465.20 Z M 9098.90 8428.00 L 9096.20 8427.70 L 9093.50 8428.00 L 9092.20 8428.90 L 9091.30 8430.10 L 9090.70 8431.50 L 9090.60 8433.00 L 9090.20 8435.80 L 9090.30 8438.60 L 9090.90 8441.40 L 9092.00 8444.00 L 9093.50 8446.40 L 9097.80 8450.30 L 9100.80 8451.90 L 9104.50 8453.30 L 9109.10 8454.40 L 9115.10 8455.20 L 9122.30 8455.60 L 9139.10 8454.80 L 9148.50 8453.60 L 9158.80 8451.80 L 9151.80 8447.50 L 9144.60 8443.50 L 9137.30 8439.90 L 9129.80 8436.80 L 9114.20 8431.60 L 9106.30 8429.60 L 9098.20 8428.00 L 9098.90 8428.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="375" stroke="none" target-height="45.5" target-width="92.799805" target-x="9080.9" target-y="8419.8"/><path d="M 9169.10 8458.70 L 9168.10 8458.90 L 9167.20 8458.70 L 9160.90 8454.50 L 9157.20 8451.50 L 9146.00 8440.70 L 9140.50 8434.50 L 9135.30 8427.80 L 9130.50 8420.90 L 9126.50 8414.00 L 9124.20 8409.30 L 9122.40 8404.90 L 9121.10 8400.70 L 9120.30 8396.50 L 9120.20 8392.70 L 9120.60 8389.30 L 9121.40 8387.00 L 9122.50 8384.90 L 9124.00 8383.00 L 9125.70 8381.30 L 9127.80 8379.90 L 9130.00 8379.00 L 9132.30 8378.30 L 9134.70 8378.10 L 9137.90 8377.90 L 9144.30 8378.90 L 9152.60 8383.60 L 9155.70 8386.70 L 9158.50 8390.30 L 9161.00 8394.60 L 9163.20 8399.10 L 9165.10 8403.90 L 9166.80 8409.10 L 9168.90 8417.00 L 9170.50 8424.80 L 9171.70 8432.40 L 9172.60 8439.20 L 9173.40 8450.10 L 9173.60 8455.20 L 9173.20 8457.40 L 9171.50 8459.00 L 9170.20 8459.00 L 9169.10 8458.70 Z M 9137.10 8386.00 L 9135.40 8386.00 L 9132.90 8386.30 L 9131.40 8386.80 L 9130.20 8387.70 L 9129.50 8388.60 L 9129.00 8390.30 L 9128.70 8392.70 L 9129.00 8395.60 L 9129.90 8399.20 L 9131.30 8402.70 L 9133.00 8406.60 L 9139.30 8417.10 L 9143.90 8423.60 L 9148.90 8429.90 L 9165.00 8445.90 L 9164.70 8438.30 L 9163.80 8430.90 L 9162.40 8423.60 L 9160.40 8416.30 L 9157.80 8409.30 L 9154.80 8402.50 L 9147.10 8389.60 L 9144.90 8388.00 L 9142.40 8386.80 L 9139.80 8386.20 L 9137.10 8386.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="377" stroke="none" target-height="81.09961" target-width="53.399414" target-x="9120.2" target-y="8377.9"/><path d="M 8489.50 8435.40 L 8483.90 8437.00 L 8478.30 8438.20 L 8472.70 8438.90 L 8467.00 8439.20 L 8461.30 8438.90 L 8455.60 8438.20 L 8450.00 8437.00 L 8444.40 8435.40 L 8441.30 8433.30 L 8438.60 8430.80 L 8436.30 8427.80 L 8434.50 8424.50 L 8433.30 8421.00 L 8432.70 8417.20 L 8432.60 8414.90 L 8432.90 8412.60 L 8433.60 8410.30 L 8434.70 8408.10 L 8436.10 8406.30 L 8437.80 8404.60 L 8439.90 8403.00 L 8442.50 8401.50 L 8445.50 8400.30 L 8449.20 8399.20 L 8454.00 8398.20 L 8459.40 8397.50 L 8465.50 8397.20 L 8474.80 8397.10 L 8484.70 8397.70 L 8494.60 8398.60 L 8504.30 8399.80 L 8522.10 8402.80 L 8536.00 8405.80 L 8544.80 8408.50 L 8545.80 8409.30 L 8546.30 8410.50 L 8546.40 8413.10 L 8545.90 8414.30 L 8545.00 8415.30 L 8543.90 8416.10 L 8530.60 8421.70 L 8517.10 8426.80 L 8503.40 8431.40 L 8489.50 8435.40 Z M 8450.60 8407.00 L 8448.00 8407.80 L 8445.50 8408.90 L 8443.20 8410.60 L 8442.20 8411.60 L 8441.60 8412.80 L 8441.20 8414.20 L 8441.30 8415.60 L 8441.70 8418.10 L 8442.50 8420.40 L 8443.60 8422.60 L 8445.10 8424.60 L 8446.90 8426.30 L 8449.00 8427.70 L 8452.10 8429.10 L 8456.10 8430.00 L 8460.90 8430.50 L 8466.90 8430.50 L 8478.80 8429.10 L 8494.10 8425.50 L 8504.50 8422.40 L 8516.10 8418.30 L 8528.90 8413.20 L 8519.20 8411.00 L 8509.50 8409.20 L 8490.00 8406.80 L 8480.20 8406.20 L 8470.30 8406.10 L 8460.50 8406.30 L 8450.60 8407.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="379" stroke="none" target-height="42.100586" target-width="113.80078" target-x="8432.6" target-y="8397.1"/><path d="M 8543.20 8416.10 L 8537.30 8415.20 L 8527.70 8412.10 L 8512.10 8405.20 L 8504.10 8400.80 L 8496.40 8396.00 L 8491.40 8392.60 L 8486.80 8389.10 L 8482.50 8385.50 L 8478.50 8381.70 L 8475.20 8378.10 L 8472.50 8374.50 L 8470.80 8371.60 L 8469.50 8368.90 L 8468.70 8366.30 L 8468.30 8363.80 L 8468.50 8361.40 L 8469.30 8358.60 L 8470.10 8356.80 L 8471.40 8355.00 L 8473.30 8353.10 L 8478.20 8350.00 L 8481.90 8348.60 L 8489.80 8346.90 L 8494.00 8346.80 L 8498.00 8347.40 L 8505.70 8350.00 L 8513.80 8355.30 L 8517.60 8358.70 L 8521.10 8362.50 L 8524.30 8366.50 L 8531.60 8377.50 L 8535.20 8384.20 L 8538.30 8390.90 L 8540.80 8396.70 L 8545.80 8410.60 L 8545.90 8411.70 L 8545.70 8412.80 L 8545.30 8413.80 L 8544.00 8415.40 L 8543.20 8416.10 Z M 8486.70 8355.70 L 8484.30 8355.70 L 8480.90 8357.10 L 8477.70 8359.80 L 8477.10 8360.80 L 8476.90 8361.80 L 8476.90 8362.40 L 8477.10 8364.20 L 8477.70 8366.10 L 8478.90 8368.30 L 8480.70 8370.80 L 8483.30 8373.90 L 8486.50 8377.10 L 8490.60 8380.60 L 8504.50 8390.30 L 8512.30 8394.80 L 8520.20 8398.90 L 8528.20 8402.40 L 8535.60 8405.10 L 8533.20 8398.00 L 8530.20 8391.20 L 8526.80 8384.70 L 8518.30 8372.60 L 8513.40 8367.10 L 8508.00 8362.00 L 8502.20 8357.40 L 8499.70 8356.30 L 8497.20 8355.60 L 8494.60 8355.10 L 8491.90 8355.00 L 8486.70 8355.70 Z" fill="#429cfd" fill-rule="nonzero" node-id="381" stroke="none" target-height="69.299805" target-width="77.600586" target-x="8468.3" target-y="8346.8"/><path d="M 8200.00 3443.60 L 7951.20 3558.10 L 7922.30 3629.60 L 8014.10 3691.40 L 8032.40 3688.60 L 8052.60 3684.40 L 8064.30 3681.50 L 8077.70 3677.80 L 8091.40 3673.50 L 8106.10 3668.30 L 8115.90 3664.40 L 8136.00 3655.50 L 8145.90 3650.40 L 8155.80 3644.90 L 8165.50 3638.90 L 8175.00 3632.50 L 8184.20 3625.60 L 8193.00 3618.20 L 8199.40 3612.30 L 8205.50 3606.10 L 8216.70 3592.80 L 8221.80 3585.70 L 8226.50 3578.30 L 8230.80 3570.50 L 8234.80 3562.30 L 8200.00 3443.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="383" stroke="none" target-height="247.7998" target-width="312.5" target-x="7922.3" target-y="3443.6"/><path d="M 8210.40 3592.20 L 8208.50 3577.80 L 8205.90 3563.70 L 8202.70 3549.70 L 8198.90 3535.90 L 8194.60 3522.20 L 8189.60 3508.70 L 8184.10 3495.40 L 8178.00 3482.40 L 8171.40 3469.70 L 8164.20 3457.20 L 8203.50 3427.60 L 8210.70 3439.60 L 8217.40 3451.80 L 8223.70 3464.20 L 8229.50 3476.80 L 8234.90 3489.70 L 8239.70 3502.70 L 8244.10 3515.80 L 8248.00 3529.20 L 8251.50 3542.70 L 8254.40 3556.20 L 8256.90 3570.00 L 8258.90 3583.80 L 8210.40 3592.20 Z" fill="#263238" fill-rule="nonzero" node-id="385" stroke="none" target-height="164.59985" target-width="94.700195" target-x="8164.2" target-y="3427.6"/><path d="M 8252.90 3477.40 L 8255.30 3481.70 L 8257.30 3486.10 L 8258.70 3490.70 L 8259.70 3495.50 L 8260.30 3500.30 L 8260.30 3505.20 L 8258.90 3514.80 L 8257.40 3519.40 L 8255.50 3523.90 L 8253.20 3528.10 L 8250.40 3532.20 L 8247.20 3535.90 L 8243.70 3539.20 L 8235.80 3544.70 L 8231.40 3546.90 L 8226.80 3548.60 L 8222.10 3549.80 L 8217.30 3550.50 L 8212.50 3550.70 L 8207.60 3550.50 L 8202.90 3549.70 L 8198.10 3548.50 L 8189.20 3544.60 L 8185.10 3542.00 L 8181.30 3539.00 L 8174.70 3531.90 L 8171.90 3527.80 L 8169.60 3523.60 L 8167.70 3519.10 L 8165.40 3509.70 L 8165.00 3504.80 L 8165.60 3495.10 L 8168.20 3485.80 L 8170.10 3481.40 L 8172.60 3477.10 L 8175.40 3473.20 L 8178.70 3469.50 L 8186.10 3463.40 L 8190.30 3460.90 L 8198.60 3457.10 L 8202.60 3455.70 L 8206.70 3454.80 L 8215.10 3454.10 L 8223.50 3455.00 L 8227.60 3456.10 L 8231.70 3457.70 L 8239.00 3461.70 L 8242.40 3464.30 L 8245.50 3467.20 L 8248.20 3470.30 L 8252.90 3477.40 Z" fill="#263238" fill-rule="nonzero" node-id="387" stroke="none" target-height="96.59985" target-width="95.299805" target-x="8165" target-y="3454.1"/><path d="M 7783.00 3650.60 L 7816.20 3684.00 L 8039.40 3588.60 L 7951.20 3558.10 L 7783.00 3650.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="389" stroke="none" target-height="125.8999" target-width="256.3999" target-x="7783" target-y="3558.1"/><g node-id="595"><path d="M 8741.60 8010.30 L 8743.50 8014.20 L 8753.00 8039.20 L 8775.50 8101.40 L 8445.40 8240.30 L 8393.40 8143.40 L 8741.60 8010.30 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="8" node-id="393" stroke="none" target-height="230" target-width="382.0996" target-x="8393.4" target-y="8010.3"/></g><g node-id="596"><path d="M 9416.40 8126.00 L 9416.60 8126.50 L 9417.30 8129.90 L 9420.50 8155.10 L 9427.40 8217.80 L 9065.80 8217.80 L 9040.00 8112.40 L 9416.40 8126.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="9" node-id="398" stroke="none" target-height="105.3999" target-width="387.4004" target-x="9040" target-y="8112.4"/></g><path d="M 9360.60 2491.10 L 9363.60 2501.80 L 9366.10 2512.50 L 9369.60 2534.30 L 9370.60 2545.40 L 9371.20 2556.50 L 9371.30 2567.70 L 9371.00 2578.90 L 9370.40 2590.30 L 9369.20 2601.70 L 9367.30 2615.90 L 9364.90 2630.10 L 9362.00 2644.30 L 9358.50 2658.70 L 9354.50 2672.80 L 9350.20 2686.90 L 9345.40 2701.00 L 9340.30 2715.00 L 9332.90 2733.50 L 9325.00 2751.70 L 9316.70 2769.50 L 9307.90 2787.20 L 9289.80 2820.90 L 9270.80 2853.00 L 9247.20 2889.70 L 9220.60 2927.70 L 9197.50 2958.20 L 9188.50 2969.60 L 9169.80 2992.00 L 8815.60 2847.50 L 8831.60 2801.70 L 8848.30 2756.20 L 8865.50 2710.90 L 8883.30 2665.80 L 8901.80 2621.00 L 8920.80 2576.40 L 8940.40 2532.10 L 8960.60 2488.00 L 8967.00 2474.80 L 8973.50 2462.40 L 8980.20 2450.60 L 8986.90 2439.60 L 9000.80 2419.40 L 9008.40 2409.40 L 9016.10 2400.20 L 9023.80 2391.60 L 9031.60 2383.60 L 9039.40 2376.10 L 9055.70 2362.50 L 9064.20 2356.40 L 9072.60 2350.80 L 9081.00 2345.70 L 9089.50 2341.20 L 9106.70 2333.50 L 9115.50 2330.30 L 9124.30 2327.70 L 9133.00 2325.50 L 9141.70 2323.80 L 9159.20 2321.80 L 9167.90 2321.50 L 9176.60 2321.60 L 9193.80 2323.30 L 9202.30 2324.80 L 9210.70 2326.80 L 9227.30 2332.00 L 9243.60 2339.10 L 9251.60 2343.30 L 9259.30 2347.90 L 9266.90 2352.90 L 9274.30 2358.40 L 9281.60 2364.30 L 9288.80 2370.70 L 9302.50 2384.70 L 9309.00 2392.20 L 9315.20 2400.20 L 9321.30 2408.60 L 9327.30 2417.60 L 9333.00 2427.10 L 9338.20 2436.50 L 9343.20 2446.40 L 9347.90 2456.80 L 9352.40 2467.70 L 9360.60 2491.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="401" stroke="none" target-height="670.5" target-width="555.7002" target-x="8815.6" target-y="2321.5"/><g node-id="597"><path d="M 9360.60 2491.10 L 9363.60 2501.80 L 9366.10 2512.50 L 9369.60 2534.30 L 9370.60 2545.40 L 9371.20 2556.50 L 9371.30 2567.70 L 9371.00 2578.90 L 9370.40 2590.30 L 9369.20 2601.70 L 9367.30 2615.90 L 9364.90 2630.10 L 9362.00 2644.30 L 9358.50 2658.70 L 9354.50 2672.80 L 9350.20 2686.90 L 9345.40 2701.00 L 9340.30 2715.00 L 9332.90 2733.50 L 9325.00 2751.70 L 9316.70 2769.50 L 9307.90 2787.20 L 9289.80 2820.90 L 9270.80 2853.00 L 9247.20 2889.70 L 9220.60 2927.70 L 9197.50 2958.20 L 9188.50 2969.60 L 9169.80 2992.00 L 8815.60 2847.50 L 8831.60 2801.70 L 8848.30 2756.20 L 8865.50 2710.90 L 8883.30 2665.80 L 8901.80 2621.00 L 8920.80 2576.40 L 8940.40 2532.10 L 8960.60 2488.00 L 8967.00 2474.80 L 8973.50 2462.40 L 8980.20 2450.60 L 8986.90 2439.60 L 9000.80 2419.40 L 9008.40 2409.40 L 9016.10 2400.20 L 9023.80 2391.60 L 9031.60 2383.60 L 9039.40 2376.10 L 9055.70 2362.50 L 9064.20 2356.40 L 9072.60 2350.80 L 9081.00 2345.70 L 9089.50 2341.20 L 9106.70 2333.50 L 9115.50 2330.30 L 9124.30 2327.70 L 9133.00 2325.50 L 9141.70 2323.80 L 9159.20 2321.80 L 9167.90 2321.50 L 9176.60 2321.60 L 9193.80 2323.30 L 9202.30 2324.80 L 9210.70 2326.80 L 9227.30 2332.00 L 9243.60 2339.10 L 9251.60 2343.30 L 9259.30 2347.90 L 9266.90 2352.90 L 9274.30 2358.40 L 9281.60 2364.30 L 9288.80 2370.70 L 9302.50 2384.70 L 9309.00 2392.20 L 9315.20 2400.20 L 9321.30 2408.60 L 9327.30 2417.60 L 9333.00 2427.10 L 9338.20 2436.50 L 9343.20 2446.40 L 9347.90 2456.80 L 9352.40 2467.70 L 9360.60 2491.10 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="10" node-id="405" stroke="none" target-height="670.5" target-width="555.7002" target-x="8815.6" target-y="2321.5"/></g><path d="M 5841.00 371.40 L 5688.50 371.40 L 5688.50 395.90 L 5841.00 395.90 L 5841.00 371.40 Z" fill="#429cfd" fill-rule="nonzero" node-id="408" stroke="none" target-height="24.5" target-width="152.5" target-x="5688.5" target-y="371.4"/><path d="M 7814.00 1343.80 L 7795.50 1753.10 L 7820.10 1754.20 L 7838.50 1344.90 L 7814.00 1343.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="410" stroke="none" target-height="410.3999" target-width="43" target-x="7795.5" target-y="1343.8"/><path d="M 7766.60 481.60 L 4952.00 481.60 L 4690.10 6342.60 L 7504.70 6342.60 L 7766.60 481.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="412" stroke="none" target-height="5861" target-width="3076.5" target-x="4690.1" target-y="481.6"/><g node-id="598"><path d="M 7682.60 562.20 L 4868.00 562.20 L 4606.10 6423.20 L 7420.70 6423.20 L 7682.60 562.20 Z" fill="#fafafa" fill-opacity="0.56" fill-rule="nonzero" group-id="11" node-id="416" stroke="none" target-height="5861" target-width="3076.5" target-x="4606.1" target-y="562.2"/></g><g node-id="599"><path d="M 7598.60 642.60 L 4784.10 642.60 L 4521.90 6503.60 L 7336.50 6503.60 L 7598.60 642.60 Z" fill="#429cfd" fill-opacity="0.07" fill-rule="nonzero" group-id="12" node-id="421" stroke="none" target-height="5861" target-width="3076.7002" target-x="4521.9" target-y="642.6"/></g><path d="M 7278.30 3198.80 L 4875.90 3198.80 L 4855.90 3647.30 L 7258.30 3647.30 L 7278.30 3198.80 Z" fill="#ffffff" fill-rule="nonzero" node-id="424" stroke="none" target-height="448.5" target-width="2422.4" target-x="4855.9" target-y="3198.8"/><path d="M 6197.10 2871.60 L 4890.40 2871.60 L 4881.60 3072.20 L 6188.20 3072.20 L 6197.10 2871.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="426" stroke="none" target-height="200.59985" target-width="1315.5" target-x="4881.6" target-y="2871.6"/><path d="M 7224.20 4409.10 L 4821.70 4409.10 L 4801.70 4857.50 L 7204.10 4857.50 L 7224.20 4409.10 Z" fill="#ffffff" fill-rule="nonzero" node-id="428" stroke="none" target-height="448.3999" target-width="2422.5" target-x="4801.7" target-y="4409.1"/><g node-id="600"><path d="M 6783.60 5463.10 L 5168.10 5463.10 L 5144.00 6000.50 L 6759.50 6000.50 L 6783.60 5463.10 Z" fill="#429cfd" fill-opacity="0.47" fill-rule="nonzero" group-id="13" node-id="432" stroke="none" target-height="537.3999" target-width="1639.6001" target-x="5144" target-y="5463.1"/></g><path d="M 6675.50 6084.00 L 5057.90 6084.00 L 5057.70 6082.90 L 5081.70 5544.20 L 5082.00 5543.20 L 5082.60 5542.30 L 5083.50 5541.70 L 5084.60 5541.60 L 6700.10 5541.60 L 6701.10 5541.40 L 6702.00 5541.60 L 6702.30 5542.60 L 6702.00 5543.50 L 6678.70 6082.30 L 6677.40 6083.70 L 6676.50 6084.00 L 6675.50 6084.00 Z M 5062.90 6078.30 L 6672.70 6078.30 L 6696.50 5546.40 L 5086.70 5546.40 L 5062.90 6078.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="435" stroke="none" target-height="542.6001" target-width="1644.5996" target-x="5057.7" target-y="5541.4"/><path d="M 5914.90 4081.90 L 4836.30 4081.90 L 4827.50 4282.70 L 5905.80 4282.70 L 5914.90 4081.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="437" stroke="none" target-height="200.8003" target-width="1087.3999" target-x="4827.5" target-y="4081.9"/><path d="M 6752.80 1750.30 L 6751.60 1769.90 L 6749.80 1789.30 L 6747.40 1808.60 L 6744.40 1827.80 L 6740.80 1846.90 L 6736.60 1865.90 L 6731.80 1884.70 L 6726.50 1903.30 L 6720.60 1921.80 L 6714.20 1940.10 L 6707.20 1958.10 L 6699.60 1976.00 L 6691.60 1993.50 L 6682.90 2010.90 L 6673.70 2028.00 L 6664.00 2044.90 L 6653.80 2061.40 L 6643.10 2077.60 L 6631.80 2093.60 L 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.70 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6098.50 2361.30 L 6082.70 2360.80 L 6066.90 2359.80 L 6051.20 2358.40 L 6035.60 2356.60 L 6020.00 2354.40 L 6004.40 2351.70 L 5989.00 2348.70 L 5973.70 2345.20 L 5958.40 2341.30 L 5943.20 2336.90 L 5928.20 2332.20 L 5913.30 2327.10 L 5898.50 2321.50 L 5883.80 2315.50 L 5869.30 2309.10 L 5841.00 2295.30 L 5827.10 2287.80 L 5813.50 2279.90 L 5800.00 2271.70 L 5786.80 2263.10 L 5773.90 2254.10 L 5761.20 2244.80 L 5748.70 2235.20 L 5736.50 2225.20 L 5724.60 2214.90 L 5712.90 2204.20 L 5690.50 2182.00 L 5679.70 2170.30 L 5669.30 2158.50 L 5659.20 2146.40 L 5649.40 2134.00 L 5640.00 2121.30 L 5631.00 2108.40 L 5622.30 2095.30 L 5605.90 2068.40 L 5598.30 2054.60 L 5591.10 2040.60 L 5584.30 2026.40 L 5577.80 2012.00 L 5571.70 1997.40 L 5566.00 1982.60 L 5555.80 1952.70 L 5551.40 1937.50 L 5547.40 1922.30 L 5543.80 1907.00 L 5540.60 1891.50 L 5537.80 1876.00 L 5535.40 1860.50 L 5533.50 1844.80 L 5532.00 1829.20 L 5530.90 1813.40 L 5530.30 1797.70 L 5530.00 1781.90 L 5530.20 1766.10 L 5530.90 1750.30 L 5532.20 1730.60 L 5534.10 1711.00 L 5536.60 1691.60 L 5539.60 1672.40 L 5543.30 1653.30 L 5547.50 1634.20 L 5552.30 1615.40 L 5557.60 1596.70 L 5563.50 1578.30 L 5569.90 1560.00 L 5576.90 1541.90 L 5584.40 1524.10 L 5592.50 1506.50 L 5601.10 1489.20 L 5610.20 1472.10 L 5619.80 1455.20 L 5629.90 1438.70 L 5640.50 1422.50 L 5651.60 1406.60 L 5663.30 1390.90 L 5675.40 1375.60 L 5687.90 1360.70 L 5701.00 1346.20 L 5714.50 1332.00 L 5728.60 1318.10 L 5743.10 1304.60 L 5757.80 1291.70 L 5773.00 1279.30 L 5788.40 1267.40 L 5804.20 1256.00 L 5820.30 1245.00 L 5836.70 1234.60 L 5853.40 1224.70 L 5870.30 1215.30 L 5887.50 1206.40 L 5905.00 1198.10 L 5922.70 1190.20 L 5940.60 1183.00 L 5958.80 1176.20 L 5977.10 1170.00 L 5995.70 1164.40 L 6014.40 1159.30 L 6033.20 1154.80 L 6052.20 1150.80 L 6071.50 1147.40 L 6090.70 1144.60 L 6110.10 1142.30 L 6129.60 1140.70 L 6149.20 1139.70 L 6168.90 1139.20 L 6184.80 1139.30 L 6200.60 1139.80 L 6216.30 1140.70 L 6232.00 1142.00 L 6247.70 1143.80 L 6263.30 1146.00 L 6278.90 1148.70 L 6294.30 1151.70 L 6309.70 1155.20 L 6325.00 1159.10 L 6340.20 1163.40 L 6355.20 1168.10 L 6370.10 1173.20 L 6384.90 1178.80 L 6399.60 1184.80 L 6414.20 1191.10 L 6428.50 1197.90 L 6442.50 1205.00 L 6456.40 1212.50 L 6470.10 1220.30 L 6483.60 1228.60 L 6496.80 1237.20 L 6509.70 1246.10 L 6522.40 1255.40 L 6534.90 1265.10 L 6547.10 1275.00 L 6559.10 1285.40 L 6570.70 1296.00 L 6582.10 1307.00 L 6593.20 1318.30 L 6604.00 1329.90 L 6624.60 1353.90 L 6634.30 1366.30 L 6643.70 1378.90 L 6652.80 1391.80 L 6661.50 1405.00 L 6669.90 1418.30 L 6677.80 1431.90 L 6692.70 1459.70 L 6699.50 1474.00 L 6706.00 1488.30 L 6712.10 1502.90 L 6717.80 1517.70 L 6723.10 1532.70 L 6727.90 1547.70 L 6732.40 1562.90 L 6736.40 1578.10 L 6743.20 1608.90 L 6746.00 1624.40 L 6748.40 1640.00 L 6750.30 1655.60 L 6751.80 1671.40 L 6752.80 1687.10 L 6753.50 1702.80 L 6753.70 1718.60 L 6753.50 1734.40 L 6752.80 1750.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="439" stroke="none" target-height="1222.2" target-width="1223.7002" target-x="5530" target-y="1139.2"/><path d="M 6810.30 1267.00 L 6808.60 1284.30 L 6807.10 1292.70 L 6805.20 1301.10 L 6800.10 1317.50 L 6796.90 1325.50 L 6793.30 1333.30 L 6785.00 1348.30 L 6780.20 1355.50 L 6775.00 1362.40 L 6768.80 1370.00 L 6762.30 1377.20 L 6755.40 1384.00 L 6748.10 1390.40 L 6740.40 1396.30 L 6732.40 1401.90 L 6724.10 1406.90 L 6715.50 1411.50 L 6706.60 1415.60 L 6697.60 1419.20 L 6688.40 1422.30 L 6679.00 1424.80 L 6669.50 1426.80 L 6659.90 1428.20 L 6650.30 1429.10 L 6640.50 1429.50 L 6631.00 1429.20 L 6621.60 1428.40 L 6612.40 1427.10 L 6603.20 1425.10 L 6594.10 1422.60 L 6585.20 1419.60 L 6576.50 1416.00 L 6568.00 1411.90 L 6559.70 1407.30 L 6551.80 1402.20 L 6544.30 1396.60 L 6537.00 1390.60 L 6530.20 1384.10 L 6523.80 1377.30 L 6517.80 1370.10 L 6512.20 1362.40 L 6507.60 1355.30 L 6503.50 1347.90 L 6499.80 1340.40 L 6496.50 1332.70 L 6493.60 1324.90 L 6491.10 1316.90 L 6489.10 1308.80 L 6487.50 1300.60 L 6486.30 1292.30 L 6485.60 1283.90 L 6485.30 1275.50 L 6485.40 1267.00 L 6486.10 1258.30 L 6487.20 1249.70 L 6488.80 1241.20 L 6490.70 1232.90 L 6493.10 1224.60 L 6495.90 1216.50 L 6499.10 1208.60 L 6502.60 1200.80 L 6506.60 1193.20 L 6510.90 1185.80 L 6515.70 1178.60 L 6520.70 1171.70 L 6526.10 1165.00 L 6531.90 1158.50 L 6538.10 1152.30 L 6544.60 1146.40 L 6551.30 1141.00 L 6558.20 1135.80 L 6565.30 1131.10 L 6572.70 1126.70 L 6580.30 1122.70 L 6588.10 1119.10 L 6596.00 1115.90 L 6604.10 1113.00 L 6612.30 1110.60 L 6620.70 1108.60 L 6629.10 1107.00 L 6637.70 1105.90 L 6646.30 1105.10 L 6655.00 1104.80 L 6662.90 1105.00 L 6670.80 1105.50 L 6678.50 1106.40 L 6686.30 1107.80 L 6694.00 1109.50 L 6701.50 1111.60 L 6716.30 1116.90 L 6723.50 1120.20 L 6730.50 1123.80 L 6737.30 1127.70 L 6743.80 1132.00 L 6750.20 1136.60 L 6756.30 1141.60 L 6767.70 1152.40 L 6773.10 1158.20 L 6778.00 1164.30 L 6782.70 1170.60 L 6787.00 1177.10 L 6791.00 1183.90 L 6794.70 1190.80 L 6798.00 1198.00 L 6800.90 1205.30 L 6803.40 1212.80 L 6805.60 1220.30 L 6808.80 1235.70 L 6809.70 1243.50 L 6810.30 1251.30 L 6810.30 1267.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="441" stroke="none" target-height="324.69995" target-width="325" target-x="6485.3" target-y="1104.8"/><path d="M 5134.70 3423.10 L 5134.00 3429.40 L 5132.90 3435.70 L 5131.20 3441.80 L 5129.00 3447.70 L 5126.40 3453.40 L 5123.20 3458.90 L 5119.70 3464.10 L 5115.70 3469.00 L 5111.20 3473.60 L 5106.40 3477.80 L 5101.30 3481.60 L 5095.90 3484.90 L 5090.30 3487.80 L 5084.40 3490.10 L 5078.40 3492.00 L 5072.20 3493.40 L 5066.00 3494.30 L 5059.60 3494.60 L 5054.90 3494.50 L 5045.70 3493.40 L 5041.20 3492.30 L 5032.50 3489.30 L 5028.20 3487.40 L 5024.20 3485.20 L 5020.30 3482.70 L 5016.60 3479.90 L 5009.70 3473.70 L 5006.60 3470.20 L 5001.20 3462.80 L 4998.80 3458.80 L 4996.80 3454.60 L 4995.00 3450.30 L 4993.60 3445.90 L 4992.40 3441.40 L 4991.50 3436.90 L 4990.80 3427.70 L 4990.90 3423.10 L 4991.50 3416.70 L 4992.60 3410.40 L 4996.40 3398.40 L 5002.20 3387.10 L 5005.70 3381.90 L 5009.80 3377.00 L 5014.20 3372.40 L 5019.10 3368.10 L 5024.20 3364.40 L 5029.60 3361.00 L 5035.20 3358.20 L 5041.00 3355.80 L 5047.10 3354.00 L 5053.30 3352.60 L 5066.00 3351.50 L 5070.60 3351.60 L 5075.20 3352.00 L 5079.80 3352.80 L 5088.70 3355.20 L 5093.00 3356.80 L 5097.30 3358.80 L 5105.20 3363.50 L 5112.40 3369.20 L 5115.80 3372.50 L 5118.90 3375.90 L 5124.30 3383.40 L 5126.60 3387.40 L 5130.40 3395.80 L 5131.90 3400.20 L 5133.10 3404.70 L 5134.00 3409.20 L 5134.50 3413.80 L 5134.80 3418.40 L 5134.70 3423.10 Z" fill="#263238" fill-rule="nonzero" node-id="443" stroke="none" target-height="143.1001" target-width="144" target-x="4990.8" target-y="3351.5"/><path d="M 5456.20 3423.00 L 5455.60 3429.40 L 5454.40 3435.70 L 5452.80 3441.80 L 5450.60 3447.70 L 5447.90 3453.40 L 5444.80 3458.90 L 5441.30 3464.10 L 5437.30 3469.10 L 5432.80 3473.70 L 5428.00 3477.90 L 5422.90 3481.70 L 5417.50 3485.00 L 5411.80 3487.80 L 5406.00 3490.20 L 5400.00 3492.10 L 5393.80 3493.40 L 5387.50 3494.30 L 5381.10 3494.60 L 5376.40 3494.50 L 5367.30 3493.30 L 5362.80 3492.30 L 5358.40 3490.90 L 5354.10 3489.30 L 5349.90 3487.30 L 5341.90 3482.60 L 5334.70 3476.90 L 5331.40 3473.60 L 5328.30 3470.20 L 5322.90 3462.70 L 5320.60 3458.70 L 5318.50 3454.60 L 5316.80 3450.30 L 5315.30 3445.90 L 5313.30 3436.90 L 5312.50 3427.70 L 5312.60 3423.00 L 5313.20 3416.70 L 5314.40 3410.40 L 5318.20 3398.40 L 5320.80 3392.70 L 5323.90 3387.20 L 5327.50 3382.00 L 5331.40 3377.10 L 5335.90 3372.40 L 5340.70 3368.20 L 5345.80 3364.40 L 5351.20 3361.10 L 5356.80 3358.30 L 5362.60 3355.90 L 5368.70 3354.00 L 5374.80 3352.70 L 5381.10 3351.80 L 5387.50 3351.50 L 5392.20 3351.60 L 5401.30 3352.70 L 5405.80 3353.80 L 5414.60 3356.80 L 5418.80 3358.70 L 5426.80 3363.40 L 5430.50 3366.20 L 5434.00 3369.10 L 5437.40 3372.40 L 5440.50 3375.80 L 5443.30 3379.50 L 5445.90 3383.30 L 5450.30 3391.50 L 5452.00 3395.80 L 5453.50 3400.20 L 5454.70 3404.60 L 5455.50 3409.20 L 5456.10 3413.80 L 5456.20 3423.00 Z" fill="#263238" fill-rule="nonzero" node-id="445" stroke="none" target-height="143.1001" target-width="143.7002" target-x="5312.5" target-y="3351.5"/><path d="M 5778.00 3423.00 L 5777.30 3429.40 L 5776.20 3435.70 L 5774.50 3441.80 L 5772.40 3447.70 L 5769.70 3453.40 L 5766.60 3458.90 L 5763.00 3464.10 L 5754.60 3473.70 L 5749.70 3477.90 L 5744.60 3481.70 L 5739.20 3485.00 L 5733.60 3487.80 L 5727.80 3490.20 L 5721.70 3492.10 L 5715.50 3493.40 L 5709.30 3494.30 L 5702.90 3494.60 L 5698.20 3494.50 L 5693.60 3494.10 L 5689.10 3493.30 L 5680.10 3490.90 L 5675.80 3489.30 L 5671.60 3487.30 L 5667.50 3485.10 L 5663.60 3482.60 L 5656.40 3476.90 L 5653.10 3473.60 L 5650.00 3470.20 L 5647.10 3466.50 L 5644.50 3462.70 L 5642.20 3458.70 L 5638.40 3450.30 L 5636.90 3445.90 L 5634.90 3436.90 L 5634.10 3427.70 L 5634.10 3423.00 L 5634.80 3416.60 L 5635.90 3410.40 L 5639.80 3398.40 L 5642.40 3392.70 L 5645.50 3387.20 L 5649.10 3381.90 L 5653.10 3377.00 L 5657.60 3372.40 L 5662.40 3368.20 L 5667.50 3364.40 L 5678.50 3358.30 L 5684.40 3355.90 L 5690.40 3354.00 L 5696.60 3352.70 L 5702.90 3351.80 L 5709.30 3351.50 L 5713.90 3351.60 L 5723.10 3352.70 L 5732.00 3355.10 L 5736.40 3356.80 L 5740.60 3358.70 L 5748.60 3363.40 L 5752.30 3366.20 L 5755.80 3369.10 L 5759.10 3372.40 L 5762.20 3375.80 L 5767.70 3383.30 L 5772.00 3391.50 L 5773.80 3395.80 L 5775.30 3400.20 L 5777.30 3409.20 L 5777.80 3413.80 L 5778.10 3418.40 L 5778.00 3423.00 Z" fill="#263238" fill-rule="nonzero" node-id="447" stroke="none" target-height="143.1001" target-width="144" target-x="5634.1" target-y="3351.5"/><path d="M 5080.50 4633.30 L 5079.90 4639.70 L 5078.70 4645.90 L 5077.00 4652.00 L 5074.90 4657.90 L 5069.10 4669.10 L 5065.50 4674.40 L 5061.50 4679.30 L 5057.10 4683.90 L 5052.20 4688.10 L 5047.10 4691.90 L 5041.80 4695.20 L 5036.10 4698.00 L 5030.30 4700.40 L 5024.30 4702.30 L 5018.10 4703.70 L 5011.80 4704.50 L 5005.40 4704.90 L 5000.80 4704.70 L 4991.60 4703.60 L 4982.70 4701.20 L 4978.40 4699.50 L 4974.10 4697.60 L 4970.10 4695.40 L 4966.20 4692.90 L 4962.50 4690.10 L 4955.60 4683.90 L 4949.70 4676.80 L 4947.10 4673.00 L 4944.80 4669.00 L 4941.00 4660.60 L 4939.50 4656.20 L 4938.30 4651.70 L 4937.40 4647.20 L 4936.60 4638.00 L 4936.70 4633.30 L 4937.30 4626.90 L 4938.50 4620.70 L 4940.20 4614.60 L 4942.30 4608.60 L 4945.00 4602.90 L 4948.10 4597.40 L 4951.70 4592.20 L 4960.10 4582.70 L 4965.00 4578.50 L 4970.10 4574.70 L 4975.50 4571.40 L 4981.10 4568.50 L 4986.90 4566.20 L 4993.00 4564.30 L 4999.20 4562.90 L 5005.40 4562.10 L 5011.90 4561.80 L 5016.50 4561.90 L 5021.10 4562.30 L 5025.60 4563.10 L 5034.60 4565.50 L 5038.90 4567.10 L 5043.10 4569.10 L 5051.10 4573.80 L 5054.80 4576.50 L 5058.30 4579.50 L 5061.60 4582.70 L 5064.70 4586.20 L 5070.10 4593.70 L 5072.50 4597.60 L 5074.50 4601.80 L 5076.30 4606.10 L 5077.80 4610.50 L 5078.90 4614.90 L 5079.80 4619.50 L 5080.60 4628.70 L 5080.50 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="449" stroke="none" target-height="143.1001" target-width="144" target-x="4936.6" target-y="4561.8"/><path d="M 5402.10 4633.30 L 5401.40 4639.70 L 5400.30 4645.90 L 5398.60 4652.00 L 5396.50 4657.90 L 5393.80 4663.60 L 5390.70 4669.10 L 5387.20 4674.30 L 5383.20 4679.20 L 5378.70 4683.90 L 5373.90 4688.10 L 5368.80 4691.90 L 5363.50 4695.20 L 5357.80 4698.00 L 5352.00 4700.40 L 5346.00 4702.30 L 5339.80 4703.70 L 5327.20 4704.90 L 5322.50 4704.80 L 5317.90 4704.30 L 5313.40 4703.60 L 5308.90 4702.60 L 5300.10 4699.60 L 5295.90 4697.60 L 5287.90 4692.90 L 5280.70 4687.20 L 5277.30 4684.00 L 5274.20 4680.50 L 5271.40 4676.90 L 5268.80 4673.00 L 5266.50 4669.00 L 5262.70 4660.60 L 5261.20 4656.20 L 5259.20 4647.20 L 5258.40 4638.00 L 5258.50 4633.30 L 5260.30 4620.70 L 5261.90 4614.60 L 5264.10 4608.60 L 5266.70 4602.90 L 5273.40 4592.20 L 5277.40 4587.30 L 5281.90 4582.70 L 5286.70 4578.50 L 5291.80 4574.70 L 5297.20 4571.40 L 5302.90 4568.50 L 5314.70 4564.30 L 5320.90 4562.90 L 5333.60 4561.80 L 5338.20 4561.90 L 5347.40 4563.10 L 5356.30 4565.50 L 5360.60 4567.10 L 5364.80 4569.10 L 5368.90 4571.30 L 5372.80 4573.80 L 5380.00 4579.50 L 5383.30 4582.70 L 5386.40 4586.20 L 5389.20 4589.80 L 5391.80 4593.70 L 5394.10 4597.70 L 5397.90 4606.10 L 5399.40 4610.50 L 5401.40 4619.50 L 5401.90 4624.10 L 5402.10 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="451" stroke="none" target-height="143.1001" target-width="143.7002" target-x="5258.4" target-y="4561.8"/><path d="M 5724.60 4633.30 L 5723.90 4639.70 L 5722.80 4645.90 L 5721.10 4652.00 L 5718.90 4658.00 L 5716.30 4663.70 L 5713.20 4669.20 L 5709.60 4674.40 L 5705.60 4679.30 L 5701.10 4684.00 L 5691.20 4691.90 L 5685.80 4695.20 L 5680.20 4698.10 L 5674.30 4700.50 L 5668.30 4702.30 L 5662.10 4703.70 L 5655.80 4704.50 L 5649.40 4704.90 L 5644.80 4704.70 L 5635.60 4703.50 L 5631.10 4702.50 L 5622.40 4699.50 L 5618.20 4697.50 L 5610.30 4692.80 L 5606.60 4690.00 L 5603.10 4687.10 L 5599.70 4683.80 L 5596.60 4680.40 L 5591.20 4672.90 L 5588.90 4668.90 L 5585.00 4660.50 L 5583.60 4656.10 L 5582.40 4651.70 L 5581.50 4647.10 L 5580.90 4642.60 L 5580.70 4633.30 L 5581.40 4626.90 L 5582.50 4620.70 L 5584.20 4614.60 L 5586.40 4608.70 L 5589.00 4603.00 L 5592.20 4597.50 L 5595.70 4592.30 L 5599.70 4587.40 L 5604.20 4582.70 L 5609.00 4578.50 L 5614.10 4574.80 L 5619.50 4571.40 L 5625.20 4568.60 L 5631.00 4566.20 L 5637.00 4564.30 L 5643.20 4563.00 L 5649.50 4562.10 L 5655.90 4561.80 L 5660.50 4561.90 L 5669.70 4563.00 L 5678.60 4565.40 L 5683.00 4567.00 L 5687.20 4569.00 L 5691.20 4571.20 L 5695.10 4573.70 L 5702.40 4579.40 L 5705.70 4582.70 L 5708.80 4586.10 L 5714.20 4593.60 L 5716.60 4597.60 L 5720.40 4606.00 L 5721.90 4610.40 L 5723.90 4619.50 L 5724.40 4624.00 L 5724.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="453" stroke="none" target-height="143.1001" target-width="143.8999" target-x="5580.7" target-y="4561.8"/><path d="M 6045.60 4633.30 L 6043.80 4645.90 L 6039.90 4657.90 L 6037.30 4663.60 L 6034.20 4669.10 L 6030.60 4674.40 L 6026.60 4679.30 L 6022.10 4683.90 L 6017.30 4688.10 L 6012.20 4691.90 L 6006.80 4695.20 L 6001.20 4698.00 L 5995.40 4700.40 L 5989.30 4702.30 L 5983.20 4703.70 L 5976.90 4704.50 L 5970.50 4704.90 L 5965.80 4704.70 L 5956.70 4703.50 L 5952.20 4702.50 L 5943.50 4699.50 L 5939.30 4697.50 L 5931.30 4692.80 L 5927.60 4690.00 L 5920.80 4683.80 L 5917.70 4680.40 L 5912.30 4672.90 L 5909.90 4668.90 L 5907.90 4664.80 L 5906.10 4660.50 L 5902.60 4647.10 L 5901.70 4637.90 L 5901.80 4633.30 L 5902.40 4626.90 L 5903.60 4620.70 L 5905.30 4614.60 L 5907.50 4608.70 L 5913.20 4597.50 L 5916.80 4592.30 L 5925.30 4582.70 L 5930.10 4578.50 L 5935.20 4574.80 L 5940.60 4571.40 L 5946.20 4568.60 L 5958.10 4564.30 L 5964.20 4563.00 L 5976.90 4561.80 L 5981.60 4561.90 L 5986.20 4562.30 L 5990.70 4563.10 L 5999.60 4565.50 L 6004.00 4567.10 L 6008.20 4569.10 L 6016.10 4573.80 L 6019.80 4576.50 L 6023.40 4579.50 L 6026.70 4582.70 L 6029.80 4586.20 L 6032.60 4589.80 L 6035.20 4593.70 L 6039.60 4601.80 L 6041.40 4606.10 L 6042.80 4610.50 L 6044.90 4619.50 L 6045.70 4628.70 L 6045.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="455" stroke="none" target-height="143.1001" target-width="144" target-x="5901.7" target-y="4561.8"/><path d="M 6368.60 4633.30 L 6367.90 4639.70 L 6366.70 4645.90 L 6365.10 4652.00 L 6362.90 4657.90 L 6360.20 4663.60 L 6357.10 4669.10 L 6353.50 4674.40 L 6349.50 4679.30 L 6345.10 4683.90 L 6340.30 4688.10 L 6335.20 4691.90 L 6329.80 4695.20 L 6324.10 4698.00 L 6318.30 4700.40 L 6312.30 4702.30 L 6306.10 4703.70 L 6299.80 4704.50 L 6293.40 4704.90 L 6288.80 4704.80 L 6284.20 4704.30 L 6279.60 4703.60 L 6275.10 4702.60 L 6266.30 4699.60 L 6258.10 4695.40 L 6250.40 4690.20 L 6246.90 4687.20 L 6243.60 4684.00 L 6240.50 4680.50 L 6237.60 4676.90 L 6232.70 4669.00 L 6230.70 4664.90 L 6228.90 4660.60 L 6227.40 4656.20 L 6226.30 4651.70 L 6224.90 4642.60 L 6224.70 4638.00 L 6224.70 4633.30 L 6225.40 4626.90 L 6226.50 4620.70 L 6228.20 4614.60 L 6230.40 4608.60 L 6236.10 4597.40 L 6239.70 4592.20 L 6243.70 4587.30 L 6248.20 4582.70 L 6253.00 4578.50 L 6258.10 4574.70 L 6263.50 4571.40 L 6269.10 4568.50 L 6275.00 4566.20 L 6281.00 4564.30 L 6287.20 4562.90 L 6293.50 4562.10 L 6299.90 4561.80 L 6304.50 4561.90 L 6309.10 4562.30 L 6313.70 4563.10 L 6322.60 4565.50 L 6326.90 4567.10 L 6331.10 4569.10 L 6335.20 4571.30 L 6339.10 4573.80 L 6342.80 4576.50 L 6346.30 4579.50 L 6349.60 4582.70 L 6352.70 4586.20 L 6355.60 4589.80 L 6358.20 4593.70 L 6360.50 4597.60 L 6362.50 4601.80 L 6364.30 4606.10 L 6365.80 4610.50 L 6367.80 4619.50 L 6368.60 4628.70 L 6368.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="457" stroke="none" target-height="143.1001" target-width="143.8999" target-x="6224.7" target-y="4561.8"/><path d="M 6319.80 1718.50 L 6328.20 1709.90 L 6336.00 1701.00 L 6343.40 1692.00 L 6350.30 1682.80 L 6356.70 1673.40 L 6362.80 1663.60 L 6368.30 1653.70 L 6373.40 1643.60 L 6378.00 1633.50 L 6382.10 1623.20 L 6385.80 1612.60 L 6389.00 1602.00 L 6391.70 1591.40 L 6393.90 1580.70 L 6395.70 1569.90 L 6397.00 1559.10 L 6397.80 1548.20 L 6398.20 1537.40 L 6398.10 1526.60 L 6397.50 1515.80 L 6396.50 1505.00 L 6394.90 1494.40 L 6392.90 1483.80 L 6390.50 1473.30 L 6387.50 1462.90 L 6384.10 1452.60 L 6380.20 1442.50 L 6375.80 1432.60 L 6370.90 1422.80 L 6365.50 1413.20 L 6359.80 1403.90 L 6353.50 1394.80 L 6346.70 1386.00 L 6339.40 1377.30 L 6331.60 1368.90 L 6323.30 1360.90 L 6314.90 1353.40 L 6306.20 1346.50 L 6297.20 1340.00 L 6288.10 1334.00 L 6278.60 1328.40 L 6268.90 1323.30 L 6259.10 1318.70 L 6249.10 1314.60 L 6238.90 1310.90 L 6228.60 1307.70 L 6218.10 1305.00 L 6207.60 1302.80 L 6197.00 1301.00 L 6186.20 1299.70 L 6175.40 1298.90 L 6164.60 1298.50 L 6153.80 1298.70 L 6142.90 1299.30 L 6132.10 1300.30 L 6121.20 1301.90 L 6110.50 1303.90 L 6099.80 1306.40 L 6089.20 1309.30 L 6078.50 1312.80 L 6068.10 1316.60 L 6057.90 1321.00 L 6047.70 1325.80 L 6037.70 1331.20 L 6027.80 1337.00 L 6018.20 1343.20 L 6008.80 1349.90 L 5999.70 1357.10 L 5990.70 1364.70 L 5981.90 1373.00 L 5973.50 1381.60 L 5965.60 1390.40 L 5958.20 1399.40 L 5951.30 1408.60 L 5944.90 1418.00 L 5938.90 1427.80 L 5933.30 1437.70 L 5928.30 1447.80 L 5923.70 1457.90 L 5919.60 1468.30 L 5915.90 1478.80 L 5912.70 1489.40 L 5910.00 1500.00 L 5907.70 1510.70 L 5905.90 1521.50 L 5904.60 1532.30 L 5903.80 1543.20 L 5903.40 1554.00 L 5903.50 1564.80 L 5904.10 1575.60 L 5905.20 1586.40 L 5906.70 1597.00 L 5908.70 1607.60 L 5911.20 1618.10 L 5914.10 1628.50 L 5917.60 1638.80 L 5921.50 1648.90 L 5925.80 1658.80 L 5930.70 1668.60 L 5936.10 1678.20 L 5941.90 1687.50 L 5948.20 1696.60 L 5954.90 1705.40 L 5962.20 1714.10 L 5970.10 1722.50 L 5978.30 1730.50 L 5986.80 1738.00 L 5995.40 1744.90 L 6004.40 1751.40 L 6013.60 1757.40 L 6023.10 1763.00 L 6032.70 1768.10 L 6042.50 1772.70 L 6052.50 1776.80 L 6062.70 1780.50 L 6073.10 1783.70 L 6083.50 1786.40 L 6094.00 1788.60 L 6104.70 1790.40 L 6115.40 1791.70 L 6126.20 1792.50 L 6137.00 1792.90 L 6147.80 1792.70 L 6158.70 1792.10 L 6169.60 1791.10 L 6180.40 1789.50 L 6191.10 1787.50 L 6201.80 1785.00 L 6212.50 1782.10 L 6223.10 1778.60 L 6233.50 1774.80 L 6243.80 1770.40 L 6253.90 1765.60 L 6263.90 1760.20 L 6273.80 1754.40 L 6283.40 1748.20 L 6292.80 1741.50 L 6302.00 1734.40 L 6311.00 1726.70 L 6319.80 1718.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="459" stroke="none" target-height="494.40002" target-width="494.8003" target-x="5903.4" target-y="1298.5"/><path d="M 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.60 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6095.30 2361.20 L 6076.30 2360.50 L 6057.50 2359.10 L 6038.70 2357.10 L 6020.00 2354.50 L 6001.40 2351.20 L 5983.00 2347.40 L 5964.70 2343.00 L 5946.50 2338.00 L 5928.50 2332.40 L 5910.60 2326.20 L 5893.00 2319.40 L 5875.60 2312.10 L 5858.40 2304.20 L 5841.40 2295.60 L 5824.70 2286.60 L 5808.40 2277.00 L 5792.40 2266.90 L 5776.80 2256.30 L 5761.50 2245.20 L 5746.60 2233.60 L 5732.10 2221.60 L 5718.00 2209.10 L 5704.30 2196.10 L 5691.10 2182.70 L 5678.20 2168.80 L 5665.90 2154.50 L 5654.00 2139.90 L 5642.50 2124.80 L 5631.50 2109.30 L 5643.30 2097.90 L 5655.50 2086.80 L 5668.10 2076.00 L 5681.30 2065.40 L 5694.90 2055.00 L 5708.70 2045.10 L 5722.90 2035.50 L 5737.60 2026.20 L 5752.70 2017.20 L 5768.20 2008.50 L 5783.80 2000.20 L 5799.80 1992.30 L 5816.20 1984.70 L 5832.90 1977.50 L 5850.10 1970.60 L 5867.30 1964.10 L 5884.80 1958.10 L 5902.60 1952.40 L 5920.80 1947.10 L 5939.20 1942.30 L 5957.70 1937.90 L 5976.50 1933.90 L 5995.50 1930.30 L 6014.80 1927.20 L 6034.40 1924.60 L 6053.90 1922.40 L 6073.60 1920.70 L 6093.50 1919.40 L 6113.70 1918.70 L 6134.10 1918.40 L 6154.50 1918.70 L 6174.60 1919.50 L 6194.50 1920.70 L 6214.00 1922.40 L 6233.30 1924.60 L 6252.70 1927.20 L 6271.70 1930.30 L 6290.40 1933.90 L 6308.80 1937.90 L 6326.90 1942.30 L 6345.00 1947.20 L 6362.70 1952.40 L 6380.10 1958.10 L 6397.00 1964.10 L 6413.60 1970.60 L 6430.20 1977.50 L 6446.30 1984.70 L 6462.00 1992.30 L 6477.30 2000.20 L 6492.20 2008.50 L 6507.00 2017.20 L 6521.30 2026.20 L 6535.10 2035.60 L 6548.50 2045.20 L 6561.40 2055.00 L 6574.10 2065.40 L 6586.30 2076.00 L 6598.00 2086.80 L 6609.20 2097.90 L 6620.00 2109.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="461" stroke="none" target-height="442.99988" target-width="988.5" target-x="5631.5" target-y="1918.4"/><g node-id="601"><path d="M 6319.80 1718.50 L 6328.20 1709.90 L 6336.00 1701.00 L 6343.40 1692.00 L 6350.30 1682.80 L 6356.70 1673.40 L 6362.80 1663.60 L 6368.30 1653.70 L 6373.40 1643.60 L 6378.00 1633.50 L 6382.10 1623.20 L 6385.80 1612.60 L 6389.00 1602.00 L 6391.70 1591.40 L 6393.90 1580.70 L 6395.70 1569.90 L 6397.00 1559.10 L 6397.80 1548.20 L 6398.20 1537.40 L 6398.10 1526.60 L 6397.50 1515.80 L 6396.50 1505.00 L 6394.90 1494.40 L 6392.90 1483.80 L 6390.50 1473.30 L 6387.50 1462.90 L 6384.10 1452.60 L 6380.20 1442.50 L 6375.80 1432.60 L 6370.90 1422.80 L 6365.50 1413.20 L 6359.80 1403.90 L 6353.50 1394.80 L 6346.70 1386.00 L 6339.40 1377.30 L 6331.60 1368.90 L 6323.30 1360.90 L 6314.90 1353.40 L 6306.20 1346.50 L 6297.20 1340.00 L 6288.10 1334.00 L 6278.60 1328.40 L 6268.90 1323.30 L 6259.10 1318.70 L 6249.10 1314.60 L 6238.90 1310.90 L 6228.60 1307.70 L 6218.10 1305.00 L 6207.60 1302.80 L 6197.00 1301.00 L 6186.20 1299.70 L 6175.40 1298.90 L 6164.60 1298.50 L 6153.80 1298.70 L 6142.90 1299.30 L 6132.10 1300.30 L 6121.20 1301.90 L 6110.50 1303.90 L 6099.80 1306.40 L 6089.20 1309.30 L 6078.50 1312.80 L 6068.10 1316.60 L 6057.90 1321.00 L 6047.70 1325.80 L 6037.70 1331.20 L 6027.80 1337.00 L 6018.20 1343.20 L 6008.80 1349.90 L 5999.70 1357.10 L 5990.70 1364.70 L 5981.90 1373.00 L 5973.50 1381.60 L 5965.60 1390.40 L 5958.20 1399.40 L 5951.30 1408.60 L 5944.90 1418.00 L 5938.90 1427.80 L 5933.30 1437.70 L 5928.30 1447.80 L 5923.70 1457.90 L 5919.60 1468.30 L 5915.90 1478.80 L 5912.70 1489.40 L 5910.00 1500.00 L 5907.70 1510.70 L 5905.90 1521.50 L 5904.60 1532.30 L 5903.80 1543.20 L 5903.40 1554.00 L 5903.50 1564.80 L 5904.10 1575.60 L 5905.20 1586.40 L 5906.70 1597.00 L 5908.70 1607.60 L 5911.20 1618.10 L 5914.10 1628.50 L 5917.60 1638.80 L 5921.50 1648.90 L 5925.80 1658.80 L 5930.70 1668.60 L 5936.10 1678.20 L 5941.90 1687.50 L 5948.20 1696.60 L 5954.90 1705.40 L 5962.20 1714.10 L 5970.10 1722.50 L 5978.30 1730.50 L 5986.80 1738.00 L 5995.40 1744.90 L 6004.40 1751.40 L 6013.60 1757.40 L 6023.10 1763.00 L 6032.70 1768.10 L 6042.50 1772.70 L 6052.50 1776.80 L 6062.70 1780.50 L 6073.10 1783.70 L 6083.50 1786.40 L 6094.00 1788.60 L 6104.70 1790.40 L 6115.40 1791.70 L 6126.20 1792.50 L 6137.00 1792.90 L 6147.80 1792.70 L 6158.70 1792.10 L 6169.60 1791.10 L 6180.40 1789.50 L 6191.10 1787.50 L 6201.80 1785.00 L 6212.50 1782.10 L 6223.10 1778.60 L 6233.50 1774.80 L 6243.80 1770.40 L 6253.90 1765.60 L 6263.90 1760.20 L 6273.80 1754.40 L 6283.40 1748.20 L 6292.80 1741.50 L 6302.00 1734.40 L 6311.00 1726.70 L 6319.80 1718.50 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="14" node-id="465" stroke="none" target-height="494.40002" target-width="494.8003" target-x="5903.4" target-y="1298.5"/></g><g node-id="602"><path d="M 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.60 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6095.30 2361.20 L 6076.30 2360.50 L 6057.50 2359.10 L 6038.70 2357.10 L 6020.00 2354.50 L 6001.40 2351.20 L 5983.00 2347.40 L 5964.70 2343.00 L 5946.50 2338.00 L 5928.50 2332.40 L 5910.60 2326.20 L 5893.00 2319.40 L 5875.60 2312.10 L 5858.40 2304.20 L 5841.40 2295.60 L 5824.70 2286.60 L 5808.40 2277.00 L 5792.40 2266.90 L 5776.80 2256.30 L 5761.50 2245.20 L 5746.60 2233.60 L 5732.10 2221.60 L 5718.00 2209.10 L 5704.30 2196.10 L 5691.10 2182.70 L 5678.20 2168.80 L 5665.90 2154.50 L 5654.00 2139.90 L 5642.50 2124.80 L 5631.50 2109.30 L 5643.30 2097.90 L 5655.50 2086.80 L 5668.10 2076.00 L 5681.30 2065.40 L 5694.90 2055.00 L 5708.70 2045.10 L 5722.90 2035.50 L 5737.60 2026.20 L 5752.70 2017.20 L 5768.20 2008.50 L 5783.80 2000.20 L 5799.80 1992.30 L 5816.20 1984.70 L 5832.90 1977.50 L 5850.10 1970.60 L 5867.30 1964.10 L 5884.80 1958.10 L 5902.60 1952.40 L 5920.80 1947.10 L 5939.20 1942.30 L 5957.70 1937.90 L 5976.50 1933.90 L 5995.50 1930.30 L 6014.80 1927.20 L 6034.40 1924.60 L 6053.90 1922.40 L 6073.60 1920.70 L 6093.50 1919.40 L 6113.70 1918.70 L 6134.10 1918.40 L 6154.50 1918.70 L 6174.60 1919.50 L 6194.50 1920.70 L 6214.00 1922.40 L 6233.30 1924.60 L 6252.70 1927.20 L 6271.70 1930.30 L 6290.40 1933.90 L 6308.80 1937.90 L 6326.90 1942.30 L 6345.00 1947.20 L 6362.70 1952.40 L 6380.10 1958.10 L 6397.00 1964.10 L 6413.60 1970.60 L 6430.20 1977.50 L 6446.30 1984.70 L 6462.00 1992.30 L 6477.30 2000.20 L 6492.20 2008.50 L 6507.00 2017.20 L 6521.30 2026.20 L 6535.10 2035.60 L 6548.50 2045.20 L 6561.40 2055.00 L 6574.10 2065.40 L 6586.30 2076.00 L 6598.00 2086.80 L 6609.20 2097.90 L 6620.00 2109.30 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="15" node-id="470" stroke="none" target-height="442.99988" target-width="988.5" target-x="5631.5" target-y="1918.4"/></g><path d="M 3110.60 3755.30 L 3087.70 3806.30 L 3064.90 3859.20 L 3043.30 3912.50 L 3022.50 3965.90 L 3002.20 4020.10 L 2992.40 4047.30 L 2972.00 4106.70 L 2961.50 4139.10 L 2951.60 4171.70 L 2942.30 4204.40 L 2933.50 4237.30 L 2925.20 4270.30 L 2917.50 4303.40 L 2910.30 4336.70 L 2903.70 4370.10 L 2897.60 4403.60 L 2892.30 4438.70 L 2892.20 4443.20 L 2892.40 4447.70 L 2894.00 4456.60 L 2897.10 4466.40 L 2900.70 4475.90 L 2904.80 4485.30 L 2909.50 4494.40 L 2914.60 4503.30 L 2920.20 4511.90 L 2932.00 4528.10 L 2944.10 4544.00 L 2956.70 4559.40 L 2969.80 4574.60 L 2983.20 4589.30 L 2997.10 4603.70 L 3011.40 4617.60 L 3047.30 4650.50 L 3068.70 4669.40 L 3090.50 4687.90 L 3112.60 4706.00 L 3135.00 4723.80 L 3180.90 4758.70 L 3204.20 4776.00 L 3263.60 4818.60 L 3299.30 4843.20 L 3254.70 4926.90 L 3226.40 4914.30 L 3198.40 4901.20 L 3170.70 4887.60 L 3143.30 4873.50 L 3116.10 4858.90 L 3089.20 4843.80 L 3062.60 4828.20 L 3036.20 4812.10 L 3010.20 4795.60 L 2984.40 4778.50 L 2959.00 4761.00 L 2933.80 4743.00 L 2918.00 4731.20 L 2902.50 4718.90 L 2887.30 4706.30 L 2872.50 4693.30 L 2857.90 4679.90 L 2843.80 4666.10 L 2830.00 4652.00 L 2816.50 4637.50 L 2803.40 4622.70 L 2790.70 4607.60 L 2781.70 4595.90 L 2773.20 4584.00 L 2765.20 4571.70 L 2757.80 4559.10 L 2750.90 4546.20 L 2744.60 4533.00 L 2738.90 4519.50 L 2733.70 4505.70 L 2730.20 4494.10 L 2727.40 4482.30 L 2725.20 4470.40 L 2723.60 4458.40 L 2722.60 4446.30 L 2722.30 4434.10 L 2722.30 4404.30 L 2724.70 4380.50 L 2728.30 4349.40 L 2732.50 4318.50 L 2737.20 4287.60 L 2742.50 4256.80 L 2748.20 4226.20 L 2754.50 4195.60 L 2761.20 4165.10 L 2768.50 4134.70 L 2776.30 4104.50 L 2784.60 4074.40 L 2793.30 4044.40 L 2816.90 3970.60 L 2831.70 3926.90 L 2841.90 3897.90 L 2852.60 3869.10 L 2875.10 3812.00 L 2898.80 3755.50 L 2920.10 3708.20 L 2938.60 3669.70 L 3110.60 3755.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="473" stroke="none" target-height="1257.2" target-width="577" target-x="2722.3" target-y="3669.7"/><path d="M 3265.60 4828.40 L 3434.30 4743.00 L 3390.60 4928.10 L 3367.90 4933.00 L 3348.80 4935.70 L 3337.70 4936.70 L 3326.20 4937.30 L 3314.00 4937.40 L 3297.40 4936.50 L 3289.00 4935.50 L 3280.70 4934.10 L 3272.40 4932.30 L 3264.30 4930.00 L 3256.30 4927.20 L 3248.60 4923.80 L 3241.20 4919.90 L 3230.80 4912.90 L 3225.90 4908.80 L 3221.30 4904.30 L 3265.60 4828.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="475" stroke="none" target-height="194.3999" target-width="213" target-x="3221.3" target-y="4743"/><path d="M 3588.60 4773.30 L 3543.70 4926.50 L 3390.60 4928.10 L 3434.30 4743.00 L 3588.60 4773.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="477" stroke="none" target-height="185.1001" target-width="198" target-x="3390.6" target-y="4743"/><path d="M 3826.60 2862.30 L 3831.40 2878.70 L 3836.80 2895.00 L 3842.80 2911.00 L 3849.30 2926.80 L 3856.40 2942.40 L 3864.10 2957.70 L 3861.60 2960.20 L 3856.20 2964.50 L 3850.10 2967.80 L 3846.80 2969.00 L 3843.40 2969.90 L 3836.50 2970.80 L 3833.10 2970.80 L 3829.60 2970.50 L 3826.20 2969.90 L 3826.60 2862.30 Z" fill="#df5753" fill-rule="nonzero" node-id="479" stroke="none" target-height="108.5" target-width="37.900146" target-x="3826.2" target-y="2862.3"/><path d="M 3821.60 2863.70 L 3824.00 2863.50 L 3826.40 2862.70 L 3828.60 2861.60 L 3830.60 2860.00 L 3832.50 2858.10 L 3834.30 2855.70 L 3837.00 2850.20 L 3838.10 2847.00 L 3839.30 2840.10 L 3839.50 2836.30 L 3839.30 2832.50 L 3838.10 2825.60 L 3837.00 2822.40 L 3835.80 2819.50 L 3834.30 2816.90 L 3832.50 2814.50 L 3830.60 2812.60 L 3828.60 2811.00 L 3826.40 2809.80 L 3824.00 2809.10 L 3821.60 2808.90 L 3816.90 2809.80 L 3814.70 2811.00 L 3810.70 2814.50 L 3809.00 2816.90 L 3807.50 2819.50 L 3806.20 2822.40 L 3805.10 2825.60 L 3803.90 2832.50 L 3803.70 2836.30 L 3803.90 2840.10 L 3805.10 2847.00 L 3806.20 2850.20 L 3809.00 2855.70 L 3810.70 2858.10 L 3812.60 2860.00 L 3814.70 2861.60 L 3816.90 2862.70 L 3821.60 2863.70 Z" fill="#263238" fill-rule="nonzero" node-id="481" stroke="none" target-height="54.80005" target-width="35.80005" target-x="3803.7" target-y="2808.9"/><path d="M 3816.40 2809.80 L 3852.60 2799.50 L 3849.70 2803.50 L 3844.70 2808.80 L 3839.10 2812.90 L 3834.00 2815.10 L 3831.30 2815.70 L 3828.50 2815.70 L 3825.50 2815.30 L 3823.40 2814.60 L 3821.20 2813.50 L 3816.40 2809.80 Z" fill="#263238" fill-rule="nonzero" node-id="483" stroke="none" target-height="16.199951" target-width="36.200195" target-x="3816.4" target-y="2799.5"/><path d="M 3360.80 3037.40 L 3367.90 3077.40 L 3371.10 3099.20 L 3374.20 3122.60 L 3376.70 3146.30 L 3378.80 3170.90 L 3380.60 3204.00 L 3381.00 3220.60 L 3381.00 3237.20 L 3380.70 3253.70 L 3379.90 3269.90 L 3378.70 3286.00 L 3376.90 3301.70 L 3374.70 3316.90 L 3372.70 3328.20 L 3370.30 3339.10 L 3367.60 3349.60 L 3364.60 3359.70 L 3361.20 3369.80 L 3357.40 3379.30 L 3353.30 3388.30 L 3348.80 3396.70 L 3344.80 3403.30 L 3340.60 3409.60 L 3336.10 3415.40 L 3331.40 3420.80 L 3326.40 3425.90 L 3329.50 3433.90 L 3332.60 3440.10 L 3335.00 3444.40 L 3338.10 3449.40 L 3342.00 3455.10 L 3351.20 3466.50 L 3357.30 3472.90 L 3363.60 3478.90 L 3371.00 3485.10 L 3379.60 3491.50 L 3393.40 3500.40 L 3410.20 3509.30 L 3418.90 3513.20 L 3428.40 3517.10 L 3438.90 3520.80 L 3450.20 3524.30 L 3461.40 3527.30 L 3473.50 3530.00 L 3486.60 3532.50 L 3500.80 3534.60 L 3514.70 3536.20 L 3529.70 3537.40 L 3545.90 3538.20 L 3563.30 3538.50 L 3579.00 3538.30 L 3593.10 3537.80 L 3616.90 3535.90 L 3628.60 3534.30 L 3638.80 3532.60 L 3655.60 3528.70 L 3663.60 3526.10 L 3670.50 3523.40 L 3676.30 3520.70 L 3681.20 3517.90 L 3686.10 3514.60 L 3690.10 3511.30 L 3693.40 3508.00 L 3696.00 3504.70 L 3698.30 3501.00 L 3700.10 3497.30 L 3702.10 3489.90 L 3702.50 3484.80 L 3702.30 3479.70 L 3701.50 3474.50 L 3700.20 3469.50 L 3698.40 3464.60 L 3696.30 3459.70 L 3692.60 3452.80 L 3684.40 3440.60 L 3676.80 3431.40 L 3671.60 3425.90 L 3660.80 3423.10 L 3650.90 3420.00 L 3641.80 3416.70 L 3633.50 3413.30 L 3626.00 3409.60 L 3618.30 3405.40 L 3611.30 3401.00 L 3605.00 3396.40 L 3599.20 3391.70 L 3594.00 3386.90 L 3589.00 3381.60 L 3580.50 3370.50 L 3577.00 3364.80 L 3573.80 3358.90 L 3570.40 3351.20 L 3567.50 3343.40 L 3565.20 3335.20 L 3563.50 3326.90 L 3562.20 3318.40 L 3561.40 3309.80 L 3561.00 3301.00 L 3561.10 3291.90 L 3561.70 3279.90 L 3562.90 3267.70 L 3564.80 3255.30 L 3567.00 3242.90 L 3572.60 3218.20 L 3360.80 3037.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="485" stroke="none" target-height="501.1001" target-width="376.1001" target-x="3326.4" target-y="3037.4"/><path d="M 3300.40 2784.50 L 3304.40 2849.30 L 3308.70 2905.40 L 3312.30 2939.20 L 3316.80 2969.80 L 3319.50 2984.30 L 3322.60 2997.90 L 3326.20 3011.50 L 3330.30 3024.50 L 3334.80 3037.10 L 3338.50 3046.40 L 3347.10 3064.60 L 3352.00 3073.50 L 3357.10 3082.20 L 3362.70 3090.90 L 3368.80 3099.70 L 3375.40 3108.60 L 3389.60 3125.80 L 3397.70 3134.60 L 3406.40 3143.70 L 3416.00 3153.10 L 3425.90 3161.80 L 3435.80 3169.90 L 3445.90 3177.40 L 3456.10 3184.20 L 3466.70 3190.70 L 3477.40 3196.50 L 3488.20 3201.80 L 3499.00 3206.50 L 3509.90 3210.60 L 3521.10 3214.30 L 3532.20 3217.40 L 3543.30 3220.00 L 3554.40 3222.00 L 3565.60 3223.50 L 3576.80 3224.50 L 3588.00 3225.00 L 3599.00 3225.00 L 3610.00 3224.50 L 3620.90 3223.50 L 3631.80 3221.90 L 3642.50 3219.90 L 3653.10 3217.40 L 3663.50 3214.50 L 3673.80 3211.00 L 3683.90 3207.10 L 3693.70 3202.70 L 3703.40 3197.80 L 3712.80 3192.50 L 3722.00 3186.70 L 3730.80 3180.50 L 3739.40 3173.80 L 3747.70 3166.70 L 3755.60 3159.20 L 3763.30 3151.10 L 3770.50 3142.80 L 3777.30 3134.00 L 3783.80 3124.70 L 3789.90 3115.00 L 3795.60 3104.80 L 3800.70 3094.50 L 3805.40 3083.70 L 3809.60 3072.40 L 3813.30 3060.60 L 3816.60 3048.30 L 3820.30 3031.50 L 3823.60 3013.90 L 3826.50 2995.30 L 3828.80 2976.70 L 3830.70 2957.50 L 3832.00 2937.70 L 3832.70 2917.90 L 3832.90 2897.70 L 3832.40 2877.30 L 3831.70 2862.00 L 3829.10 2831.30 L 3825.10 2800.70 L 3822.50 2785.50 L 3819.50 2770.50 L 3816.10 2755.60 L 3812.30 2740.80 L 3808.10 2726.30 L 3803.40 2712.00 L 3798.30 2698.10 L 3792.70 2684.20 L 3786.70 2670.80 L 3780.20 2657.80 L 3773.30 2645.20 L 3767.30 2635.20 L 3761.10 2625.60 L 3754.50 2616.40 L 3747.70 2607.40 L 3740.50 2598.80 L 3733.00 2590.40 L 3725.10 2582.40 L 3716.90 2574.80 L 3708.40 2567.60 L 3699.50 2560.70 L 3690.30 2554.30 L 3680.80 2548.30 L 3670.80 2542.70 L 3660.40 2537.60 L 3649.60 2532.90 L 3639.60 2529.00 L 3629.40 2525.50 L 3619.20 2522.50 L 3608.80 2520.00 L 3598.30 2517.80 L 3587.70 2516.20 L 3577.10 2514.90 L 3566.50 2514.10 L 3555.80 2513.80 L 3545.10 2513.90 L 3534.40 2514.50 L 3523.60 2515.50 L 3512.90 2517.00 L 3502.40 2518.90 L 3492.00 2521.30 L 3481.60 2524.10 L 3471.40 2527.30 L 3461.40 2531.00 L 3451.50 2535.10 L 3441.80 2539.60 L 3432.30 2544.50 L 3423.00 2549.80 L 3413.90 2555.50 L 3405.10 2561.60 L 3388.20 2574.90 L 3380.20 2582.00 L 3372.50 2589.50 L 3365.20 2597.30 L 3358.20 2605.40 L 3351.60 2613.70 L 3345.30 2622.40 L 3339.30 2631.30 L 3333.80 2640.40 L 3328.60 2649.80 L 3323.80 2659.50 L 3319.50 2669.30 L 3315.50 2679.30 L 3312.00 2689.40 L 3309.00 2699.70 L 3306.30 2710.10 L 3302.40 2731.00 L 3301.10 2741.70 L 3300.30 2752.30 L 3299.90 2763.00 L 3299.90 2773.70 L 3300.40 2784.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="487" stroke="none" target-height="711.19995" target-width="533" target-x="3299.9" target-y="2513.8"/><path d="M 3318.80 2576.10 L 3306.00 2580.30 L 3292.80 2584.10 L 3252.90 2594.30 L 3231.30 2600.90 L 3214.80 2607.40 L 3206.90 2611.20 L 3199.20 2615.60 L 3191.90 2620.50 L 3181.60 2628.80 L 3176.70 2633.70 L 3172.00 2638.90 L 3167.70 2644.40 L 3163.60 2650.50 L 3159.70 2657.20 L 3156.00 2664.60 L 3150.00 2680.10 L 3147.40 2689.10 L 3145.00 2698.90 L 3143.20 2708.60 L 3141.70 2719.30 L 3140.50 2731.00 L 3139.80 2743.80 L 3139.50 2756.20 L 3139.60 2769.80 L 3140.20 2784.60 L 3141.30 2800.80 L 3142.70 2816.40 L 3144.70 2833.40 L 3147.20 2851.70 L 3154.50 2897.20 L 3158.00 2921.40 L 3160.80 2944.10 L 3163.00 2965.50 L 3164.90 2987.40 L 3166.30 3007.90 L 3167.70 3045.10 L 3167.80 3063.50 L 3167.00 3096.60 L 3166.10 3111.30 L 3164.40 3131.30 L 3162.40 3149.10 L 3160.10 3165.00 L 3157.20 3180.90 L 3154.30 3194.90 L 3151.20 3207.00 L 3147.80 3219.20 L 3141.40 3238.20 L 3136.30 3250.60 L 3132.20 3259.50 L 3128.10 3267.10 L 3122.70 3275.40 L 3162.30 3282.60 L 3208.70 3289.50 L 3236.70 3293.10 L 3292.80 3299.00 L 3344.20 3303.00 L 3370.90 3304.60 L 3399.20 3305.90 L 3429.10 3306.90 L 3459.10 3307.40 L 3490.30 3307.40 L 3522.90 3307.00 L 3572.00 3305.20 L 3623.20 3301.90 L 3648.90 3299.70 L 3675.00 3297.10 L 3701.40 3294.00 L 3728.20 3290.40 L 3754.80 3286.30 L 3781.60 3281.70 L 3808.50 3276.60 L 3835.70 3270.90 L 3824.50 3249.70 L 3819.20 3239.10 L 3806.20 3211.00 L 3799.00 3194.10 L 3791.80 3176.50 L 3784.60 3157.00 L 3775.40 3130.00 L 3767.10 3101.30 L 3760.00 3071.50 L 3757.10 3056.50 L 3754.80 3041.30 L 3752.90 3026.10 L 3751.90 3014.60 L 3751.30 3003.20 L 3751.20 2980.70 L 3751.80 2969.50 L 3752.90 2958.50 L 3754.50 2947.60 L 3761.80 2911.30 L 3766.10 2888.10 L 3769.40 2867.00 L 3772.10 2845.90 L 3774.10 2827.00 L 3775.40 2810.10 L 3776.20 2793.20 L 3776.50 2778.40 L 3776.30 2765.40 L 3775.80 2752.40 L 3775.00 2741.40 L 3774.00 2732.10 L 3772.00 2718.80 L 3770.10 2709.20 L 3768.00 2701.00 L 3764.90 2692.00 L 3740.90 2680.10 L 3697.20 2659.70 L 3658.50 2642.80 L 3614.50 2625.00 L 3590.80 2616.10 L 3566.80 2607.60 L 3542.20 2599.40 L 3525.60 2594.20 L 3492.50 2584.90 L 3475.90 2580.80 L 3459.60 2577.20 L 3443.60 2574.00 L 3427.60 2571.40 L 3412.10 2569.40 L 3397.20 2568.10 L 3386.00 2567.50 L 3375.20 2567.30 L 3364.90 2567.60 L 3355.00 2568.30 L 3345.10 2569.50 L 3335.80 2571.20 L 3327.00 2573.40 L 3318.80 2576.10 Z" fill="#263238" fill-rule="nonzero" node-id="489" stroke="none" target-height="740.09985" target-width="713" target-x="3122.7" target-y="2567.3"/><path d="M 3712.40 2881.10 L 3712.60 2889.90 L 3713.20 2898.70 L 3714.30 2907.30 L 3715.80 2916.00 L 3717.60 2924.50 L 3719.90 2932.90 L 3725.50 2949.40 L 3732.70 2965.30 L 3741.50 2980.60 L 3745.60 2986.30 L 3749.50 2991.00 L 3753.30 2994.70 L 3757.00 2997.60 L 3761.10 3000.10 L 3765.00 3001.80 L 3768.70 3002.70 L 3775.90 3002.80 L 3779.40 3001.90 L 3782.70 3000.40 L 3786.10 2998.30 L 3789.00 2995.80 L 3791.80 2992.70 L 3794.50 2989.00 L 3797.10 2984.70 L 3799.10 2980.20 L 3801.00 2975.20 L 3804.00 2963.40 L 3804.90 2957.30 L 3805.70 2950.70 L 3806.30 2943.40 L 3806.50 2928.50 L 3806.20 2920.60 L 3804.60 2904.90 L 3801.60 2889.10 L 3797.10 2874.20 L 3794.30 2867.10 L 3791.00 2860.40 L 3787.30 2854.20 L 3784.20 2849.80 L 3780.90 2845.80 L 3777.30 2842.20 L 3773.40 2838.90 L 3768.30 2835.40 L 3763.60 2832.70 L 3759.00 2830.90 L 3754.80 2829.70 L 3750.30 2829.00 L 3746.00 2829.00 L 3742.00 2829.60 L 3738.20 2830.70 L 3734.50 2832.40 L 3731.10 2834.60 L 3727.90 2837.40 L 3724.80 2840.70 L 3719.80 2848.30 L 3717.70 2852.80 L 3715.80 2858.00 L 3713.40 2868.60 L 3712.40 2881.10 Z" fill="#e58a7b" fill-rule="nonzero" node-id="491" stroke="none" target-height="173.80005" target-width="94.1001" target-x="3712.4" target-y="2829"/><path d="M 3238.00 2607.30 L 3236.20 2601.60 L 3235.10 2595.80 L 3234.50 2589.90 L 3234.50 2583.80 L 3235.10 2577.60 L 3236.30 2571.60 L 3237.90 2565.50 L 3240.20 2559.30 L 3243.10 2553.00 L 3246.60 2546.50 L 3250.50 2540.60 L 3254.90 2534.60 L 3260.00 2528.50 L 3265.80 2522.50 L 3272.30 2516.40 L 3278.80 2510.90 L 3286.00 2505.50 L 3293.90 2500.10 L 3302.60 2494.90 L 3312.00 2489.70 L 3321.20 2485.10 L 3331.10 2480.70 L 3341.80 2476.50 L 3353.30 2472.50 L 3365.50 2468.70 L 3377.40 2465.50 L 3390.10 2462.60 L 3403.50 2460.00 L 3417.80 2457.70 L 3432.80 2455.90 L 3447.40 2454.50 L 3462.80 2453.60 L 3478.90 2453.10 L 3495.90 2453.10 L 3513.80 2453.60 L 3531.00 2454.50 L 3549.00 2456.00 L 3567.80 2458.10 L 3587.50 2460.80 L 3608.10 2464.20 L 3623.00 2467.10 L 3637.10 2470.20 L 3650.60 2473.70 L 3663.30 2477.30 L 3675.40 2481.30 L 3687.80 2485.70 L 3710.60 2495.20 L 3721.10 2500.20 L 3731.10 2505.30 L 3743.50 2512.40 L 3755.20 2519.60 L 3766.00 2527.00 L 3776.10 2534.50 L 3786.00 2542.60 L 3795.30 2550.70 L 3803.80 2558.80 L 3811.70 2567.00 L 3819.40 2575.70 L 3826.50 2584.20 L 3833.00 2592.70 L 3839.00 2601.10 L 3846.50 2612.70 L 3853.20 2624.00 L 3859.00 2634.90 L 3864.40 2646.10 L 3869.00 2656.60 L 3872.90 2666.60 L 3879.40 2686.00 L 3884.80 2706.70 L 3888.20 2725.40 L 3889.40 2736.30 L 3835.00 2671.50 L 3837.40 2739.70 L 3560.40 2792.90 L 3238.00 2607.30 Z" fill="#263238" fill-rule="nonzero" node-id="493" stroke="none" target-height="339.7998" target-width="654.8999" target-x="3234.5" target-y="2453.1"/><path d="M 3260.90 3438.60 L 3260.50 3430.40 L 3260.80 3426.40 L 3261.60 3422.40 L 3262.80 3418.50 L 3264.30 3414.70 L 3266.20 3411.10 L 3268.40 3407.70 L 3271.00 3404.40 L 3277.00 3398.90 L 3283.80 3394.60 L 3291.40 3391.80 L 3295.40 3390.80 L 3331.50 3385.10 L 3375.30 3378.70 L 3424.30 3372.20 L 3450.00 3369.20 L 3502.70 3363.80 L 3528.80 3361.80 L 3554.80 3360.10 L 3596.00 3358.80 L 3626.10 3359.00 L 3640.70 3359.70 L 3654.00 3360.80 L 3666.10 3362.20 L 3675.10 3363.70 L 3683.40 3365.50 L 3690.80 3367.50 L 3697.60 3369.70 L 3704.50 3372.30 L 3710.70 3375.20 L 3721.40 3381.30 L 3730.80 3388.50 L 3734.80 3392.20 L 3738.40 3396.00 L 3742.80 3401.50 L 3746.60 3407.10 L 3749.70 3412.70 L 3752.40 3418.60 L 3754.60 3424.50 L 3756.30 3430.40 L 3757.70 3436.30 L 3759.40 3447.90 L 3759.50 3452.40 L 3759.10 3456.80 L 3758.30 3461.10 L 3757.00 3465.50 L 3755.30 3469.60 L 3753.10 3473.50 L 3750.60 3477.10 L 3747.60 3480.50 L 3744.30 3483.60 L 3740.70 3486.20 L 3736.90 3488.50 L 3732.80 3490.40 L 3728.50 3491.80 L 3719.70 3493.20 L 3300.70 3474.60 L 3295.80 3474.00 L 3291.10 3473.00 L 3286.60 3471.40 L 3282.20 3469.30 L 3278.20 3466.70 L 3274.30 3463.70 L 3270.90 3460.20 L 3268.00 3456.40 L 3265.40 3452.30 L 3263.40 3447.90 L 3261.90 3443.30 L 3260.90 3438.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="495" stroke="none" target-height="134.3999" target-width="499" target-x="3260.5" target-y="3358.8"/><g node-id="603"><path d="M 3260.90 3438.60 L 3260.50 3430.40 L 3260.80 3426.40 L 3261.60 3422.40 L 3262.80 3418.50 L 3264.30 3414.70 L 3266.20 3411.10 L 3268.40 3407.70 L 3271.00 3404.40 L 3277.00 3398.90 L 3283.80 3394.60 L 3291.40 3391.80 L 3295.40 3390.80 L 3331.50 3385.10 L 3375.30 3378.70 L 3424.30 3372.20 L 3450.00 3369.20 L 3502.70 3363.80 L 3528.80 3361.80 L 3554.80 3360.10 L 3596.00 3358.80 L 3626.10 3359.00 L 3640.70 3359.70 L 3654.00 3360.80 L 3666.10 3362.20 L 3675.10 3363.70 L 3683.40 3365.50 L 3690.80 3367.50 L 3697.60 3369.70 L 3704.50 3372.30 L 3710.70 3375.20 L 3721.40 3381.30 L 3730.80 3388.50 L 3734.80 3392.20 L 3738.40 3396.00 L 3742.80 3401.50 L 3746.60 3407.10 L 3749.70 3412.70 L 3752.40 3418.60 L 3754.60 3424.50 L 3756.30 3430.40 L 3757.70 3436.30 L 3759.40 3447.90 L 3759.50 3452.40 L 3759.10 3456.80 L 3758.30 3461.10 L 3757.00 3465.50 L 3755.30 3469.60 L 3753.10 3473.50 L 3750.60 3477.10 L 3747.60 3480.50 L 3744.30 3483.60 L 3740.70 3486.20 L 3736.90 3488.50 L 3732.80 3490.40 L 3728.50 3491.80 L 3719.70 3493.20 L 3300.70 3474.60 L 3295.80 3474.00 L 3291.10 3473.00 L 3286.60 3471.40 L 3282.20 3469.30 L 3278.20 3466.70 L 3274.30 3463.70 L 3270.90 3460.20 L 3268.00 3456.40 L 3265.40 3452.30 L 3263.40 3447.90 L 3261.90 3443.30 L 3260.90 3438.60 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="16" node-id="499" stroke="none" target-height="134.3999" target-width="499" target-x="3260.5" target-y="3358.8"/></g><path d="M 3500.60 7605.60 L 3654.40 7712.40 L 3911.80 7363.50 L 3757.90 7256.80 L 3500.60 7605.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="502" stroke="none" target-height="455.6001" target-width="411.19995" target-x="3500.6" target-y="7256.8"/><path d="M 3141.80 7598.60 L 3304.30 7691.20 L 3532.10 7322.20 L 3369.60 7229.60 L 3141.80 7598.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="504" stroke="none" target-height="461.6001" target-width="390.30005" target-x="3141.8" target-y="7229.6"/><path d="M 3911.50 7363.50 L 3778.90 7543.30 L 3625.10 7436.70 L 3757.70 7256.80 L 3911.50 7363.50 Z" fill="#cf6f64" fill-rule="nonzero" node-id="506" stroke="none" target-height="286.5" target-width="286.3999" target-x="3625.1" target-y="7256.8"/><path d="M 3369.40 7229.60 L 3532.10 7322.40 L 3414.70 7512.50 L 3252.00 7419.70 L 3369.40 7229.60 Z" fill="#cf6f64" fill-rule="nonzero" node-id="508" stroke="none" target-height="282.8999" target-width="280.1001" target-x="3252" target-y="7229.6"/><path d="M 3630.30 4603.50 L 3655.90 4637.40 L 3685.00 4678.10 L 3702.30 4703.10 L 3722.40 4733.10 L 3743.20 4764.80 L 3766.20 4801.10 L 3797.60 4852.60 L 3830.90 4909.80 L 3847.80 4940.10 L 3865.20 4972.00 L 3882.10 5004.00 L 3899.20 5037.50 L 3916.50 5072.40 L 3941.60 5125.50 L 3966.60 5181.30 L 3978.60 5209.60 L 4002.00 5267.70 L 4013.30 5297.60 L 4024.30 5327.50 L 4034.90 5357.90 L 4045.10 5388.80 L 4055.00 5420.00 L 4064.30 5451.40 L 4073.20 5483.10 L 4081.60 5515.10 L 4089.50 5547.50 L 4100.90 5599.50 L 4106.00 5625.80 L 4115.00 5678.80 L 4118.80 5705.40 L 4122.20 5732.10 L 4125.10 5758.90 L 4127.60 5785.80 L 4129.50 5812.80 L 4131.00 5839.80 L 4131.90 5866.80 L 4132.20 5893.90 L 4132.00 5921.10 L 4131.20 5948.30 L 4129.90 5975.50 L 4127.90 6002.60 L 4125.20 6029.80 L 4122.00 6057.00 L 4118.10 6084.30 L 4114.30 6107.50 L 4105.30 6154.90 L 4100.10 6179.10 L 4094.40 6203.60 L 4086.90 6233.90 L 4078.80 6264.50 L 4070.10 6295.50 L 4060.80 6326.80 L 4051.00 6357.80 L 4040.80 6389.00 L 4030.10 6420.30 L 4018.90 6451.90 L 4003.50 6493.70 L 3987.40 6535.40 L 3970.60 6577.20 L 3953.30 6618.70 L 3935.60 6660.00 L 3917.50 6700.90 L 3898.90 6741.60 L 3880.20 6781.80 L 3861.30 6821.30 L 3842.00 6860.60 L 3803.80 6936.50 L 3784.40 6973.80 L 3746.60 7044.80 L 3718.40 7096.40 L 3691.50 7144.50 L 3664.80 7191.10 L 3615.90 7274.50 L 3594.30 7310.60 L 3555.60 7373.50 L 3525.90 7420.70 L 3500.10 7460.50 L 3252.30 7337.50 L 3281.10 7279.00 L 3309.60 7220.30 L 3337.50 7161.40 L 3364.90 7102.30 L 3391.90 7043.00 L 3418.40 6983.50 L 3444.40 6923.70 L 3469.90 6863.80 L 3494.90 6803.60 L 3519.50 6743.20 L 3543.60 6682.70 L 3567.10 6622.00 L 3590.20 6561.00 L 3612.80 6499.90 L 3634.90 6438.60 L 3656.50 6377.20 L 3677.70 6315.50 L 3698.30 6253.60 L 3704.30 6234.30 L 3709.90 6214.80 L 3714.90 6195.30 L 3719.50 6175.70 L 3723.50 6156.00 L 3727.10 6136.20 L 3730.10 6116.30 L 3732.70 6096.40 L 3734.70 6076.40 L 3736.30 6056.40 L 3737.30 6036.30 L 3737.90 6016.20 L 3737.90 5996.10 L 3737.40 5976.00 L 3736.50 5955.90 L 3735.00 5935.80 L 3733.00 5915.70 L 3730.50 5895.60 L 3727.50 5875.50 L 3724.00 5855.60 L 3720.00 5835.90 L 3715.50 5816.30 L 3710.50 5796.80 L 3705.00 5777.40 L 3699.10 5758.20 L 3692.70 5739.10 L 3685.80 5720.30 L 3678.40 5701.60 L 3670.60 5683.10 L 3662.30 5664.80 L 3653.50 5646.60 L 3644.30 5628.80 L 3634.60 5611.10 L 3624.50 5593.70 L 3613.90 5576.50 L 3602.90 5559.50 L 3591.80 5543.80 L 3580.80 5528.90 L 3569.70 5514.60 L 3558.60 5501.00 L 3547.50 5488.10 L 3532.90 5472.00 L 3518.40 5456.90 L 3503.90 5442.70 L 3489.50 5429.20 L 3474.50 5416.10 L 3459.60 5403.70 L 3444.80 5391.90 L 3430.10 5380.90 L 3415.00 5370.00 L 3385.30 5350.00 L 3370.60 5340.80 L 3350.80 5328.80 L 3312.20 5306.90 L 3203.50 5249.00 L 3186.70 5239.60 L 3170.80 5230.20 L 3155.60 5220.80 L 3144.40 5213.40 L 3133.60 5205.80 L 3123.40 5198.10 L 3113.70 5190.20 L 3104.20 5181.90 L 3095.20 5173.30 L 3086.80 5164.30 L 3078.90 5155.10 L 3067.30 5139.40 L 3062.10 5131.00 L 3057.10 5122.40 L 3052.60 5113.30 L 3048.50 5104.20 L 3044.70 5094.60 L 3041.40 5084.50 L 3038.40 5073.90 L 3035.80 5062.80 L 3033.80 5051.90 L 3032.10 5040.30 L 3030.90 5028.00 L 3030.20 5015.10 L 3029.90 5001.30 L 3030.10 4988.10 L 3030.80 4974.10 L 3032.00 4959.30 L 3033.70 4943.50 L 3036.00 4926.80 L 3038.70 4910.90 L 3045.70 4876.10 L 3050.20 4857.10 L 3055.40 4837.10 L 3062.20 4813.00 L 3070.10 4787.20 L 3079.10 4759.60 L 3089.30 4730.00 L 3099.80 4701.40 L 3111.50 4670.80 L 3124.60 4638.20 L 3139.00 4603.50 L 3630.30 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="510" stroke="none" target-height="2857" target-width="1102.3003" target-x="3029.9" target-y="4603.5"/><g node-id="604"><path d="M 3630.30 4603.50 L 3655.90 4637.40 L 3685.00 4678.10 L 3702.30 4703.10 L 3722.40 4733.10 L 3743.20 4764.80 L 3766.20 4801.10 L 3797.60 4852.60 L 3830.90 4909.80 L 3847.80 4940.10 L 3865.20 4972.00 L 3882.10 5004.00 L 3899.20 5037.50 L 3916.50 5072.40 L 3941.60 5125.50 L 3966.60 5181.30 L 3978.60 5209.60 L 4002.00 5267.70 L 4013.30 5297.60 L 4024.30 5327.50 L 4034.90 5357.90 L 4045.10 5388.80 L 4055.00 5420.00 L 4064.30 5451.40 L 4073.20 5483.10 L 4081.60 5515.10 L 4089.50 5547.50 L 4100.90 5599.50 L 4106.00 5625.80 L 4115.00 5678.80 L 4118.80 5705.40 L 4122.20 5732.10 L 4125.10 5758.90 L 4127.60 5785.80 L 4129.50 5812.80 L 4131.00 5839.80 L 4131.90 5866.80 L 4132.20 5893.90 L 4132.00 5921.10 L 4131.20 5948.30 L 4129.90 5975.50 L 4127.90 6002.60 L 4125.20 6029.80 L 4122.00 6057.00 L 4118.10 6084.30 L 4114.30 6107.50 L 4105.30 6154.90 L 4100.10 6179.10 L 4094.40 6203.60 L 4086.90 6233.90 L 4078.80 6264.50 L 4070.10 6295.50 L 4060.80 6326.80 L 4051.00 6357.80 L 4040.80 6389.00 L 4030.10 6420.30 L 4018.90 6451.90 L 4003.50 6493.70 L 3987.40 6535.40 L 3970.60 6577.20 L 3953.30 6618.70 L 3935.60 6660.00 L 3917.50 6700.90 L 3898.90 6741.60 L 3880.20 6781.80 L 3861.30 6821.30 L 3842.00 6860.60 L 3803.80 6936.50 L 3784.40 6973.80 L 3746.60 7044.80 L 3718.40 7096.40 L 3691.50 7144.50 L 3664.80 7191.10 L 3615.90 7274.50 L 3594.30 7310.60 L 3555.60 7373.50 L 3525.90 7420.70 L 3500.10 7460.50 L 3252.30 7337.50 L 3281.10 7279.00 L 3309.60 7220.30 L 3337.50 7161.40 L 3364.90 7102.30 L 3391.90 7043.00 L 3418.40 6983.50 L 3444.40 6923.70 L 3469.90 6863.80 L 3494.90 6803.60 L 3519.50 6743.20 L 3543.60 6682.70 L 3567.10 6622.00 L 3590.20 6561.00 L 3612.80 6499.90 L 3634.90 6438.60 L 3656.50 6377.20 L 3677.70 6315.50 L 3698.30 6253.60 L 3704.30 6234.30 L 3709.90 6214.80 L 3714.90 6195.30 L 3719.50 6175.70 L 3723.50 6156.00 L 3727.10 6136.20 L 3730.10 6116.30 L 3732.70 6096.40 L 3734.70 6076.40 L 3736.30 6056.40 L 3737.30 6036.30 L 3737.90 6016.20 L 3737.90 5996.10 L 3737.40 5976.00 L 3736.50 5955.90 L 3735.00 5935.80 L 3733.00 5915.70 L 3730.50 5895.60 L 3727.50 5875.50 L 3724.00 5855.60 L 3720.00 5835.90 L 3715.50 5816.30 L 3710.50 5796.80 L 3705.00 5777.40 L 3699.10 5758.20 L 3692.70 5739.10 L 3685.80 5720.30 L 3678.40 5701.60 L 3670.60 5683.10 L 3662.30 5664.80 L 3653.50 5646.60 L 3644.30 5628.80 L 3634.60 5611.10 L 3624.50 5593.70 L 3613.90 5576.50 L 3602.90 5559.50 L 3591.80 5543.80 L 3580.80 5528.90 L 3569.70 5514.60 L 3558.60 5501.00 L 3547.50 5488.10 L 3532.90 5472.00 L 3518.40 5456.90 L 3503.90 5442.70 L 3489.50 5429.20 L 3474.50 5416.10 L 3459.60 5403.70 L 3444.80 5391.90 L 3430.10 5380.90 L 3415.00 5370.00 L 3385.30 5350.00 L 3370.60 5340.80 L 3350.80 5328.80 L 3312.20 5306.90 L 3203.50 5249.00 L 3186.70 5239.60 L 3170.80 5230.20 L 3155.60 5220.80 L 3144.40 5213.40 L 3133.60 5205.80 L 3123.40 5198.10 L 3113.70 5190.20 L 3104.20 5181.90 L 3095.20 5173.30 L 3086.80 5164.30 L 3078.90 5155.10 L 3067.30 5139.40 L 3062.10 5131.00 L 3057.10 5122.40 L 3052.60 5113.30 L 3048.50 5104.20 L 3044.70 5094.60 L 3041.40 5084.50 L 3038.40 5073.90 L 3035.80 5062.80 L 3033.80 5051.90 L 3032.10 5040.30 L 3030.90 5028.00 L 3030.20 5015.10 L 3029.90 5001.30 L 3030.10 4988.10 L 3030.80 4974.10 L 3032.00 4959.30 L 3033.70 4943.50 L 3036.00 4926.80 L 3038.70 4910.90 L 3045.70 4876.10 L 3050.20 4857.10 L 3055.40 4837.10 L 3062.20 4813.00 L 3070.10 4787.20 L 3079.10 4759.60 L 3089.30 4730.00 L 3099.80 4701.40 L 3111.50 4670.80 L 3124.60 4638.20 L 3139.00 4603.50 L 3630.30 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="17" node-id="514" stroke="none" target-height="2857" target-width="1102.3003" target-x="3029.9" target-y="4603.5"/></g><g node-id="605"><path d="M 3924.90 5089.60 L 3837.60 5002.80 L 3844.10 5045.40 L 4054.20 6347.10 L 4062.40 6321.30 L 4077.60 6269.40 L 4084.60 6243.30 L 4091.30 6217.10 L 4097.50 6190.80 L 4108.70 6138.00 L 4113.70 6111.40 L 4118.30 6084.70 L 4122.20 6058.00 L 4125.40 6031.30 L 4128.10 6004.70 L 4130.10 5978.00 L 4131.50 5951.40 L 4132.30 5924.70 L 4132.60 5898.00 L 4132.40 5871.40 L 4131.60 5844.90 L 4130.30 5818.40 L 4128.50 5791.90 L 4126.20 5765.50 L 4123.50 5739.20 L 4120.30 5713.00 L 4116.60 5686.90 L 4111.40 5654.30 L 4105.70 5621.90 L 4099.30 5589.80 L 4092.30 5557.90 L 4084.70 5526.10 L 4076.60 5494.60 L 4068.10 5463.50 L 4059.10 5432.60 L 4049.60 5401.80 L 4039.70 5371.50 L 4029.50 5341.60 L 4018.90 5312.10 L 3996.70 5253.70 L 3985.20 5225.30 L 3961.50 5169.50 L 3949.40 5142.20 L 3924.90 5089.60 Z" fill="#000000" fill-opacity="0.4" fill-rule="nonzero" group-id="18" node-id="519" stroke="none" target-height="1344.3003" target-width="295" target-x="3837.6" target-y="5002.8"/></g><path d="M 3898.40 4603.50 L 3926.10 4640.80 L 3977.30 4712.00 L 4023.50 4778.00 L 4049.80 4816.50 L 4106.00 4900.40 L 4135.60 4945.70 L 4166.70 4994.30 L 4198.00 5044.10 L 4230.30 5096.60 L 4273.20 5168.40 L 4316.30 5243.10 L 4337.70 5281.10 L 4358.90 5319.80 L 4379.80 5358.70 L 4400.30 5397.90 L 4420.50 5437.40 L 4440.20 5477.20 L 4459.40 5517.00 L 4478.00 5556.90 L 4491.50 5587.00 L 4504.70 5617.00 L 4529.50 5676.60 L 4541.40 5706.60 L 4552.70 5736.30 L 4563.40 5765.70 L 4573.50 5794.80 L 4583.20 5824.30 L 4592.20 5853.40 L 4600.40 5881.90 L 4608.00 5910.10 L 4613.80 5933.00 L 4619.00 5955.50 L 4627.80 5999.30 L 4631.50 6020.70 L 4634.80 6042.50 L 4637.50 6063.80 L 4639.60 6084.70 L 4641.10 6105.10 L 4642.10 6125.00 L 4642.40 6140.80 L 4642.10 6157.00 L 4641.20 6173.70 L 4639.70 6190.80 L 4637.60 6208.40 L 4635.10 6225.70 L 4632.00 6243.30 L 4628.50 6261.40 L 4624.30 6279.80 L 4619.60 6298.70 L 4613.30 6321.90 L 4606.20 6345.50 L 4598.30 6369.70 L 4589.70 6394.50 L 4580.70 6418.80 L 4571.00 6443.60 L 4560.70 6468.70 L 4549.60 6494.30 L 4526.40 6544.90 L 4501.00 6596.70 L 4483.30 6631.00 L 4464.80 6665.60 L 4445.60 6700.40 L 4425.90 6734.90 L 4405.70 6769.40 L 4385.00 6803.80 L 4363.90 6838.10 L 4320.90 6905.70 L 4298.90 6939.20 L 4254.90 7004.60 L 4232.70 7036.90 L 4188.80 7099.00 L 4156.00 7144.50 L 4124.20 7187.70 L 4092.70 7229.80 L 4033.50 7307.10 L 3979.90 7375.10 L 3933.70 7432.30 L 3882.60 7494.00 L 3855.00 7526.40 L 3621.30 7375.10 L 3647.70 7337.20 L 3678.00 7292.30 L 3717.30 7232.50 L 3739.30 7198.20 L 3763.90 7159.30 L 3788.90 7118.90 L 3815.80 7074.60 L 3843.00 7028.90 L 3871.40 6979.90 L 3909.30 6912.50 L 3928.80 6877.00 L 3967.00 6805.00 L 3986.20 6767.60 L 4004.90 6730.10 L 4023.50 6692.10 L 4041.80 6653.40 L 4059.60 6614.60 L 4076.90 6575.50 L 4093.80 6536.10 L 4106.10 6506.40 L 4117.90 6476.70 L 4140.40 6417.40 L 4151.10 6387.50 L 4161.30 6357.80 L 4170.90 6328.30 L 4179.90 6299.00 L 4188.50 6269.40 L 4196.50 6240.10 L 4203.80 6211.10 L 4210.40 6182.50 L 4208.70 6166.00 L 4206.40 6148.90 L 4203.50 6131.30 L 4200.00 6113.20 L 4195.80 6094.50 L 4191.30 6076.40 L 4186.20 6057.80 L 4180.50 6038.80 L 4174.30 6019.30 L 4167.50 5999.40 L 4158.60 5975.00 L 4148.90 5950.00 L 4138.50 5924.50 L 4127.20 5898.30 L 4115.50 5872.70 L 4103.20 5846.50 L 4090.20 5819.90 L 4076.50 5792.80 L 4047.90 5739.20 L 4017.00 5684.20 L 3995.70 5647.80 L 3973.50 5611.00 L 3950.60 5573.90 L 3927.20 5537.10 L 3903.20 5500.10 L 3878.70 5463.20 L 3853.80 5426.40 L 3803.00 5353.40 L 3777.20 5317.20 L 3725.30 5246.10 L 3699.00 5210.90 L 3647.10 5142.50 L 3608.10 5092.20 L 3570.10 5043.90 L 3532.30 4996.60 L 3496.00 4951.90 L 3460.10 4908.20 L 3393.30 4828.40 L 3362.90 4792.60 L 3307.30 4728.20 L 3261.20 4675.70 L 3226.20 4636.50 L 3196.20 4603.50 L 3898.40 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="522" stroke="none" target-height="2922.9" target-width="1446.2" target-x="3196.2" target-y="4603.5"/><g node-id="606"><path d="M 3898.40 4603.50 L 3926.10 4640.80 L 3977.30 4712.00 L 4023.50 4778.00 L 4049.80 4816.50 L 4106.00 4900.40 L 4135.60 4945.70 L 4166.70 4994.30 L 4198.00 5044.10 L 4230.30 5096.60 L 4273.20 5168.40 L 4316.30 5243.10 L 4337.70 5281.10 L 4358.90 5319.80 L 4379.80 5358.70 L 4400.30 5397.90 L 4420.50 5437.40 L 4440.20 5477.20 L 4459.40 5517.00 L 4478.00 5556.90 L 4491.50 5587.00 L 4504.70 5617.00 L 4529.50 5676.60 L 4541.40 5706.60 L 4552.70 5736.30 L 4563.40 5765.70 L 4573.50 5794.80 L 4583.20 5824.30 L 4592.20 5853.40 L 4600.40 5881.90 L 4608.00 5910.10 L 4613.80 5933.00 L 4619.00 5955.50 L 4627.80 5999.30 L 4631.50 6020.70 L 4634.80 6042.50 L 4637.50 6063.80 L 4639.60 6084.70 L 4641.10 6105.10 L 4642.10 6125.00 L 4642.40 6140.80 L 4642.10 6157.00 L 4641.20 6173.70 L 4639.70 6190.80 L 4637.60 6208.40 L 4635.10 6225.70 L 4632.00 6243.30 L 4628.50 6261.40 L 4624.30 6279.80 L 4619.60 6298.70 L 4613.30 6321.90 L 4606.20 6345.50 L 4598.30 6369.70 L 4589.70 6394.50 L 4580.70 6418.80 L 4571.00 6443.60 L 4560.70 6468.70 L 4549.60 6494.30 L 4526.40 6544.90 L 4501.00 6596.70 L 4483.30 6631.00 L 4464.80 6665.60 L 4445.60 6700.40 L 4425.90 6734.90 L 4405.70 6769.40 L 4385.00 6803.80 L 4363.90 6838.10 L 4320.90 6905.70 L 4298.90 6939.20 L 4254.90 7004.60 L 4232.70 7036.90 L 4188.80 7099.00 L 4156.00 7144.50 L 4124.20 7187.70 L 4092.70 7229.80 L 4033.50 7307.10 L 3979.90 7375.10 L 3933.70 7432.30 L 3882.60 7494.00 L 3855.00 7526.40 L 3621.30 7375.10 L 3647.70 7337.20 L 3678.00 7292.30 L 3717.30 7232.50 L 3739.30 7198.20 L 3763.90 7159.30 L 3788.90 7118.90 L 3815.80 7074.60 L 3843.00 7028.90 L 3871.40 6979.90 L 3909.30 6912.50 L 3928.80 6877.00 L 3967.00 6805.00 L 3986.20 6767.60 L 4004.90 6730.10 L 4023.50 6692.10 L 4041.80 6653.40 L 4059.60 6614.60 L 4076.90 6575.50 L 4093.80 6536.10 L 4106.10 6506.40 L 4117.90 6476.70 L 4140.40 6417.40 L 4151.10 6387.50 L 4161.30 6357.80 L 4170.90 6328.30 L 4179.90 6299.00 L 4188.50 6269.40 L 4196.50 6240.10 L 4203.80 6211.10 L 4210.40 6182.50 L 4208.70 6166.00 L 4206.40 6148.90 L 4203.50 6131.30 L 4200.00 6113.20 L 4195.80 6094.50 L 4191.30 6076.40 L 4186.20 6057.80 L 4180.50 6038.80 L 4174.30 6019.30 L 4167.50 5999.40 L 4158.60 5975.00 L 4148.90 5950.00 L 4138.50 5924.50 L 4127.20 5898.30 L 4115.50 5872.70 L 4103.20 5846.50 L 4090.20 5819.90 L 4076.50 5792.80 L 4047.90 5739.20 L 4017.00 5684.20 L 3995.70 5647.80 L 3973.50 5611.00 L 3950.60 5573.90 L 3927.20 5537.10 L 3903.20 5500.10 L 3878.70 5463.20 L 3853.80 5426.40 L 3803.00 5353.40 L 3777.20 5317.20 L 3725.30 5246.10 L 3699.00 5210.90 L 3647.10 5142.50 L 3608.10 5092.20 L 3570.10 5043.90 L 3532.30 4996.60 L 3496.00 4951.90 L 3460.10 4908.20 L 3393.30 4828.40 L 3362.90 4792.60 L 3307.30 4728.20 L 3261.20 4675.70 L 3226.20 4636.50 L 3196.20 4603.50 L 3898.40 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="19" node-id="526" stroke="none" target-height="2922.9" target-width="1446.2" target-x="3196.2" target-y="4603.5"/></g><path d="M 3003.70 3468.40 L 2999.70 3469.60 L 2995.60 3471.30 L 2991.40 3473.40 L 2987.10 3476.20 L 2982.80 3479.50 L 2977.80 3483.80 L 2972.70 3488.80 L 2967.60 3494.60 L 2962.30 3501.20 L 2955.80 3510.10 L 2949.20 3520.00 L 2942.60 3531.00 L 2930.20 3553.90 L 2915.30 3585.50 L 2906.90 3605.10 L 2891.60 3644.60 L 2884.60 3664.10 L 2872.40 3700.20 L 2859.20 3743.10 L 2852.30 3767.70 L 3154.50 3969.50 L 3163.00 3949.50 L 3177.30 3913.50 L 3188.70 3881.90 L 3194.60 3864.30 L 3205.90 3827.40 L 3211.10 3808.30 L 3218.60 3775.90 L 3223.20 3750.30 L 3224.90 3737.60 L 3227.00 3713.30 L 3227.30 3701.30 L 3227.10 3690.00 L 3226.30 3679.30 L 3225.20 3671.20 L 3223.80 3663.70 L 3222.00 3656.60 L 3219.80 3649.90 L 3214.30 3635.40 L 3208.20 3621.10 L 3201.50 3606.70 L 3194.20 3592.60 L 3186.30 3578.90 L 3178.00 3565.50 L 3164.50 3546.30 L 3157.40 3537.30 L 3150.00 3528.60 L 3142.30 3520.20 L 3134.40 3512.30 L 3126.30 3505.00 L 3118.00 3498.20 L 3109.40 3491.80 L 3100.60 3486.00 L 3091.70 3480.90 L 3082.60 3476.50 L 3075.10 3473.40 L 3067.60 3470.80 L 3059.90 3468.60 L 3052.20 3467.00 L 3044.30 3465.80 L 3036.50 3465.20 L 3028.50 3465.10 L 3020.40 3465.60 L 3012.10 3466.70 L 3003.70 3468.40 Z" fill="#429cfd" fill-rule="nonzero" node-id="529" stroke="none" target-height="504.3999" target-width="375" target-x="2852.3" target-y="3465.1"/><g node-id="607"><path d="M 3062.90 3649.40 L 3041.90 3894.40 L 3154.20 3969.70 L 3163.30 3948.70 L 3171.90 3927.40 L 3180.00 3906.00 L 3187.60 3884.40 L 3194.70 3862.70 L 3201.30 3840.80 L 3207.40 3818.70 L 3213.00 3796.50 L 3218.10 3774.20 L 3222.70 3751.70 L 3062.90 3649.40 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="20" node-id="533" stroke="none" target-height="320.30005" target-width="180.80005" target-x="3041.9" target-y="3649.4"/></g><path d="M 3987.90 3473.90 L 3990.30 3476.00 L 3992.30 3478.80 L 3994.20 3482.40 L 3996.60 3488.30 L 3998.90 3495.40 L 4002.80 3513.00 L 4005.70 3533.00 L 4006.90 3544.00 L 4008.90 3572.60 L 4009.60 3588.10 L 4010.10 3626.70 L 4010.00 3647.50 L 4008.60 3697.70 L 4005.80 3754.30 L 4001.10 3821.20 L 3994.30 3899.10 L 3985.40 3984.90 L 3974.00 4083.30 L 3967.30 4136.80 L 3951.70 4253.10 L 3932.70 4383.90 L 3911.00 4524.90 L 3898.40 4603.30 L 3138.50 4603.30 L 3141.40 4527.90 L 3143.20 4455.60 L 3143.70 4419.90 L 3143.70 4384.30 L 3143.20 4348.50 L 3141.10 4287.80 L 3138.20 4237.10 L 3134.00 4184.90 L 3131.40 4157.30 L 3125.10 4100.90 L 3117.10 4040.60 L 3107.20 3975.50 L 3098.80 3924.70 L 3089.00 3869.60 L 3078.30 3812.80 L 3065.90 3751.00 L 3052.70 3687.40 L 3037.70 3618.00 L 3021.70 3546.40 L 3003.70 3468.40 L 3035.70 3462.00 L 3067.70 3456.10 L 3099.90 3450.70 L 3132.00 3445.80 L 3164.30 3441.30 L 3196.60 3437.30 L 3229.00 3433.70 L 3261.40 3430.70 L 3293.90 3428.00 L 3360.90 3423.70 L 3395.40 3422.00 L 3429.90 3420.70 L 3464.50 3420.00 L 3499.00 3419.70 L 3533.60 3420.00 L 3568.10 3420.70 L 3602.60 3422.00 L 3637.10 3423.70 L 3671.60 3425.90 L 3699.50 3428.70 L 3756.00 3435.40 L 3783.60 3439.10 L 3836.90 3447.10 L 3885.40 3455.00 L 3926.90 3462.30 L 3987.90 3473.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="536" stroke="none" target-height="1183.5999" target-width="1006.40015" target-x="3003.7" target-y="3419.7"/><path d="M 4065.20 3649.40 L 4100.80 3748.00 L 4133.70 3835.00 L 4161.80 3910.40 L 4176.10 3948.00 L 4234.50 4097.80 L 4256.90 4153.90 L 4260.50 4163.20 L 4260.50 4164.60 L 4258.20 4161.60 L 4253.00 4156.30 L 4247.00 4151.70 L 4243.80 4149.80 L 4234.00 4145.10 L 4228.90 4143.30 L 4223.60 4141.90 L 4218.20 4141.00 L 4212.80 4140.50 L 4208.20 4140.50 L 4203.70 4140.90 L 4194.90 4142.60 L 4190.60 4143.90 L 4186.30 4145.50 L 4181.40 4148.00 L 4178.60 4149.60 L 4176.60 4151.10 L 4175.80 4151.90 L 4175.50 4152.40 L 4178.40 4149.90 L 4180.80 4147.00 L 4188.60 4136.40 L 4195.80 4125.60 L 4202.60 4114.40 L 4209.00 4103.10 L 4223.20 4074.80 L 4231.50 4057.50 L 4247.60 4022.50 L 4268.10 3974.30 L 4292.70 3912.90 L 4307.30 3875.50 L 4335.60 3800.40 L 4417.20 3572.40 L 4509.00 3596.20 L 4502.80 3632.40 L 4496.20 3668.40 L 4481.80 3739.90 L 4465.90 3811.30 L 4448.60 3882.70 L 4432.40 3945.50 L 4417.20 3999.00 L 4400.60 4052.40 L 4384.70 4099.40 L 4377.30 4119.60 L 4361.20 4160.30 L 4355.00 4175.10 L 4348.30 4189.70 L 4341.20 4204.00 L 4333.70 4218.20 L 4325.70 4232.10 L 4317.30 4245.70 L 4310.70 4254.60 L 4303.70 4263.20 L 4296.30 4271.50 L 4290.00 4277.80 L 4283.30 4283.70 L 4276.20 4289.10 L 4268.70 4294.00 L 4261.00 4298.40 L 4252.90 4302.20 L 4245.50 4305.10 L 4237.90 4307.40 L 4230.20 4309.10 L 4222.40 4310.30 L 4214.50 4310.80 L 4206.60 4310.80 L 4199.90 4310.40 L 4193.40 4309.50 L 4186.90 4308.20 L 4180.50 4306.50 L 4174.20 4304.40 L 4168.10 4301.90 L 4162.10 4299.10 L 4156.30 4295.80 L 4149.60 4291.40 L 4137.40 4281.50 L 4126.50 4270.10 L 4121.60 4264.00 L 4117.00 4257.50 L 4112.90 4250.70 L 4107.90 4241.60 L 4099.50 4224.70 L 4072.30 4169.10 L 4054.50 4131.90 L 4025.50 4069.30 L 4003.90 4019.10 L 3956.30 3904.90 L 3930.60 3840.80 L 3911.40 3789.10 L 3902.10 3762.70 L 3884.40 3708.60 L 4065.20 3649.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="538" stroke="none" target-height="738.3999" target-width="624.6001" target-x="3884.4" target-y="3572.4"/><path d="M 3987.90 3473.90 L 3992.70 3475.20 L 3997.60 3477.10 L 4007.70 3482.20 L 4013.00 3485.50 L 4019.10 3490.00 L 4031.70 3500.80 L 4038.10 3507.20 L 4046.30 3516.10 L 4054.50 3525.80 L 4062.90 3536.50 L 4078.70 3559.00 L 4086.60 3571.10 L 4097.90 3589.60 L 4108.80 3608.70 L 4119.30 3627.90 L 4129.00 3646.90 L 4138.30 3665.70 L 4154.60 3700.60 L 4172.50 3741.90 L 4182.00 3765.60 L 3910.40 3996.70 L 3897.50 3974.40 L 3875.30 3934.10 L 3856.70 3898.70 L 3846.80 3879.00 L 3826.90 3837.40 L 3817.20 3815.80 L 3807.70 3793.80 L 3798.80 3771.70 L 3790.70 3749.90 L 3781.10 3721.10 L 3777.00 3707.40 L 3773.40 3693.50 L 3770.40 3680.40 L 3768.10 3668.00 L 3766.80 3658.50 L 3765.90 3649.60 L 3765.40 3633.40 L 3765.80 3625.40 L 3766.80 3618.00 L 3768.20 3611.40 L 3770.10 3605.30 L 3774.90 3592.60 L 3780.00 3580.60 L 3785.30 3569.20 L 3790.80 3558.50 L 3796.80 3547.80 L 3803.10 3537.90 L 3809.70 3528.60 L 3816.50 3519.90 L 3822.40 3513.30 L 3828.50 3507.10 L 3834.80 3501.30 L 3841.30 3495.90 L 3848.10 3491.00 L 3855.20 3486.50 L 3862.60 3482.40 L 3870.20 3478.80 L 3878.30 3475.60 L 3886.60 3472.80 L 3895.00 3470.60 L 3903.80 3468.90 L 3913.00 3467.70 L 3922.70 3466.90 L 3932.90 3466.70 L 3942.70 3467.00 L 3953.10 3467.80 L 3964.10 3469.20 L 3975.70 3471.20 L 3987.90 3473.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="540" stroke="none" target-height="530" target-width="416.6001" target-x="3765.4" target-y="3466.7"/><path d="M 4460.40 3487.00 L 4555.80 3407.30 L 4622.10 3510.60 L 4573.20 3596.70 L 4565.90 3602.80 L 4553.30 3612.00 L 4545.00 3617.40 L 4532.70 3624.40 L 4518.60 3631.10 L 4511.10 3634.00 L 4503.30 3636.70 L 4495.30 3638.90 L 4487.10 3640.50 L 4478.60 3641.70 L 4472.20 3642.10 L 4465.80 3642.10 L 4459.30 3641.60 L 4452.80 3640.70 L 4446.30 3639.40 L 4439.90 3637.40 L 4433.30 3634.90 L 4426.80 3631.70 L 4423.40 3623.50 L 4420.70 3615.00 L 4418.60 3606.40 L 4417.20 3597.70 L 4416.30 3589.00 L 4416.10 3580.10 L 4416.50 3571.30 L 4417.60 3562.50 L 4419.30 3553.70 L 4421.60 3545.10 L 4424.60 3536.70 L 4428.10 3528.60 L 4432.20 3520.80 L 4436.80 3513.30 L 4441.90 3506.10 L 4447.60 3499.30 L 4453.70 3492.90 L 4460.40 3487.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="542" stroke="none" target-height="234.80005" target-width="206" target-x="4416.1" target-y="3407.3"/><path d="M 4728.00 3407.50 L 4720.90 3433.50 L 4569.90 3458.80 L 4555.10 3407.30 L 4728.00 3407.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="544" stroke="none" target-height="51.5" target-width="172.8999" target-x="4555.1" target-y="3407.3"/><path d="M 3873.60 7538.50 L 3601.20 7362.50 L 3650.10 7277.60 L 3956.10 7465.80 L 3873.60 7538.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="546" stroke="none" target-height="260.8999" target-width="354.90015" target-x="3601.2" target-y="7277.6"/><path d="M 3410.90 7678.80 L 3401.90 7677.40 L 3393.10 7675.60 L 3375.90 7670.50 L 3367.60 7667.30 L 3359.40 7663.60 L 3351.40 7659.50 L 3342.40 7654.30 L 3341.50 7653.40 L 3340.90 7652.20 L 3340.90 7649.60 L 3341.50 7648.40 L 3342.40 7647.40 L 3343.60 7646.80 L 3350.00 7644.90 L 3361.50 7641.70 L 3376.30 7638.30 L 3384.50 7636.70 L 3392.80 7635.50 L 3401.20 7634.60 L 3409.10 7634.20 L 3414.30 7634.20 L 3419.00 7634.60 L 3423.30 7635.30 L 3427.50 7636.50 L 3430.90 7638.00 L 3433.80 7639.90 L 3435.70 7641.80 L 3438.40 7646.50 L 3439.10 7649.10 L 3439.00 7654.40 L 3438.60 7657.70 L 3437.70 7660.70 L 3436.50 7663.70 L 3434.90 7666.50 L 3432.90 7669.00 L 3430.70 7671.30 L 3428.20 7673.30 L 3422.00 7676.60 L 3418.40 7677.80 L 3414.70 7678.50 L 3410.90 7678.80 Z M 3357.20 7652.50 L 3367.30 7657.40 L 3376.50 7661.40 L 3384.80 7664.50 L 3397.10 7668.00 L 3407.00 7669.60 L 3411.90 7669.80 L 3416.00 7669.40 L 3419.40 7668.70 L 3422.30 7667.60 L 3424.70 7666.00 L 3426.70 7664.10 L 3428.40 7661.80 L 3429.70 7659.20 L 3430.50 7656.60 L 3430.90 7653.70 L 3430.90 7651.10 L 3430.70 7649.40 L 3430.30 7648.50 L 3426.60 7645.90 L 3423.70 7644.80 L 3419.90 7644.00 L 3416.10 7643.60 L 3411.70 7643.50 L 3399.00 7644.20 L 3390.50 7645.30 L 3382.00 7646.70 L 3364.80 7650.50 L 3357.20 7652.50 Z" fill="#263238" fill-rule="nonzero" node-id="548" stroke="none" target-height="44.59961" target-width="98.200195" target-x="3340.9" target-y="7634.2"/><path d="M 3345.30 7656.60 L 3342.00 7655.20 L 3341.50 7654.10 L 3341.40 7653.00 L 3342.00 7650.90 L 3342.90 7647.20 L 3345.60 7639.00 L 3350.00 7627.80 L 3355.90 7615.30 L 3359.40 7609.00 L 3366.00 7599.20 L 3371.90 7592.50 L 3375.10 7589.60 L 3381.80 7585.30 L 3385.00 7584.10 L 3391.70 7583.10 L 3395.10 7583.40 L 3401.60 7585.30 L 3404.00 7586.30 L 3406.20 7587.60 L 3408.20 7589.30 L 3411.10 7593.60 L 3412.50 7598.60 L 3411.90 7604.80 L 3410.60 7608.50 L 3408.50 7612.50 L 3403.00 7620.20 L 3399.30 7624.20 L 3393.40 7629.90 L 3386.80 7635.50 L 3379.80 7640.60 L 3372.70 7645.30 L 3365.50 7649.50 L 3354.40 7654.90 L 3347.20 7657.30 L 3345.30 7656.60 Z M 3391.60 7591.50 L 3389.20 7591.70 L 3387.00 7592.30 L 3382.00 7594.80 L 3376.40 7599.70 L 3372.40 7604.30 L 3368.60 7609.70 L 3361.90 7621.60 L 3356.30 7633.90 L 3352.00 7645.10 L 3358.30 7642.10 L 3365.20 7638.30 L 3372.00 7634.00 L 3378.60 7629.20 L 3385.00 7624.00 L 3390.50 7618.90 L 3394.00 7615.30 L 3396.80 7611.90 L 3401.10 7605.30 L 3402.30 7602.40 L 3402.80 7599.80 L 3402.60 7597.50 L 3401.10 7595.10 L 3399.70 7594.00 L 3397.30 7592.70 L 3394.50 7591.50 L 3391.60 7590.80 L 3391.60 7591.50 Z" fill="#263238" fill-rule="nonzero" node-id="550" stroke="none" target-height="74.19971" target-width="71.1001" target-x="3341.4" target-y="7583.1"/><path d="M 3751.20 7781.80 L 3746.80 7781.50 L 3742.00 7780.60 L 3737.00 7779.10 L 3727.10 7774.90 L 3714.10 7767.30 L 3706.40 7761.90 L 3698.80 7756.00 L 3684.40 7743.60 L 3677.90 7737.50 L 3666.30 7726.00 L 3665.70 7724.80 L 3665.50 7723.50 L 3666.30 7721.00 L 3668.30 7719.20 L 3669.50 7718.70 L 3670.90 7718.60 L 3689.50 7720.90 L 3704.90 7723.80 L 3722.10 7727.70 L 3730.80 7730.10 L 3747.60 7735.80 L 3755.00 7738.90 L 3759.80 7741.30 L 3767.40 7746.10 L 3770.70 7748.90 L 3773.10 7751.60 L 3775.90 7756.60 L 3776.80 7761.30 L 3775.90 7766.00 L 3773.40 7770.90 L 3771.60 7773.30 L 3769.50 7775.40 L 3767.20 7777.30 L 3764.60 7778.90 L 3761.90 7780.20 L 3759.00 7781.00 L 3751.20 7781.80 Z M 3682.10 7729.30 L 3692.30 7738.90 L 3701.90 7747.10 L 3710.60 7754.00 L 3717.70 7758.90 L 3724.00 7763.00 L 3729.80 7766.30 L 3735.10 7768.80 L 3739.80 7770.70 L 3743.90 7771.90 L 3747.50 7772.60 L 3753.60 7772.80 L 3756.20 7772.20 L 3758.70 7771.20 L 3763.00 7768.20 L 3764.70 7766.20 L 3766.00 7763.90 L 3766.60 7762.60 L 3766.90 7761.20 L 3766.00 7758.40 L 3763.30 7754.90 L 3761.10 7753.00 L 3758.20 7751.00 L 3749.30 7746.50 L 3743.50 7744.10 L 3734.50 7741.10 L 3724.40 7738.10 L 3703.10 7733.10 L 3682.10 7729.30 Z" fill="#263238" fill-rule="nonzero" node-id="552" stroke="none" target-height="63.199707" target-width="111.30005" target-x="3665.5" target-y="7718.6"/><path d="M 3684.70 7728.20 L 3674.00 7727.70 L 3667.70 7726.70 L 3665.00 7723.20 L 3664.80 7722.10 L 3665.00 7720.90 L 3665.40 7719.80 L 3675.90 7708.40 L 3680.70 7703.80 L 3692.80 7693.50 L 3699.70 7688.60 L 3704.40 7685.60 L 3709.30 7682.90 L 3714.30 7680.60 L 3719.40 7678.70 L 3724.50 7677.40 L 3729.60 7676.60 L 3738.10 7677.10 L 3742.20 7678.10 L 3746.20 7679.70 L 3749.90 7681.70 L 3753.40 7684.30 L 3756.30 7687.10 L 3759.70 7692.00 L 3760.70 7694.50 L 3761.20 7696.70 L 3760.80 7701.60 L 3758.70 7706.30 L 3757.20 7708.50 L 3752.40 7712.80 L 3744.10 7717.40 L 3738.90 7719.50 L 3733.50 7721.30 L 3727.70 7722.90 L 3712.10 7726.00 L 3702.70 7727.20 L 3693.30 7727.90 L 3684.70 7728.20 Z M 3678.50 7719.30 L 3685.40 7719.50 L 3700.70 7718.60 L 3716.40 7716.30 L 3731.10 7712.80 L 3737.50 7710.70 L 3741.50 7709.10 L 3745.00 7707.40 L 3747.80 7705.80 L 3752.20 7702.00 L 3753.70 7699.10 L 3753.60 7697.80 L 3752.30 7694.60 L 3749.10 7691.20 L 3746.50 7689.20 L 3743.70 7687.60 L 3740.60 7686.40 L 3734.20 7685.30 L 3731.00 7685.50 L 3723.30 7687.90 L 3716.00 7690.90 L 3708.90 7694.40 L 3702.10 7698.50 L 3695.60 7703.10 L 3689.60 7708.10 L 3678.50 7719.30 Z" fill="#263238" fill-rule="nonzero" node-id="554" stroke="none" target-height="51.600098" target-width="96.3999" target-x="3664.8" target-y="7676.6"/><path d="M 3351.70 7630.80 L 3149.50 7573.60 L 3146.80 7573.00 L 3144.10 7573.00 L 3141.50 7573.40 L 3138.90 7574.30 L 3134.50 7577.50 L 3132.90 7579.50 L 3131.60 7581.90 L 3063.40 7735.30 L 3062.00 7739.30 L 3061.30 7743.50 L 3061.10 7747.70 L 3061.60 7751.90 L 3062.60 7756.00 L 3064.20 7759.90 L 3066.30 7763.60 L 3068.90 7766.90 L 3072.00 7769.80 L 3075.40 7772.30 L 3079.20 7774.20 L 3083.20 7775.60 L 3111.80 7782.90 L 3213.00 7807.30 L 3243.00 7815.20 L 3278.00 7825.00 L 3313.50 7835.60 L 3441.30 7876.60 L 3486.70 7890.10 L 3494.00 7891.90 L 3500.70 7893.10 L 3506.90 7893.80 L 3512.70 7894.00 L 3518.70 7893.70 L 3524.20 7893.10 L 3529.20 7892.10 L 3533.90 7890.80 L 3542.90 7887.00 L 3550.30 7882.20 L 3558.60 7874.30 L 3561.90 7870.10 L 3564.70 7865.50 L 3566.80 7860.90 L 3568.50 7856.20 L 3569.60 7851.40 L 3570.10 7846.80 L 3570.10 7842.40 L 3569.50 7838.00 L 3568.40 7834.10 L 3565.10 7827.90 L 3560.90 7823.80 L 3558.30 7822.10 L 3527.10 7804.70 L 3514.00 7796.80 L 3501.10 7788.40 L 3489.60 7780.50 L 3479.40 7773.10 L 3469.50 7765.30 L 3452.80 7750.80 L 3438.50 7736.40 L 3432.50 7729.60 L 3421.40 7715.90 L 3409.80 7699.30 L 3385.50 7660.20 L 3378.90 7650.40 L 3376.30 7646.90 L 3370.40 7640.90 L 3363.50 7635.90 L 3359.70 7633.90 L 3355.80 7632.20 L 3351.70 7630.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="556" stroke="none" target-height="321" target-width="509" target-x="3061.1" target-y="7573"/><path d="M 3671.80 7698.10 L 3499.10 7578.80 L 3496.80 7577.40 L 3494.30 7576.50 L 3491.70 7576.10 L 3489.00 7576.10 L 3483.90 7577.50 L 3479.60 7580.70 L 3365.10 7703.80 L 3362.50 7707.20 L 3360.50 7710.80 L 3359.00 7714.80 L 3358.00 7718.90 L 3357.70 7723.10 L 3357.90 7727.30 L 3358.80 7731.40 L 3360.20 7735.40 L 3362.10 7739.10 L 3364.60 7742.60 L 3367.50 7745.60 L 3370.80 7748.20 L 3395.30 7764.30 L 3483.20 7820.40 L 3509.10 7837.60 L 3549.80 7865.40 L 3589.30 7894.10 L 3683.30 7963.90 L 3714.50 7986.80 L 3743.60 8007.50 L 3749.90 8011.50 L 3755.80 8014.80 L 3761.50 8017.50 L 3766.90 8019.60 L 3772.60 8021.30 L 3778.00 8022.50 L 3783.10 8023.10 L 3788.00 8023.40 L 3793.00 8023.20 L 3797.60 8022.70 L 3806.30 8020.60 L 3811.70 8018.40 L 3816.60 8015.90 L 3821.10 8012.90 L 3825.20 8009.40 L 3828.80 8005.80 L 3834.40 7997.80 L 3836.40 7993.60 L 3837.80 7989.40 L 3838.70 7985.10 L 3838.90 7981.00 L 3837.70 7974.10 L 3835.00 7968.90 L 3833.10 7966.40 L 3816.20 7948.00 L 3801.30 7930.90 L 3788.10 7914.90 L 3775.40 7898.60 L 3764.20 7883.40 L 3754.50 7869.30 L 3745.10 7854.80 L 3737.00 7841.20 L 3730.00 7828.50 L 3723.40 7815.50 L 3712.70 7791.70 L 3704.00 7768.60 L 3695.50 7741.60 L 3689.80 7721.80 L 3688.20 7717.80 L 3686.30 7714.00 L 3681.30 7706.90 L 3678.50 7703.70 L 3675.30 7700.80 L 3671.80 7698.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="558" stroke="none" target-height="447.2998" target-width="481.19995" target-x="3357.7" target-y="7576.1"/><path d="M 3531.80 7476.30 L 3220.50 7321.50 L 3252.70 7237.00 L 3585.20 7400.20 L 3531.80 7476.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="560" stroke="none" target-height="239.2998" target-width="364.69995" target-x="3220.5" target-y="7237"/><path d="M 3127.00 4558.70 L 3100.20 4629.10 L 3100.90 4632.50 L 3103.40 4635.30 L 3107.70 4637.30 L 3110.30 4637.90 L 3113.20 4638.10 L 3902.20 4638.10 L 3905.60 4637.80 L 3908.60 4637.10 L 3911.30 4635.80 L 3913.30 4634.30 L 3914.30 4633.10 L 3915.00 4631.80 L 3915.40 4630.50 L 3922.00 4562.20 L 3921.80 4560.80 L 3921.30 4559.40 L 3919.10 4556.80 L 3915.80 4554.90 L 3911.60 4553.80 L 3137.10 4553.60 L 3132.60 4554.60 L 3130.50 4555.70 L 3128.70 4557.00 L 3127.00 4558.70 Z" fill="#429cfd" fill-rule="nonzero" node-id="562" stroke="none" target-height="84.5" target-width="821.80005" target-x="3100.2" target-y="4553.6"/><g node-id="608"><path d="M 3127.00 4558.70 L 3100.20 4629.10 L 3100.90 4632.50 L 3103.40 4635.30 L 3107.70 4637.30 L 3110.30 4637.90 L 3113.20 4638.10 L 3902.20 4638.10 L 3905.60 4637.80 L 3908.60 4637.10 L 3911.30 4635.80 L 3913.30 4634.30 L 3914.30 4633.10 L 3915.00 4631.80 L 3915.40 4630.50 L 3922.00 4562.20 L 3921.80 4560.80 L 3921.30 4559.40 L 3919.10 4556.80 L 3915.80 4554.90 L 3911.60 4553.80 L 3137.10 4553.60 L 3132.60 4554.60 L 3130.50 4555.70 L 3128.70 4557.00 L 3127.00 4558.70 Z" fill="#ffffff" fill-opacity="0.4" fill-rule="nonzero" group-id="21" node-id="566" stroke="none" target-height="84.5" target-width="821.80005" target-x="3100.2" target-y="4553.6"/></g><path d="M 3251.30 4644.80 L 3228.50 4644.60 L 3225.50 4643.40 L 3223.80 4641.20 L 3223.60 4640.00 L 3233.40 4551.50 L 3234.60 4549.30 L 3237.40 4547.60 L 3239.30 4547.10 L 3262.00 4547.00 L 3264.10 4547.20 L 3267.10 4548.30 L 3268.20 4549.30 L 3268.80 4550.40 L 3269.00 4551.50 L 3259.20 4640.00 L 3258.00 4642.30 L 3256.70 4643.40 L 3255.10 4644.10 L 3253.40 4644.60 L 3251.30 4644.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="569" stroke="none" target-height="97.799805" target-width="45.399902" target-x="3223.6" target-y="4547"/><path d="M 3737.90 4644.80 L 3715.30 4644.60 L 3711.20 4642.30 L 3710.60 4641.20 L 3710.50 4640.00 L 3720.00 4551.50 L 3720.30 4550.40 L 3721.20 4549.30 L 3722.50 4548.40 L 3724.20 4547.60 L 3726.10 4547.10 L 3750.60 4547.10 L 3753.80 4548.40 L 3755.50 4550.30 L 3746.00 4640.00 L 3745.30 4641.20 L 3744.30 4642.40 L 3743.10 4643.40 L 3741.70 4644.10 L 3740.00 4644.60 L 3737.90 4644.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="571" stroke="none" target-height="97.69971" target-width="45" target-x="3710.5" target-y="4547.1"/><g node-id="609"><path d="M 3233.20 8684.20 L 3348.00 8683.40 L 3456.10 8681.30 L 3507.70 8679.70 L 3555.70 8677.80 L 3602.40 8675.60 L 3644.90 8673.30 L 3685.80 8670.50 L 3721.90 8667.70 L 3756.20 8664.50 L 3784.90 8661.20 L 3819.10 8656.40 L 3832.20 8654.00 L 3845.20 8651.20 L 3854.90 8648.60 L 3861.90 8646.20 L 3866.30 8644.20 L 3869.20 8642.40 L 3871.00 8640.70 L 3871.90 8639.30 L 3872.20 8637.90 L 3871.90 8636.50 L 3871.00 8635.00 L 3869.20 8633.40 L 3866.30 8631.60 L 3861.90 8629.60 L 3854.90 8627.20 L 3845.20 8624.50 L 3832.20 8621.70 L 3803.50 8617.00 L 3784.90 8614.50 L 3756.20 8611.30 L 3721.90 8608.10 L 3685.80 8605.20 L 3644.90 8602.50 L 3602.40 8600.10 L 3507.70 8596.10 L 3403.50 8593.30 L 3291.70 8591.80 L 3174.70 8591.80 L 3062.80 8593.30 L 2958.70 8596.10 L 2910.70 8597.90 L 2864.00 8600.10 L 2821.50 8602.50 L 2780.50 8605.20 L 2744.50 8608.10 L 2710.20 8611.30 L 2681.40 8614.50 L 2662.90 8617.00 L 2647.20 8619.40 L 2634.20 8621.70 L 2621.10 8624.50 L 2611.50 8627.20 L 2604.50 8629.60 L 2600.00 8631.60 L 2597.10 8633.40 L 2595.40 8635.00 L 2594.50 8636.50 L 2594.20 8637.90 L 2594.50 8639.30 L 2597.10 8642.40 L 2600.00 8644.20 L 2604.50 8646.20 L 2611.50 8648.60 L 2621.10 8651.20 L 2634.20 8654.00 L 2647.20 8656.40 L 2662.90 8658.80 L 2681.40 8661.20 L 2710.20 8664.50 L 2744.50 8667.70 L 2780.50 8670.50 L 2821.50 8673.30 L 2864.00 8675.60 L 2910.70 8677.80 L 3010.20 8681.30 L 3062.80 8682.50 L 3118.30 8683.40 L 3233.20 8684.20 Z" fill="#f5f5f5" fill-rule="nonzero" group-id="22" node-id="575" stroke="none" target-height="92.40039" target-width="1278" target-x="2594.2" target-y="8591.8"/></g><path d="M 3622.50 8572.50 L 3565.20 8555.30 L 3507.60 8536.80 L 3479.00 8527.00 L 3451.30 8517.10 L 3424.00 8506.80 L 3398.20 8496.50 L 3365.10 8482.20 L 3334.80 8467.70 L 3301.40 8449.90 L 3301.40 7938.10 L 3530.10 7938.10 L 3535.90 7937.50 L 3541.50 7936.40 L 3547.00 7934.90 L 3552.40 7932.90 L 3562.50 7927.70 L 3571.60 7920.80 L 3579.50 7912.40 L 3582.90 7907.70 L 3585.90 7902.80 L 3590.50 7892.50 L 3592.20 7887.00 L 3593.40 7881.40 L 3594.10 7875.70 L 3594.30 7870.00 L 3594.10 7864.20 L 3593.40 7858.50 L 3592.20 7852.90 L 3590.50 7847.40 L 3585.90 7837.10 L 3582.90 7832.20 L 3579.50 7827.50 L 3571.60 7819.10 L 3562.50 7812.20 L 3557.50 7809.40 L 3552.40 7807.00 L 3547.00 7805.00 L 3541.50 7803.50 L 3535.90 7802.40 L 3530.10 7801.90 L 3302.60 7801.90 L 3302.60 5468.60 L 3165.20 5468.60 L 3165.20 7801.90 L 2933.20 7801.70 L 2928.60 7801.90 L 2924.00 7802.40 L 2919.50 7803.30 L 2915.00 7804.40 L 2906.30 7807.60 L 2898.10 7811.90 L 2890.60 7817.20 L 2887.10 7820.30 L 2883.80 7823.60 L 2880.80 7827.10 L 2875.50 7834.70 L 2871.20 7842.90 L 2868.10 7851.60 L 2866.30 7860.70 L 2865.80 7865.30 L 2865.80 7874.60 L 2866.30 7879.20 L 2867.10 7883.80 L 2868.10 7888.20 L 2871.20 7897.00 L 2873.20 7901.20 L 2878.00 7909.10 L 2883.80 7916.30 L 2887.10 7919.60 L 2890.60 7922.70 L 2898.10 7928.00 L 2902.10 7930.30 L 2906.30 7932.30 L 2910.60 7934.10 L 2919.50 7936.60 L 2924.00 7937.50 L 2928.60 7938.00 L 2933.20 7938.20 L 3165.20 7938.10 L 3165.20 8449.20 L 3162.00 8450.30 L 3158.80 8452.50 L 3145.80 8459.80 L 3131.70 8467.20 L 3116.60 8474.70 L 3101.30 8481.90 L 3068.10 8496.20 L 3042.20 8506.60 L 3015.00 8516.90 L 2987.30 8526.80 L 2958.80 8536.50 L 2901.40 8554.90 L 2844.20 8571.80 L 2840.40 8573.20 L 2836.90 8575.00 L 2833.60 8577.10 L 2830.70 8579.70 L 2828.00 8582.60 L 2825.70 8585.80 L 2823.70 8589.30 L 2822.20 8592.90 L 2821.20 8596.70 L 2820.40 8604.50 L 2820.80 8608.50 L 2821.60 8612.40 L 2822.80 8616.10 L 2824.40 8619.70 L 2826.50 8623.00 L 2829.00 8626.10 L 2831.80 8628.90 L 2834.90 8631.30 L 2841.90 8635.00 L 2845.60 8636.10 L 2849.50 8636.90 L 2853.50 8637.20 L 3613.10 8637.20 L 3616.90 8636.70 L 3624.10 8634.50 L 3630.60 8630.80 L 3633.60 8628.30 L 3636.20 8625.60 L 3640.50 8619.30 L 3642.00 8615.90 L 3643.20 8612.30 L 3643.90 8608.60 L 3644.30 8604.80 L 3643.60 8597.30 L 3641.30 8590.20 L 3639.60 8586.80 L 3637.40 8583.60 L 3632.20 8578.20 L 3626.00 8574.00 L 3622.50 8572.50 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="578" stroke="none" target-height="3168.6" target-width="823.90015" target-x="2820.4" target-y="5468.6"/><path d="M 3657.50 5231.10 L 2809.30 5231.10 L 2800.80 5231.30 L 2792.50 5232.20 L 2784.40 5233.60 L 2776.50 5235.50 L 2768.70 5237.90 L 2761.20 5240.80 L 2754.00 5244.10 L 2747.00 5247.90 L 2740.20 5252.20 L 2733.80 5256.80 L 2727.70 5261.80 L 2722.00 5267.20 L 2716.50 5273.00 L 2711.50 5279.10 L 2706.90 5285.50 L 2702.60 5292.20 L 2698.80 5299.20 L 2695.50 5306.50 L 2692.60 5314.00 L 2690.20 5321.80 L 2688.30 5329.70 L 2686.90 5337.70 L 2686.10 5346.10 L 2685.80 5354.60 L 2685.80 5606.70 L 2686.10 5615.30 L 2686.90 5623.60 L 2688.30 5631.70 L 2690.20 5639.60 L 2692.60 5647.40 L 2695.50 5654.90 L 2698.80 5662.10 L 2702.60 5669.10 L 2706.90 5675.80 L 2711.50 5682.20 L 2716.50 5688.30 L 2722.00 5694.10 L 2727.70 5699.50 L 2733.80 5704.50 L 2740.20 5709.20 L 2747.00 5713.40 L 2754.00 5717.20 L 2761.20 5720.60 L 2768.70 5723.40 L 2776.50 5725.90 L 2784.40 5727.80 L 2792.50 5729.10 L 2800.80 5730.00 L 2809.30 5730.30 L 3657.50 5730.30 L 3666.10 5730.00 L 3674.40 5729.10 L 3682.50 5727.80 L 3690.40 5725.90 L 3698.10 5723.40 L 3705.60 5720.60 L 3719.90 5713.40 L 3726.60 5709.20 L 3739.10 5699.50 L 3744.90 5694.10 L 3750.30 5688.30 L 3755.30 5682.20 L 3759.90 5675.80 L 3764.20 5669.10 L 3768.00 5662.10 L 3771.30 5654.90 L 3774.20 5647.40 L 3776.70 5639.60 L 3778.60 5631.70 L 3779.90 5623.60 L 3780.80 5615.30 L 3781.10 5606.70 L 3781.10 5354.60 L 3780.80 5346.10 L 3779.90 5337.70 L 3778.60 5329.70 L 3776.70 5321.80 L 3774.20 5314.00 L 3771.30 5306.50 L 3768.00 5299.20 L 3764.20 5292.20 L 3759.90 5285.50 L 3755.30 5279.10 L 3750.30 5273.00 L 3744.90 5267.20 L 3739.10 5261.80 L 3733.00 5256.80 L 3726.60 5252.20 L 3719.90 5247.90 L 3712.90 5244.10 L 3705.60 5240.80 L 3698.10 5237.90 L 3690.40 5235.50 L 3682.50 5233.60 L 3674.40 5232.20 L 3666.10 5231.30 L 3657.50 5231.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="580" stroke="none" target-height="499.1997" target-width="1095.3" target-x="2685.8" target-y="5231.1"/><path d="M 2801.50 5730.50 L 2801.50 5773.90 L 2801.80 5779.30 L 2802.60 5784.50 L 2804.00 5789.50 L 2805.90 5794.40 L 2808.30 5799.10 L 2811.10 5803.70 L 2814.40 5808.00 L 2822.30 5816.10 L 2831.60 5823.10 L 2836.90 5826.30 L 2842.40 5829.00 L 2848.20 5831.50 L 2854.30 5833.70 L 2860.70 5835.50 L 2867.20 5836.90 L 2873.90 5837.90 L 2880.80 5838.60 L 2888.00 5838.80 L 3579.80 5838.80 L 3593.90 5837.90 L 3600.60 5836.90 L 3613.50 5833.70 L 3619.60 5831.50 L 3630.80 5826.30 L 3636.20 5823.10 L 3645.50 5816.10 L 3653.40 5808.00 L 3656.70 5803.70 L 3659.50 5799.10 L 3661.90 5794.40 L 3663.80 5789.50 L 3665.20 5784.50 L 3666.00 5779.30 L 3666.30 5773.90 L 3666.30 5730.50 L 2801.50 5730.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="582" stroke="none" target-height="108.299805" target-width="864.80005" target-x="2801.5" target-y="5730.5"/><g node-id="610"><path d="M 2801.50 5730.50 L 2801.50 5773.90 L 2801.80 5779.30 L 2802.60 5784.50 L 2804.00 5789.50 L 2805.90 5794.40 L 2808.30 5799.10 L 2811.10 5803.70 L 2814.40 5808.00 L 2822.30 5816.10 L 2831.60 5823.10 L 2836.90 5826.30 L 2842.40 5829.00 L 2848.20 5831.50 L 2854.30 5833.70 L 2860.70 5835.50 L 2867.20 5836.90 L 2873.90 5837.90 L 2880.80 5838.60 L 2888.00 5838.80 L 3579.80 5838.80 L 3593.90 5837.90 L 3600.60 5836.90 L 3613.50 5833.70 L 3619.60 5831.50 L 3630.80 5826.30 L 3636.20 5823.10 L 3645.50 5816.10 L 3653.40 5808.00 L 3656.70 5803.70 L 3659.50 5799.10 L 3661.90 5794.40 L 3663.80 5789.50 L 3665.20 5784.50 L 3666.00 5779.30 L 3666.30 5773.90 L 3666.30 5730.50 L 2801.50 5730.50 Z" fill="#ffffff" fill-opacity="0.3" fill-rule="nonzero" group-id="23" node-id="586" stroke="none" target-height="108.299805" target-width="864.80005" target-x="2801.5" target-y="5730.5"/></g></svg>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6818c459..bb42a852 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -16,13 +16,30 @@
 
     <!-- 登录页内容 -->
     <div class="login-content">
-      <div class="login-img">
-        <el-image :src="http://github.com/loginImage" style="width: 210px" />
+      <div class="login-carousel">
+        <div class="project-info">
+          <div class="title-container">
+            <h2>{{ defaultSettings.title }}</h2>
+            <el-tag type="success" size="small">
+              {{ defaultSettings.version }}
+            </el-tag>
+          </div>
+          <p class="description">
+            基于 Vue3 + Vite6 + TypeScript + Element-Plus 构建的中后台管理模板
+          </p>
+        </div>
+        <el-carousel style="width: 100%" indicator-position="none">
+          <el-carousel-item>
+            <div class="flex-center h-full">
+              <el-image :src="http://github.com/loginImage" alt="login" style="width: 60%; height: 60%" />
+            </div>
+          </el-carousel-item>
+        </el-carousel>
       </div>
       <div class="login-form">
         <el-form ref="loginFormRef" :model="loginData" :rules="loginRules">
           <div class="form-title">
-            <h2>{{ defaultSettings.title }}</h2>
+            <h3>登录</h3>
             <el-dropdown style="position: absolute; right: 0">
               <div class="cursor-pointer">
                 <el-icon>
@@ -31,13 +48,6 @@
               </div>
               <template #dropdown>
                 <el-dropdown-menu>
-                  <el-dropdown-item>
-                    版本号：
-                    <el-tag type="success">
-                      {{ defaultSettings.version }}
-                    </el-tag>
-                  </el-dropdown-item>
-
                   <el-dropdown-item @click="setLoginCredentials('root', '123456')">
                     超级管理员：root/123456
                   </el-dropdown-item>
@@ -157,6 +167,7 @@
 
 <script setup lang="ts">
 import { LocationQuery, useRoute } from "vue-router";
+import { useI18n } from "vue-i18n";
 
 import AuthAPI, { type LoginData } from "@/api/auth";
 import router from "@/router";
@@ -351,9 +362,10 @@ onMounted(() => {
       box-shadow: none;
     }
 
-    .login-img {
+    .login-carousel {
       display: flex;
       flex: 3;
+      flex-direction: column;
       align-items: center;
       justify-content: center;
       background: linear-gradient(60deg, #165dff, #6aa1ff);
@@ -361,6 +373,29 @@ onMounted(() => {
       @media (width <= 768px) {
         display: none;
       }
+
+      .project-info {
+        position: relative;
+        color: #fff;
+        text-align: center;
+
+        .title-container {
+          display: flex;
+          align-items: center;
+          justify-content: center;
+
+          h2 {
+            margin-right: 10px;
+            font-size: 24px;
+            font-weight: bold;
+            line-height: 18px;
+          }
+        }
+
+        .description {
+          font-size: 12px;
+        }
+      }
     }
 
     .login-form {

From c1b7686e72a3e543cfca3939f1d6a51abc3159f2 Mon Sep 17 00:00:00 2001
From: wangchengxin <wangchengxin1995@foxmail.com>
Date: Mon, 16 Dec 2024 10:20:21 +0800
Subject: [PATCH 097/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E9=A1=B6=E9=83=A8=E5=9B=BE=E6=A0=87=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 5fd72995..9b3ac6d6 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -28,7 +28,7 @@
         <AppMain />
         <Settings v-if="defaultSettings.showSettings" />
         <!-- 返回顶部 -->
-        <el-backtop target=".main-container">
+        <el-backtop target=".app-main">
           <svg-icon icon-class="backtop" size="24px" />
         </el-backtop>
       </div>
@@ -43,7 +43,7 @@
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
       <!-- 返回顶部 -->
-      <el-backtop target=".main-container">
+      <el-backtop target=".app-main">
         <svg-icon icon-class="backtop" size="24px" />
       </el-backtop>
     </div>

From 2801099d4718efb8d7fdeffb61a526ca46d4928f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=83=A1=E5=B0=91=E7=BF=94?= <971366405@qq.com>
Date: Mon, 16 Dec 2024 11:18:28 +0800
Subject: [PATCH 098/497] =?UTF-8?q?docs:=20:memo:=20=E7=B2=BE=E7=AE=80?=
 =?UTF-8?q?=E7=89=88=E9=A1=B9=E7=9B=AE=E5=9C=B0=E5=9D=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新前端项目名称为 "Lite"
---
 README.en-US.md | 7 ++++---
 README.md       | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index 590045fc..25109d51 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -50,10 +50,11 @@
 
 ## Project Links
 
-| Project | Gitee                                                        | Github                                                       | GitCode                                                      |
-| ---- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
+| Project  | Gitee                                                        | Github                                                       | GitCode                                                      |
+|----------| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
 | Frontend | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin) |
-| Backend | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot)        |
+| Lite     | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
+| Backend  | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot)        |
 
 ## Environment Setup
 
diff --git a/README.md b/README.md
index e2dc8b43..d8e16816 100644
--- a/README.md
+++ b/README.md
@@ -51,9 +51,9 @@
 ## 项目源码
 
 | 项目 | Gitee   | Github    | GitCode|
-| ---- | ----| ---- | ---- | 
+| ---- | ----| ---- | ---- |
 | 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
-| 精简版 | [vue3-element-admin-thin](https://gitee.com/cshaptx4869/vue3-element-admin-thin) | [vue3-element-admin-thin](https://github.com/youlaitech/vue3-element-admin-thin) |-|
+| 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
 | 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
 
 ## 环境准备

From 0e766cc1a3075a33841e52cf799632bd3aed63fa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 16 Dec 2024 11:22:12 +0800
Subject: [PATCH 099/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E7=B2=BE=E7=AE=80=EF=BC=8C=E6=96=B9?=
 =?UTF-8?q?=E4=BE=BF=E6=89=A9=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 332 +++++++++++++++-----------------------
 1 file changed, 131 insertions(+), 201 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bb42a852..2c99d81d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -15,142 +15,123 @@
     </div>
 
     <!-- 登录页内容 -->
-    <div class="login-content">
-      <div class="login-carousel">
-        <div class="project-info">
-          <div class="title-container">
-            <h2>{{ defaultSettings.title }}</h2>
-            <el-tag type="success" size="small">
-              {{ defaultSettings.version }}
-            </el-tag>
-          </div>
-          <p class="description">
-            基于 Vue3 + Vite6 + TypeScript + Element-Plus 构建的中后台管理模板
-          </p>
-        </div>
-        <el-carousel style="width: 100%" indicator-position="none">
-          <el-carousel-item>
-            <div class="flex-center h-full">
-              <el-image :src="http://github.com/loginImage" alt="login" style="width: 60%; height: 60%" />
+    <div class="login-form">
+      <el-form ref="loginFormRef" :model="loginData" :rules="loginRules">
+        <div class="form-title">
+          <h2>{{ defaultSettings.title }}</h2>
+          <el-dropdown style="position: absolute; right: 0">
+            <div class="cursor-pointer">
+              <el-icon>
+                <arrow-down />
+              </el-icon>
             </div>
-          </el-carousel-item>
-        </el-carousel>
-      </div>
-      <div class="login-form">
-        <el-form ref="loginFormRef" :model="loginData" :rules="loginRules">
-          <div class="form-title">
-            <h3>登录</h3>
-            <el-dropdown style="position: absolute; right: 0">
-              <div class="cursor-pointer">
-                <el-icon>
-                  <arrow-down />
-                </el-icon>
-              </div>
-              <template #dropdown>
-                <el-dropdown-menu>
-                  <el-dropdown-item @click="setLoginCredentials('root', '123456')">
-                    超级管理员：root/123456
-                  </el-dropdown-item>
-                  <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
-                    系统管理员：admin/123456
-                  </el-dropdown-item>
-                  <el-dropdown-item @click="setLoginCredentials('test', '123456')">
-                    测试小游客：test/123456
-                  </el-dropdown-item>
-                </el-dropdown-menu>
-              </template>
-            </el-dropdown>
+            <template #dropdown>
+              <el-dropdown-menu>
+                <el-dropdown-item>
+                  <el-tag>{{ defaultSettings.version }}</el-tag>
+                </el-dropdown-item>
+                <el-dropdown-item @click="setLoginCredentials('root', '123456')">
+                  超级管理员：root/123456
+                </el-dropdown-item>
+                <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
+                  系统管理员：admin/123456
+                </el-dropdown-item>
+                <el-dropdown-item @click="setLoginCredentials('test', '123456')">
+                  测试小游客：test/123456
+                </el-dropdown-item>
+              </el-dropdown-menu>
+            </template>
+          </el-dropdown>
+        </div>
+
+        <!-- 用户名 -->
+        <el-form-item prop="username">
+          <div class="input-wrapper">
+            <el-icon class="mx-2">
+              <User />
+            </el-icon>
+            <el-input
+              ref="username"
+              v-model="loginData.username"
+              :placeholder="$t('login.username')"
+              name="username"
+              size="large"
+              class="h-[48px]"
+            />
           </div>
+        </el-form-item>
 
-          <!-- 用户名 -->
-          <el-form-item prop="username">
+        <!-- 密码 -->
+        <el-tooltip :visible="isCapslock" :content="$t('login.capsLock')" placement="right">
+          <el-form-item prop="password">
             <div class="input-wrapper">
               <el-icon class="mx-2">
-                <User />
+                <Lock />
               </el-icon>
               <el-input
-                ref="username"
-                v-model="loginData.username"
-                :placeholder="$t('login.username')"
-                name="username"
+                v-model="loginData.password"
+                :placeholder="$t('login.password')"
+                type="password"
+                name="password"
                 size="large"
-                class="h-[48px]"
-              />
-            </div>
-          </el-form-item>
-
-          <!-- 密码 -->
-          <el-tooltip :visible="isCapslock" :content="$t('login.capsLock')" placement="right">
-            <el-form-item prop="password">
-              <div class="input-wrapper">
-                <el-icon class="mx-2">
-                  <Lock />
-                </el-icon>
-                <el-input
-                  v-model="loginData.password"
-                  :placeholder="$t('login.password')"
-                  type="password"
-                  name="password"
-                  size="large"
-                  class="h-[48px] pr-2"
-                  show-password
-                  @keyup="checkCapslock"
-                  @keyup.enter="handleLoginSubmit"
-                />
-              </div>
-            </el-form-item>
-          </el-tooltip>
-
-          <!-- 验证码 -->
-          <el-form-item prop="captchaCode">
-            <div class="input-wrapper">
-              <svg-icon icon-class="captcha" class="mx-2" />
-              <el-input
-                v-model="loginData.captchaCode"
-                auto-complete="off"
-                size="large"
-                class="flex-1"
-                :placeholder="$t('login.captchaCode')"
+                class="h-[48px] pr-2"
+                show-password
+                @keyup="checkCapslock"
                 @keyup.enter="handleLoginSubmit"
               />
-
-              <el-image :src="http://github.com/captchaBase64" class="captcha-img" @click="getCaptcha" />
             </div>
           </el-form-item>
+        </el-tooltip>
+
+        <!-- 验证码 -->
+        <el-form-item prop="captchaCode">
+          <div class="input-wrapper">
+            <svg-icon icon-class="captcha" class="mx-2" />
+            <el-input
+              v-model="loginData.captchaCode"
+              auto-complete="off"
+              size="large"
+              class="flex-1"
+              :placeholder="$t('login.captchaCode')"
+              @keyup.enter="handleLoginSubmit"
+            />
+
+            <el-image :src="http://github.com/captchaBase64" class="captcha-img" @click="getCaptcha" />
+          </div>
+        </el-form-item>
 
-          <div class="flex-x-between w-full py-1">
-            <el-checkbox>
-              {{ $t("login.rememberMe") }}
-            </el-checkbox>
+        <div class="flex-x-between w-full py-1">
+          <el-checkbox>
+            {{ $t("login.rememberMe") }}
+          </el-checkbox>
 
-            <el-link type="primary" href="http://github.com/forget-password">
-              {{ $t("login.forgetPassword") }}
-            </el-link>
-          </div>
+          <el-link type="primary" href="http://github.com/forget-password">
+            {{ $t("login.forgetPassword") }}
+          </el-link>
+        </div>
 
-          <!-- 登录按钮 -->
-          <el-button
-            :loading="loading"
-            type="primary"
-            size="large"
-            class="w-full"
-            @click.prevent="handleLoginSubmit"
-          >
-            {{ $t("login.login") }}
-          </el-button>
-
-          <!-- 第三方登录 -->
-          <el-divider>
-            <el-text size="small">{{ $t("login.otherLoginMethods") }}</el-text>
-          </el-divider>
-          <div class="third-party-login">
-            <svg-icon icon-class="wechat" class="icon" />
-            <svg-icon icon-class="qq" class="icon" />
-            <svg-icon icon-class="github" class="icon" />
-            <svg-icon icon-class="gitee" class="icon" />
-          </div>
-        </el-form>
-      </div>
+        <!-- 登录按钮 -->
+        <el-button
+          :loading="loading"
+          type="primary"
+          size="large"
+          class="w-full"
+          @click.prevent="handleLoginSubmit"
+        >
+          {{ $t("login.login") }}
+        </el-button>
+
+        <!-- 第三方登录 -->
+        <el-divider>
+          <el-text size="small">{{ $t("login.otherLoginMethods") }}</el-text>
+        </el-divider>
+        <div class="third-party-login">
+          <svg-icon icon-class="wechat" class="icon" />
+          <svg-icon icon-class="qq" class="icon" />
+          <svg-icon icon-class="github" class="icon" />
+          <svg-icon icon-class="gitee" class="icon" />
+        </div>
+      </el-form>
     </div>
 
     <!-- 登录页底部 -->
@@ -345,107 +326,56 @@ onMounted(() => {
     }
   }
 
-  .login-content {
+  .login-form {
     display: flex;
-    width: 960px;
+    flex-direction: column;
+    justify-content: center;
+    width: 460px;
+    padding: 40px;
     overflow: hidden;
     background-color: #fff;
     border-radius: 5px;
     box-shadow: var(--el-box-shadow-light);
 
-    @media (width <= 768px) {
-      flex-direction: column;
-      max-width: 100%;
-      height: 100vh;
-      padding: 0 30px;
-      border-radius: 0;
-      box-shadow: none;
+    @media (width <= 460px) {
+      width: 100%;
+      padding: 0 20px;
     }
 
-    .login-carousel {
+    .form-title {
+      position: relative;
       display: flex;
-      flex: 3;
-      flex-direction: column;
       align-items: center;
       justify-content: center;
-      background: linear-gradient(60deg, #165dff, #6aa1ff);
+      padding: 0 0 20px;
+      text-align: center;
+    }
 
-      @media (width <= 768px) {
-        display: none;
-      }
+    .input-wrapper {
+      display: flex;
+      align-items: center;
+      width: 100%;
+    }
 
-      .project-info {
-        position: relative;
-        color: #fff;
-        text-align: center;
-
-        .title-container {
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          h2 {
-            margin-right: 10px;
-            font-size: 24px;
-            font-weight: bold;
-            line-height: 18px;
-          }
-        }
-
-        .description {
-          font-size: 12px;
-        }
-      }
+    .captcha-img {
+      height: 48px;
+      cursor: pointer;
+      border-top-right-radius: 6px;
+      border-bottom-right-radius: 6px;
     }
 
-    .login-form {
+    .third-party-login {
       display: flex;
-      flex: 2;
-      flex-direction: column;
       justify-content: center;
-      min-width: 400px;
-      padding: 30px;
+      width: 100%;
+      color: var(--el-text-color-secondary);
 
-      @media (width <= 768px) {
-        width: 100%;
-        padding: 0 20px;
+      *:not(:first-child) {
+        margin-left: 20px;
       }
 
-      .form-title {
-        position: relative;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        padding: 0 0 20px;
-        text-align: center;
-      }
-
-      .input-wrapper {
-        display: flex;
-        align-items: center;
-        width: 100%;
-      }
-
-      .captcha-img {
-        height: 48px;
+      .icon {
         cursor: pointer;
-        border-top-right-radius: 6px;
-        border-bottom-right-radius: 6px;
-      }
-
-      .third-party-login {
-        display: flex;
-        justify-content: center;
-        width: 100%;
-        color: var(--el-text-color-secondary);
-
-        *:not(:first-child) {
-          margin-left: 20px;
-        }
-
-        .icon {
-          cursor: pointer;
-        }
       }
     }
   }

From 3e7e8b74d825c4a168fe07eb46a87aeb11b55977 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 16 Dec 2024 22:02:32 +0800
Subject: [PATCH 100/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E5=9B=BE=E7=89=87=E5=92=8C?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=91=BD=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...{login-background-dark.jpg => login-bg-dark.jpg} | Bin
 .../{login-background-light.jpg => login-bg.jpg}    | Bin
 src/assets/images/login-image.svg                   |   1 -
 src/views/login/index.vue                           |   4 ++--
 4 files changed, 2 insertions(+), 3 deletions(-)
 rename src/assets/images/{login-background-dark.jpg => login-bg-dark.jpg} (100%)
 rename src/assets/images/{login-background-light.jpg => login-bg.jpg} (100%)
 delete mode 100644 src/assets/images/login-image.svg

diff --git a/src/assets/images/login-background-dark.jpg b/src/assets/images/login-bg-dark.jpg
similarity index 100%
rename from src/assets/images/login-background-dark.jpg
rename to src/assets/images/login-bg-dark.jpg
diff --git a/src/assets/images/login-background-light.jpg b/src/assets/images/login-bg.jpg
similarity index 100%
rename from src/assets/images/login-background-light.jpg
rename to src/assets/images/login-bg.jpg
diff --git a/src/assets/images/login-image.svg b/src/assets/images/login-image.svg
deleted file mode 100644
index bedf1758..00000000
--- a/src/assets/images/login-image.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="8887" node-id="1" sillyvg="true" template-height="8887" template-width="11927" version="1.1" viewBox="0 0 11927 8887" width="11927" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><defs node-id="176"></defs><path d="M 11926.20 7809.20 L 0.00 7809.20 L 0.00 7815.20 L 11926.20 7815.20 L 11926.20 7809.20 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="178" stroke="none" target-height="6" target-width="11926.2" target-x="0" target-y="7809.2"/><path d="M 2977.20 8170.10 L 2187.30 8170.10 L 2187.30 8176.10 L 2977.20 8176.10 L 2977.20 8170.10 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="180" stroke="none" target-height="6" target-width="789.8999" target-x="2187.3" target-y="8170.1"/><path d="M 1937.30 8170.10 L 1479.60 8170.10 L 1479.60 8176.10 L 1937.30 8176.10 L 1937.30 8170.10 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="182" stroke="none" target-height="6" target-width="457.70007" target-x="1479.6" target-y="8170.1"/><path d="M 5022.10 8257.90 L 4564.40 8257.90 L 4564.40 8263.90 L 5022.10 8263.90 L 5022.10 8257.90 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="184" stroke="none" target-height="6" target-width="457.7002" target-x="4564.4" target-y="8257.9"/><path d="M 7408.80 8391.00 L 6378.60 8391.00 L 6378.60 8397.00 L 7408.80 8397.00 L 7408.80 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="186" stroke="none" target-height="6" target-width="1030.1997" target-x="6378.6" target-y="8391"/><path d="M 6166.30 8391.00 L 6015.30 8391.00 L 6015.30 8397.00 L 6166.30 8397.00 L 6166.30 8391.00 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="188" stroke="none" target-height="6" target-width="151" target-x="6015.3" target-y="8391"/><path d="M 10813.40 8257.90 L 8579.00 8257.90 L 8579.00 8263.90 L 10813.40 8263.90 L 10813.40 8257.90 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="190" stroke="none" target-height="6" target-width="2234.4004" target-x="8579" target-y="8257.9"/><path d="M 5653.00 6745.40 L 1047.40 6745.40 L 1038.30 6745.10 L 1029.40 6744.20 L 1020.70 6742.80 L 1012.10 6740.70 L 1003.60 6738.10 L 995.30 6735.00 L 987.30 6731.30 L 979.40 6727.20 L 971.90 6722.50 L 964.70 6717.30 L 957.80 6711.60 L 951.20 6705.50 L 945.00 6698.90 L 939.40 6691.90 L 934.20 6684.70 L 929.60 6677.20 L 925.40 6669.30 L 921.70 6661.30 L 918.60 6653.00 L 916.10 6644.50 L 914.00 6635.90 L 912.60 6627.20 L 911.70 6618.30 L 911.40 6609.20 L 911.40 135.00 L 911.80 126.00 L 912.70 117.20 L 914.20 108.50 L 916.30 99.90 L 918.90 91.50 L 922.10 83.30 L 925.70 75.30 L 929.90 67.60 L 934.60 60.10 L 939.80 52.90 L 945.50 46.10 L 951.60 39.60 L 958.20 33.40 L 965.10 27.80 L 972.30 22.70 L 979.80 18.10 L 987.60 13.90 L 995.60 10.30 L 1003.80 7.20 L 1012.20 4.70 L 1020.80 2.60 L 1029.50 1.20 L 1038.40 0.30 L 1047.40 0.00 L 5653.00 0.00 L 5662.00 0.30 L 5670.90 1.20 L 5679.70 2.60 L 5688.30 4.70 L 5696.80 7.30 L 5705.10 10.40 L 5713.20 14.00 L 5721.00 18.20 L 5728.60 22.90 L 5735.80 28.00 L 5742.70 33.70 L 5749.30 39.90 L 5755.50 46.50 L 5761.10 53.40 L 5766.30 60.60 L 5771.00 68.20 L 5775.20 76.00 L 5778.80 84.10 L 5781.90 92.30 L 5784.50 100.90 L 5786.60 109.50 L 5788.00 118.30 L 5788.90 127.20 L 5789.20 136.20 L 5789.20 6609.20 L 5788.90 6618.30 L 5786.60 6635.90 L 5784.50 6644.60 L 5778.80 6661.40 L 5775.20 6669.40 L 5771.00 6677.20 L 5766.30 6684.80 L 5761.10 6692.00 L 5755.50 6698.90 L 5749.30 6705.50 L 5742.70 6711.70 L 5735.80 6717.40 L 5728.60 6722.60 L 5721.00 6727.20 L 5713.20 6731.40 L 5705.10 6735.10 L 5688.30 6740.80 L 5679.70 6742.80 L 5670.90 6744.20 L 5662.00 6745.10 L 5653.00 6745.40 Z M 1047.40 4.80 L 1038.70 5.10 L 1030.20 5.90 L 1021.90 7.30 L 1013.60 9.30 L 1005.50 11.80 L 997.60 14.80 L 989.90 18.20 L 982.40 22.30 L 975.20 26.70 L 968.30 31.70 L 961.70 37.10 L 955.40 43.00 L 949.50 49.30 L 944.10 55.90 L 939.20 62.80 L 934.70 70.00 L 930.70 77.50 L 927.30 85.20 L 924.30 93.10 L 921.80 101.20 L 919.90 109.50 L 918.50 117.90 L 917.70 126.40 L 917.40 135.00 L 917.40 6609.20 L 917.70 6617.90 L 918.50 6626.40 L 919.90 6634.70 L 921.80 6643.00 L 924.30 6651.10 L 927.30 6659.00 L 930.70 6666.70 L 934.70 6674.20 L 939.20 6681.40 L 944.10 6688.30 L 949.50 6694.90 L 955.40 6701.20 L 961.70 6707.20 L 968.30 6712.60 L 975.20 6717.50 L 982.40 6722.00 L 989.90 6726.00 L 997.60 6729.50 L 1005.50 6732.50 L 1013.60 6735.00 L 1021.90 6736.90 L 1030.20 6738.30 L 1038.70 6739.20 L 1047.40 6739.50 L 5653.00 6739.50 L 5661.60 6739.20 L 5670.10 6738.30 L 5678.50 6736.90 L 5686.80 6735.00 L 5694.90 6732.50 L 5702.80 6729.50 L 5710.50 6726.00 L 5718.00 6722.00 L 5725.20 6717.50 L 5738.70 6707.20 L 5745.00 6701.30 L 5750.90 6694.90 L 5756.30 6688.30 L 5761.30 6681.40 L 5765.80 6674.20 L 5769.80 6666.70 L 5773.30 6659.00 L 5776.20 6651.10 L 5778.70 6643.00 L 5780.70 6634.70 L 5782.10 6626.40 L 5782.90 6617.90 L 5783.20 6609.20 L 5783.20 135.00 L 5782.90 126.40 L 5782.10 117.90 L 5780.70 109.50 L 5778.70 101.20 L 5776.20 93.10 L 5773.30 85.20 L 5769.80 77.50 L 5765.80 70.00 L 5761.30 62.80 L 5756.30 55.90 L 5750.90 49.30 L 5745.00 43.00 L 5738.70 37.10 L 5732.10 31.70 L 5725.20 26.70 L 5718.00 22.20 L 5710.50 18.20 L 5702.80 14.70 L 5694.90 11.80 L 5686.80 9.30 L 5678.50 7.30 L 5670.10 5.90 L 5661.60 5.10 L 5653.00 4.80 L 1047.40 4.80 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="192" stroke="none" target-height="6745.4" target-width="4877.8003" target-x="911.4" target-y="0"/><path d="M 10812.50 6745.40 L 6206.60 6745.40 L 6197.60 6745.10 L 6188.70 6744.20 L 6179.90 6742.80 L 6171.30 6740.70 L 6162.80 6738.10 L 6154.50 6735.00 L 6146.50 6731.40 L 6138.60 6727.20 L 6123.90 6717.30 L 6117.00 6711.60 L 6110.40 6705.50 L 6104.20 6698.90 L 6098.50 6692.00 L 6093.40 6684.70 L 6088.70 6677.20 L 6084.50 6669.40 L 6080.80 6661.30 L 6077.70 6653.10 L 6075.10 6644.60 L 6073.10 6635.90 L 6071.60 6627.20 L 6070.70 6618.30 L 6070.40 6609.20 L 6070.40 135.00 L 6070.80 126.00 L 6071.80 117.20 L 6073.30 108.50 L 6075.40 99.90 L 6078.00 91.50 L 6081.20 83.30 L 6084.90 75.30 L 6089.10 67.50 L 6093.80 60.10 L 6099.00 52.90 L 6104.60 46.10 L 6110.80 39.50 L 6117.40 33.40 L 6124.30 27.80 L 6131.50 22.70 L 6139.00 18.10 L 6146.80 13.90 L 6154.80 10.30 L 6163.00 7.20 L 6171.50 4.70 L 6180.10 2.60 L 6188.80 1.20 L 6197.60 0.30 L 6206.60 0.00 L 10812.50 0.00 L 10821.50 0.30 L 10830.30 1.20 L 10839.00 2.70 L 10847.60 4.70 L 10856.00 7.30 L 10864.20 10.40 L 10872.20 14.00 L 10880.00 18.20 L 10887.50 22.80 L 10894.70 27.90 L 10901.50 33.50 L 10908.10 39.60 L 10914.20 46.20 L 10919.90 53.00 L 10925.00 60.20 L 10929.70 67.60 L 10933.90 75.40 L 10937.60 83.40 L 10940.70 91.50 L 10943.30 100.00 L 10945.40 108.50 L 10946.90 117.20 L 10947.80 126.00 L 10948.20 135.00 L 10948.20 6609.20 L 10947.90 6618.30 L 10945.60 6635.90 L 10943.60 6644.50 L 10937.90 6661.20 L 10930.10 6677.10 L 10925.40 6684.60 L 10914.60 6698.80 L 10908.50 6705.40 L 10901.90 6711.50 L 10895.00 6717.20 L 10887.80 6722.40 L 10880.30 6727.10 L 10872.50 6731.30 L 10864.40 6734.90 L 10856.20 6738.10 L 10847.70 6740.70 L 10839.10 6742.70 L 10830.40 6744.20 L 10821.50 6745.10 L 10812.50 6745.40 Z M 6206.60 4.80 L 6198.00 5.10 L 6189.50 5.90 L 6181.10 7.30 L 6172.80 9.30 L 6164.70 11.80 L 6156.80 14.70 L 6149.10 18.20 L 6141.60 22.20 L 6134.40 26.70 L 6127.50 31.70 L 6120.90 37.10 L 6114.60 43.00 L 6108.70 49.30 L 6103.30 55.90 L 6098.30 62.80 L 6093.80 70.00 L 6089.80 77.50 L 6086.40 85.20 L 6083.40 93.10 L 6080.90 101.20 L 6078.90 109.50 L 6077.50 117.90 L 6076.70 126.40 L 6076.40 135.00 L 6076.40 6609.20 L 6076.70 6617.90 L 6077.50 6626.40 L 6078.90 6634.70 L 6080.90 6643.00 L 6083.40 6651.10 L 6086.40 6659.00 L 6089.80 6666.70 L 6093.80 6674.20 L 6098.30 6681.40 L 6103.30 6688.30 L 6108.70 6694.90 L 6114.60 6701.30 L 6120.90 6707.20 L 6127.50 6712.60 L 6134.40 6717.50 L 6141.60 6722.00 L 6149.10 6726.00 L 6156.80 6729.50 L 6164.70 6732.50 L 6172.80 6735.00 L 6181.10 6736.90 L 6189.50 6738.30 L 6198.00 6739.20 L 6206.60 6739.50 L 10812.50 6739.50 L 10821.10 6739.20 L 10838.00 6736.90 L 10846.30 6735.00 L 10854.40 6732.50 L 10862.30 6729.50 L 10870.00 6726.00 L 10877.50 6722.00 L 10884.70 6717.50 L 10891.60 6712.60 L 10898.20 6707.20 L 10904.50 6701.30 L 10910.40 6694.90 L 10915.80 6688.30 L 10920.80 6681.40 L 10925.20 6674.20 L 10929.30 6666.70 L 10932.80 6659.00 L 10938.20 6643.00 L 10940.20 6634.70 L 10942.40 6617.90 L 10942.70 6609.20 L 10942.70 135.00 L 10942.40 126.40 L 10941.60 117.90 L 10940.20 109.50 L 10938.20 101.20 L 10935.70 93.10 L 10932.70 85.20 L 10929.30 77.50 L 10925.20 70.00 L 10920.80 62.80 L 10915.80 55.90 L 10910.40 49.30 L 10904.50 43.00 L 10898.20 37.10 L 10891.60 31.70 L 10884.70 26.70 L 10877.50 22.20 L 10870.00 18.20 L 10862.30 14.70 L 10854.40 11.80 L 10846.30 9.30 L 10838.00 7.30 L 10829.60 5.90 L 10821.10 5.10 L 10812.50 4.80 L 6206.60 4.80 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="194" stroke="none" target-height="6745.4" target-width="4877.8003" target-x="6070.4" target-y="0"/><path d="M 6378.10 5771.80 L 5853.60 5771.80 L 5853.60 7852.40 L 6378.10 7852.40 L 6378.10 5771.80 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="196" stroke="none" target-height="2080.6" target-width="524.5" target-x="5853.6" target-y="5771.8"/><path d="M 6278.40 7852.40 L 6378.10 7852.40 L 6378.10 7569.00 L 6173.90 7569.00 L 6278.40 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="198" stroke="none" target-height="283.3999" target-width="204.2002" target-x="6173.9" target-y="7569"/><path d="M 4079.70 5771.80 L 3555.20 5771.80 L 3555.20 7852.40 L 4079.70 7852.40 L 4079.70 5771.80 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="200" stroke="none" target-height="2080.6" target-width="524.5" target-x="3555.2" target-y="5771.8"/><path d="M 6378.10 5771.80 L 3992.90 5771.80 L 3992.90 7678.50 L 6378.10 7678.50 L 6378.10 5771.80 Z" fill="#fafafa" fill-rule="nonzero" node-id="202" stroke="none" target-height="1906.7002" target-width="2385.2002" target-x="3992.9" target-y="5771.8"/><path d="M 6291.50 5865.50 L 6291.50 6370.00 L 4078.70 6370.00 L 4078.70 5865.50 L 6290.80 5865.50 M 6300.10 5856.20 L 4070.20 5856.20 L 4070.20 6379.10 L 6300.80 6379.10 L 6300.80 5856.20 L 6300.10 5856.20 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="204" stroke="none" target-height="522.8999" target-width="2230.5999" target-x="4070.2" target-y="5856.2"/><path d="M 4092.30 7852.40 L 3992.90 7852.40 L 3992.90 7569.00 L 4196.80 7569.00 L 4092.30 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="206" stroke="none" target-height="283.3999" target-width="203.8999" target-x="3992.9" target-y="7569"/><path d="M 5132.80 6117.60 L 5133.80 6127.90 L 5135.00 6132.90 L 5136.80 6137.80 L 5139.00 6142.50 L 5141.70 6146.90 L 5148.20 6154.90 L 5152.10 6158.40 L 5156.20 6161.50 L 5160.60 6164.10 L 5165.30 6166.30 L 5175.20 6169.30 L 5180.30 6170.10 L 5185.50 6170.40 L 5190.60 6170.10 L 5195.80 6169.30 L 5200.80 6168.10 L 5205.70 6166.30 L 5210.30 6164.10 L 5214.80 6161.50 L 5218.90 6158.40 L 5222.80 6154.90 L 5229.30 6146.90 L 5232.00 6142.50 L 5234.20 6137.80 L 5235.90 6133.00 L 5237.20 6127.90 L 5238.00 6122.80 L 5238.20 6117.60 L 5238.00 6112.50 L 5237.20 6107.40 L 5235.90 6102.40 L 5234.20 6097.50 L 5232.00 6092.80 L 5229.30 6088.30 L 5222.80 6080.40 L 5219.00 6076.90 L 5214.80 6073.80 L 5210.30 6071.10 L 5205.70 6068.90 L 5200.80 6067.20 L 5195.80 6065.90 L 5190.70 6065.20 L 5185.50 6064.90 L 5175.10 6066.00 L 5170.20 6067.20 L 5165.30 6068.90 L 5156.30 6073.80 L 5152.10 6076.80 L 5148.20 6080.40 L 5144.70 6084.30 L 5141.60 6088.40 L 5136.80 6097.50 L 5133.80 6107.30 L 5132.80 6117.60 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="208" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="6064.9"/><path d="M 6291.50 6472.80 L 6291.50 6977.30 L 4078.70 6977.30 L 4078.70 6472.80 L 6290.80 6472.80 M 6300.10 6463.70 L 4070.20 6463.70 L 4070.20 6986.60 L 6300.80 6986.60 L 6300.80 6464.00 L 6300.10 6463.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="210" stroke="none" target-height="522.8999" target-width="2230.5999" target-x="4070.2" target-y="6463.7"/><path d="M 5132.80 6726.40 L 5133.00 6731.60 L 5133.80 6736.70 L 5135.00 6741.70 L 5136.80 6746.50 L 5141.70 6755.60 L 5144.80 6759.80 L 5148.20 6763.60 L 5152.10 6767.10 L 5156.20 6770.20 L 5165.30 6775.10 L 5170.20 6776.80 L 5175.20 6778.10 L 5180.30 6778.80 L 5185.50 6779.10 L 5190.60 6778.80 L 5195.80 6778.10 L 5200.80 6776.80 L 5205.70 6775.00 L 5210.30 6772.80 L 5214.80 6770.20 L 5222.80 6763.60 L 5226.30 6759.80 L 5229.30 6755.60 L 5234.20 6746.50 L 5235.90 6741.70 L 5237.20 6736.60 L 5238.00 6731.50 L 5238.20 6726.30 L 5238.00 6721.20 L 5237.20 6716.10 L 5234.20 6706.20 L 5232.00 6701.50 L 5229.30 6697.10 L 5226.20 6692.90 L 5222.80 6689.10 L 5219.00 6685.60 L 5214.80 6682.50 L 5210.30 6679.80 L 5205.70 6677.60 L 5195.80 6674.70 L 5190.70 6673.90 L 5185.50 6673.60 L 5175.10 6674.70 L 5165.30 6677.70 L 5156.30 6682.50 L 5152.10 6685.60 L 5148.20 6689.10 L 5144.70 6693.00 L 5141.60 6697.10 L 5139.00 6701.50 L 5136.80 6706.20 L 5135.10 6711.00 L 5133.80 6716.00 L 5133.00 6721.10 L 5132.80 6726.40 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="212" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="6673.6"/><path d="M 6291.50 7080.30 L 6291.50 7585.00 L 4078.70 7585.00 L 4078.70 7080.30 L 6290.80 7080.30 M 6300.10 7071.00 L 4070.20 7071.00 L 4070.20 7594.10 L 6300.80 7594.10 L 6300.80 7071.00 L 6300.10 7071.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="214" stroke="none" target-height="523.1001" target-width="2230.5999" target-x="4070.2" target-y="7071"/><path d="M 5132.80 7332.70 L 5133.10 7337.90 L 5133.80 7343.00 L 5135.10 7348.00 L 5136.90 7352.80 L 5139.10 7357.40 L 5141.80 7361.90 L 5144.90 7366.10 L 5148.40 7369.90 L 5152.20 7373.30 L 5156.40 7376.40 L 5160.80 7379.00 L 5165.50 7381.20 L 5175.40 7384.20 L 5185.60 7385.20 L 5190.80 7384.90 L 5195.90 7384.10 L 5201.00 7382.80 L 5205.80 7381.10 L 5210.50 7378.90 L 5214.90 7376.20 L 5222.90 7369.60 L 5226.30 7365.80 L 5229.40 7361.60 L 5234.20 7352.50 L 5235.90 7347.70 L 5237.20 7342.60 L 5238.20 7332.30 L 5237.20 7322.10 L 5235.90 7317.10 L 5234.20 7312.20 L 5229.30 7303.10 L 5222.70 7295.10 L 5218.90 7291.70 L 5214.80 7288.60 L 5205.60 7283.70 L 5200.80 7282.00 L 5195.80 7280.70 L 5190.70 7280.00 L 5185.50 7279.70 L 5175.20 7280.70 L 5170.20 7282.00 L 5165.30 7283.80 L 5160.50 7286.00 L 5156.10 7288.70 L 5148.10 7295.30 L 5141.60 7303.30 L 5138.90 7307.70 L 5136.70 7312.40 L 5135.00 7317.40 L 5133.80 7322.40 L 5132.80 7332.70 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="216" stroke="none" target-height="105.5" target-width="105.40039" target-x="5132.8" target-y="7279.7"/><path d="M 3759.40 4563.40 L 3234.90 4563.40 L 3234.90 7852.70 L 3759.40 7852.70 L 3759.40 4563.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="218" stroke="none" target-height="3289.3003" target-width="524.5" target-x="3234.9" target-y="4563.4"/><path d="M 3659.70 7852.40 L 3759.40 7852.40 L 3759.40 7569.00 L 3555.40 7569.00 L 3659.70 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="220" stroke="none" target-height="283.3999" target-width="204" target-x="3555.4" target-y="7569"/><path d="M 1799.20 4563.40 L 1274.70 4563.40 L 1274.70 7852.70 L 1799.20 7852.70 L 1799.20 4563.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="222" stroke="none" target-height="3289.3003" target-width="524.5" target-x="1274.7" target-y="4563.4"/><path d="M 3759.40 4563.40 L 1712.10 4563.40 L 1712.10 7678.80 L 3759.40 7678.80 L 3759.40 4563.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="224" stroke="none" target-height="3115.4" target-width="2047.2999" target-x="1712.1" target-y="4563.4"/><path d="M 3671.10 4651.20 L 3671.10 5356.50 L 1800.40 5356.50 L 1800.40 4651.20 L 3671.10 4651.20 Z M 3682.10 4640.50 L 1788.90 4640.50 L 1788.90 5366.80 L 3681.60 5366.80 L 3681.60 4640.70 L 3682.10 4640.50 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="226" stroke="none" target-height="726.2998" target-width="1893.2001" target-x="1788.9" target-y="4640.5"/><path d="M 3671.10 5442.60 L 3671.10 7313.40 L 2780.00 7313.40 L 2780.00 5442.60 L 3671.10 5442.60 Z M 3682.10 5431.70 L 2769.30 5431.70 L 2769.30 7324.30 L 3682.10 7324.30 L 3682.10 5431.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="228" stroke="none" target-height="1892.5996" target-width="912.80005" target-x="2769.3" target-y="5431.7"/><path d="M 2691.50 5442.60 L 2691.50 7313.40 L 1800.40 7313.40 L 1800.40 5442.60 L 2691.50 5442.60 Z M 2702.20 5431.70 L 1788.90 5431.70 L 1788.90 7324.30 L 2701.80 7324.30 L 2701.80 5431.70 L 2702.20 5431.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="230" stroke="none" target-height="1892.5996" target-width="913.2999" target-x="1788.9" target-y="5431.7"/><path d="M 1811.80 7852.40 L 1712.10 7852.40 L 1712.10 7569.00 L 1916.30 7569.00 L 1811.80 7852.40 Z" fill="#fafafa" fill-rule="nonzero" node-id="232" stroke="none" target-height="283.3999" target-width="204.20007" target-x="1712.1" target-y="7569"/><path d="M 2682.90 5004.20 L 2683.10 5009.40 L 2683.90 5014.60 L 2685.10 5019.60 L 2686.80 5024.50 L 2689.00 5029.20 L 2691.70 5033.70 L 2694.80 5037.90 L 2698.30 5041.80 L 2702.10 5045.30 L 2706.30 5048.40 L 2710.70 5051.00 L 2715.40 5053.30 L 2720.40 5055.10 L 2725.40 5056.40 L 2730.50 5057.10 L 2735.70 5057.40 L 2740.90 5057.20 L 2746.00 5056.40 L 2751.10 5055.20 L 2756.00 5053.40 L 2760.70 5051.20 L 2765.20 5048.60 L 2769.30 5045.50 L 2773.20 5042.00 L 2776.70 5038.10 L 2779.80 5033.90 L 2782.50 5029.50 L 2784.70 5024.80 L 2786.50 5020.00 L 2787.80 5014.90 L 2788.60 5009.70 L 2788.80 5004.50 L 2788.60 4999.30 L 2787.80 4994.20 L 2786.60 4989.20 L 2784.80 4984.20 L 2782.60 4979.50 L 2776.80 4970.90 L 2773.30 4967.00 L 2769.50 4963.60 L 2765.30 4960.40 L 2760.80 4957.70 L 2756.10 4955.50 L 2751.20 4953.80 L 2741.10 4951.80 L 2730.60 4951.80 L 2725.50 4952.50 L 2720.50 4953.80 L 2711.00 4957.70 L 2706.60 4960.30 L 2702.40 4963.40 L 2698.50 4966.90 L 2695.00 4970.80 L 2691.90 4975.00 L 2689.20 4979.40 L 2687.00 4984.00 L 2685.20 4988.90 L 2684.00 4993.80 L 2683.20 4998.90 L 2682.90 5004.20 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="234" stroke="none" target-height="105.6001" target-width="105.90015" target-x="2682.9" target-y="4951.8"/><path d="M 2871.80 6333.50 L 2872.10 6338.70 L 2872.80 6343.90 L 2874.10 6348.90 L 2875.90 6353.80 L 2878.10 6358.50 L 2880.80 6362.90 L 2887.40 6371.00 L 2891.20 6374.50 L 2895.40 6377.60 L 2899.80 6380.20 L 2904.60 6382.50 L 2909.50 6384.20 L 2914.50 6385.50 L 2919.70 6386.20 L 2924.80 6386.50 L 2930.00 6386.20 L 2935.20 6385.40 L 2940.30 6384.10 L 2945.10 6382.40 L 2949.80 6380.20 L 2954.30 6377.50 L 2958.40 6374.40 L 2962.30 6370.90 L 2965.80 6367.00 L 2968.90 6362.80 L 2971.50 6358.30 L 2973.70 6353.70 L 2975.50 6348.80 L 2976.70 6343.70 L 2977.50 6338.50 L 2977.70 6333.30 L 2977.50 6328.20 L 2976.70 6323.00 L 2973.60 6313.10 L 2971.40 6308.30 L 2968.70 6303.90 L 2965.60 6299.80 L 2962.10 6295.90 L 2954.00 6289.40 L 2949.50 6286.70 L 2944.80 6284.50 L 2939.90 6282.80 L 2934.90 6281.50 L 2924.50 6280.50 L 2919.30 6280.80 L 2914.20 6281.60 L 2904.30 6284.60 L 2899.60 6286.80 L 2895.20 6289.50 L 2891.00 6292.60 L 2887.20 6296.10 L 2883.70 6300.00 L 2880.60 6304.10 L 2878.00 6308.50 L 2875.80 6313.30 L 2874.00 6318.20 L 2872.80 6323.20 L 2871.80 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="236" stroke="none" target-height="106" target-width="105.8999" target-x="2871.8" target-y="6280.5"/><path d="M 2494.20 6333.50 L 2495.30 6343.80 L 2498.30 6353.60 L 2500.50 6358.30 L 2503.20 6362.70 L 2509.80 6370.70 L 2513.70 6374.10 L 2517.80 6377.20 L 2522.20 6379.80 L 2526.90 6382.00 L 2531.90 6383.80 L 2536.80 6385.00 L 2547.10 6386.00 L 2552.20 6385.70 L 2557.40 6384.90 L 2562.40 6383.70 L 2567.30 6381.90 L 2571.90 6379.70 L 2576.30 6377.00 L 2580.50 6374.00 L 2584.30 6370.50 L 2587.80 6366.60 L 2590.80 6362.40 L 2593.50 6358.00 L 2595.70 6353.40 L 2597.40 6348.50 L 2598.70 6343.50 L 2599.40 6338.30 L 2599.70 6333.20 L 2599.40 6328.00 L 2598.60 6322.90 L 2597.40 6317.90 L 2595.60 6313.00 L 2593.40 6308.30 L 2590.70 6303.90 L 2587.70 6299.80 L 2584.20 6296.00 L 2580.40 6292.50 L 2576.20 6289.40 L 2571.70 6286.70 L 2567.10 6284.60 L 2562.20 6282.80 L 2557.20 6281.60 L 2552.10 6280.80 L 2547.00 6280.50 L 2541.80 6280.80 L 2536.60 6281.60 L 2531.60 6282.80 L 2526.70 6284.60 L 2522.00 6286.80 L 2517.60 6289.50 L 2513.50 6292.60 L 2509.60 6296.10 L 2506.10 6300.00 L 2503.00 6304.10 L 2498.20 6313.30 L 2495.20 6323.20 L 2494.50 6328.30 L 2494.20 6333.50 Z" fill="#e6e6e6" fill-rule="nonzero" node-id="238" stroke="none" target-height="105.5" target-width="105.5" target-x="2494.2" target-y="6280.5"/><path d="M 2434.60 3646.30 L 2213.50 3646.30 L 2219.40 3678.50 L 2224.80 3710.80 L 2229.80 3743.20 L 2234.30 3775.60 L 2238.40 3808.10 L 2242.00 3840.60 L 2245.20 3873.20 L 2247.90 3905.80 L 2250.10 3938.50 L 2251.90 3971.20 L 2251.60 3979.70 L 2250.90 3989.90 L 2249.50 4001.80 L 2246.90 4020.10 L 2239.10 4063.80 L 2224.10 4140.70 L 2213.70 4196.60 L 2208.90 4225.30 L 2204.50 4254.30 L 2199.60 4293.00 L 2196.20 4331.10 L 2195.10 4349.70 L 2194.60 4367.90 L 2194.50 4381.60 L 2195.40 4407.70 L 2196.30 4420.10 L 2197.70 4432.60 L 2199.50 4444.60 L 2201.70 4456.00 L 2204.30 4466.90 L 2206.80 4475.60 L 2209.60 4483.90 L 2212.70 4491.80 L 2216.10 4499.30 L 2219.80 4506.40 L 2223.90 4513.40 L 2228.40 4519.90 L 2233.20 4526.00 L 2238.40 4531.60 L 2243.90 4536.90 L 2249.80 4541.70 L 2256.20 4546.00 L 2263.00 4550.00 L 2270.30 4553.40 L 2278.10 4556.50 L 2285.90 4558.90 L 2294.20 4560.80 L 2303.30 4562.20 L 2313.00 4563.10 L 2323.50 4563.40 L 2333.90 4563.10 L 2343.60 4562.20 L 2352.70 4560.80 L 2361.00 4558.90 L 2368.80 4556.50 L 2376.70 4553.50 L 2383.90 4550.00 L 2390.70 4546.10 L 2397.10 4541.70 L 2403.00 4536.90 L 2408.50 4531.70 L 2413.70 4526.00 L 2418.50 4520.00 L 2423.00 4513.50 L 2427.10 4506.50 L 2430.80 4499.40 L 2434.20 4492.00 L 2437.30 4484.10 L 2440.10 4475.80 L 2442.60 4467.10 L 2445.20 4456.20 L 2447.40 4444.80 L 2449.20 4432.90 L 2450.60 4420.40 L 2451.50 4408.00 L 2452.40 4381.90 L 2452.40 4368.20 L 2451.80 4350.10 L 2450.80 4331.50 L 2447.30 4293.40 L 2442.40 4254.80 L 2438.00 4225.90 L 2433.20 4197.20 L 2422.80 4141.30 L 2407.80 4064.20 L 2400.00 4020.50 L 2397.40 4002.10 L 2396.00 3990.10 L 2395.30 3979.80 L 2395.00 3971.20 L 2396.90 3938.50 L 2399.30 3905.80 L 2402.10 3873.20 L 2405.40 3840.60 L 2409.10 3808.00 L 2413.30 3775.60 L 2417.90 3743.10 L 2423.00 3710.80 L 2428.60 3678.50 L 2434.60 3646.30 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="240" stroke="none" target-height="917.09985" target-width="257.8999" target-x="2194.5" target-y="3646.3"/><path d="M 1593.30 4130.00 L 1593.30 4273.10 L 1593.60 4284.70 L 1594.30 4296.10 L 1595.50 4307.40 L 1597.10 4318.70 L 1599.10 4329.80 L 1601.60 4340.90 L 1604.50 4351.90 L 1607.80 4362.60 L 1611.50 4373.30 L 1615.60 4383.80 L 1620.20 4394.20 L 1625.10 4404.30 L 1630.40 4414.20 L 1636.20 4424.00 L 1642.30 4433.60 L 1648.80 4442.90 L 1655.60 4451.90 L 1662.80 4460.70 L 1670.40 4469.30 L 1678.40 4477.60 L 1686.70 4485.60 L 1695.30 4493.20 L 1704.10 4500.40 L 1713.20 4507.30 L 1722.50 4513.80 L 1732.00 4519.90 L 1741.80 4525.60 L 1761.90 4535.90 L 1772.20 4540.40 L 1782.80 4544.60 L 1793.40 4548.30 L 1804.20 4551.60 L 1815.10 4554.50 L 1826.20 4556.90 L 1837.40 4559.00 L 1848.60 4560.60 L 1859.90 4561.70 L 1871.40 4562.40 L 1882.90 4562.70 L 2026.00 4562.70 L 2037.50 4562.40 L 2049.00 4561.70 L 2060.30 4560.60 L 2071.50 4559.00 L 2082.70 4556.90 L 2093.80 4554.50 L 2104.70 4551.60 L 2115.50 4548.30 L 2126.20 4544.60 L 2136.70 4540.40 L 2147.00 4535.90 L 2157.20 4530.90 L 2167.10 4525.60 L 2176.90 4519.90 L 2186.40 4513.80 L 2195.80 4507.30 L 2204.80 4500.40 L 2213.60 4493.20 L 2222.20 4485.60 L 2230.50 4477.60 L 2238.50 4469.30 L 2246.10 4460.70 L 2253.30 4451.90 L 2260.20 4442.90 L 2266.60 4433.60 L 2272.80 4424.00 L 2278.50 4414.20 L 2283.80 4404.30 L 2288.70 4394.20 L 2293.30 4383.80 L 2297.40 4373.30 L 2301.10 4362.60 L 2304.40 4351.90 L 2307.30 4340.90 L 2309.80 4329.80 L 2311.80 4318.70 L 2313.40 4307.40 L 2314.60 4296.10 L 2315.30 4284.70 L 2315.60 4273.10 L 2315.60 4130.00 L 1593.30 4130.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="242" stroke="none" target-height="432.7002" target-width="722.30005" target-x="1593.3" target-y="4130"/><path d="M 4667.20 5468.40 L 4667.40 5478.80 L 4668.20 5489.20 L 4669.30 5499.40 L 4671.00 5509.50 L 4673.10 5519.50 L 4675.70 5529.40 L 4679.30 5541.10 L 4683.50 5552.60 L 4688.40 5564.00 L 4693.80 5575.20 L 4699.90 5586.20 L 4706.50 5596.90 L 4713.60 5607.40 L 4721.30 5617.70 L 4729.50 5627.80 L 4738.30 5637.80 L 4747.40 5647.20 L 4757.10 5656.40 L 4767.20 5665.40 L 4777.90 5674.20 L 4789.10 5682.70 L 4800.50 5690.70 L 4812.30 5698.40 L 4824.60 5705.90 L 4837.30 5713.00 L 4850.60 5719.80 L 4863.90 5726.10 L 4877.60 5732.10 L 4891.70 5737.70 L 4906.20 5743.00 L 4921.10 5747.90 L 4936.00 5752.20 L 4951.20 5756.20 L 4966.70 5759.80 L 4982.60 5762.90 L 4998.80 5765.60 L 5015.00 5767.80 L 5031.40 5769.50 L 5048.10 5770.80 L 5065.00 5771.50 L 5082.20 5771.80 L 5288.30 5771.80 L 5305.50 5771.50 L 5322.40 5770.80 L 5339.10 5769.50 L 5355.50 5767.80 L 5371.70 5765.60 L 5387.90 5762.90 L 5403.80 5759.80 L 5434.50 5752.20 L 5449.40 5747.90 L 5464.30 5743.00 L 5478.80 5737.70 L 5492.90 5732.10 L 5519.90 5719.80 L 5533.20 5713.00 L 5545.90 5705.90 L 5558.20 5698.40 L 5570.00 5690.70 L 5581.40 5682.70 L 5592.60 5674.20 L 5603.30 5665.40 L 5613.40 5656.40 L 5623.10 5647.20 L 5632.20 5637.80 L 5641.00 5627.80 L 5649.20 5617.70 L 5656.90 5607.40 L 5664.00 5596.90 L 5670.60 5586.20 L 5676.70 5575.20 L 5682.10 5564.00 L 5687.00 5552.60 L 5691.20 5541.10 L 5694.80 5529.40 L 5697.40 5519.50 L 5699.50 5509.50 L 5701.20 5499.40 L 5702.30 5489.20 L 5703.10 5478.80 L 5703.30 5468.40 L 4667.20 5468.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="244" stroke="none" target-height="303.3999" target-width="1036.0996" target-x="4667.2" target-y="5468.4"/><path d="M 10127.90 5223.70 L 10096.40 5250.30 L 10061.70 5281.70 L 10026.80 5315.30 L 10008.40 5333.90 L 9989.30 5353.60 L 9970.90 5373.30 L 9951.90 5394.10 L 9932.40 5416.10 L 9893.10 5462.30 L 9873.40 5486.50 L 9853.30 5511.70 L 9832.90 5538.20 L 9813.00 5564.60 L 9793.00 5592.00 L 9772.70 5620.60 L 9752.20 5650.30 L 9732.40 5680.00 L 9712.40 5710.70 L 9692.40 5742.50 L 9672.40 5775.40 L 9659.40 5797.30 L 9646.80 5819.40 L 9634.70 5841.50 L 9623.10 5863.80 L 9611.90 5886.20 L 9590.70 5931.80 L 9580.70 5954.90 L 9571.20 5978.20 L 9562.00 6001.80 L 9553.30 6025.90 L 9544.90 6050.30 L 9537.00 6074.70 L 9529.50 6099.70 L 9522.30 6125.20 L 9515.60 6151.20 L 9509.30 6177.20 L 9503.30 6203.90 L 9497.80 6231.30 L 9492.50 6259.30 L 9487.80 6287.20 L 9483.40 6315.90 L 9479.30 6345.50 L 9475.60 6376.00 L 9475.80 6209.20 L 9478.20 5529.00 L 9536.60 5395.50 L 9586.30 5279.30 L 9623.10 5190.30 L 9655.90 5108.70 L 9695.00 5012.60 L 9747.30 4888.10 L 9779.10 4814.50 L 9809.20 4746.20 L 9925.80 4485.50 L 9957.50 4413.10 L 9991.50 4333.70 L 10028.70 4245.20 L 10052.70 4187.20 L 10076.70 4128.30 L 10124.10 4010.20 L 10170.20 3892.70 L 10214.20 3778.10 L 10235.30 3722.00 L 10274.70 3615.00 L 10310.10 3515.80 L 10340.70 3426.30 L 10353.70 3386.60 L 10365.80 3348.50 L 10375.70 3315.60 L 10381.90 3294.10 L 10391.00 3259.30 L 10394.70 3243.00 L 10398.80 3219.70 L 10399.60 3211.50 L 10399.70 3205.60 L 10398.50 3198.90 L 10397.60 3197.40 L 10396.50 3196.50 L 10395.30 3196.20 L 10393.70 3196.30 L 10391.70 3197.10 L 10389.10 3198.80 L 10383.90 3203.20 L 10377.90 3208.70 L 10371.20 3215.50 L 10363.60 3223.80 L 10354.20 3234.90 L 10343.60 3248.10 L 10331.80 3263.50 L 10307.90 3296.50 L 10274.50 3345.60 L 10252.80 3379.00 L 10230.80 3413.60 L 10184.10 3489.50 L 10135.30 3571.50 L 10110.30 3614.30 L 10060.20 3701.70 L 10010.40 3790.30 L 9985.80 3834.70 L 9938.10 3921.80 L 9872.10 4044.80 L 9814.90 4154.50 L 9770.60 4242.20 L 9749.40 4286.40 L 9741.20 4304.30 L 9736.00 4316.60 L 9718.70 4359.30 L 9702.00 4402.30 L 9685.90 4445.40 L 9670.30 4488.70 L 9655.30 4532.20 L 9640.80 4575.90 L 9626.90 4619.80 L 9613.60 4663.80 L 9600.80 4708.00 L 9588.60 4752.40 L 9577.00 4796.80 L 9566.00 4841.50 L 9555.50 4886.30 L 9545.60 4931.20 L 9536.30 4976.20 L 9527.60 5021.30 L 9519.40 5066.60 L 9511.80 5112.00 L 9504.80 5157.50 L 9498.40 5203.10 L 9492.60 5248.70 L 9487.40 5294.50 L 9482.70 5340.40 L 9478.70 5386.30 L 9479.40 5084.80 L 9482.20 4601.60 L 9484.60 4355.40 L 9486.70 4222.80 L 9489.00 4113.60 L 9491.40 4025.70 L 9493.80 3956.80 L 9496.20 3904.70 L 9498.30 3867.10 L 9500.10 3841.70 L 9530.00 3794.80 L 9543.90 3773.60 L 9569.30 3736.10 L 9582.30 3716.20 L 9594.50 3696.60 L 9606.40 3676.70 L 9628.70 3637.40 L 9639.20 3617.60 L 9659.40 3577.50 L 9674.00 3547.00 L 9688.30 3515.40 L 9702.50 3483.30 L 9716.90 3449.60 L 9779.30 3300.60 L 9826.70 3190.00 L 9847.90 3137.50 L 9868.40 3082.80 L 9878.70 3054.20 L 9898.40 2996.50 L 9922.30 2922.20 L 9936.00 2877.20 L 9949.30 2832.10 L 9962.00 2787.40 L 9974.20 2742.80 L 9985.80 2699.30 L 10006.90 2614.90 L 10016.60 2574.30 L 10033.40 2499.10 L 10040.40 2465.30 L 10052.00 2403.90 L 10056.50 2376.70 L 10059.80 2354.30 L 10062.80 2327.80 L 10063.70 2308.50 L 10063.40 2301.90 L 10062.70 2297.70 L 10061.80 2295.40 L 10060.90 2294.20 L 10059.90 2293.80 L 10057.10 2294.80 L 10044.00 2305.90 L 10030.90 2317.80 L 10017.80 2330.50 L 10004.80 2344.00 L 9991.70 2358.40 L 9979.30 2372.80 L 9966.80 2388.00 L 9954.30 2404.00 L 9929.10 2438.60 L 9914.00 2460.70 L 9898.80 2484.00 L 9883.50 2508.50 L 9868.00 2534.30 L 9853.10 2560.00 L 9838.00 2586.90 L 9807.20 2644.20 L 9787.10 2683.20 L 9766.50 2724.20 L 9745.50 2767.10 L 9714.10 2832.40 L 9681.40 2901.80 L 9613.90 3046.90 L 9601.90 3073.40 L 9590.70 3099.00 L 9580.50 3123.80 L 9571.10 3147.60 L 9562.00 3172.10 L 9553.70 3195.70 L 9546.00 3218.70 L 9539.10 3241.00 L 9532.50 3263.60 L 9526.50 3285.70 L 9521.10 3307.30 L 9516.20 3328.30 L 9511.70 3349.60 L 9503.90 3391.00 L 9500.70 3411.10 L 9496.80 3438.10 L 9493.60 3464.70 L 9490.80 3490.90 L 9486.50 3543.30 L 9482.80 3608.20 L 9477.70 3727.10 L 9475.70 3767.60 L 9471.10 3837.70 L 9464.00 3912.90 L 9462.30 3939.00 L 9460.90 3968.30 L 9459.30 4006.50 L 9456.60 4096.80 L 9454.10 4207.80 L 9451.80 4337.20 L 9449.80 4483.00 L 9445.10 4447.90 L 9434.90 4381.20 L 9429.50 4349.60 L 9423.50 4317.70 L 9417.30 4286.80 L 9410.80 4257.00 L 9404.10 4228.10 L 9396.80 4199.10 L 9389.20 4171.00 L 9381.30 4143.60 L 9373.10 4117.20 L 9364.40 4090.60 L 9355.30 4064.80 L 9345.90 4039.60 L 9336.20 4015.00 L 9325.90 3990.60 L 9315.20 3966.60 L 9304.20 3943.10 L 9292.70 3920.10 L 9280.80 3897.30 L 9268.40 3874.80 L 9255.60 3852.70 L 9242.30 3830.80 L 9228.60 3809.30 L 9214.30 3787.90 L 9199.60 3766.60 L 9184.30 3745.50 L 9162.60 3716.50 L 9141.20 3688.40 L 9099.40 3635.50 L 9078.90 3610.50 L 9052.40 3579.00 L 9026.50 3549.20 L 9001.30 3520.90 L 8976.70 3494.20 L 8951.30 3467.40 L 8926.60 3442.30 L 8902.80 3418.70 L 8879.70 3396.70 L 8855.80 3374.60 L 8832.90 3354.10 L 8811.00 3335.20 L 8789.90 3317.80 L 8768.00 3300.40 L 8747.30 3284.60 L 8727.70 3270.30 L 8709.20 3257.50 L 8703.60 3254.00 L 8695.40 3250.20 L 8690.10 3249.20 L 8688.00 3249.50 L 8686.30 3250.20 L 8685.00 3251.20 L 8682.90 3254.60 L 8682.00 3260.90 L 8683.10 3271.90 L 8684.80 3279.60 L 8687.40 3289.30 L 8691.20 3300.90 L 8696.30 3314.60 L 8708.10 3343.50 L 8727.70 3386.40 L 8741.90 3415.40 L 8756.90 3445.30 L 8773.60 3477.60 L 8809.80 3545.30 L 8849.30 3616.60 L 8891.00 3689.70 L 8933.60 3763.00 L 8997.00 3869.30 L 9037.10 3935.00 L 9074.10 3994.50 L 9197.80 4188.70 L 9231.50 4242.50 L 9275.10 4313.50 L 9316.10 4383.10 L 9335.60 4417.50 L 9354.20 4451.40 L 9367.90 4477.00 L 9381.00 4502.50 L 9393.60 4527.70 L 9405.60 4552.70 L 9417.30 4578.00 L 9428.30 4603.10 L 9438.80 4628.10 L 9448.60 4652.90 L 9446.00 4983.10 L 9444.10 5340.90 L 9443.50 5525.80 L 9442.70 6084.00 L 9436.20 6046.90 L 9429.20 6009.40 L 9421.80 5971.50 L 9405.80 5895.90 L 9397.10 5858.10 L 9388.00 5820.30 L 9378.50 5782.90 L 9368.60 5745.80 L 9358.30 5708.70 L 9347.50 5672.30 L 9336.50 5636.50 L 9324.80 5600.80 L 9312.90 5566.10 L 9300.70 5532.30 L 9291.10 5507.00 L 9281.30 5482.40 L 9271.40 5458.50 L 9230.20 5365.00 L 9196.40 5289.70 L 9160.50 5211.40 L 9141.80 5171.80 L 9103.50 5092.80 L 9084.00 5054.10 L 9070.80 5028.50 L 9044.50 4979.20 L 9017.90 4931.80 L 8991.50 4887.60 L 8965.60 4847.40 L 8945.80 4819.20 L 8927.10 4794.60 L 8917.30 4782.70 L 8907.90 4771.90 L 8890.00 4753.30 L 8888.90 4752.60 L 8888.20 4752.50 L 8887.60 4752.90 L 8887.00 4754.10 L 8886.60 4756.60 L 8886.50 4760.70 L 8886.80 4767.10 L 8887.70 4776.30 L 8889.70 4790.90 L 8892.90 4810.40 L 8901.60 4856.60 L 8907.10 4883.10 L 8920.60 4943.80 L 8936.60 5011.40 L 8954.80 5083.90 L 8964.60 5121.40 L 8985.10 5197.10 L 8995.90 5235.00 L 9017.90 5309.30 L 9029.00 5345.00 L 9040.40 5380.10 L 9051.50 5413.10 L 9062.90 5445.20 L 9073.80 5474.50 L 9081.40 5493.60 L 9088.60 5511.10 L 9095.50 5527.00 L 9102.80 5542.80 L 9109.70 5556.60 L 9148.50 5627.30 L 9186.30 5698.90 L 9207.60 5740.20 L 9266.90 5857.40 L 9284.90 5892.60 L 9302.80 5926.70 L 9319.50 5957.70 L 9330.70 5977.80 L 9341.50 5996.30 L 9359.90 6027.10 L 9371.30 6047.40 L 9399.80 6099.40 L 9442.70 6178.90 L 9443.10 6564.10 L 9443.70 6743.20 L 9445.50 7062.80 L 9448.00 7315.90 L 9449.60 7411.80 L 9451.20 7484.10 L 9477.00 7484.10 L 9476.00 7403.50 L 9475.40 7241.10 L 9475.60 6730.90 L 9482.50 6707.60 L 9490.00 6684.00 L 9498.10 6659.90 L 9506.80 6635.50 L 9525.40 6587.00 L 9535.50 6562.30 L 9546.10 6537.20 L 9560.50 6504.20 L 9591.40 6437.10 L 9624.10 6369.70 L 9666.90 6285.20 L 9797.30 6035.30 L 9825.40 5980.80 L 9857.60 5917.20 L 9892.80 5846.60 L 9948.70 5732.30 L 9986.40 5653.30 L 10023.10 5574.80 L 10040.60 5536.60 L 10073.40 5462.80 L 10102.40 5394.60 L 10115.20 5362.70 L 10126.20 5334.30 L 10133.00 5315.60 L 10138.80 5298.80 L 10143.70 5283.90 L 10148.20 5268.80 L 10151.50 5256.10 L 10153.80 5245.50 L 10155.20 5237.10 L 10155.80 5230.40 L 10155.30 5221.20 L 10154.60 5218.50 L 10153.50 5216.40 L 10149.10 5213.40 L 10147.10 5213.30 L 10144.70 5213.60 L 10138.10 5216.50 L 10133.50 5219.40 L 10127.90 5223.70 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="246" stroke="none" target-height="5190.3" target-width="1717.7002" target-x="8682" target-y="2293.8"/><path d="M 9837.60 7852.40 L 9090.10 7852.40 L 9033.60 7119.70 L 9894.20 7119.70 L 9837.60 7852.40 Z" fill="#f0f0f0" fill-rule="nonzero" node-id="248" stroke="none" target-height="732.6997" target-width="860.6006" target-x="9033.6" target-y="7119.7"/><path d="M 9949.80 7205.10 L 8977.80 7205.10 L 8950.10 6957.70 L 9977.70 6957.70 L 9949.80 7205.10 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="250" stroke="none" target-height="247.3999" target-width="1027.6006" target-x="8950.1" target-y="6957.7"/><path d="M 2963.90 489.00 L 1627.00 489.00 L 1627.00 1957.10 L 2963.90 1957.10 L 2963.90 489.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="252" stroke="none" target-height="1468.1" target-width="1336.8999" target-x="1627" target-y="489"/><path d="M 3108.70 489.00 L 1727.60 489.00 L 1727.60 1957.10 L 3108.70 1957.10 L 3108.70 489.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="254" stroke="none" target-height="1468.1" target-width="1381.1" target-x="1727.6" target-y="489"/><path d="M 2993.00 1841.40 L 2993.00 604.70 L 1843.30 604.70 L 1843.30 1841.40 L 2993.00 1841.40 Z" fill="#ffffff" fill-rule="nonzero" node-id="256" stroke="none" target-height="1236.7" target-width="1149.7" target-x="1843.3" target-y="604.7"/><path d="M 2714.20 1541.30 L 2714.20 904.20 L 2121.90 904.20 L 2121.90 1541.30 L 2714.20 1541.30 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="258" stroke="none" target-height="637.10004" target-width="592.30005" target-x="2121.9" target-y="904.2"/><path d="M 9780.60 660.00 L 8538.70 660.00 L 8538.70 2023.90 L 9780.60 2023.90 L 9780.60 660.00 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="260" stroke="none" target-height="1363.9" target-width="1241.8994" target-x="8538.7" target-y="660"/><path d="M 9915.20 660.00 L 8632.40 660.00 L 8632.40 2023.90 L 9915.20 2023.90 L 9915.20 660.00 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="262" stroke="none" target-height="1363.9" target-width="1282.7998" target-x="8632.4" target-y="660"/><path d="M 9807.80 1916.30 L 9807.80 767.60 L 8740.00 767.60 L 8740.00 1916.30 L 9807.80 1916.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="264" stroke="none" target-height="1148.7001" target-width="1067.7998" target-x="8740" target-y="767.6"/><path d="M 9273.80 1675.20 L 9287.60 1674.90 L 9301.30 1674.00 L 9314.70 1672.70 L 9327.90 1670.80 L 9340.90 1668.40 L 9353.90 1665.40 L 9366.70 1662.00 L 9379.20 1658.10 L 9391.40 1653.80 L 9403.50 1649.00 L 9415.40 1643.70 L 9427.00 1637.90 L 9438.30 1631.80 L 9449.30 1625.20 L 9460.10 1618.20 L 9470.60 1610.80 L 9480.80 1603.10 L 9490.60 1594.90 L 9500.20 1586.40 L 9509.40 1577.60 L 9518.30 1568.30 L 9526.80 1558.80 L 9534.90 1548.90 L 9542.70 1538.70 L 9550.10 1528.20 L 9557.10 1517.50 L 9563.60 1506.40 L 9569.80 1495.10 L 9575.50 1483.50 L 9580.80 1471.60 L 9585.60 1459.60 L 9590.00 1447.30 L 9593.90 1434.80 L 9597.30 1422.10 L 9600.20 1409.10 L 9602.60 1396.10 L 9604.50 1382.80 L 9605.90 1369.40 L 9606.70 1355.80 L 9607.00 1341.90 L 9606.70 1328.10 L 9605.90 1314.40 L 9604.50 1301.00 L 9602.60 1287.80 L 9600.20 1274.80 L 9597.30 1261.80 L 9593.90 1249.00 L 9590.00 1236.50 L 9585.60 1224.30 L 9580.80 1212.20 L 9575.50 1200.30 L 9569.80 1188.80 L 9563.60 1177.40 L 9557.10 1166.40 L 9550.10 1155.60 L 9542.70 1145.10 L 9534.90 1134.90 L 9526.80 1125.10 L 9518.30 1115.50 L 9509.40 1106.30 L 9500.20 1097.40 L 9490.60 1088.90 L 9480.80 1080.80 L 9470.60 1073.00 L 9460.10 1065.60 L 9449.30 1058.60 L 9438.30 1052.10 L 9427.00 1045.90 L 9415.40 1040.20 L 9403.50 1034.90 L 9391.40 1030.10 L 9379.20 1025.70 L 9366.70 1021.80 L 9353.90 1018.40 L 9340.90 1015.50 L 9327.90 1013.10 L 9314.70 1011.20 L 9301.30 1009.80 L 9287.60 1009.00 L 9273.80 1008.70 L 9259.90 1009.00 L 9246.30 1009.80 L 9232.90 1011.20 L 9219.70 1013.10 L 9206.60 1015.50 L 9193.60 1018.40 L 9180.90 1021.80 L 9168.40 1025.70 L 9156.10 1030.10 L 9144.10 1034.90 L 9132.20 1040.20 L 9120.60 1045.90 L 9109.30 1052.10 L 9098.20 1058.60 L 9087.50 1065.60 L 9077.00 1073.00 L 9066.80 1080.80 L 9056.90 1088.90 L 9047.40 1097.40 L 9038.20 1106.30 L 9029.30 1115.50 L 9020.80 1125.10 L 9012.60 1134.90 L 9004.90 1145.10 L 8997.50 1155.60 L 8990.50 1166.40 L 8983.90 1177.40 L 8977.80 1188.80 L 8972.10 1200.30 L 8966.70 1212.20 L 8961.90 1224.30 L 8957.60 1236.50 L 8953.70 1249.00 L 8950.30 1261.80 L 8947.30 1274.80 L 8944.90 1287.80 L 8943.00 1301.00 L 8941.70 1314.40 L 8940.90 1328.10 L 8940.60 1341.90 L 8940.90 1355.80 L 8941.70 1369.40 L 8943.00 1382.80 L 8944.90 1396.10 L 8947.30 1409.10 L 8950.30 1422.10 L 8953.70 1434.80 L 8957.60 1447.30 L 8961.90 1459.60 L 8966.70 1471.60 L 8972.10 1483.50 L 8977.80 1495.10 L 8983.90 1506.40 L 8990.50 1517.50 L 8997.50 1528.20 L 9004.90 1538.70 L 9012.60 1548.90 L 9020.80 1558.80 L 9029.30 1568.30 L 9038.20 1577.60 L 9047.40 1586.40 L 9056.90 1594.90 L 9066.80 1603.10 L 9077.00 1610.80 L 9087.50 1618.20 L 9098.20 1625.20 L 9109.30 1631.80 L 9120.60 1637.90 L 9132.20 1643.70 L 9144.10 1649.00 L 9156.10 1653.80 L 9168.40 1658.10 L 9180.90 1662.00 L 9193.60 1665.40 L 9206.60 1668.40 L 9219.70 1670.80 L 9232.90 1672.70 L 9246.30 1674.00 L 9259.90 1674.90 L 9273.80 1675.20 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="266" stroke="none" target-height="666.49994" target-width="666.4004" target-x="8940.6" target-y="1008.7"/><path d="M 4352.80 1364.40 L 3361.00 1364.40 L 3361.00 2453.50 L 4352.80 2453.50 L 4352.80 1364.40 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="268" stroke="none" target-height="1089.1" target-width="991.7998" target-x="3361" target-y="1364.4"/><path d="M 4460.10 1364.40 L 3435.70 1364.40 L 3435.70 2453.50 L 4460.10 2453.50 L 4460.10 1364.40 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="270" stroke="none" target-height="1089.1" target-width="1024.4001" target-x="3435.7" target-y="1364.4"/><path d="M 4374.30 2367.60 L 4374.30 1450.20 L 3521.60 1450.20 L 3521.60 2367.60 L 4374.30 2367.60 Z" fill="#ffffff" fill-rule="nonzero" node-id="272" stroke="none" target-height="917.40015" target-width="852.6997" target-x="3521.6" target-y="1450.2"/><path d="M 3948.00 1676.80 L 3714.80 2080.90 L 4181.30 2080.90 L 3948.00 1676.80 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="274" stroke="none" target-height="404.09985" target-width="466.49976" target-x="3714.8" target-y="1676.8"/><path d="M 5963.10 8886.40 L 6122.80 8886.30 L 6435.90 8885.00 L 6591.50 8883.90 L 6895.10 8880.90 L 7045.70 8879.00 L 7338.30 8874.30 L 7483.20 8871.50 L 7763.20 8865.20 L 7901.60 8861.60 L 8167.50 8853.80 L 8298.60 8849.50 L 8548.80 8840.30 L 8671.90 8835.30 L 8904.80 8824.80 L 9019.10 8819.10 L 9233.30 8807.30 L 9337.90 8801.00 L 9531.70 8788.20 L 9626.00 8781.30 L 9714.70 8774.30 L 9798.00 8767.40 L 9881.10 8759.90 L 9958.20 8752.50 L 10029.60 8745.10 L 10083.70 8739.10 L 10134.00 8733.20 L 10180.90 8727.30 L 10224.40 8721.50 L 10269.00 8715.10 L 10309.60 8708.90 L 10346.50 8702.70 L 10379.90 8696.70 L 10407.90 8691.20 L 10433.10 8685.90 L 10455.70 8680.70 L 10475.90 8675.70 L 10493.80 8670.80 L 10510.40 8665.90 L 10524.70 8661.10 L 10537.00 8656.60 L 10547.60 8652.20 L 10556.50 8648.00 L 10563.90 8644.00 L 10570.50 8639.90 L 10575.70 8636.10 L 10582.90 8629.00 L 10585.10 8625.70 L 10586.60 8622.50 L 10587.50 8619.40 L 10587.80 8616.40 L 10587.50 8613.40 L 10586.60 8610.30 L 10585.10 8607.10 L 10582.90 8603.80 L 10579.80 8600.40 L 10570.50 8592.90 L 10563.90 8588.80 L 10556.50 8584.80 L 10547.60 8580.60 L 10524.70 8571.70 L 10510.40 8566.90 L 10475.90 8557.10 L 10455.70 8552.10 L 10433.10 8546.90 L 10407.90 8541.60 L 10346.50 8530.10 L 10269.00 8517.70 L 10224.40 8511.30 L 10180.90 8505.50 L 10083.70 8493.70 L 10029.60 8487.70 L 9958.20 8480.30 L 9881.10 8472.90 L 9798.00 8465.40 L 9714.70 8458.50 L 9626.00 8451.60 L 9531.70 8444.70 L 9337.90 8431.80 L 9233.30 8425.50 L 9019.10 8413.70 L 8904.80 8408.10 L 8671.90 8397.50 L 8548.80 8392.50 L 8298.60 8383.30 L 8167.50 8379.00 L 7901.60 8371.20 L 7763.20 8367.60 L 7483.20 8361.30 L 7193.40 8356.10 L 7045.70 8353.80 L 6744.50 8350.20 L 6591.50 8348.90 L 6280.40 8347.00 L 6122.80 8346.60 L 5963.10 8346.40 L 5645.80 8347.00 L 5490.20 8347.80 L 5181.60 8350.20 L 5031.00 8351.90 L 4732.70 8356.10 L 4587.80 8358.50 L 4301.30 8364.40 L 4024.60 8371.20 L 3889.80 8375.00 L 3627.60 8383.30 L 3500.50 8387.80 L 3254.30 8397.50 L 3135.60 8402.70 L 2907.10 8413.70 L 2797.70 8419.60 L 2588.20 8431.80 L 2488.80 8438.20 L 2394.40 8444.70 L 2300.10 8451.60 L 2211.50 8458.50 L 2128.20 8465.40 L 2045.00 8472.90 L 1967.90 8480.30 L 1896.50 8487.70 L 1842.50 8493.70 L 1745.30 8505.50 L 1701.80 8511.30 L 1657.20 8517.70 L 1616.60 8524.00 L 1579.70 8530.10 L 1546.30 8536.10 L 1518.30 8541.60 L 1493.00 8546.90 L 1450.20 8557.10 L 1432.30 8562.00 L 1415.80 8566.90 L 1401.40 8571.70 L 1389.10 8576.30 L 1378.60 8580.60 L 1369.70 8584.80 L 1362.20 8588.80 L 1355.70 8592.90 L 1350.40 8596.70 L 1346.40 8600.40 L 1343.30 8603.80 L 1339.50 8610.30 L 1338.70 8613.40 L 1338.40 8616.40 L 1338.70 8619.40 L 1339.50 8622.50 L 1341.00 8625.70 L 1343.30 8629.00 L 1346.40 8632.40 L 1350.40 8636.10 L 1355.70 8639.90 L 1362.20 8644.00 L 1369.70 8648.00 L 1378.60 8652.20 L 1389.10 8656.60 L 1401.40 8661.10 L 1415.80 8665.90 L 1432.30 8670.80 L 1450.20 8675.70 L 1470.40 8680.70 L 1493.00 8685.90 L 1518.30 8691.20 L 1546.30 8696.70 L 1579.70 8702.70 L 1616.60 8708.90 L 1657.20 8715.10 L 1701.80 8721.50 L 1745.30 8727.30 L 1842.50 8739.10 L 1896.50 8745.10 L 1967.90 8752.50 L 2045.00 8759.90 L 2128.20 8767.40 L 2211.50 8774.30 L 2300.10 8781.30 L 2394.40 8788.20 L 2588.20 8801.00 L 2692.90 8807.30 L 2907.10 8819.10 L 3021.30 8824.80 L 3254.30 8835.30 L 3377.30 8840.30 L 3627.60 8849.50 L 3758.70 8853.80 L 4024.60 8861.60 L 4162.90 8865.20 L 4443.00 8871.50 L 4587.80 8874.30 L 4880.50 8879.00 L 5031.00 8880.90 L 5334.70 8883.90 L 5490.20 8885.00 L 5803.40 8886.30 L 5963.10 8886.40 Z" fill="#f5f5f5" fill-rule="nonzero" node-id="276" stroke="none" target-height="540" target-width="9249.399" target-x="1338.4" target-y="8346.4"/><path d="M 8330.40 2586.30 L 8093.80 2490.90 L 8060.60 2550.30 L 8037.30 2591.30 L 7978.20 2693.20 L 7944.20 2750.10 L 7908.50 2808.40 L 7872.20 2866.10 L 7853.90 2894.30 L 7836.00 2921.20 L 7818.10 2947.50 L 7801.10 2971.80 L 7784.00 2995.10 L 7768.30 3015.80 L 7757.60 3029.20 L 7738.50 3051.40 L 7729.00 3061.50 L 7720.40 3069.80 L 7712.80 3076.50 L 7706.60 3081.30 L 7701.10 3084.90 L 7692.10 3089.10 L 7671.20 3096.10 L 7622.00 3113.60 L 7473.20 3168.60 L 7441.10 3180.10 L 7376.20 3202.50 L 7322.70 3219.70 L 7281.50 3231.80 L 7261.00 3237.40 L 7241.30 3242.30 L 7222.50 3246.60 L 7203.60 3250.50 L 7185.90 3253.70 L 7169.30 3256.10 L 7165.00 3261.70 L 7160.00 3269.10 L 7155.10 3277.20 L 7144.90 3296.40 L 7135.30 3317.40 L 7131.10 3328.10 L 7127.20 3338.70 L 7124.00 3348.70 L 7121.40 3358.40 L 7119.70 3366.90 L 7119.00 3372.50 L 7119.00 3381.10 L 7131.50 3385.00 L 7144.80 3388.50 L 7158.90 3391.80 L 7173.80 3394.70 L 7188.50 3397.10 L 7203.90 3399.20 L 7219.90 3400.90 L 7236.60 3402.40 L 7258.70 3403.70 L 7281.50 3404.60 L 7305.30 3404.80 L 7329.00 3404.60 L 7353.20 3403.80 L 7377.90 3402.60 L 7402.60 3400.90 L 7427.40 3398.80 L 7452.40 3396.20 L 7477.30 3393.30 L 7526.70 3386.50 L 7551.20 3382.50 L 7598.80 3373.80 L 7622.30 3369.00 L 7666.60 3358.90 L 7688.30 3353.50 L 7708.80 3347.90 L 7728.20 3342.40 L 7747.50 3336.50 L 7765.20 3330.60 L 7781.40 3324.80 L 7797.60 3318.60 L 7811.80 3312.60 L 7824.30 3306.80 L 7841.90 3297.40 L 7854.80 3289.00 L 7866.10 3280.30 L 7877.60 3270.80 L 7889.40 3260.50 L 7913.00 3238.00 L 7936.70 3213.40 L 7948.80 3200.00 L 7964.50 3181.90 L 7980.30 3162.90 L 7996.20 3142.90 L 8027.50 3101.70 L 8058.40 3058.30 L 8088.60 3013.70 L 8110.70 2979.70 L 8132.20 2945.60 L 8153.20 2911.50 L 8192.70 2844.70 L 8228.50 2781.40 L 8260.10 2723.50 L 8297.50 2652.10 L 8315.40 2616.90 L 8330.40 2586.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="278" stroke="none" target-height="913.90015" target-width="1211.4004" target-x="7119" target-y="2490.9"/><path d="M 8403.20 2456.80 L 8405.10 2464.90 L 8406.60 2473.40 L 8408.40 2491.20 L 8408.60 2500.70 L 8408.30 2512.30 L 8407.50 2524.30 L 8406.10 2536.80 L 8401.60 2562.40 L 8395.20 2588.60 L 8391.30 2602.20 L 8385.60 2620.00 L 8379.30 2638.10 L 8372.30 2656.40 L 8364.80 2674.50 L 8356.90 2692.60 L 8340.00 2728.50 L 8322.30 2763.20 L 8308.50 2788.50 L 8295.00 2812.40 L 8281.40 2835.50 L 8256.10 2876.40 L 8234.30 2909.80 L 8208.30 2947.40 L 7895.10 2771.90 L 7923.80 2708.00 L 7944.00 2664.60 L 7968.20 2613.80 L 7995.60 2558.20 L 8010.20 2529.40 L 8025.40 2500.00 L 8033.40 2485.10 L 8041.50 2471.10 L 8049.80 2458.00 L 8058.30 2445.60 L 8066.90 2434.00 L 8076.10 2422.40 L 8085.40 2411.60 L 8094.70 2401.60 L 8104.10 2392.30 L 8113.50 2383.70 L 8123.50 2375.40 L 8133.50 2367.70 L 8143.40 2360.80 L 8153.30 2354.60 L 8163.10 2349.00 L 8173.40 2343.80 L 8183.60 2339.30 L 8193.70 2335.40 L 8203.70 2332.20 L 8213.50 2329.60 L 8223.70 2327.50 L 8233.70 2326.10 L 8243.50 2325.20 L 8253.20 2325.00 L 8262.70 2325.40 L 8272.20 2326.30 L 8281.60 2327.90 L 8290.70 2330.10 L 8299.60 2332.80 L 8308.30 2336.20 L 8322.30 2343.00 L 8329.10 2347.00 L 8342.10 2356.40 L 8348.40 2361.80 L 8354.30 2367.30 L 8360.00 2373.40 L 8365.50 2379.80 L 8370.70 2386.70 L 8375.80 2394.10 L 8380.70 2402.00 L 8385.10 2409.90 L 8389.20 2418.20 L 8396.70 2436.40 L 8400.10 2446.30 L 8403.20 2456.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="280" stroke="none" target-height="622.3999" target-width="513.4995" target-x="7895.1" target-y="2325"/><g node-id="588"><path d="M 8403.20 2456.80 L 8405.10 2464.90 L 8406.60 2473.40 L 8408.40 2491.20 L 8408.60 2500.70 L 8408.30 2512.30 L 8407.50 2524.30 L 8406.10 2536.80 L 8401.60 2562.40 L 8395.20 2588.60 L 8391.30 2602.20 L 8385.60 2620.00 L 8379.30 2638.10 L 8372.30 2656.40 L 8364.80 2674.50 L 8356.90 2692.60 L 8340.00 2728.50 L 8322.30 2763.20 L 8308.50 2788.50 L 8295.00 2812.40 L 8281.40 2835.50 L 8256.10 2876.40 L 8234.30 2909.80 L 8208.30 2947.40 L 7895.10 2771.90 L 7923.80 2708.00 L 7944.00 2664.60 L 7968.20 2613.80 L 7995.60 2558.20 L 8010.20 2529.40 L 8025.40 2500.00 L 8033.40 2485.10 L 8041.50 2471.10 L 8049.80 2458.00 L 8058.30 2445.60 L 8066.90 2434.00 L 8076.10 2422.40 L 8085.40 2411.60 L 8094.70 2401.60 L 8104.10 2392.30 L 8113.50 2383.70 L 8123.50 2375.40 L 8133.50 2367.70 L 8143.40 2360.80 L 8153.30 2354.60 L 8163.10 2349.00 L 8173.40 2343.80 L 8183.60 2339.30 L 8193.70 2335.40 L 8203.70 2332.20 L 8213.50 2329.60 L 8223.70 2327.50 L 8233.70 2326.10 L 8243.50 2325.20 L 8253.20 2325.00 L 8262.70 2325.40 L 8272.20 2326.30 L 8281.60 2327.90 L 8290.70 2330.10 L 8299.60 2332.80 L 8308.30 2336.20 L 8322.30 2343.00 L 8329.10 2347.00 L 8342.10 2356.40 L 8348.40 2361.80 L 8354.30 2367.30 L 8360.00 2373.40 L 8365.50 2379.80 L 8370.70 2386.70 L 8375.80 2394.10 L 8380.70 2402.00 L 8385.10 2409.90 L 8389.20 2418.20 L 8396.70 2436.40 L 8400.10 2446.30 L 8403.20 2456.80 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="1" node-id="284" stroke="none" target-height="622.3999" target-width="513.4995" target-x="7895.1" target-y="2325"/></g><g node-id="589"><path d="M 8019.40 2842.00 L 8142.70 2911.20 L 8164.40 2532.60 L 8157.90 2538.00 L 8151.40 2544.00 L 8145.00 2550.70 L 8138.50 2558.10 L 8126.50 2573.80 L 8114.60 2591.80 L 8107.30 2604.30 L 8100.00 2617.50 L 8086.20 2645.60 L 8073.50 2674.90 L 8064.60 2697.30 L 8056.30 2719.90 L 8048.50 2742.40 L 8034.90 2785.70 L 8029.20 2805.60 L 8019.40 2842.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="2" node-id="289" stroke="none" target-height="378.59985" target-width="145" target-x="8019.4" target-y="2532.6"/></g><path d="M 8197.10 2334.20 L 8187.40 2358.10 L 8179.70 2379.00 L 8171.50 2402.80 L 8161.20 2434.70 L 8154.50 2457.10 L 8147.10 2482.80 L 8139.10 2512.20 L 8131.60 2541.80 L 8123.80 2574.70 L 8115.70 2611.30 L 8110.00 2638.50 L 8098.60 2698.60 L 8093.00 2731.60 L 8087.80 2764.10 L 8082.80 2798.40 L 8077.90 2834.70 L 8073.20 2873.00 L 8069.10 2910.70 L 8065.30 2950.20 L 8061.80 2991.70 L 8058.60 3035.20 L 8056.10 3078.00 L 8054.00 3122.70 L 8052.40 3169.30 L 8051.40 3217.90 L 8051.00 3256.10 L 8051.00 3295.40 L 8051.40 3336.00 L 8052.30 3377.80 L 8053.60 3420.80 L 8055.40 3463.00 L 8057.60 3506.40 L 8060.40 3550.90 L 8063.70 3596.70 L 8067.60 3643.80 L 8071.90 3689.90 L 8076.80 3737.20 L 8082.40 3785.70 L 8088.60 3835.50 L 8095.50 3886.50 L 9056.00 3886.50 L 9057.90 3858.10 L 9058.60 3838.10 L 9059.20 3806.80 L 9060.00 3627.40 L 9061.20 3511.70 L 9062.50 3447.50 L 9065.10 3358.60 L 9069.10 3263.40 L 9074.90 3163.10 L 9078.50 3112.10 L 9082.70 3059.70 L 9087.50 3005.90 L 9095.70 2924.90 L 9100.40 2883.40 L 9111.00 2799.60 L 9123.40 2714.80 L 9130.30 2671.70 L 9137.50 2628.90 L 9145.40 2585.80 L 9153.70 2542.50 L 9162.60 2498.90 L 9172.00 2455.60 L 9181.90 2412.20 L 9192.50 2368.70 L 9203.70 2325.10 L 9172.00 2319.20 L 9140.30 2313.60 L 9108.50 2308.50 L 9076.70 2303.80 L 9044.80 2299.50 L 9012.80 2295.60 L 8980.80 2292.20 L 8948.70 2289.10 L 8884.50 2284.30 L 8843.70 2282.20 L 8802.90 2280.60 L 8762.10 2279.40 L 8721.30 2278.70 L 8680.50 2278.40 L 8639.60 2278.70 L 8598.80 2279.40 L 8558.00 2280.60 L 8517.20 2282.20 L 8476.40 2284.30 L 8420.00 2290.90 L 8391.80 2294.90 L 8363.80 2299.20 L 8335.80 2304.00 L 8307.90 2309.20 L 8280.10 2314.80 L 8252.30 2320.90 L 8224.70 2327.30 L 8197.10 2334.20 Z" fill="#429cfd" fill-rule="nonzero" node-id="292" stroke="none" target-height="1608.1001" target-width="1152.7002" target-x="8051" target-y="2278.4"/><g node-id="590"><path d="M 8197.10 2334.20 L 8187.40 2358.10 L 8179.70 2379.00 L 8171.50 2402.80 L 8161.20 2434.70 L 8154.50 2457.10 L 8147.10 2482.80 L 8139.10 2512.20 L 8131.60 2541.80 L 8123.80 2574.70 L 8115.70 2611.30 L 8110.00 2638.50 L 8098.60 2698.60 L 8093.00 2731.60 L 8087.80 2764.10 L 8082.80 2798.40 L 8077.90 2834.70 L 8073.20 2873.00 L 8069.10 2910.70 L 8065.30 2950.20 L 8061.80 2991.70 L 8058.60 3035.20 L 8056.10 3078.00 L 8054.00 3122.70 L 8052.40 3169.30 L 8051.40 3217.90 L 8051.00 3256.10 L 8051.00 3295.40 L 8051.40 3336.00 L 8052.30 3377.80 L 8053.60 3420.80 L 8055.40 3463.00 L 8057.60 3506.40 L 8060.40 3550.90 L 8063.70 3596.70 L 8067.60 3643.80 L 8071.90 3689.90 L 8076.80 3737.20 L 8082.40 3785.70 L 8088.60 3835.50 L 8095.50 3886.50 L 9056.00 3886.50 L 9057.90 3858.10 L 9058.60 3838.10 L 9059.20 3806.80 L 9060.00 3627.40 L 9061.20 3511.70 L 9062.50 3447.50 L 9065.10 3358.60 L 9069.10 3263.40 L 9074.90 3163.10 L 9078.50 3112.10 L 9082.70 3059.70 L 9087.50 3005.90 L 9095.70 2924.90 L 9100.40 2883.40 L 9111.00 2799.60 L 9123.40 2714.80 L 9130.30 2671.70 L 9137.50 2628.90 L 9145.40 2585.80 L 9153.70 2542.50 L 9162.60 2498.90 L 9172.00 2455.60 L 9181.90 2412.20 L 9192.50 2368.70 L 9203.70 2325.10 L 9172.00 2319.20 L 9140.30 2313.60 L 9108.50 2308.50 L 9076.70 2303.80 L 9044.80 2299.50 L 9012.80 2295.60 L 8980.80 2292.20 L 8948.70 2289.10 L 8884.50 2284.30 L 8843.70 2282.20 L 8802.90 2280.60 L 8762.10 2279.40 L 8721.30 2278.70 L 8680.50 2278.40 L 8639.60 2278.70 L 8598.80 2279.40 L 8558.00 2280.60 L 8517.20 2282.20 L 8476.40 2284.30 L 8420.00 2290.90 L 8391.80 2294.90 L 8363.80 2299.20 L 8335.80 2304.00 L 8307.90 2309.20 L 8280.10 2314.80 L 8252.30 2320.90 L 8224.70 2327.30 L 8197.10 2334.20 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="3" node-id="296" stroke="none" target-height="1608.1001" target-width="1152.7002" target-x="8051" target-y="2278.4"/></g><g node-id="591"><path d="M 7974.30 8637.90 L 7974.50 8639.00 L 7975.10 8640.10 L 7976.40 8641.40 L 7987.00 8646.30 L 7995.70 8648.70 L 8007.90 8651.30 L 8041.00 8656.50 L 8084.40 8661.40 L 8121.00 8664.60 L 8164.60 8667.90 L 8210.50 8670.70 L 8262.60 8673.50 L 8316.70 8675.90 L 8376.20 8678.10 L 8437.40 8679.90 L 8503.10 8681.50 L 8570.30 8682.70 L 8641.10 8683.60 L 8787.70 8684.40 L 8934.40 8683.60 L 9072.60 8681.50 L 9138.50 8679.90 L 9199.90 8678.10 L 9314.10 8673.50 L 9366.50 8670.70 L 9412.80 8667.90 L 9456.80 8664.60 L 9493.70 8661.40 L 9537.70 8656.50 L 9554.50 8654.10 L 9571.30 8651.30 L 9583.80 8648.70 L 9598.90 8644.10 L 9602.70 8642.30 L 9605.00 8640.60 L 9606.10 8639.20 L 9606.50 8637.90 L 9606.30 8636.80 L 9605.70 8635.60 L 9604.40 8634.30 L 9602.20 8632.90 L 9598.80 8631.30 L 9593.80 8629.50 L 9572.90 8624.50 L 9556.40 8621.60 L 9520.00 8616.90 L 9496.50 8614.40 L 9459.90 8611.20 L 9416.30 8608.00 L 9370.40 8605.10 L 9318.30 8602.40 L 9264.20 8600.00 L 9204.70 8597.90 L 9077.80 8594.50 L 8939.80 8592.30 L 8793.20 8591.60 L 8646.40 8592.30 L 8575.50 8593.30 L 8508.20 8594.50 L 8442.30 8596.10 L 8380.90 8597.90 L 8321.10 8600.10 L 8266.70 8602.50 L 8214.30 8605.20 L 8168.00 8608.10 L 8124.10 8611.30 L 8087.20 8614.50 L 8043.20 8619.40 L 8026.40 8621.70 L 8009.60 8624.50 L 7997.00 8627.20 L 7988.00 8629.60 L 7982.00 8631.70 L 7978.10 8633.50 L 7975.90 8635.20 L 7974.70 8636.60 L 7974.30 8637.90 Z" fill="#e8ecf1" fill-rule="nonzero" group-id="4" node-id="301" stroke="none" target-height="92.80078" target-width="1632.2002" target-x="7974.3" target-y="8591.6"/></g><path d="M 8615.50 7961.00 L 8445.10 8027.00 L 8591.90 8406.10 L 8762.20 8340.10 L 8615.50 7961.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="304" stroke="none" target-height="445.0996" target-width="317.1006" target-x="8445.1" target-y="7961"/><path d="M 9375.20 8454.50 L 9195.50 8454.50 L 9129.70 8038.70 L 9309.30 8038.70 L 9375.20 8454.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="306" stroke="none" target-height="415.7998" target-width="245.5" target-x="9129.7" target-y="8038.7"/><path d="M 9183.10 8433.70 L 9384.90 8433.70 L 9387.50 8433.90 L 9390.00 8434.60 L 9394.50 8437.20 L 9396.30 8439.10 L 9397.80 8441.20 L 9398.80 8443.60 L 9399.50 8446.10 L 9425.50 8605.70 L 9425.70 8609.70 L 9424.50 8617.60 L 9423.10 8621.40 L 9415.80 8630.90 L 9412.60 8633.30 L 9409.10 8635.20 L 9405.30 8636.60 L 9401.40 8637.40 L 9397.30 8637.60 L 9369.10 8637.00 L 9269.10 8633.00 L 9239.30 8632.40 L 9204.40 8632.20 L 9177.70 8632.50 L 9145.60 8633.30 L 9033.30 8636.70 L 8996.00 8637.60 L 8961.60 8637.90 L 8954.40 8637.60 L 8941.80 8636.00 L 8930.90 8632.90 L 8925.90 8630.90 L 8921.40 8628.60 L 8917.40 8626.10 L 8913.50 8623.30 L 8910.00 8620.30 L 8907.00 8617.20 L 8904.30 8614.00 L 8898.50 8604.60 L 8896.60 8599.80 L 8895.10 8594.80 L 8894.30 8590.00 L 8894.10 8580.60 L 8894.70 8576.20 L 8895.80 8572.20 L 8897.50 8568.30 L 8899.50 8564.90 L 8904.10 8560.10 L 8906.50 8558.60 L 8909.10 8557.40 L 8911.90 8556.50 L 8935.20 8551.20 L 8956.30 8545.90 L 8975.30 8540.50 L 8994.10 8534.70 L 9011.20 8528.80 L 9041.60 8516.70 L 9067.70 8504.40 L 9079.90 8497.80 L 9101.10 8484.90 L 9111.10 8478.20 L 9128.90 8465.00 L 9153.30 8444.90 L 9156.50 8442.30 L 9159.90 8440.10 L 9163.50 8438.20 L 9171.10 8435.30 L 9179.00 8433.90 L 9183.10 8433.70 Z" fill="#263238" fill-rule="nonzero" node-id="308" stroke="none" target-height="204.2002" target-width="531.6006" target-x="8894.1" target-y="8433.7"/><path d="M 8586.80 8372.20 L 8777.70 8316.40 L 8782.80 8315.80 L 8785.40 8316.20 L 8787.90 8317.00 L 8790.30 8318.20 L 8792.30 8319.80 L 8795.50 8324.00 L 8867.10 8467.10 L 8868.50 8470.80 L 8869.60 8478.70 L 8869.30 8482.60 L 8868.40 8486.50 L 8867.00 8490.20 L 8865.00 8493.70 L 8859.70 8499.60 L 8856.50 8501.90 L 8853.00 8503.70 L 8849.20 8505.00 L 8722.20 8539.50 L 8646.50 8561.10 L 8631.50 8565.60 L 8601.40 8575.90 L 8578.80 8584.20 L 8511.10 8610.10 L 8488.60 8618.30 L 8466.40 8625.70 L 8460.40 8627.40 L 8453.60 8629.10 L 8445.70 8630.60 L 8433.60 8632.50 L 8406.00 8635.50 L 8376.10 8637.40 L 8360.80 8638.10 L 8330.90 8638.90 L 8303.10 8639.20 L 8279.10 8639.30 L 8272.20 8639.10 L 8259.70 8637.40 L 8254.20 8636.00 L 8248.60 8634.10 L 8243.50 8632.00 L 8234.50 8627.10 L 8224.10 8619.00 L 8216.10 8609.70 L 8212.90 8604.90 L 8210.40 8600.00 L 8208.30 8594.90 L 8206.80 8590.00 L 8205.80 8585.30 L 8205.40 8580.50 L 8205.50 8576.20 L 8206.10 8572.20 L 8206.90 8569.30 L 8208.00 8566.70 L 8209.40 8564.50 L 8211.10 8562.50 L 8213.00 8560.80 L 8215.20 8559.50 L 8217.80 8558.60 L 8220.70 8558.00 L 8293.40 8550.60 L 8309.10 8548.20 L 8316.30 8546.50 L 8323.40 8544.50 L 8330.60 8542.10 L 8338.30 8539.00 L 8373.40 8522.80 L 8391.00 8514.10 L 8408.30 8504.80 L 8425.30 8495.00 L 8441.90 8484.60 L 8458.20 8473.80 L 8474.20 8462.40 L 8489.80 8450.50 L 8505.00 8438.00 L 8519.80 8425.20 L 8534.20 8411.80 L 8552.20 8393.60 L 8556.50 8389.60 L 8561.00 8385.90 L 8565.80 8382.50 L 8575.90 8376.60 L 8586.80 8372.20 Z" fill="#263238" fill-rule="nonzero" node-id="310" stroke="none" target-height="323.5" target-width="664.1992" target-x="8205.4" target-y="8315.8"/><path d="M 7199.30 3255.10 L 7001.80 3172.40 L 6920.50 3391.30 L 6940.80 3394.10 L 6961.10 3396.50 L 6981.50 3398.30 L 7001.80 3399.50 L 7022.20 3400.30 L 7042.60 3400.60 L 7063.10 3400.30 L 7083.40 3399.50 L 7103.80 3398.30 L 7124.10 3396.50 L 7144.50 3394.10 L 7164.80 3391.30 L 7199.30 3255.10 Z" fill="#e58a7b" fill-rule="nonzero" node-id="312" stroke="none" target-height="228.2002" target-width="278.7998" target-x="6920.5" target-y="3172.4"/><path d="M 6854.90 3166.60 L 6849.70 3312.10 L 6920.50 3390.80 L 7001.80 3171.90 L 6854.90 3166.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="314" stroke="none" target-height="224.19995" target-width="152.09961" target-x="6849.7" target-y="3166.6"/><path d="M 8638.80 7993.20 L 8467.90 8059.20 L 8543.60 8255.20 L 8714.50 8189.20 L 8638.80 7993.20 Z" fill="#cf6f64" fill-rule="nonzero" node-id="316" stroke="none" target-height="262" target-width="246.59961" target-x="8467.9" target-y="7993.2"/><path d="M 9309.30 8038.70 L 9129.70 8038.70 L 9163.80 8253.10 L 9343.40 8253.10 L 9309.30 8038.70 Z" fill="#cf6f64" fill-rule="nonzero" node-id="318" stroke="none" target-height="214.39941" target-width="213.7002" target-x="9129.7" target-y="8038.7"/><g node-id="592"><path d="M 8064.90 3613.40 L 8070.80 3678.90 L 8077.80 3746.00 L 8808.60 3508.90 L 8825.00 3503.10 L 8841.10 3496.80 L 8857.00 3490.00 L 8872.60 3482.60 L 8888.00 3474.70 L 8903.00 3466.30 L 8917.80 3457.50 L 8932.20 3448.10 L 8946.30 3438.30 L 8960.10 3427.90 L 8973.50 3417.20 L 8986.50 3406.00 L 8999.20 3394.30 L 9011.50 3382.20 L 9023.40 3369.70 L 9034.90 3356.70 L 9045.90 3343.40 L 9056.50 3329.70 L 9066.70 3315.50 L 9071.70 3217.50 L 9074.90 3167.00 L 9082.60 3063.40 L 9087.00 3010.90 L 9090.50 2974.50 L 9098.90 2898.80 L 8064.90 3613.40 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="5" node-id="322" stroke="none" target-height="847.19995" target-width="1034.0005" target-x="8064.9" target-y="2898.8"/></g><path d="M 8298.20 2831.00 L 8274.40 2828.20 L 8276.20 2815.40 L 8278.50 2802.90 L 8281.40 2790.70 L 8284.80 2778.80 L 8288.70 2767.00 L 8293.10 2755.60 L 8297.90 2744.50 L 8303.10 2733.80 L 8308.90 2723.30 L 8315.00 2713.20 L 8321.40 2703.60 L 8328.20 2694.40 L 8335.50 2685.40 L 8343.00 2677.00 L 8350.70 2669.10 L 8358.80 2661.80 L 8367.20 2654.70 L 8375.80 2648.30 L 8384.60 2642.50 L 8393.60 2637.20 L 8402.90 2632.40 L 8412.30 2628.30 L 8421.80 2624.80 L 8431.50 2622.00 L 8439.30 2620.20 L 8447.20 2618.80 L 8463.10 2617.40 L 8471.20 2617.30 L 8471.20 2641.20 L 8462.90 2641.30 L 8454.80 2642.00 L 8446.80 2643.20 L 8438.70 2644.90 L 8430.70 2647.20 L 8422.90 2650.00 L 8415.20 2653.20 L 8407.60 2657.00 L 8400.10 2661.20 L 8392.70 2665.90 L 8385.50 2671.00 L 8378.60 2676.40 L 8371.80 2682.30 L 8358.70 2695.40 L 8346.70 2709.70 L 8335.60 2725.50 L 8330.40 2733.90 L 8325.70 2742.50 L 8321.20 2751.40 L 8317.10 2760.50 L 8309.70 2779.70 L 8306.60 2789.60 L 8303.90 2799.60 L 8301.60 2809.80 L 8299.70 2820.30 L 8298.20 2831.00 Z" fill="#ffffff" fill-rule="nonzero" node-id="325" stroke="none" target-height="213.69995" target-width="196.7998" target-x="8274.4" target-y="2617.3"/><path d="M 8425.40 3051.20 L 8421.30 3051.20 L 8421.30 3027.30 L 8435.30 3027.00 L 8449.10 3025.00 L 8456.00 3023.40 L 8464.40 3020.90 L 8472.70 3017.80 L 8480.90 3014.10 L 8489.00 3009.80 L 8496.80 3005.10 L 8504.50 2999.90 L 8512.00 2994.10 L 8526.30 2981.10 L 8539.60 2966.40 L 8546.00 2958.40 L 8551.90 2950.10 L 8562.80 2932.30 L 8572.40 2913.20 L 8576.60 2903.30 L 8580.40 2893.00 L 8583.80 2882.40 L 8586.80 2871.70 L 8589.30 2860.80 L 8591.40 2849.60 L 8593.00 2838.20 L 8616.90 2841.10 L 8615.20 2853.50 L 8613.10 2865.80 L 8610.40 2877.70 L 8607.20 2889.40 L 8603.40 2901.00 L 8599.30 2912.20 L 8594.70 2923.10 L 8589.60 2933.70 L 8584.10 2944.10 L 8578.20 2954.10 L 8572.00 2963.60 L 8565.40 2972.70 L 8558.40 2981.60 L 8551.10 2989.90 L 8543.50 2997.80 L 8535.70 3005.20 L 8527.50 3012.20 L 8519.10 3018.70 L 8510.50 3024.60 L 8501.70 3029.90 L 8492.60 3034.80 L 8483.30 3039.00 L 8474.00 3042.70 L 8464.50 3045.70 L 8456.80 3047.60 L 8449.00 3049.20 L 8441.20 3050.30 L 8433.30 3051.00 L 8425.40 3051.20 Z" fill="#ffffff" fill-rule="nonzero" node-id="327" stroke="none" target-height="213" target-width="195.60059" target-x="8421.3" target-y="2838.2"/><path d="M 8871.20 1824.70 L 8865.60 1847.20 L 8859.90 1872.20 L 8854.50 1898.00 L 8846.10 1944.30 L 8840.40 1982.80 L 8838.00 2002.40 L 8836.00 2022.00 L 8834.40 2041.60 L 8833.20 2061.30 L 8832.40 2080.80 L 8832.20 2099.90 L 8832.40 2114.30 L 8833.90 2142.10 L 8835.10 2155.50 L 8836.70 2168.90 L 8838.80 2181.90 L 8841.20 2194.30 L 8844.00 2206.20 L 8846.70 2215.80 L 8849.60 2224.90 L 8852.90 2233.60 L 8856.40 2241.90 L 8860.10 2249.80 L 8864.40 2257.70 L 8868.90 2265.00 L 8873.80 2271.90 L 8879.00 2278.30 L 8884.50 2284.30 L 8879.20 2293.80 L 8874.20 2301.20 L 8865.70 2312.10 L 8859.80 2318.90 L 8853.60 2325.40 L 8846.40 2332.40 L 8837.80 2339.90 L 8831.30 2345.30 L 8824.10 2350.70 L 8816.10 2356.30 L 8807.30 2362.10 L 8798.60 2367.40 L 8789.10 2372.60 L 8778.60 2377.90 L 8767.30 2383.10 L 8756.10 2387.80 L 8744.00 2392.30 L 8730.90 2396.70 L 8716.80 2400.80 L 8702.80 2404.40 L 8687.90 2407.70 L 8671.80 2410.60 L 8654.60 2413.10 L 8641.20 2414.70 L 8627.10 2415.90 L 8612.20 2416.90 L 8579.90 2417.70 L 8564.40 2417.40 L 8550.60 2416.80 L 8538.20 2415.80 L 8527.20 2414.60 L 8515.80 2412.80 L 8497.10 2408.50 L 8489.50 2406.00 L 8481.70 2403.00 L 8475.00 2399.90 L 8469.30 2396.60 L 8459.90 2389.50 L 8456.00 2385.50 L 8452.80 2381.60 L 8450.30 2377.60 L 8448.10 2373.30 L 8446.50 2368.90 L 8445.40 2364.50 L 8444.70 2360.10 L 8444.40 2354.00 L 8444.80 2348.00 L 8445.70 2341.90 L 8449.00 2330.10 L 8455.00 2316.20 L 8459.10 2308.70 L 8463.40 2301.70 L 8471.10 2290.80 L 8476.40 2284.30 L 8487.70 2281.50 L 8498.20 2278.40 L 8508.00 2275.10 L 8517.00 2271.60 L 8525.40 2268.00 L 8534.00 2263.80 L 8541.90 2259.50 L 8549.30 2255.00 L 8556.00 2250.40 L 8562.30 2245.70 L 8568.40 2240.50 L 8574.10 2235.10 L 8579.20 2229.70 L 8584.00 2224.10 L 8588.30 2218.30 L 8593.30 2210.80 L 8597.80 2203.00 L 8601.70 2195.10 L 8605.10 2186.90 L 8608.00 2178.50 L 8610.40 2170.00 L 8612.40 2161.20 L 8613.90 2152.30 L 8615.10 2143.30 L 8615.90 2134.20 L 8616.40 2115.40 L 8616.00 2102.80 L 8615.20 2090.10 L 8612.20 2064.40 L 8607.80 2038.70 L 8871.20 1824.70 Z" fill="#e58a7b" fill-rule="nonzero" node-id="329" stroke="none" target-height="593" target-width="440.0996" target-x="8444.4" target-y="1824.7"/><path d="M 8763.80 1912.00 L 8608.10 2038.70 L 8610.70 2052.90 L 8612.90 2067.10 L 8614.50 2081.40 L 8615.70 2095.80 L 8616.40 2110.20 L 8619.60 2113.10 L 8622.90 2115.40 L 8626.20 2117.30 L 8633.10 2119.70 L 8637.60 2120.40 L 8642.30 2120.50 L 8647.10 2120.10 L 8652.20 2119.10 L 8657.00 2117.60 L 8662.00 2115.70 L 8667.20 2113.20 L 8672.50 2110.20 L 8679.20 2105.80 L 8686.10 2100.60 L 8693.10 2094.80 L 8706.30 2081.80 L 8712.80 2074.60 L 8725.00 2059.40 L 8736.10 2043.30 L 8741.10 2035.20 L 8745.70 2027.20 L 8749.90 2018.90 L 8756.70 2003.50 L 8759.30 1995.70 L 8761.30 1988.60 L 8764.20 1973.40 L 8765.40 1964.70 L 8766.10 1955.90 L 8766.50 1947.10 L 8766.40 1938.30 L 8766.00 1929.50 L 8765.10 1920.80 L 8763.80 1912.00 Z" fill="#cf6f64" fill-rule="nonzero" node-id="331" stroke="none" target-height="208.5" target-width="158.40039" target-x="8608.1" target-y="1912"/><path d="M 8340.20 1823.00 L 8344.40 1830.00 L 8349.00 1836.70 L 8353.90 1843.10 L 8359.20 1849.30 L 8370.50 1860.70 L 8383.10 1871.10 L 8389.70 1875.70 L 8396.60 1880.00 L 8403.70 1883.90 L 8410.90 1887.50 L 8418.40 1890.70 L 8426.00 1893.50 L 8441.60 1897.90 L 8448.90 1899.20 L 8455.60 1899.80 L 8461.90 1899.70 L 8467.70 1899.10 L 8473.60 1897.90 L 8479.00 1896.10 L 8484.00 1893.90 L 8488.70 1891.20 L 8493.10 1888.00 L 8497.10 1884.40 L 8500.70 1880.40 L 8504.00 1876.00 L 8506.90 1871.30 L 8509.40 1866.30 L 8511.50 1861.00 L 8513.20 1855.40 L 8514.50 1849.60 L 8515.40 1843.70 L 8515.90 1837.50 L 8515.90 1831.10 L 8515.60 1824.70 L 8514.70 1818.20 L 8513.50 1811.60 L 8511.70 1804.90 L 8506.90 1791.00 L 8500.30 1776.50 L 8496.40 1769.30 L 8492.10 1762.10 L 8487.50 1755.10 L 8482.50 1748.30 L 8477.20 1741.70 L 8471.50 1735.40 L 8465.60 1729.50 L 8459.40 1724.10 L 8452.80 1719.10 L 8446.10 1714.70 L 8439.10 1710.90 L 8433.60 1708.40 L 8428.10 1706.40 L 8422.40 1704.80 L 8416.60 1703.60 L 8410.80 1703.00 L 8404.80 1702.80 L 8398.70 1703.10 L 8392.40 1704.00 L 8386.30 1705.50 L 8380.30 1707.50 L 8374.50 1710.00 L 8368.90 1712.90 L 8363.50 1716.30 L 8358.40 1720.10 L 8353.60 1724.30 L 8349.20 1728.80 L 8345.20 1733.70 L 8341.60 1738.90 L 8338.30 1744.30 L 8335.60 1750.00 L 8333.20 1755.90 L 8331.40 1762.00 L 8330.10 1768.20 L 8329.20 1774.40 L 8328.90 1780.70 L 8329.00 1787.10 L 8329.70 1793.40 L 8332.40 1805.70 L 8337.10 1817.40 L 8340.20 1823.00 Z" fill="#cf6f64" fill-rule="nonzero" node-id="333" stroke="none" target-height="197" target-width="187" target-x="8328.9" target-y="1702.8"/><path d="M 8434.90 1402.50 L 8430.60 1404.70 L 8426.40 1407.40 L 8422.20 1410.70 L 8418.00 1414.50 L 8413.80 1418.90 L 8409.20 1424.60 L 8404.50 1431.00 L 8400.00 1438.10 L 8395.50 1446.20 L 8391.50 1454.20 L 8387.60 1462.90 L 8380.10 1482.30 L 8375.80 1495.70 L 8371.80 1509.90 L 8368.10 1525.10 L 8364.90 1540.30 L 8362.10 1556.00 L 8359.70 1572.30 L 8357.70 1588.70 L 8356.20 1605.20 L 8355.10 1622.00 L 8354.50 1638.80 L 8354.40 1655.40 L 8354.70 1671.90 L 8355.60 1688.40 L 8357.00 1704.40 L 8358.90 1719.90 L 8360.70 1731.60 L 8365.20 1753.50 L 8370.90 1774.20 L 8374.30 1784.00 L 8377.90 1793.10 L 8381.80 1801.70 L 8386.30 1810.10 L 8391.00 1817.80 L 8396.00 1824.80 L 8401.20 1831.20 L 8405.80 1836.00 L 8410.70 1840.30 L 8415.70 1844.10 L 8420.90 1847.40 L 8426.30 1850.20 L 8430.90 1852.00 L 8435.40 1853.10 L 8439.70 1853.60 L 8443.90 1853.40 L 8448.00 1852.70 L 8452.10 1851.40 L 8456.10 1849.60 L 8460.10 1847.30 L 8464.10 1844.30 L 8468.20 1840.60 L 8472.70 1835.90 L 8477.30 1830.30 L 8481.90 1823.80 L 8486.50 1816.40 L 8494.60 1800.80 L 8502.50 1782.10 L 8507.10 1769.20 L 8511.60 1755.20 L 8515.90 1740.20 L 8519.70 1725.10 L 8523.20 1709.40 L 8526.40 1693.00 L 8529.20 1676.50 L 8531.60 1659.70 L 8533.70 1642.60 L 8535.30 1625.50 L 8537.30 1591.40 L 8537.70 1574.40 L 8537.60 1557.90 L 8537.10 1541.70 L 8536.10 1525.60 L 8534.60 1510.30 L 8532.60 1495.80 L 8530.80 1484.80 L 8526.20 1464.90 L 8523.60 1455.90 L 8520.40 1446.80 L 8517.10 1438.60 L 8513.40 1431.10 L 8509.60 1424.30 L 8506.10 1419.00 L 8498.50 1410.20 L 8494.50 1406.50 L 8490.40 1403.40 L 8485.90 1400.70 L 8481.20 1398.50 L 8476.30 1396.90 L 8471.10 1395.90 L 8465.60 1395.40 L 8460.30 1395.50 L 8454.60 1396.20 L 8448.50 1397.50 L 8441.90 1399.60 L 8434.90 1402.50 Z" fill="#263238" fill-rule="nonzero" node-id="335" stroke="none" target-height="458.19995" target-width="183.2998" target-x="8354.4" target-y="1395.4"/><path d="M 8898.30 1627.00 L 8886.00 1732.30 L 8882.00 1762.90 L 8879.00 1783.00 L 8875.80 1802.10 L 8872.40 1820.10 L 8869.50 1833.60 L 8863.00 1859.20 L 8855.20 1883.50 L 8850.80 1895.30 L 8845.90 1906.70 L 8840.70 1917.90 L 8835.00 1928.80 L 8828.80 1939.60 L 8822.00 1950.20 L 8814.60 1960.70 L 8806.80 1970.70 L 8798.40 1980.70 L 8789.10 1990.70 L 8771.50 2008.10 L 8755.50 2021.70 L 8747.10 2028.00 L 8738.40 2033.80 L 8729.40 2039.20 L 8710.80 2048.80 L 8701.20 2053.00 L 8681.40 2060.00 L 8671.20 2062.80 L 8660.80 2065.10 L 8650.50 2067.00 L 8640.10 2068.40 L 8629.70 2069.30 L 8619.20 2069.70 L 8598.30 2069.20 L 8587.80 2068.20 L 8577.40 2066.70 L 8567.10 2064.70 L 8556.90 2062.30 L 8546.70 2059.40 L 8536.70 2056.00 L 8526.90 2052.20 L 8517.30 2047.90 L 8498.80 2038.10 L 8489.90 2032.60 L 8481.20 2026.70 L 8472.80 2020.40 L 8464.80 2013.70 L 8457.00 2006.70 L 8449.50 1999.30 L 8442.40 1991.50 L 8435.60 1983.40 L 8429.20 1975.00 L 8423.30 1966.40 L 8417.70 1957.50 L 8412.60 1948.30 L 8407.90 1939.00 L 8403.60 1929.40 L 8399.70 1919.70 L 8396.30 1909.80 L 8393.40 1899.70 L 8390.90 1889.50 L 8386.20 1863.00 L 8384.10 1846.10 L 8382.30 1828.30 L 8381.10 1810.50 L 8380.50 1792.10 L 8380.30 1773.10 L 8380.80 1754.10 L 8381.70 1734.80 L 8383.30 1715.10 L 8385.50 1695.60 L 8388.30 1676.00 L 8391.70 1656.30 L 8398.00 1627.10 L 8401.70 1612.70 L 8405.80 1598.40 L 8410.30 1584.20 L 8415.20 1570.20 L 8420.50 1556.50 L 8426.20 1543.10 L 8432.30 1529.80 L 8438.90 1516.90 L 8445.80 1504.40 L 8453.20 1492.30 L 8461.10 1480.40 L 8469.40 1469.00 L 8478.10 1458.10 L 8487.30 1447.70 L 8495.00 1439.70 L 8503.00 1432.00 L 8511.30 1424.70 L 8519.90 1417.70 L 8528.80 1411.10 L 8538.00 1405.00 L 8547.50 1399.20 L 8557.40 1393.90 L 8567.60 1388.90 L 8587.70 1380.50 L 8597.30 1377.00 L 8607.00 1373.90 L 8616.80 1371.30 L 8626.80 1369.10 L 8636.70 1367.40 L 8646.80 1366.10 L 8656.90 1365.30 L 8667.10 1364.90 L 8677.30 1364.90 L 8687.40 1365.40 L 8697.70 1366.40 L 8707.80 1367.80 L 8717.80 1369.70 L 8727.70 1372.00 L 8737.50 1374.70 L 8747.20 1377.90 L 8756.70 1381.40 L 8766.00 1385.40 L 8775.20 1389.90 L 8784.10 1394.70 L 8792.90 1399.90 L 8801.40 1405.50 L 8809.70 1411.50 L 8817.70 1417.90 L 8825.40 1424.50 L 8832.80 1431.50 L 8839.80 1438.90 L 8846.60 1446.50 L 8852.90 1454.40 L 8858.90 1462.60 L 8864.60 1471.00 L 8869.90 1479.70 L 8874.70 1488.60 L 8879.20 1497.80 L 8883.40 1507.20 L 8887.00 1516.70 L 8890.30 1526.40 L 8895.50 1546.00 L 8897.40 1556.00 L 8898.90 1566.10 L 8899.90 1576.10 L 8900.50 1586.30 L 8900.60 1596.50 L 8900.30 1606.60 L 8899.60 1616.80 L 8898.30 1627.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="337" stroke="none" target-height="704.7999" target-width="520.2998" target-x="8380.3" target-y="1364.9"/><path d="M 8605.20 1494.60 L 8652.90 1482.70 L 8675.50 1477.50 L 8696.20 1473.30 L 8709.90 1470.90 L 8722.40 1469.00 L 8742.80 1467.10 L 8750.90 1466.80 L 8765.00 1467.50 L 8771.90 1468.40 L 8778.00 1469.90 L 8783.40 1471.70 L 8788.20 1473.90 L 8795.10 1478.70 L 8797.90 1481.60 L 8800.40 1484.90 L 8802.50 1488.50 L 8804.10 1492.30 L 8805.30 1496.50 L 8806.20 1501.30 L 8806.70 1506.70 L 8806.20 1518.40 L 8804.00 1531.60 L 8799.60 1548.00 L 8765.50 1655.30 L 8757.90 1680.70 L 8751.20 1704.40 L 8747.10 1720.10 L 8740.90 1748.50 L 8739.10 1758.90 L 8736.80 1777.60 L 8736.30 1785.90 L 8736.20 1794.60 L 8736.60 1802.30 L 8737.50 1809.20 L 8738.90 1815.30 L 8740.50 1820.30 L 8742.40 1824.70 L 8744.70 1828.60 L 8747.40 1832.00 L 8750.40 1835.00 L 8753.70 1837.60 L 8757.50 1839.70 L 8761.90 1841.40 L 8766.80 1842.70 L 8772.40 1843.50 L 8777.00 1843.70 L 8782.90 1843.30 L 8797.50 1840.70 L 8805.80 1838.70 L 8824.40 1833.00 L 8844.80 1825.50 L 8855.20 1821.20 L 8876.80 1811.30 L 8887.60 1805.90 L 8909.00 1793.90 L 8919.50 1787.40 L 8939.10 1773.70 L 8948.50 1766.40 L 8957.00 1758.90 L 8964.80 1751.40 L 8975.40 1739.40 L 8979.90 1733.40 L 8983.80 1727.40 L 8987.30 1721.10 L 8990.10 1714.80 L 8992.30 1708.50 L 8993.80 1702.30 L 8994.60 1697.20 L 8994.80 1692.10 L 8994.60 1687.00 L 8993.80 1681.80 L 8990.80 1669.40 L 8989.70 1662.80 L 8989.20 1656.60 L 8989.30 1650.90 L 8989.90 1645.10 L 8991.10 1639.60 L 8992.60 1634.40 L 8994.60 1629.50 L 8997.10 1624.70 L 8999.80 1620.10 L 9002.90 1615.70 L 9006.30 1611.50 L 9011.20 1606.10 L 9022.10 1596.00 L 9030.80 1589.00 L 9062.20 1565.20 L 9071.30 1556.80 L 9074.30 1553.40 L 9079.10 1546.70 L 9080.80 1543.20 L 9084.80 1533.60 L 9088.00 1524.80 L 9090.40 1516.80 L 9092.10 1509.40 L 9093.30 1501.70 L 9093.90 1494.70 L 9094.00 1488.20 L 9093.50 1482.20 L 9092.60 1476.10 L 9091.20 1470.50 L 9089.40 1465.20 L 9087.20 1460.30 L 9084.60 1455.60 L 9081.70 1451.00 L 9075.10 1442.70 L 9070.10 1437.60 L 9059.20 1428.10 L 9050.40 1421.60 L 9024.10 1403.60 L 9013.60 1395.50 L 9009.00 1391.30 L 9004.70 1386.90 L 9001.10 1382.30 L 8998.10 1377.50 L 8996.30 1373.70 L 8995.00 1369.70 L 8994.00 1365.50 L 8993.60 1360.90 L 8993.60 1356.50 L 8994.20 1351.70 L 8995.40 1346.30 L 8999.00 1335.40 L 9000.10 1330.30 L 9000.80 1325.00 L 9001.10 1319.70 L 9000.90 1314.20 L 9000.00 1307.40 L 8998.60 1300.50 L 8996.50 1293.50 L 8993.80 1286.30 L 8990.60 1279.40 L 8986.90 1272.40 L 8977.70 1258.40 L 8967.00 1245.00 L 8960.90 1238.50 L 8947.70 1225.80 L 8933.30 1214.10 L 8917.80 1203.30 L 8901.50 1193.90 L 8893.00 1189.70 L 8884.40 1185.80 L 8875.80 1182.40 L 8867.10 1179.40 L 8858.30 1176.80 L 8849.50 1174.70 L 8840.60 1173.10 L 8831.90 1172.00 L 8823.30 1171.50 L 8814.60 1171.50 L 8806.10 1172.10 L 8797.70 1173.40 L 8789.50 1175.20 L 8783.10 1177.10 L 8776.80 1179.50 L 8770.70 1182.40 L 8764.70 1185.70 L 8748.10 1196.70 L 8737.00 1203.60 L 8725.70 1210.10 L 8714.10 1216.30 L 8702.30 1222.10 L 8678.30 1232.60 L 8653.90 1241.60 L 8629.50 1249.10 L 8605.20 1255.00 L 8581.60 1259.30 L 8570.20 1260.80 L 8558.60 1262.00 L 8536.90 1262.90 L 8516.40 1262.20 L 8506.80 1261.10 L 8497.90 1259.60 L 8482.70 1255.80 L 8470.80 1251.20 L 8460.70 1245.50 L 8456.10 1242.10 L 8452.00 1238.40 L 8448.40 1234.50 L 8445.40 1230.20 L 8442.80 1225.70 L 8440.70 1221.00 L 8439.20 1215.90 L 8438.20 1210.40 L 8437.80 1204.50 L 8437.90 1198.00 L 8438.70 1192.00 L 8440.00 1185.40 L 8442.10 1178.30 L 8444.90 1170.60 L 8448.60 1162.20 L 8452.50 1154.60 L 8457.20 1146.50 L 8462.80 1137.70 L 8469.40 1128.20 L 8483.90 1109.00 L 8489.60 1100.80 L 8494.20 1093.50 L 8497.90 1086.90 L 8501.40 1079.80 L 8504.00 1073.40 L 8505.80 1067.80 L 8506.90 1062.70 L 8507.60 1057.40 L 8507.60 1052.60 L 8507.20 1048.30 L 8506.20 1044.50 L 8502.80 1037.30 L 8500.50 1034.20 L 8497.80 1031.40 L 8494.80 1028.90 L 8487.80 1024.50 L 8483.80 1022.70 L 8472.50 1018.90 L 8466.40 1017.50 L 8456.90 1016.00 L 8447.40 1015.10 L 8437.90 1014.70 L 8420.50 1014.90 L 8398.40 1016.80 L 8404.10 1020.90 L 8408.20 1024.30 L 8412.30 1028.30 L 8416.90 1033.40 L 8419.70 1037.10 L 8422.40 1041.20 L 8426.90 1050.50 L 8428.60 1055.70 L 8429.80 1061.30 L 8430.30 1070.00 L 8429.20 1079.80 L 8428.00 1084.70 L 8426.30 1089.80 L 8423.90 1095.30 L 8420.80 1101.20 L 8413.30 1112.40 L 8408.20 1118.50 L 8402.10 1125.10 L 8396.00 1131.10 L 8388.80 1137.50 L 8380.40 1144.30 L 8370.80 1151.50 L 8361.30 1158.10 L 8350.50 1165.10 L 8338.20 1172.40 L 8314.80 1185.90 L 8306.00 1191.70 L 8297.90 1197.70 L 8290.50 1203.80 L 8283.80 1210.10 L 8277.30 1217.00 L 8271.50 1223.90 L 8266.30 1231.00 L 8261.70 1238.20 L 8257.70 1245.60 L 8254.20 1253.20 L 8251.10 1261.00 L 8248.70 1268.80 L 8246.70 1276.70 L 8245.30 1284.70 L 8244.40 1292.80 L 8243.90 1300.90 L 8244.00 1309.10 L 8244.60 1317.40 L 8245.60 1325.70 L 8247.20 1333.90 L 8249.10 1342.10 L 8251.60 1350.20 L 8254.50 1358.40 L 8257.90 1366.60 L 8261.70 1374.60 L 8265.90 1382.40 L 8270.60 1390.20 L 8275.70 1398.00 L 8281.30 1405.60 L 8293.40 1420.20 L 8300.10 1427.20 L 8307.20 1434.10 L 8314.80 1440.90 L 8322.60 1447.20 L 8330.70 1453.40 L 8339.30 1459.30 L 8348.30 1465.00 L 8357.70 1470.40 L 8377.10 1480.20 L 8387.30 1484.60 L 8398.00 1488.70 L 8409.00 1492.50 L 8420.10 1495.80 L 8431.50 1498.70 L 8443.30 1501.20 L 8455.40 1503.30 L 8468.00 1505.10 L 8480.40 1506.30 L 8493.10 1507.10 L 8506.30 1507.30 L 8519.80 1507.10 L 8533.70 1506.40 L 8547.20 1505.20 L 8561.20 1503.40 L 8575.50 1501.10 L 8590.10 1498.20 L 8605.20 1494.60 Z" fill="#263238" fill-rule="nonzero" node-id="339" stroke="none" target-height="828.99994" target-width="850.0996" target-x="8243.9" target-y="1014.7"/><path d="M 8968.50 1823.00 L 8963.00 1830.50 L 8957.30 1837.60 L 8951.30 1844.30 L 8944.90 1850.80 L 8938.30 1856.90 L 8931.30 1862.70 L 8924.10 1868.10 L 8909.00 1877.90 L 8901.10 1882.30 L 8892.90 1886.20 L 8884.60 1889.70 L 8876.10 1892.90 L 8858.50 1897.90 L 8852.40 1899.00 L 8846.80 1899.60 L 8841.60 1899.80 L 8832.10 1899.10 L 8826.30 1897.90 L 8821.10 1896.10 L 8816.30 1893.90 L 8812.00 1891.20 L 8808.00 1888.00 L 8804.40 1884.40 L 8801.20 1880.40 L 8798.40 1876.00 L 8796.10 1871.40 L 8794.20 1866.40 L 8792.70 1861.10 L 8791.60 1855.40 L 8790.90 1849.70 L 8790.80 1843.70 L 8791.00 1837.50 L 8791.70 1831.10 L 8794.50 1818.30 L 8796.50 1811.70 L 8799.10 1804.90 L 8802.10 1798.10 L 8805.60 1791.10 L 8809.60 1783.70 L 8818.60 1769.30 L 8823.80 1762.10 L 8835.00 1748.30 L 8841.10 1741.70 L 8847.40 1735.40 L 8854.00 1729.50 L 8860.80 1724.10 L 8868.00 1719.10 L 8875.20 1714.70 L 8882.60 1710.90 L 8888.30 1708.40 L 8894.00 1706.40 L 8899.80 1704.80 L 8905.70 1703.60 L 8911.60 1702.90 L 8917.50 1702.80 L 8923.50 1703.10 L 8929.60 1704.00 L 8936.60 1705.70 L 8943.00 1707.90 L 8948.80 1710.40 L 8954.10 1713.40 L 8959.20 1716.90 L 8963.70 1720.70 L 8967.80 1724.90 L 8971.40 1729.40 L 8974.60 1734.20 L 8977.40 1739.20 L 8979.60 1744.50 L 8981.50 1750.10 L 8982.90 1755.80 L 8983.80 1761.60 L 8984.30 1767.60 L 8984.40 1773.80 L 8984.00 1780.00 L 8983.10 1786.20 L 8981.80 1792.40 L 8980.00 1798.70 L 8977.80 1804.90 L 8975.20 1811.00 L 8972.10 1817.00 L 8968.50 1823.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="341" stroke="none" target-height="197" target-width="193.60059" target-x="8790.8" target-y="1702.8"/><path d="M 8095.50 3886.50 L 8075.00 4074.60 L 8053.20 4280.90 L 8027.10 4536.30 L 8013.30 4676.50 L 7999.30 4821.70 L 7978.80 5043.80 L 7965.90 5191.30 L 7954.10 5335.50 L 7943.50 5473.90 L 7934.60 5604.10 L 7927.60 5723.80 L 7925.00 5778.00 L 7922.90 5830.50 L 7921.60 5877.20 L 7921.70 5921.00 L 7922.50 5945.30 L 7923.80 5971.30 L 7927.80 6023.50 L 7930.50 6051.70 L 7933.80 6081.30 L 7938.60 6120.40 L 7944.20 6161.60 L 7950.60 6205.00 L 7957.50 6248.20 L 7965.10 6293.20 L 7982.20 6386.70 L 8001.50 6484.20 L 8022.60 6583.90 L 8033.90 6635.30 L 8051.40 6712.50 L 8069.80 6791.10 L 8088.80 6870.00 L 8108.40 6949.40 L 8128.40 7028.70 L 8169.30 7186.60 L 8210.80 7341.30 L 8251.90 7490.60 L 8291.90 7632.30 L 8347.60 7824.80 L 8380.90 7937.40 L 8410.00 8034.70 L 8434.10 8114.20 L 8468.10 8224.00 L 8754.30 8104.80 L 8732.10 7993.90 L 8697.90 7816.40 L 8676.90 7703.60 L 8654.10 7578.00 L 8630.10 7441.80 L 8605.50 7297.40 L 8581.10 7147.30 L 8557.30 6993.60 L 8545.90 6916.20 L 8534.90 6838.80 L 8524.40 6761.60 L 8514.50 6685.30 L 8505.20 6609.40 L 8496.60 6535.30 L 8491.30 6486.10 L 8482.00 6391.30 L 8477.90 6344.40 L 8474.30 6299.20 L 8468.50 6211.90 L 8466.40 6170.20 L 8464.80 6130.50 L 8463.80 6090.70 L 8463.40 6053.30 L 8463.60 6018.30 L 8464.20 5991.80 L 8465.10 5966.80 L 8466.40 5943.50 L 8472.50 5869.80 L 8477.90 5812.80 L 8483.70 5754.10 L 8497.20 5626.90 L 8512.80 5490.30 L 8529.90 5346.70 L 8557.80 5123.10 L 8577.30 4972.20 L 8616.80 4675.80 L 8636.00 4534.90 L 8671.50 4279.30 L 8700.60 4073.90 L 8727.60 3887.50 L 8095.50 3886.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="343" stroke="none" target-height="4337.5" target-width="832.6997" target-x="7921.6" target-y="3886.5"/><g node-id="593"><path d="M 8496.20 4282.70 L 8489.50 4297.20 L 8483.20 4312.40 L 8477.20 4328.10 L 8471.60 4344.50 L 8466.30 4361.50 L 8461.60 4378.40 L 8457.20 4395.80 L 8453.10 4413.70 L 8449.40 4432.10 L 8446.00 4451.10 L 8442.40 4474.70 L 8439.20 4498.90 L 8436.50 4523.80 L 8434.30 4549.40 L 8432.60 4574.80 L 8431.40 4600.80 L 8430.50 4627.20 L 8430.10 4654.10 L 8430.50 4708.10 L 8432.40 4763.20 L 8434.50 4800.10 L 8437.00 4837.20 L 8440.20 4874.60 L 8443.80 4911.80 L 8447.80 4949.00 L 8452.30 4985.90 L 8457.20 5022.90 L 8467.80 5095.20 L 8473.60 5131.10 L 8485.60 5200.30 L 8495.10 5251.00 L 8504.60 5299.00 L 8514.40 5345.90 L 8523.90 5389.20 L 8540.30 5254.80 L 8557.60 5117.70 L 8575.50 4979.60 L 8611.60 4707.50 L 8611.00 4656.70 L 8610.00 4608.00 L 8608.60 4560.20 L 8605.30 4485.80 L 8601.70 4431.70 L 8597.10 4381.40 L 8594.60 4359.30 L 8591.60 4337.20 L 8588.40 4317.60 L 8585.10 4300.30 L 8579.20 4275.50 L 8576.20 4265.50 L 8573.20 4256.80 L 8570.20 4249.50 L 8567.20 4243.40 L 8564.30 4238.40 L 8561.40 4234.40 L 8558.60 4231.20 L 8555.70 4228.60 L 8552.80 4226.80 L 8550.00 4225.60 L 8547.10 4225.00 L 8544.10 4225.00 L 8541.00 4225.50 L 8538.20 4226.40 L 8535.10 4227.90 L 8531.90 4230.10 L 8528.30 4233.10 L 8524.50 4237.00 L 8520.30 4241.90 L 8511.80 4254.00 L 8507.00 4262.00 L 8496.20 4282.70 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="6" node-id="347" stroke="none" target-height="1164.2002" target-width="181.5" target-x="8430.1" target-y="4225"/></g><path d="M 8741.60 8010.30 L 8743.50 8014.20 L 8753.00 8039.20 L 8775.50 8101.40 L 8445.40 8240.30 L 8393.40 8143.40 L 8741.60 8010.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="350" stroke="none" target-height="230" target-width="382.0996" target-x="8393.4" target-y="8010.3"/><path d="M 8436.30 3886.50 L 8461.30 4156.40 L 8494.90 4503.90 L 8522.20 4774.80 L 8536.80 4915.00 L 8551.80 5055.40 L 8567.10 5193.70 L 8582.50 5327.60 L 8597.70 5454.80 L 8612.70 5572.90 L 8620.10 5628.60 L 8634.50 5729.10 L 8648.20 5816.50 L 8675.40 5978.10 L 8721.50 6242.80 L 8776.10 6548.10 L 8865.50 7040.00 L 8953.00 7515.40 L 9082.50 8211.60 L 9411.40 8211.60 L 9380.00 7917.00 L 9339.70 7531.80 L 9308.20 7226.90 L 9275.70 6905.40 L 9244.20 6585.70 L 9229.50 6432.30 L 9215.80 6286.50 L 9203.50 6150.40 L 9188.00 5968.70 L 9180.20 5867.10 L 9177.20 5824.00 L 9154.10 5470.50 L 9101.40 4628.40 L 9056.00 3886.50 L 8436.30 3886.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="352" stroke="none" target-height="4325.0996" target-width="975.1006" target-x="8436.3" target-y="3886.5"/><path d="M 9416.40 8126.00 L 9416.60 8126.50 L 9417.30 8129.90 L 9420.50 8155.10 L 9427.40 8217.80 L 9065.80 8217.80 L 9040.00 8112.40 L 9416.40 8126.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="354" stroke="none" target-height="105.3999" target-width="387.4004" target-x="9040" target-y="8112.4"/><g node-id="594"><path d="M 9290.50 8017.20 L 9289.40 8017.10 L 9288.40 8016.50 L 9287.70 8015.70 L 9287.40 8014.60 L 9285.70 7998.80 L 9255.20 7712.30 L 9215.40 7331.40 L 9169.40 6881.40 L 9139.10 6575.40 L 9124.90 6428.00 L 9111.70 6287.60 L 9099.70 6156.50 L 9084.70 5981.90 L 9077.20 5884.80 L 9074.40 5844.10 L 9052.30 5504.70 L 8994.40 4575.70 L 8964.40 4083.30 L 8965.20 4081.10 L 8966.10 4080.40 L 8967.30 4080.20 L 8969.40 4081.00 L 8970.10 4081.90 L 8970.40 4083.00 L 8973.30 4133.80 L 9015.90 4829.90 L 9058.30 5504.20 L 9080.30 5843.80 L 9083.20 5884.60 L 9090.70 5981.60 L 9105.70 6156.20 L 9117.60 6287.20 L 9145.10 6575.00 L 9175.40 6880.80 L 9221.30 7330.70 L 9261.00 7711.60 L 9293.10 8014.40 L 9293.10 8015.60 L 9292.50 8016.60 L 9291.60 8017.40 L 9290.50 8017.70 L 9290.50 8017.20 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="7" node-id="358" stroke="none" target-height="3937.5002" target-width="328.69922" target-x="8964.4" target-y="4080.2"/></g><path d="M 8625.50 1676.60 L 8625.30 1680.20 L 8623.90 1686.80 L 8622.70 1689.90 L 8619.70 1695.20 L 8617.90 1697.40 L 8615.90 1699.30 L 8613.80 1700.80 L 8611.50 1701.90 L 8609.20 1702.60 L 8606.90 1702.80 L 8604.50 1702.60 L 8600.30 1700.80 L 8598.40 1699.30 L 8596.20 1696.70 L 8594.40 1693.60 L 8592.80 1689.80 L 8591.80 1685.90 L 8591.30 1681.50 L 8591.40 1676.60 L 8592.00 1671.70 L 8593.00 1667.30 L 8594.50 1663.30 L 8596.50 1659.50 L 8598.70 1656.40 L 8603.20 1652.30 L 8605.40 1651.30 L 8607.60 1650.60 L 8610.00 1650.30 L 8612.30 1650.60 L 8616.50 1652.40 L 8618.40 1654.00 L 8620.60 1656.50 L 8622.50 1659.60 L 8624.00 1663.40 L 8625.00 1667.40 L 8625.50 1671.80 L 8625.50 1676.60 Z" fill="#263238" fill-rule="nonzero" node-id="361" stroke="none" target-height="52.5" target-width="34.200195" target-x="8591.3" target-y="1650.3"/><path d="M 8461.80 1676.60 L 8461.60 1680.20 L 8460.20 1686.80 L 8459.10 1689.90 L 8457.60 1692.70 L 8456.00 1695.20 L 8454.10 1697.40 L 8450.10 1700.80 L 8447.80 1701.90 L 8445.50 1702.60 L 8443.20 1702.80 L 8438.80 1701.90 L 8436.80 1700.80 L 8434.90 1699.30 L 8432.70 1696.80 L 8430.80 1693.70 L 8429.20 1689.80 L 8428.10 1685.90 L 8427.60 1681.50 L 8427.50 1676.60 L 8427.90 1672.90 L 8428.50 1669.50 L 8429.40 1666.30 L 8430.60 1663.20 L 8432.00 1660.50 L 8433.60 1658.00 L 8435.50 1655.70 L 8439.50 1652.40 L 8441.70 1651.30 L 8444.00 1650.60 L 8446.30 1650.30 L 8448.70 1650.60 L 8452.90 1652.40 L 8454.80 1654.00 L 8457.00 1656.50 L 8458.80 1659.60 L 8460.40 1663.40 L 8461.40 1667.40 L 8461.90 1671.80 L 8461.80 1676.60 Z" fill="#263238" fill-rule="nonzero" node-id="363" stroke="none" target-height="52.5" target-width="34.40039" target-x="8427.5" target-y="1650.3"/><path d="M 8513.40 1684.00 L 8505.60 1700.50 L 8497.40 1716.80 L 8488.60 1732.70 L 8479.30 1748.40 L 8469.50 1763.70 L 8459.10 1778.70 L 8448.30 1793.40 L 8437.00 1807.80 L 8441.20 1811.50 L 8445.70 1814.50 L 8450.40 1817.00 L 8455.30 1819.00 L 8460.30 1820.60 L 8465.40 1821.70 L 8475.50 1823.00 L 8487.20 1823.00 L 8498.40 1822.00 L 8505.50 1820.70 L 8513.40 1684.00 Z" fill="#df5753" fill-rule="nonzero" node-id="365" stroke="none" target-height="139" target-width="76.40039" target-x="8437" target-y="1684"/><path d="M 8517.70 1881.50 L 8516.80 1881.40 L 8516.10 1881.10 L 8515.30 1880.70 L 8514.70 1880.20 L 8513.60 1878.00 L 8513.60 1877.20 L 8514.00 1875.50 L 8515.00 1874.10 L 8516.50 1873.20 L 8531.80 1872.20 L 8538.50 1871.30 L 8545.20 1870.00 L 8551.80 1868.40 L 8564.70 1864.00 L 8570.90 1861.30 L 8577.00 1858.20 L 8588.60 1851.10 L 8594.10 1847.10 L 8604.30 1838.10 L 8613.50 1828.00 L 8616.50 1826.90 L 8618.10 1827.20 L 8619.50 1828.00 L 8620.40 1829.40 L 8620.70 1831.00 L 8620.40 1832.60 L 8619.50 1834.00 L 8614.70 1839.50 L 8609.70 1844.70 L 8598.70 1854.20 L 8592.90 1858.50 L 8580.50 1866.00 L 8574.00 1869.30 L 8567.30 1872.20 L 8553.50 1876.80 L 8546.50 1878.50 L 8532.20 1880.80 L 8525.00 1881.30 L 8517.70 1881.50 Z" fill="#263238" fill-rule="nonzero" node-id="367" stroke="none" target-height="54.599976" target-width="107.100586" target-x="8513.6" target-y="1826.9"/><path d="M 8654.60 1632.70 L 8652.80 1633.40 L 8649.00 1633.40 L 8647.20 1632.70 L 8642.60 1630.00 L 8637.90 1627.70 L 8633.00 1625.70 L 8627.90 1624.10 L 8622.80 1623.00 L 8617.50 1622.20 L 8612.20 1621.90 L 8601.70 1622.40 L 8596.50 1623.30 L 8591.40 1624.60 L 8584.80 1626.80 L 8583.30 1627.10 L 8580.10 1626.70 L 8577.30 1625.00 L 8576.20 1623.80 L 8575.40 1622.40 L 8574.90 1620.80 L 8574.70 1619.10 L 8574.80 1617.40 L 8575.30 1615.80 L 8576.10 1614.30 L 8577.10 1612.90 L 8578.40 1611.80 L 8579.90 1611.00 L 8586.20 1608.70 L 8592.70 1606.90 L 8599.30 1605.70 L 8605.90 1605.00 L 8612.60 1604.80 L 8619.30 1605.10 L 8626.00 1606.00 L 8632.50 1607.40 L 8638.90 1609.40 L 8645.10 1611.80 L 8651.20 1614.70 L 8658.20 1619.20 L 8660.00 1622.00 L 8660.50 1623.50 L 8660.40 1626.80 L 8659.10 1629.80 L 8657.80 1631.10 L 8656.30 1632.00 L 8654.60 1632.70 Z" fill="#263238" fill-rule="nonzero" node-id="369" stroke="none" target-height="28.599976" target-width="85.799805" target-x="8574.7" target-y="1604.8"/><path d="M 8398.60 1585.00 L 8395.30 1583.10 L 8393.40 1580.40 L 8393.00 1578.80 L 8393.00 1575.50 L 8394.20 1572.40 L 8400.10 1566.20 L 8405.20 1561.70 L 8410.60 1557.50 L 8416.30 1553.80 L 8422.30 1550.60 L 8428.60 1547.80 L 8435.00 1545.40 L 8441.60 1543.60 L 8448.30 1542.30 L 8455.10 1541.60 L 8461.90 1541.30 L 8468.80 1541.60 L 8470.40 1542.00 L 8473.20 1543.80 L 8475.00 1546.50 L 8475.50 1548.10 L 8475.60 1549.70 L 8475.40 1551.40 L 8474.90 1553.00 L 8474.10 1554.40 L 8473.10 1555.70 L 8471.80 1556.80 L 8470.30 1557.70 L 8468.80 1558.20 L 8467.10 1558.50 L 8460.00 1558.40 L 8449.30 1559.30 L 8438.80 1561.90 L 8433.70 1563.80 L 8428.80 1566.00 L 8419.50 1571.60 L 8415.20 1574.80 L 8411.20 1578.40 L 8406.30 1583.50 L 8404.90 1584.30 L 8401.80 1585.20 L 8400.20 1585.30 L 8398.60 1585.00 Z" fill="#263238" fill-rule="nonzero" node-id="371" stroke="none" target-height="44" target-width="82.59961" target-x="8393" target-y="1541.3"/><path d="M 9296.00 2559.80 L 9047.90 2493.80 L 9003.60 2599.60 L 8981.60 2650.50 L 8956.70 2707.10 L 8915.50 2798.00 L 8886.40 2859.90 L 8871.60 2890.30 L 8842.20 2948.90 L 8827.50 2977.00 L 8813.30 3003.00 L 8799.10 3028.00 L 8785.80 3050.30 L 8768.30 3077.60 L 8760.40 3088.90 L 8752.00 3100.00 L 8744.50 3109.20 L 8737.70 3116.70 L 8732.10 3122.10 L 8727.00 3126.30 L 8722.50 3129.40 L 8682.40 3149.20 L 8662.00 3160.00 L 8639.10 3172.40 L 8590.00 3200.00 L 8509.20 3247.50 L 8424.00 3299.30 L 8367.70 3334.50 L 8313.60 3368.90 L 8263.10 3401.60 L 8218.00 3431.50 L 8179.70 3457.60 L 8178.40 3464.40 L 8177.50 3473.10 L 8176.90 3482.30 L 8176.70 3492.70 L 8176.90 3503.40 L 8177.40 3514.70 L 8178.30 3525.90 L 8181.20 3547.90 L 8184.60 3564.50 L 8187.90 3575.60 L 8189.90 3580.70 L 8194.00 3588.10 L 8231.00 3580.60 L 8271.80 3571.00 L 8315.30 3559.50 L 8348.70 3550.00 L 8383.60 3539.50 L 8418.80 3528.40 L 8454.80 3516.60 L 8490.80 3504.30 L 8526.80 3491.40 L 8562.70 3478.20 L 8598.00 3464.80 L 8632.90 3451.00 L 8666.60 3437.20 L 8699.50 3423.20 L 8730.60 3409.50 L 8760.70 3395.60 L 8788.30 3382.30 L 8822.80 3364.50 L 8837.90 3356.20 L 8852.80 3347.60 L 8866.00 3339.60 L 8877.60 3332.10 L 8893.70 3320.40 L 8905.50 3310.50 L 8915.70 3300.50 L 8926.10 3289.70 L 8936.70 3278.10 L 8957.60 3253.10 L 8967.90 3239.80 L 8978.30 3225.80 L 8988.80 3211.10 L 9002.30 3191.40 L 9015.80 3170.70 L 9029.30 3149.00 L 9042.50 3127.20 L 9055.50 3104.60 L 9081.20 3058.10 L 9106.00 3010.40 L 9124.00 2974.20 L 9141.40 2938.00 L 9158.20 2901.80 L 9189.60 2831.20 L 9217.70 2764.40 L 9242.30 2703.50 L 9271.10 2628.60 L 9284.60 2591.80 L 9296.00 2559.80 Z" fill="#e58a7b" fill-rule="nonzero" node-id="373" stroke="none" target-height="1094.3" target-width="1119.2998" target-x="8176.7" target-y="2493.8"/><path d="M 9122.80 8465.20 L 9118.20 8465.30 L 9113.70 8465.10 L 9104.90 8463.50 L 9100.60 8462.10 L 9088.70 8455.90 L 9086.50 8453.70 L 9084.70 8451.20 L 9083.20 8448.50 L 9082.00 8445.70 L 9081.20 8442.60 L 9080.90 8439.60 L 9081.30 8433.50 L 9081.70 8431.00 L 9082.50 8428.60 L 9083.70 8426.40 L 9085.30 8424.40 L 9087.20 8422.80 L 9089.40 8421.50 L 9092.40 8420.40 L 9095.90 8419.80 L 9108.50 8420.90 L 9113.40 8422.20 L 9120.70 8424.50 L 9128.30 8427.50 L 9135.80 8430.80 L 9143.10 8434.40 L 9150.10 8438.10 L 9156.30 8441.50 L 9166.40 8447.40 L 9171.90 8450.90 L 9172.90 8451.70 L 9173.50 8452.70 L 9173.70 8453.90 L 9173.60 8455.20 L 9173.10 8456.40 L 9172.40 8457.40 L 9171.40 8458.20 L 9170.30 8458.70 L 9158.50 8461.30 L 9146.70 8463.20 L 9134.80 8464.50 L 9122.80 8465.20 Z M 9098.90 8428.00 L 9096.20 8427.70 L 9093.50 8428.00 L 9092.20 8428.90 L 9091.30 8430.10 L 9090.70 8431.50 L 9090.60 8433.00 L 9090.20 8435.80 L 9090.30 8438.60 L 9090.90 8441.40 L 9092.00 8444.00 L 9093.50 8446.40 L 9097.80 8450.30 L 9100.80 8451.90 L 9104.50 8453.30 L 9109.10 8454.40 L 9115.10 8455.20 L 9122.30 8455.60 L 9139.10 8454.80 L 9148.50 8453.60 L 9158.80 8451.80 L 9151.80 8447.50 L 9144.60 8443.50 L 9137.30 8439.90 L 9129.80 8436.80 L 9114.20 8431.60 L 9106.30 8429.60 L 9098.20 8428.00 L 9098.90 8428.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="375" stroke="none" target-height="45.5" target-width="92.799805" target-x="9080.9" target-y="8419.8"/><path d="M 9169.10 8458.70 L 9168.10 8458.90 L 9167.20 8458.70 L 9160.90 8454.50 L 9157.20 8451.50 L 9146.00 8440.70 L 9140.50 8434.50 L 9135.30 8427.80 L 9130.50 8420.90 L 9126.50 8414.00 L 9124.20 8409.30 L 9122.40 8404.90 L 9121.10 8400.70 L 9120.30 8396.50 L 9120.20 8392.70 L 9120.60 8389.30 L 9121.40 8387.00 L 9122.50 8384.90 L 9124.00 8383.00 L 9125.70 8381.30 L 9127.80 8379.90 L 9130.00 8379.00 L 9132.30 8378.30 L 9134.70 8378.10 L 9137.90 8377.90 L 9144.30 8378.90 L 9152.60 8383.60 L 9155.70 8386.70 L 9158.50 8390.30 L 9161.00 8394.60 L 9163.20 8399.10 L 9165.10 8403.90 L 9166.80 8409.10 L 9168.90 8417.00 L 9170.50 8424.80 L 9171.70 8432.40 L 9172.60 8439.20 L 9173.40 8450.10 L 9173.60 8455.20 L 9173.20 8457.40 L 9171.50 8459.00 L 9170.20 8459.00 L 9169.10 8458.70 Z M 9137.10 8386.00 L 9135.40 8386.00 L 9132.90 8386.30 L 9131.40 8386.80 L 9130.20 8387.70 L 9129.50 8388.60 L 9129.00 8390.30 L 9128.70 8392.70 L 9129.00 8395.60 L 9129.90 8399.20 L 9131.30 8402.70 L 9133.00 8406.60 L 9139.30 8417.10 L 9143.90 8423.60 L 9148.90 8429.90 L 9165.00 8445.90 L 9164.70 8438.30 L 9163.80 8430.90 L 9162.40 8423.60 L 9160.40 8416.30 L 9157.80 8409.30 L 9154.80 8402.50 L 9147.10 8389.60 L 9144.90 8388.00 L 9142.40 8386.80 L 9139.80 8386.20 L 9137.10 8386.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="377" stroke="none" target-height="81.09961" target-width="53.399414" target-x="9120.2" target-y="8377.9"/><path d="M 8489.50 8435.40 L 8483.90 8437.00 L 8478.30 8438.20 L 8472.70 8438.90 L 8467.00 8439.20 L 8461.30 8438.90 L 8455.60 8438.20 L 8450.00 8437.00 L 8444.40 8435.40 L 8441.30 8433.30 L 8438.60 8430.80 L 8436.30 8427.80 L 8434.50 8424.50 L 8433.30 8421.00 L 8432.70 8417.20 L 8432.60 8414.90 L 8432.90 8412.60 L 8433.60 8410.30 L 8434.70 8408.10 L 8436.10 8406.30 L 8437.80 8404.60 L 8439.90 8403.00 L 8442.50 8401.50 L 8445.50 8400.30 L 8449.20 8399.20 L 8454.00 8398.20 L 8459.40 8397.50 L 8465.50 8397.20 L 8474.80 8397.10 L 8484.70 8397.70 L 8494.60 8398.60 L 8504.30 8399.80 L 8522.10 8402.80 L 8536.00 8405.80 L 8544.80 8408.50 L 8545.80 8409.30 L 8546.30 8410.50 L 8546.40 8413.10 L 8545.90 8414.30 L 8545.00 8415.30 L 8543.90 8416.10 L 8530.60 8421.70 L 8517.10 8426.80 L 8503.40 8431.40 L 8489.50 8435.40 Z M 8450.60 8407.00 L 8448.00 8407.80 L 8445.50 8408.90 L 8443.20 8410.60 L 8442.20 8411.60 L 8441.60 8412.80 L 8441.20 8414.20 L 8441.30 8415.60 L 8441.70 8418.10 L 8442.50 8420.40 L 8443.60 8422.60 L 8445.10 8424.60 L 8446.90 8426.30 L 8449.00 8427.70 L 8452.10 8429.10 L 8456.10 8430.00 L 8460.90 8430.50 L 8466.90 8430.50 L 8478.80 8429.10 L 8494.10 8425.50 L 8504.50 8422.40 L 8516.10 8418.30 L 8528.90 8413.20 L 8519.20 8411.00 L 8509.50 8409.20 L 8490.00 8406.80 L 8480.20 8406.20 L 8470.30 8406.10 L 8460.50 8406.30 L 8450.60 8407.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="379" stroke="none" target-height="42.100586" target-width="113.80078" target-x="8432.6" target-y="8397.1"/><path d="M 8543.20 8416.10 L 8537.30 8415.20 L 8527.70 8412.10 L 8512.10 8405.20 L 8504.10 8400.80 L 8496.40 8396.00 L 8491.40 8392.60 L 8486.80 8389.10 L 8482.50 8385.50 L 8478.50 8381.70 L 8475.20 8378.10 L 8472.50 8374.50 L 8470.80 8371.60 L 8469.50 8368.90 L 8468.70 8366.30 L 8468.30 8363.80 L 8468.50 8361.40 L 8469.30 8358.60 L 8470.10 8356.80 L 8471.40 8355.00 L 8473.30 8353.10 L 8478.20 8350.00 L 8481.90 8348.60 L 8489.80 8346.90 L 8494.00 8346.80 L 8498.00 8347.40 L 8505.70 8350.00 L 8513.80 8355.30 L 8517.60 8358.70 L 8521.10 8362.50 L 8524.30 8366.50 L 8531.60 8377.50 L 8535.20 8384.20 L 8538.30 8390.90 L 8540.80 8396.70 L 8545.80 8410.60 L 8545.90 8411.70 L 8545.70 8412.80 L 8545.30 8413.80 L 8544.00 8415.40 L 8543.20 8416.10 Z M 8486.70 8355.70 L 8484.30 8355.70 L 8480.90 8357.10 L 8477.70 8359.80 L 8477.10 8360.80 L 8476.90 8361.80 L 8476.90 8362.40 L 8477.10 8364.20 L 8477.70 8366.10 L 8478.90 8368.30 L 8480.70 8370.80 L 8483.30 8373.90 L 8486.50 8377.10 L 8490.60 8380.60 L 8504.50 8390.30 L 8512.30 8394.80 L 8520.20 8398.90 L 8528.20 8402.40 L 8535.60 8405.10 L 8533.20 8398.00 L 8530.20 8391.20 L 8526.80 8384.70 L 8518.30 8372.60 L 8513.40 8367.10 L 8508.00 8362.00 L 8502.20 8357.40 L 8499.70 8356.30 L 8497.20 8355.60 L 8494.60 8355.10 L 8491.90 8355.00 L 8486.70 8355.70 Z" fill="#429cfd" fill-rule="nonzero" node-id="381" stroke="none" target-height="69.299805" target-width="77.600586" target-x="8468.3" target-y="8346.8"/><path d="M 8200.00 3443.60 L 7951.20 3558.10 L 7922.30 3629.60 L 8014.10 3691.40 L 8032.40 3688.60 L 8052.60 3684.40 L 8064.30 3681.50 L 8077.70 3677.80 L 8091.40 3673.50 L 8106.10 3668.30 L 8115.90 3664.40 L 8136.00 3655.50 L 8145.90 3650.40 L 8155.80 3644.90 L 8165.50 3638.90 L 8175.00 3632.50 L 8184.20 3625.60 L 8193.00 3618.20 L 8199.40 3612.30 L 8205.50 3606.10 L 8216.70 3592.80 L 8221.80 3585.70 L 8226.50 3578.30 L 8230.80 3570.50 L 8234.80 3562.30 L 8200.00 3443.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="383" stroke="none" target-height="247.7998" target-width="312.5" target-x="7922.3" target-y="3443.6"/><path d="M 8210.40 3592.20 L 8208.50 3577.80 L 8205.90 3563.70 L 8202.70 3549.70 L 8198.90 3535.90 L 8194.60 3522.20 L 8189.60 3508.70 L 8184.10 3495.40 L 8178.00 3482.40 L 8171.40 3469.70 L 8164.20 3457.20 L 8203.50 3427.60 L 8210.70 3439.60 L 8217.40 3451.80 L 8223.70 3464.20 L 8229.50 3476.80 L 8234.90 3489.70 L 8239.70 3502.70 L 8244.10 3515.80 L 8248.00 3529.20 L 8251.50 3542.70 L 8254.40 3556.20 L 8256.90 3570.00 L 8258.90 3583.80 L 8210.40 3592.20 Z" fill="#263238" fill-rule="nonzero" node-id="385" stroke="none" target-height="164.59985" target-width="94.700195" target-x="8164.2" target-y="3427.6"/><path d="M 8252.90 3477.40 L 8255.30 3481.70 L 8257.30 3486.10 L 8258.70 3490.70 L 8259.70 3495.50 L 8260.30 3500.30 L 8260.30 3505.20 L 8258.90 3514.80 L 8257.40 3519.40 L 8255.50 3523.90 L 8253.20 3528.10 L 8250.40 3532.20 L 8247.20 3535.90 L 8243.70 3539.20 L 8235.80 3544.70 L 8231.40 3546.90 L 8226.80 3548.60 L 8222.10 3549.80 L 8217.30 3550.50 L 8212.50 3550.70 L 8207.60 3550.50 L 8202.90 3549.70 L 8198.10 3548.50 L 8189.20 3544.60 L 8185.10 3542.00 L 8181.30 3539.00 L 8174.70 3531.90 L 8171.90 3527.80 L 8169.60 3523.60 L 8167.70 3519.10 L 8165.40 3509.70 L 8165.00 3504.80 L 8165.60 3495.10 L 8168.20 3485.80 L 8170.10 3481.40 L 8172.60 3477.10 L 8175.40 3473.20 L 8178.70 3469.50 L 8186.10 3463.40 L 8190.30 3460.90 L 8198.60 3457.10 L 8202.60 3455.70 L 8206.70 3454.80 L 8215.10 3454.10 L 8223.50 3455.00 L 8227.60 3456.10 L 8231.70 3457.70 L 8239.00 3461.70 L 8242.40 3464.30 L 8245.50 3467.20 L 8248.20 3470.30 L 8252.90 3477.40 Z" fill="#263238" fill-rule="nonzero" node-id="387" stroke="none" target-height="96.59985" target-width="95.299805" target-x="8165" target-y="3454.1"/><path d="M 7783.00 3650.60 L 7816.20 3684.00 L 8039.40 3588.60 L 7951.20 3558.10 L 7783.00 3650.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="389" stroke="none" target-height="125.8999" target-width="256.3999" target-x="7783" target-y="3558.1"/><g node-id="595"><path d="M 8741.60 8010.30 L 8743.50 8014.20 L 8753.00 8039.20 L 8775.50 8101.40 L 8445.40 8240.30 L 8393.40 8143.40 L 8741.60 8010.30 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="8" node-id="393" stroke="none" target-height="230" target-width="382.0996" target-x="8393.4" target-y="8010.3"/></g><g node-id="596"><path d="M 9416.40 8126.00 L 9416.60 8126.50 L 9417.30 8129.90 L 9420.50 8155.10 L 9427.40 8217.80 L 9065.80 8217.80 L 9040.00 8112.40 L 9416.40 8126.00 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="9" node-id="398" stroke="none" target-height="105.3999" target-width="387.4004" target-x="9040" target-y="8112.4"/></g><path d="M 9360.60 2491.10 L 9363.60 2501.80 L 9366.10 2512.50 L 9369.60 2534.30 L 9370.60 2545.40 L 9371.20 2556.50 L 9371.30 2567.70 L 9371.00 2578.90 L 9370.40 2590.30 L 9369.20 2601.70 L 9367.30 2615.90 L 9364.90 2630.10 L 9362.00 2644.30 L 9358.50 2658.70 L 9354.50 2672.80 L 9350.20 2686.90 L 9345.40 2701.00 L 9340.30 2715.00 L 9332.90 2733.50 L 9325.00 2751.70 L 9316.70 2769.50 L 9307.90 2787.20 L 9289.80 2820.90 L 9270.80 2853.00 L 9247.20 2889.70 L 9220.60 2927.70 L 9197.50 2958.20 L 9188.50 2969.60 L 9169.80 2992.00 L 8815.60 2847.50 L 8831.60 2801.70 L 8848.30 2756.20 L 8865.50 2710.90 L 8883.30 2665.80 L 8901.80 2621.00 L 8920.80 2576.40 L 8940.40 2532.10 L 8960.60 2488.00 L 8967.00 2474.80 L 8973.50 2462.40 L 8980.20 2450.60 L 8986.90 2439.60 L 9000.80 2419.40 L 9008.40 2409.40 L 9016.10 2400.20 L 9023.80 2391.60 L 9031.60 2383.60 L 9039.40 2376.10 L 9055.70 2362.50 L 9064.20 2356.40 L 9072.60 2350.80 L 9081.00 2345.70 L 9089.50 2341.20 L 9106.70 2333.50 L 9115.50 2330.30 L 9124.30 2327.70 L 9133.00 2325.50 L 9141.70 2323.80 L 9159.20 2321.80 L 9167.90 2321.50 L 9176.60 2321.60 L 9193.80 2323.30 L 9202.30 2324.80 L 9210.70 2326.80 L 9227.30 2332.00 L 9243.60 2339.10 L 9251.60 2343.30 L 9259.30 2347.90 L 9266.90 2352.90 L 9274.30 2358.40 L 9281.60 2364.30 L 9288.80 2370.70 L 9302.50 2384.70 L 9309.00 2392.20 L 9315.20 2400.20 L 9321.30 2408.60 L 9327.30 2417.60 L 9333.00 2427.10 L 9338.20 2436.50 L 9343.20 2446.40 L 9347.90 2456.80 L 9352.40 2467.70 L 9360.60 2491.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="401" stroke="none" target-height="670.5" target-width="555.7002" target-x="8815.6" target-y="2321.5"/><g node-id="597"><path d="M 9360.60 2491.10 L 9363.60 2501.80 L 9366.10 2512.50 L 9369.60 2534.30 L 9370.60 2545.40 L 9371.20 2556.50 L 9371.30 2567.70 L 9371.00 2578.90 L 9370.40 2590.30 L 9369.20 2601.70 L 9367.30 2615.90 L 9364.90 2630.10 L 9362.00 2644.30 L 9358.50 2658.70 L 9354.50 2672.80 L 9350.20 2686.90 L 9345.40 2701.00 L 9340.30 2715.00 L 9332.90 2733.50 L 9325.00 2751.70 L 9316.70 2769.50 L 9307.90 2787.20 L 9289.80 2820.90 L 9270.80 2853.00 L 9247.20 2889.70 L 9220.60 2927.70 L 9197.50 2958.20 L 9188.50 2969.60 L 9169.80 2992.00 L 8815.60 2847.50 L 8831.60 2801.70 L 8848.30 2756.20 L 8865.50 2710.90 L 8883.30 2665.80 L 8901.80 2621.00 L 8920.80 2576.40 L 8940.40 2532.10 L 8960.60 2488.00 L 8967.00 2474.80 L 8973.50 2462.40 L 8980.20 2450.60 L 8986.90 2439.60 L 9000.80 2419.40 L 9008.40 2409.40 L 9016.10 2400.20 L 9023.80 2391.60 L 9031.60 2383.60 L 9039.40 2376.10 L 9055.70 2362.50 L 9064.20 2356.40 L 9072.60 2350.80 L 9081.00 2345.70 L 9089.50 2341.20 L 9106.70 2333.50 L 9115.50 2330.30 L 9124.30 2327.70 L 9133.00 2325.50 L 9141.70 2323.80 L 9159.20 2321.80 L 9167.90 2321.50 L 9176.60 2321.60 L 9193.80 2323.30 L 9202.30 2324.80 L 9210.70 2326.80 L 9227.30 2332.00 L 9243.60 2339.10 L 9251.60 2343.30 L 9259.30 2347.90 L 9266.90 2352.90 L 9274.30 2358.40 L 9281.60 2364.30 L 9288.80 2370.70 L 9302.50 2384.70 L 9309.00 2392.20 L 9315.20 2400.20 L 9321.30 2408.60 L 9327.30 2417.60 L 9333.00 2427.10 L 9338.20 2436.50 L 9343.20 2446.40 L 9347.90 2456.80 L 9352.40 2467.70 L 9360.60 2491.10 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="10" node-id="405" stroke="none" target-height="670.5" target-width="555.7002" target-x="8815.6" target-y="2321.5"/></g><path d="M 5841.00 371.40 L 5688.50 371.40 L 5688.50 395.90 L 5841.00 395.90 L 5841.00 371.40 Z" fill="#429cfd" fill-rule="nonzero" node-id="408" stroke="none" target-height="24.5" target-width="152.5" target-x="5688.5" target-y="371.4"/><path d="M 7814.00 1343.80 L 7795.50 1753.10 L 7820.10 1754.20 L 7838.50 1344.90 L 7814.00 1343.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="410" stroke="none" target-height="410.3999" target-width="43" target-x="7795.5" target-y="1343.8"/><path d="M 7766.60 481.60 L 4952.00 481.60 L 4690.10 6342.60 L 7504.70 6342.60 L 7766.60 481.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="412" stroke="none" target-height="5861" target-width="3076.5" target-x="4690.1" target-y="481.6"/><g node-id="598"><path d="M 7682.60 562.20 L 4868.00 562.20 L 4606.10 6423.20 L 7420.70 6423.20 L 7682.60 562.20 Z" fill="#fafafa" fill-opacity="0.56" fill-rule="nonzero" group-id="11" node-id="416" stroke="none" target-height="5861" target-width="3076.5" target-x="4606.1" target-y="562.2"/></g><g node-id="599"><path d="M 7598.60 642.60 L 4784.10 642.60 L 4521.90 6503.60 L 7336.50 6503.60 L 7598.60 642.60 Z" fill="#429cfd" fill-opacity="0.07" fill-rule="nonzero" group-id="12" node-id="421" stroke="none" target-height="5861" target-width="3076.7002" target-x="4521.9" target-y="642.6"/></g><path d="M 7278.30 3198.80 L 4875.90 3198.80 L 4855.90 3647.30 L 7258.30 3647.30 L 7278.30 3198.80 Z" fill="#ffffff" fill-rule="nonzero" node-id="424" stroke="none" target-height="448.5" target-width="2422.4" target-x="4855.9" target-y="3198.8"/><path d="M 6197.10 2871.60 L 4890.40 2871.60 L 4881.60 3072.20 L 6188.20 3072.20 L 6197.10 2871.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="426" stroke="none" target-height="200.59985" target-width="1315.5" target-x="4881.6" target-y="2871.6"/><path d="M 7224.20 4409.10 L 4821.70 4409.10 L 4801.70 4857.50 L 7204.10 4857.50 L 7224.20 4409.10 Z" fill="#ffffff" fill-rule="nonzero" node-id="428" stroke="none" target-height="448.3999" target-width="2422.5" target-x="4801.7" target-y="4409.1"/><g node-id="600"><path d="M 6783.60 5463.10 L 5168.10 5463.10 L 5144.00 6000.50 L 6759.50 6000.50 L 6783.60 5463.10 Z" fill="#429cfd" fill-opacity="0.47" fill-rule="nonzero" group-id="13" node-id="432" stroke="none" target-height="537.3999" target-width="1639.6001" target-x="5144" target-y="5463.1"/></g><path d="M 6675.50 6084.00 L 5057.90 6084.00 L 5057.70 6082.90 L 5081.70 5544.20 L 5082.00 5543.20 L 5082.60 5542.30 L 5083.50 5541.70 L 5084.60 5541.60 L 6700.10 5541.60 L 6701.10 5541.40 L 6702.00 5541.60 L 6702.30 5542.60 L 6702.00 5543.50 L 6678.70 6082.30 L 6677.40 6083.70 L 6676.50 6084.00 L 6675.50 6084.00 Z M 5062.90 6078.30 L 6672.70 6078.30 L 6696.50 5546.40 L 5086.70 5546.40 L 5062.90 6078.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="435" stroke="none" target-height="542.6001" target-width="1644.5996" target-x="5057.7" target-y="5541.4"/><path d="M 5914.90 4081.90 L 4836.30 4081.90 L 4827.50 4282.70 L 5905.80 4282.70 L 5914.90 4081.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="437" stroke="none" target-height="200.8003" target-width="1087.3999" target-x="4827.5" target-y="4081.9"/><path d="M 6752.80 1750.30 L 6751.60 1769.90 L 6749.80 1789.30 L 6747.40 1808.60 L 6744.40 1827.80 L 6740.80 1846.90 L 6736.60 1865.90 L 6731.80 1884.70 L 6726.50 1903.30 L 6720.60 1921.80 L 6714.20 1940.10 L 6707.20 1958.10 L 6699.60 1976.00 L 6691.60 1993.50 L 6682.90 2010.90 L 6673.70 2028.00 L 6664.00 2044.90 L 6653.80 2061.40 L 6643.10 2077.60 L 6631.80 2093.60 L 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.70 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6098.50 2361.30 L 6082.70 2360.80 L 6066.90 2359.80 L 6051.20 2358.40 L 6035.60 2356.60 L 6020.00 2354.40 L 6004.40 2351.70 L 5989.00 2348.70 L 5973.70 2345.20 L 5958.40 2341.30 L 5943.20 2336.90 L 5928.20 2332.20 L 5913.30 2327.10 L 5898.50 2321.50 L 5883.80 2315.50 L 5869.30 2309.10 L 5841.00 2295.30 L 5827.10 2287.80 L 5813.50 2279.90 L 5800.00 2271.70 L 5786.80 2263.10 L 5773.90 2254.10 L 5761.20 2244.80 L 5748.70 2235.20 L 5736.50 2225.20 L 5724.60 2214.90 L 5712.90 2204.20 L 5690.50 2182.00 L 5679.70 2170.30 L 5669.30 2158.50 L 5659.20 2146.40 L 5649.40 2134.00 L 5640.00 2121.30 L 5631.00 2108.40 L 5622.30 2095.30 L 5605.90 2068.40 L 5598.30 2054.60 L 5591.10 2040.60 L 5584.30 2026.40 L 5577.80 2012.00 L 5571.70 1997.40 L 5566.00 1982.60 L 5555.80 1952.70 L 5551.40 1937.50 L 5547.40 1922.30 L 5543.80 1907.00 L 5540.60 1891.50 L 5537.80 1876.00 L 5535.40 1860.50 L 5533.50 1844.80 L 5532.00 1829.20 L 5530.90 1813.40 L 5530.30 1797.70 L 5530.00 1781.90 L 5530.20 1766.10 L 5530.90 1750.30 L 5532.20 1730.60 L 5534.10 1711.00 L 5536.60 1691.60 L 5539.60 1672.40 L 5543.30 1653.30 L 5547.50 1634.20 L 5552.30 1615.40 L 5557.60 1596.70 L 5563.50 1578.30 L 5569.90 1560.00 L 5576.90 1541.90 L 5584.40 1524.10 L 5592.50 1506.50 L 5601.10 1489.20 L 5610.20 1472.10 L 5619.80 1455.20 L 5629.90 1438.70 L 5640.50 1422.50 L 5651.60 1406.60 L 5663.30 1390.90 L 5675.40 1375.60 L 5687.90 1360.70 L 5701.00 1346.20 L 5714.50 1332.00 L 5728.60 1318.10 L 5743.10 1304.60 L 5757.80 1291.70 L 5773.00 1279.30 L 5788.40 1267.40 L 5804.20 1256.00 L 5820.30 1245.00 L 5836.70 1234.60 L 5853.40 1224.70 L 5870.30 1215.30 L 5887.50 1206.40 L 5905.00 1198.10 L 5922.70 1190.20 L 5940.60 1183.00 L 5958.80 1176.20 L 5977.10 1170.00 L 5995.70 1164.40 L 6014.40 1159.30 L 6033.20 1154.80 L 6052.20 1150.80 L 6071.50 1147.40 L 6090.70 1144.60 L 6110.10 1142.30 L 6129.60 1140.70 L 6149.20 1139.70 L 6168.90 1139.20 L 6184.80 1139.30 L 6200.60 1139.80 L 6216.30 1140.70 L 6232.00 1142.00 L 6247.70 1143.80 L 6263.30 1146.00 L 6278.90 1148.70 L 6294.30 1151.70 L 6309.70 1155.20 L 6325.00 1159.10 L 6340.20 1163.40 L 6355.20 1168.10 L 6370.10 1173.20 L 6384.90 1178.80 L 6399.60 1184.80 L 6414.20 1191.10 L 6428.50 1197.90 L 6442.50 1205.00 L 6456.40 1212.50 L 6470.10 1220.30 L 6483.60 1228.60 L 6496.80 1237.20 L 6509.70 1246.10 L 6522.40 1255.40 L 6534.90 1265.10 L 6547.10 1275.00 L 6559.10 1285.40 L 6570.70 1296.00 L 6582.10 1307.00 L 6593.20 1318.30 L 6604.00 1329.90 L 6624.60 1353.90 L 6634.30 1366.30 L 6643.70 1378.90 L 6652.80 1391.80 L 6661.50 1405.00 L 6669.90 1418.30 L 6677.80 1431.90 L 6692.70 1459.70 L 6699.50 1474.00 L 6706.00 1488.30 L 6712.10 1502.90 L 6717.80 1517.70 L 6723.10 1532.70 L 6727.90 1547.70 L 6732.40 1562.90 L 6736.40 1578.10 L 6743.20 1608.90 L 6746.00 1624.40 L 6748.40 1640.00 L 6750.30 1655.60 L 6751.80 1671.40 L 6752.80 1687.10 L 6753.50 1702.80 L 6753.70 1718.60 L 6753.50 1734.40 L 6752.80 1750.30 Z" fill="#ffffff" fill-rule="nonzero" node-id="439" stroke="none" target-height="1222.2" target-width="1223.7002" target-x="5530" target-y="1139.2"/><path d="M 6810.30 1267.00 L 6808.60 1284.30 L 6807.10 1292.70 L 6805.20 1301.10 L 6800.10 1317.50 L 6796.90 1325.50 L 6793.30 1333.30 L 6785.00 1348.30 L 6780.20 1355.50 L 6775.00 1362.40 L 6768.80 1370.00 L 6762.30 1377.20 L 6755.40 1384.00 L 6748.10 1390.40 L 6740.40 1396.30 L 6732.40 1401.90 L 6724.10 1406.90 L 6715.50 1411.50 L 6706.60 1415.60 L 6697.60 1419.20 L 6688.40 1422.30 L 6679.00 1424.80 L 6669.50 1426.80 L 6659.90 1428.20 L 6650.30 1429.10 L 6640.50 1429.50 L 6631.00 1429.20 L 6621.60 1428.40 L 6612.40 1427.10 L 6603.20 1425.10 L 6594.10 1422.60 L 6585.20 1419.60 L 6576.50 1416.00 L 6568.00 1411.90 L 6559.70 1407.30 L 6551.80 1402.20 L 6544.30 1396.60 L 6537.00 1390.60 L 6530.20 1384.10 L 6523.80 1377.30 L 6517.80 1370.10 L 6512.20 1362.40 L 6507.60 1355.30 L 6503.50 1347.90 L 6499.80 1340.40 L 6496.50 1332.70 L 6493.60 1324.90 L 6491.10 1316.90 L 6489.10 1308.80 L 6487.50 1300.60 L 6486.30 1292.30 L 6485.60 1283.90 L 6485.30 1275.50 L 6485.40 1267.00 L 6486.10 1258.30 L 6487.20 1249.70 L 6488.80 1241.20 L 6490.70 1232.90 L 6493.10 1224.60 L 6495.90 1216.50 L 6499.10 1208.60 L 6502.60 1200.80 L 6506.60 1193.20 L 6510.90 1185.80 L 6515.70 1178.60 L 6520.70 1171.70 L 6526.10 1165.00 L 6531.90 1158.50 L 6538.10 1152.30 L 6544.60 1146.40 L 6551.30 1141.00 L 6558.20 1135.80 L 6565.30 1131.10 L 6572.70 1126.70 L 6580.30 1122.70 L 6588.10 1119.10 L 6596.00 1115.90 L 6604.10 1113.00 L 6612.30 1110.60 L 6620.70 1108.60 L 6629.10 1107.00 L 6637.70 1105.90 L 6646.30 1105.10 L 6655.00 1104.80 L 6662.90 1105.00 L 6670.80 1105.50 L 6678.50 1106.40 L 6686.30 1107.80 L 6694.00 1109.50 L 6701.50 1111.60 L 6716.30 1116.90 L 6723.50 1120.20 L 6730.50 1123.80 L 6737.30 1127.70 L 6743.80 1132.00 L 6750.20 1136.60 L 6756.30 1141.60 L 6767.70 1152.40 L 6773.10 1158.20 L 6778.00 1164.30 L 6782.70 1170.60 L 6787.00 1177.10 L 6791.00 1183.90 L 6794.70 1190.80 L 6798.00 1198.00 L 6800.90 1205.30 L 6803.40 1212.80 L 6805.60 1220.30 L 6808.80 1235.70 L 6809.70 1243.50 L 6810.30 1251.30 L 6810.30 1267.00 Z" fill="#429cfd" fill-rule="nonzero" node-id="441" stroke="none" target-height="324.69995" target-width="325" target-x="6485.3" target-y="1104.8"/><path d="M 5134.70 3423.10 L 5134.00 3429.40 L 5132.90 3435.70 L 5131.20 3441.80 L 5129.00 3447.70 L 5126.40 3453.40 L 5123.20 3458.90 L 5119.70 3464.10 L 5115.70 3469.00 L 5111.20 3473.60 L 5106.40 3477.80 L 5101.30 3481.60 L 5095.90 3484.90 L 5090.30 3487.80 L 5084.40 3490.10 L 5078.40 3492.00 L 5072.20 3493.40 L 5066.00 3494.30 L 5059.60 3494.60 L 5054.90 3494.50 L 5045.70 3493.40 L 5041.20 3492.30 L 5032.50 3489.30 L 5028.20 3487.40 L 5024.20 3485.20 L 5020.30 3482.70 L 5016.60 3479.90 L 5009.70 3473.70 L 5006.60 3470.20 L 5001.20 3462.80 L 4998.80 3458.80 L 4996.80 3454.60 L 4995.00 3450.30 L 4993.60 3445.90 L 4992.40 3441.40 L 4991.50 3436.90 L 4990.80 3427.70 L 4990.90 3423.10 L 4991.50 3416.70 L 4992.60 3410.40 L 4996.40 3398.40 L 5002.20 3387.10 L 5005.70 3381.90 L 5009.80 3377.00 L 5014.20 3372.40 L 5019.10 3368.10 L 5024.20 3364.40 L 5029.60 3361.00 L 5035.20 3358.20 L 5041.00 3355.80 L 5047.10 3354.00 L 5053.30 3352.60 L 5066.00 3351.50 L 5070.60 3351.60 L 5075.20 3352.00 L 5079.80 3352.80 L 5088.70 3355.20 L 5093.00 3356.80 L 5097.30 3358.80 L 5105.20 3363.50 L 5112.40 3369.20 L 5115.80 3372.50 L 5118.90 3375.90 L 5124.30 3383.40 L 5126.60 3387.40 L 5130.40 3395.80 L 5131.90 3400.20 L 5133.10 3404.70 L 5134.00 3409.20 L 5134.50 3413.80 L 5134.80 3418.40 L 5134.70 3423.10 Z" fill="#263238" fill-rule="nonzero" node-id="443" stroke="none" target-height="143.1001" target-width="144" target-x="4990.8" target-y="3351.5"/><path d="M 5456.20 3423.00 L 5455.60 3429.40 L 5454.40 3435.70 L 5452.80 3441.80 L 5450.60 3447.70 L 5447.90 3453.40 L 5444.80 3458.90 L 5441.30 3464.10 L 5437.30 3469.10 L 5432.80 3473.70 L 5428.00 3477.90 L 5422.90 3481.70 L 5417.50 3485.00 L 5411.80 3487.80 L 5406.00 3490.20 L 5400.00 3492.10 L 5393.80 3493.40 L 5387.50 3494.30 L 5381.10 3494.60 L 5376.40 3494.50 L 5367.30 3493.30 L 5362.80 3492.30 L 5358.40 3490.90 L 5354.10 3489.30 L 5349.90 3487.30 L 5341.90 3482.60 L 5334.70 3476.90 L 5331.40 3473.60 L 5328.30 3470.20 L 5322.90 3462.70 L 5320.60 3458.70 L 5318.50 3454.60 L 5316.80 3450.30 L 5315.30 3445.90 L 5313.30 3436.90 L 5312.50 3427.70 L 5312.60 3423.00 L 5313.20 3416.70 L 5314.40 3410.40 L 5318.20 3398.40 L 5320.80 3392.70 L 5323.90 3387.20 L 5327.50 3382.00 L 5331.40 3377.10 L 5335.90 3372.40 L 5340.70 3368.20 L 5345.80 3364.40 L 5351.20 3361.10 L 5356.80 3358.30 L 5362.60 3355.90 L 5368.70 3354.00 L 5374.80 3352.70 L 5381.10 3351.80 L 5387.50 3351.50 L 5392.20 3351.60 L 5401.30 3352.70 L 5405.80 3353.80 L 5414.60 3356.80 L 5418.80 3358.70 L 5426.80 3363.40 L 5430.50 3366.20 L 5434.00 3369.10 L 5437.40 3372.40 L 5440.50 3375.80 L 5443.30 3379.50 L 5445.90 3383.30 L 5450.30 3391.50 L 5452.00 3395.80 L 5453.50 3400.20 L 5454.70 3404.60 L 5455.50 3409.20 L 5456.10 3413.80 L 5456.20 3423.00 Z" fill="#263238" fill-rule="nonzero" node-id="445" stroke="none" target-height="143.1001" target-width="143.7002" target-x="5312.5" target-y="3351.5"/><path d="M 5778.00 3423.00 L 5777.30 3429.40 L 5776.20 3435.70 L 5774.50 3441.80 L 5772.40 3447.70 L 5769.70 3453.40 L 5766.60 3458.90 L 5763.00 3464.10 L 5754.60 3473.70 L 5749.70 3477.90 L 5744.60 3481.70 L 5739.20 3485.00 L 5733.60 3487.80 L 5727.80 3490.20 L 5721.70 3492.10 L 5715.50 3493.40 L 5709.30 3494.30 L 5702.90 3494.60 L 5698.20 3494.50 L 5693.60 3494.10 L 5689.10 3493.30 L 5680.10 3490.90 L 5675.80 3489.30 L 5671.60 3487.30 L 5667.50 3485.10 L 5663.60 3482.60 L 5656.40 3476.90 L 5653.10 3473.60 L 5650.00 3470.20 L 5647.10 3466.50 L 5644.50 3462.70 L 5642.20 3458.70 L 5638.40 3450.30 L 5636.90 3445.90 L 5634.90 3436.90 L 5634.10 3427.70 L 5634.10 3423.00 L 5634.80 3416.60 L 5635.90 3410.40 L 5639.80 3398.40 L 5642.40 3392.70 L 5645.50 3387.20 L 5649.10 3381.90 L 5653.10 3377.00 L 5657.60 3372.40 L 5662.40 3368.20 L 5667.50 3364.40 L 5678.50 3358.30 L 5684.40 3355.90 L 5690.40 3354.00 L 5696.60 3352.70 L 5702.90 3351.80 L 5709.30 3351.50 L 5713.90 3351.60 L 5723.10 3352.70 L 5732.00 3355.10 L 5736.40 3356.80 L 5740.60 3358.70 L 5748.60 3363.40 L 5752.30 3366.20 L 5755.80 3369.10 L 5759.10 3372.40 L 5762.20 3375.80 L 5767.70 3383.30 L 5772.00 3391.50 L 5773.80 3395.80 L 5775.30 3400.20 L 5777.30 3409.20 L 5777.80 3413.80 L 5778.10 3418.40 L 5778.00 3423.00 Z" fill="#263238" fill-rule="nonzero" node-id="447" stroke="none" target-height="143.1001" target-width="144" target-x="5634.1" target-y="3351.5"/><path d="M 5080.50 4633.30 L 5079.90 4639.70 L 5078.70 4645.90 L 5077.00 4652.00 L 5074.90 4657.90 L 5069.10 4669.10 L 5065.50 4674.40 L 5061.50 4679.30 L 5057.10 4683.90 L 5052.20 4688.10 L 5047.10 4691.90 L 5041.80 4695.20 L 5036.10 4698.00 L 5030.30 4700.40 L 5024.30 4702.30 L 5018.10 4703.70 L 5011.80 4704.50 L 5005.40 4704.90 L 5000.80 4704.70 L 4991.60 4703.60 L 4982.70 4701.20 L 4978.40 4699.50 L 4974.10 4697.60 L 4970.10 4695.40 L 4966.20 4692.90 L 4962.50 4690.10 L 4955.60 4683.90 L 4949.70 4676.80 L 4947.10 4673.00 L 4944.80 4669.00 L 4941.00 4660.60 L 4939.50 4656.20 L 4938.30 4651.70 L 4937.40 4647.20 L 4936.60 4638.00 L 4936.70 4633.30 L 4937.30 4626.90 L 4938.50 4620.70 L 4940.20 4614.60 L 4942.30 4608.60 L 4945.00 4602.90 L 4948.10 4597.40 L 4951.70 4592.20 L 4960.10 4582.70 L 4965.00 4578.50 L 4970.10 4574.70 L 4975.50 4571.40 L 4981.10 4568.50 L 4986.90 4566.20 L 4993.00 4564.30 L 4999.20 4562.90 L 5005.40 4562.10 L 5011.90 4561.80 L 5016.50 4561.90 L 5021.10 4562.30 L 5025.60 4563.10 L 5034.60 4565.50 L 5038.90 4567.10 L 5043.10 4569.10 L 5051.10 4573.80 L 5054.80 4576.50 L 5058.30 4579.50 L 5061.60 4582.70 L 5064.70 4586.20 L 5070.10 4593.70 L 5072.50 4597.60 L 5074.50 4601.80 L 5076.30 4606.10 L 5077.80 4610.50 L 5078.90 4614.90 L 5079.80 4619.50 L 5080.60 4628.70 L 5080.50 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="449" stroke="none" target-height="143.1001" target-width="144" target-x="4936.6" target-y="4561.8"/><path d="M 5402.10 4633.30 L 5401.40 4639.70 L 5400.30 4645.90 L 5398.60 4652.00 L 5396.50 4657.90 L 5393.80 4663.60 L 5390.70 4669.10 L 5387.20 4674.30 L 5383.20 4679.20 L 5378.70 4683.90 L 5373.90 4688.10 L 5368.80 4691.90 L 5363.50 4695.20 L 5357.80 4698.00 L 5352.00 4700.40 L 5346.00 4702.30 L 5339.80 4703.70 L 5327.20 4704.90 L 5322.50 4704.80 L 5317.90 4704.30 L 5313.40 4703.60 L 5308.90 4702.60 L 5300.10 4699.60 L 5295.90 4697.60 L 5287.90 4692.90 L 5280.70 4687.20 L 5277.30 4684.00 L 5274.20 4680.50 L 5271.40 4676.90 L 5268.80 4673.00 L 5266.50 4669.00 L 5262.70 4660.60 L 5261.20 4656.20 L 5259.20 4647.20 L 5258.40 4638.00 L 5258.50 4633.30 L 5260.30 4620.70 L 5261.90 4614.60 L 5264.10 4608.60 L 5266.70 4602.90 L 5273.40 4592.20 L 5277.40 4587.30 L 5281.90 4582.70 L 5286.70 4578.50 L 5291.80 4574.70 L 5297.20 4571.40 L 5302.90 4568.50 L 5314.70 4564.30 L 5320.90 4562.90 L 5333.60 4561.80 L 5338.20 4561.90 L 5347.40 4563.10 L 5356.30 4565.50 L 5360.60 4567.10 L 5364.80 4569.10 L 5368.90 4571.30 L 5372.80 4573.80 L 5380.00 4579.50 L 5383.30 4582.70 L 5386.40 4586.20 L 5389.20 4589.80 L 5391.80 4593.70 L 5394.10 4597.70 L 5397.90 4606.10 L 5399.40 4610.50 L 5401.40 4619.50 L 5401.90 4624.10 L 5402.10 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="451" stroke="none" target-height="143.1001" target-width="143.7002" target-x="5258.4" target-y="4561.8"/><path d="M 5724.60 4633.30 L 5723.90 4639.70 L 5722.80 4645.90 L 5721.10 4652.00 L 5718.90 4658.00 L 5716.30 4663.70 L 5713.20 4669.20 L 5709.60 4674.40 L 5705.60 4679.30 L 5701.10 4684.00 L 5691.20 4691.90 L 5685.80 4695.20 L 5680.20 4698.10 L 5674.30 4700.50 L 5668.30 4702.30 L 5662.10 4703.70 L 5655.80 4704.50 L 5649.40 4704.90 L 5644.80 4704.70 L 5635.60 4703.50 L 5631.10 4702.50 L 5622.40 4699.50 L 5618.20 4697.50 L 5610.30 4692.80 L 5606.60 4690.00 L 5603.10 4687.10 L 5599.70 4683.80 L 5596.60 4680.40 L 5591.20 4672.90 L 5588.90 4668.90 L 5585.00 4660.50 L 5583.60 4656.10 L 5582.40 4651.70 L 5581.50 4647.10 L 5580.90 4642.60 L 5580.70 4633.30 L 5581.40 4626.90 L 5582.50 4620.70 L 5584.20 4614.60 L 5586.40 4608.70 L 5589.00 4603.00 L 5592.20 4597.50 L 5595.70 4592.30 L 5599.70 4587.40 L 5604.20 4582.70 L 5609.00 4578.50 L 5614.10 4574.80 L 5619.50 4571.40 L 5625.20 4568.60 L 5631.00 4566.20 L 5637.00 4564.30 L 5643.20 4563.00 L 5649.50 4562.10 L 5655.90 4561.80 L 5660.50 4561.90 L 5669.70 4563.00 L 5678.60 4565.40 L 5683.00 4567.00 L 5687.20 4569.00 L 5691.20 4571.20 L 5695.10 4573.70 L 5702.40 4579.40 L 5705.70 4582.70 L 5708.80 4586.10 L 5714.20 4593.60 L 5716.60 4597.60 L 5720.40 4606.00 L 5721.90 4610.40 L 5723.90 4619.50 L 5724.40 4624.00 L 5724.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="453" stroke="none" target-height="143.1001" target-width="143.8999" target-x="5580.7" target-y="4561.8"/><path d="M 6045.60 4633.30 L 6043.80 4645.90 L 6039.90 4657.90 L 6037.30 4663.60 L 6034.20 4669.10 L 6030.60 4674.40 L 6026.60 4679.30 L 6022.10 4683.90 L 6017.30 4688.10 L 6012.20 4691.90 L 6006.80 4695.20 L 6001.20 4698.00 L 5995.40 4700.40 L 5989.30 4702.30 L 5983.20 4703.70 L 5976.90 4704.50 L 5970.50 4704.90 L 5965.80 4704.70 L 5956.70 4703.50 L 5952.20 4702.50 L 5943.50 4699.50 L 5939.30 4697.50 L 5931.30 4692.80 L 5927.60 4690.00 L 5920.80 4683.80 L 5917.70 4680.40 L 5912.30 4672.90 L 5909.90 4668.90 L 5907.90 4664.80 L 5906.10 4660.50 L 5902.60 4647.10 L 5901.70 4637.90 L 5901.80 4633.30 L 5902.40 4626.90 L 5903.60 4620.70 L 5905.30 4614.60 L 5907.50 4608.70 L 5913.20 4597.50 L 5916.80 4592.30 L 5925.30 4582.70 L 5930.10 4578.50 L 5935.20 4574.80 L 5940.60 4571.40 L 5946.20 4568.60 L 5958.10 4564.30 L 5964.20 4563.00 L 5976.90 4561.80 L 5981.60 4561.90 L 5986.20 4562.30 L 5990.70 4563.10 L 5999.60 4565.50 L 6004.00 4567.10 L 6008.20 4569.10 L 6016.10 4573.80 L 6019.80 4576.50 L 6023.40 4579.50 L 6026.70 4582.70 L 6029.80 4586.20 L 6032.60 4589.80 L 6035.20 4593.70 L 6039.60 4601.80 L 6041.40 4606.10 L 6042.80 4610.50 L 6044.90 4619.50 L 6045.70 4628.70 L 6045.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="455" stroke="none" target-height="143.1001" target-width="144" target-x="5901.7" target-y="4561.8"/><path d="M 6368.60 4633.30 L 6367.90 4639.70 L 6366.70 4645.90 L 6365.10 4652.00 L 6362.90 4657.90 L 6360.20 4663.60 L 6357.10 4669.10 L 6353.50 4674.40 L 6349.50 4679.30 L 6345.10 4683.90 L 6340.30 4688.10 L 6335.20 4691.90 L 6329.80 4695.20 L 6324.10 4698.00 L 6318.30 4700.40 L 6312.30 4702.30 L 6306.10 4703.70 L 6299.80 4704.50 L 6293.40 4704.90 L 6288.80 4704.80 L 6284.20 4704.30 L 6279.60 4703.60 L 6275.10 4702.60 L 6266.30 4699.60 L 6258.10 4695.40 L 6250.40 4690.20 L 6246.90 4687.20 L 6243.60 4684.00 L 6240.50 4680.50 L 6237.60 4676.90 L 6232.70 4669.00 L 6230.70 4664.90 L 6228.90 4660.60 L 6227.40 4656.20 L 6226.30 4651.70 L 6224.90 4642.60 L 6224.70 4638.00 L 6224.70 4633.30 L 6225.40 4626.90 L 6226.50 4620.70 L 6228.20 4614.60 L 6230.40 4608.60 L 6236.10 4597.40 L 6239.70 4592.20 L 6243.70 4587.30 L 6248.20 4582.70 L 6253.00 4578.50 L 6258.10 4574.70 L 6263.50 4571.40 L 6269.10 4568.50 L 6275.00 4566.20 L 6281.00 4564.30 L 6287.20 4562.90 L 6293.50 4562.10 L 6299.90 4561.80 L 6304.50 4561.90 L 6309.10 4562.30 L 6313.70 4563.10 L 6322.60 4565.50 L 6326.90 4567.10 L 6331.10 4569.10 L 6335.20 4571.30 L 6339.10 4573.80 L 6342.80 4576.50 L 6346.30 4579.50 L 6349.60 4582.70 L 6352.70 4586.20 L 6355.60 4589.80 L 6358.20 4593.70 L 6360.50 4597.60 L 6362.50 4601.80 L 6364.30 4606.10 L 6365.80 4610.50 L 6367.80 4619.50 L 6368.60 4628.70 L 6368.60 4633.30 Z" fill="#263238" fill-rule="nonzero" node-id="457" stroke="none" target-height="143.1001" target-width="143.8999" target-x="6224.7" target-y="4561.8"/><path d="M 6319.80 1718.50 L 6328.20 1709.90 L 6336.00 1701.00 L 6343.40 1692.00 L 6350.30 1682.80 L 6356.70 1673.40 L 6362.80 1663.60 L 6368.30 1653.70 L 6373.40 1643.60 L 6378.00 1633.50 L 6382.10 1623.20 L 6385.80 1612.60 L 6389.00 1602.00 L 6391.70 1591.40 L 6393.90 1580.70 L 6395.70 1569.90 L 6397.00 1559.10 L 6397.80 1548.20 L 6398.20 1537.40 L 6398.10 1526.60 L 6397.50 1515.80 L 6396.50 1505.00 L 6394.90 1494.40 L 6392.90 1483.80 L 6390.50 1473.30 L 6387.50 1462.90 L 6384.10 1452.60 L 6380.20 1442.50 L 6375.80 1432.60 L 6370.90 1422.80 L 6365.50 1413.20 L 6359.80 1403.90 L 6353.50 1394.80 L 6346.70 1386.00 L 6339.40 1377.30 L 6331.60 1368.90 L 6323.30 1360.90 L 6314.90 1353.40 L 6306.20 1346.50 L 6297.20 1340.00 L 6288.10 1334.00 L 6278.60 1328.40 L 6268.90 1323.30 L 6259.10 1318.70 L 6249.10 1314.60 L 6238.90 1310.90 L 6228.60 1307.70 L 6218.10 1305.00 L 6207.60 1302.80 L 6197.00 1301.00 L 6186.20 1299.70 L 6175.40 1298.90 L 6164.60 1298.50 L 6153.80 1298.70 L 6142.90 1299.30 L 6132.10 1300.30 L 6121.20 1301.90 L 6110.50 1303.90 L 6099.80 1306.40 L 6089.20 1309.30 L 6078.50 1312.80 L 6068.10 1316.60 L 6057.90 1321.00 L 6047.70 1325.80 L 6037.70 1331.20 L 6027.80 1337.00 L 6018.20 1343.20 L 6008.80 1349.90 L 5999.70 1357.10 L 5990.70 1364.70 L 5981.90 1373.00 L 5973.50 1381.60 L 5965.60 1390.40 L 5958.20 1399.40 L 5951.30 1408.60 L 5944.90 1418.00 L 5938.90 1427.80 L 5933.30 1437.70 L 5928.30 1447.80 L 5923.70 1457.90 L 5919.60 1468.30 L 5915.90 1478.80 L 5912.70 1489.40 L 5910.00 1500.00 L 5907.70 1510.70 L 5905.90 1521.50 L 5904.60 1532.30 L 5903.80 1543.20 L 5903.40 1554.00 L 5903.50 1564.80 L 5904.10 1575.60 L 5905.20 1586.40 L 5906.70 1597.00 L 5908.70 1607.60 L 5911.20 1618.10 L 5914.10 1628.50 L 5917.60 1638.80 L 5921.50 1648.90 L 5925.80 1658.80 L 5930.70 1668.60 L 5936.10 1678.20 L 5941.90 1687.50 L 5948.20 1696.60 L 5954.90 1705.40 L 5962.20 1714.10 L 5970.10 1722.50 L 5978.30 1730.50 L 5986.80 1738.00 L 5995.40 1744.90 L 6004.40 1751.40 L 6013.60 1757.40 L 6023.10 1763.00 L 6032.70 1768.10 L 6042.50 1772.70 L 6052.50 1776.80 L 6062.70 1780.50 L 6073.10 1783.70 L 6083.50 1786.40 L 6094.00 1788.60 L 6104.70 1790.40 L 6115.40 1791.70 L 6126.20 1792.50 L 6137.00 1792.90 L 6147.80 1792.70 L 6158.70 1792.10 L 6169.60 1791.10 L 6180.40 1789.50 L 6191.10 1787.50 L 6201.80 1785.00 L 6212.50 1782.10 L 6223.10 1778.60 L 6233.50 1774.80 L 6243.80 1770.40 L 6253.90 1765.60 L 6263.90 1760.20 L 6273.80 1754.40 L 6283.40 1748.20 L 6292.80 1741.50 L 6302.00 1734.40 L 6311.00 1726.70 L 6319.80 1718.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="459" stroke="none" target-height="494.40002" target-width="494.8003" target-x="5903.4" target-y="1298.5"/><path d="M 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.60 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6095.30 2361.20 L 6076.30 2360.50 L 6057.50 2359.10 L 6038.70 2357.10 L 6020.00 2354.50 L 6001.40 2351.20 L 5983.00 2347.40 L 5964.70 2343.00 L 5946.50 2338.00 L 5928.50 2332.40 L 5910.60 2326.20 L 5893.00 2319.40 L 5875.60 2312.10 L 5858.40 2304.20 L 5841.40 2295.60 L 5824.70 2286.60 L 5808.40 2277.00 L 5792.40 2266.90 L 5776.80 2256.30 L 5761.50 2245.20 L 5746.60 2233.60 L 5732.10 2221.60 L 5718.00 2209.10 L 5704.30 2196.10 L 5691.10 2182.70 L 5678.20 2168.80 L 5665.90 2154.50 L 5654.00 2139.90 L 5642.50 2124.80 L 5631.50 2109.30 L 5643.30 2097.90 L 5655.50 2086.80 L 5668.10 2076.00 L 5681.30 2065.40 L 5694.90 2055.00 L 5708.70 2045.10 L 5722.90 2035.50 L 5737.60 2026.20 L 5752.70 2017.20 L 5768.20 2008.50 L 5783.80 2000.20 L 5799.80 1992.30 L 5816.20 1984.70 L 5832.90 1977.50 L 5850.10 1970.60 L 5867.30 1964.10 L 5884.80 1958.10 L 5902.60 1952.40 L 5920.80 1947.10 L 5939.20 1942.30 L 5957.70 1937.90 L 5976.50 1933.90 L 5995.50 1930.30 L 6014.80 1927.20 L 6034.40 1924.60 L 6053.90 1922.40 L 6073.60 1920.70 L 6093.50 1919.40 L 6113.70 1918.70 L 6134.10 1918.40 L 6154.50 1918.70 L 6174.60 1919.50 L 6194.50 1920.70 L 6214.00 1922.40 L 6233.30 1924.60 L 6252.70 1927.20 L 6271.70 1930.30 L 6290.40 1933.90 L 6308.80 1937.90 L 6326.90 1942.30 L 6345.00 1947.20 L 6362.70 1952.40 L 6380.10 1958.10 L 6397.00 1964.10 L 6413.60 1970.60 L 6430.20 1977.50 L 6446.30 1984.70 L 6462.00 1992.30 L 6477.30 2000.20 L 6492.20 2008.50 L 6507.00 2017.20 L 6521.30 2026.20 L 6535.10 2035.60 L 6548.50 2045.20 L 6561.40 2055.00 L 6574.10 2065.40 L 6586.30 2076.00 L 6598.00 2086.80 L 6609.20 2097.90 L 6620.00 2109.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="461" stroke="none" target-height="442.99988" target-width="988.5" target-x="5631.5" target-y="1918.4"/><g node-id="601"><path d="M 6319.80 1718.50 L 6328.20 1709.90 L 6336.00 1701.00 L 6343.40 1692.00 L 6350.30 1682.80 L 6356.70 1673.40 L 6362.80 1663.60 L 6368.30 1653.70 L 6373.40 1643.60 L 6378.00 1633.50 L 6382.10 1623.20 L 6385.80 1612.60 L 6389.00 1602.00 L 6391.70 1591.40 L 6393.90 1580.70 L 6395.70 1569.90 L 6397.00 1559.10 L 6397.80 1548.20 L 6398.20 1537.40 L 6398.10 1526.60 L 6397.50 1515.80 L 6396.50 1505.00 L 6394.90 1494.40 L 6392.90 1483.80 L 6390.50 1473.30 L 6387.50 1462.90 L 6384.10 1452.60 L 6380.20 1442.50 L 6375.80 1432.60 L 6370.90 1422.80 L 6365.50 1413.20 L 6359.80 1403.90 L 6353.50 1394.80 L 6346.70 1386.00 L 6339.40 1377.30 L 6331.60 1368.90 L 6323.30 1360.90 L 6314.90 1353.40 L 6306.20 1346.50 L 6297.20 1340.00 L 6288.10 1334.00 L 6278.60 1328.40 L 6268.90 1323.30 L 6259.10 1318.70 L 6249.10 1314.60 L 6238.90 1310.90 L 6228.60 1307.70 L 6218.10 1305.00 L 6207.60 1302.80 L 6197.00 1301.00 L 6186.20 1299.70 L 6175.40 1298.90 L 6164.60 1298.50 L 6153.80 1298.70 L 6142.90 1299.30 L 6132.10 1300.30 L 6121.20 1301.90 L 6110.50 1303.90 L 6099.80 1306.40 L 6089.20 1309.30 L 6078.50 1312.80 L 6068.10 1316.60 L 6057.90 1321.00 L 6047.70 1325.80 L 6037.70 1331.20 L 6027.80 1337.00 L 6018.20 1343.20 L 6008.80 1349.90 L 5999.70 1357.10 L 5990.70 1364.70 L 5981.90 1373.00 L 5973.50 1381.60 L 5965.60 1390.40 L 5958.20 1399.40 L 5951.30 1408.60 L 5944.90 1418.00 L 5938.90 1427.80 L 5933.30 1437.70 L 5928.30 1447.80 L 5923.70 1457.90 L 5919.60 1468.30 L 5915.90 1478.80 L 5912.70 1489.40 L 5910.00 1500.00 L 5907.70 1510.70 L 5905.90 1521.50 L 5904.60 1532.30 L 5903.80 1543.20 L 5903.40 1554.00 L 5903.50 1564.80 L 5904.10 1575.60 L 5905.20 1586.40 L 5906.70 1597.00 L 5908.70 1607.60 L 5911.20 1618.10 L 5914.10 1628.50 L 5917.60 1638.80 L 5921.50 1648.90 L 5925.80 1658.80 L 5930.70 1668.60 L 5936.10 1678.20 L 5941.90 1687.50 L 5948.20 1696.60 L 5954.90 1705.40 L 5962.20 1714.10 L 5970.10 1722.50 L 5978.30 1730.50 L 5986.80 1738.00 L 5995.40 1744.90 L 6004.40 1751.40 L 6013.60 1757.40 L 6023.10 1763.00 L 6032.70 1768.10 L 6042.50 1772.70 L 6052.50 1776.80 L 6062.70 1780.50 L 6073.10 1783.70 L 6083.50 1786.40 L 6094.00 1788.60 L 6104.70 1790.40 L 6115.40 1791.70 L 6126.20 1792.50 L 6137.00 1792.90 L 6147.80 1792.70 L 6158.70 1792.10 L 6169.60 1791.10 L 6180.40 1789.50 L 6191.10 1787.50 L 6201.80 1785.00 L 6212.50 1782.10 L 6223.10 1778.60 L 6233.50 1774.80 L 6243.80 1770.40 L 6253.90 1765.60 L 6263.90 1760.20 L 6273.80 1754.40 L 6283.40 1748.20 L 6292.80 1741.50 L 6302.00 1734.40 L 6311.00 1726.70 L 6319.80 1718.50 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="14" node-id="465" stroke="none" target-height="494.40002" target-width="494.8003" target-x="5903.4" target-y="1298.5"/></g><g node-id="602"><path d="M 6620.00 2109.30 L 6607.80 2124.70 L 6595.30 2139.60 L 6582.30 2154.20 L 6568.90 2168.30 L 6555.10 2182.10 L 6540.80 2195.40 L 6526.20 2208.20 L 6511.20 2220.60 L 6495.90 2232.50 L 6480.10 2244.00 L 6464.00 2255.00 L 6447.60 2265.50 L 6430.90 2275.50 L 6413.80 2285.00 L 6396.40 2294.00 L 6378.70 2302.50 L 6360.90 2310.40 L 6342.80 2317.80 L 6324.50 2324.50 L 6306.10 2330.80 L 6287.40 2336.40 L 6268.60 2341.50 L 6249.70 2346.00 L 6230.70 2350.00 L 6211.50 2353.40 L 6192.20 2356.10 L 6172.90 2358.30 L 6153.40 2359.90 L 6133.90 2361.00 L 6114.30 2361.40 L 6095.30 2361.20 L 6076.30 2360.50 L 6057.50 2359.10 L 6038.70 2357.10 L 6020.00 2354.50 L 6001.40 2351.20 L 5983.00 2347.40 L 5964.70 2343.00 L 5946.50 2338.00 L 5928.50 2332.40 L 5910.60 2326.20 L 5893.00 2319.40 L 5875.60 2312.10 L 5858.40 2304.20 L 5841.40 2295.60 L 5824.70 2286.60 L 5808.40 2277.00 L 5792.40 2266.90 L 5776.80 2256.30 L 5761.50 2245.20 L 5746.60 2233.60 L 5732.10 2221.60 L 5718.00 2209.10 L 5704.30 2196.10 L 5691.10 2182.70 L 5678.20 2168.80 L 5665.90 2154.50 L 5654.00 2139.90 L 5642.50 2124.80 L 5631.50 2109.30 L 5643.30 2097.90 L 5655.50 2086.80 L 5668.10 2076.00 L 5681.30 2065.40 L 5694.90 2055.00 L 5708.70 2045.10 L 5722.90 2035.50 L 5737.60 2026.20 L 5752.70 2017.20 L 5768.20 2008.50 L 5783.80 2000.20 L 5799.80 1992.30 L 5816.20 1984.70 L 5832.90 1977.50 L 5850.10 1970.60 L 5867.30 1964.10 L 5884.80 1958.10 L 5902.60 1952.40 L 5920.80 1947.10 L 5939.20 1942.30 L 5957.70 1937.90 L 5976.50 1933.90 L 5995.50 1930.30 L 6014.80 1927.20 L 6034.40 1924.60 L 6053.90 1922.40 L 6073.60 1920.70 L 6093.50 1919.40 L 6113.70 1918.70 L 6134.10 1918.40 L 6154.50 1918.70 L 6174.60 1919.50 L 6194.50 1920.70 L 6214.00 1922.40 L 6233.30 1924.60 L 6252.70 1927.20 L 6271.70 1930.30 L 6290.40 1933.90 L 6308.80 1937.90 L 6326.90 1942.30 L 6345.00 1947.20 L 6362.70 1952.40 L 6380.10 1958.10 L 6397.00 1964.10 L 6413.60 1970.60 L 6430.20 1977.50 L 6446.30 1984.70 L 6462.00 1992.30 L 6477.30 2000.20 L 6492.20 2008.50 L 6507.00 2017.20 L 6521.30 2026.20 L 6535.10 2035.60 L 6548.50 2045.20 L 6561.40 2055.00 L 6574.10 2065.40 L 6586.30 2076.00 L 6598.00 2086.80 L 6609.20 2097.90 L 6620.00 2109.30 Z" fill="#ffffff" fill-opacity="0.1" fill-rule="nonzero" group-id="15" node-id="470" stroke="none" target-height="442.99988" target-width="988.5" target-x="5631.5" target-y="1918.4"/></g><path d="M 3110.60 3755.30 L 3087.70 3806.30 L 3064.90 3859.20 L 3043.30 3912.50 L 3022.50 3965.90 L 3002.20 4020.10 L 2992.40 4047.30 L 2972.00 4106.70 L 2961.50 4139.10 L 2951.60 4171.70 L 2942.30 4204.40 L 2933.50 4237.30 L 2925.20 4270.30 L 2917.50 4303.40 L 2910.30 4336.70 L 2903.70 4370.10 L 2897.60 4403.60 L 2892.30 4438.70 L 2892.20 4443.20 L 2892.40 4447.70 L 2894.00 4456.60 L 2897.10 4466.40 L 2900.70 4475.90 L 2904.80 4485.30 L 2909.50 4494.40 L 2914.60 4503.30 L 2920.20 4511.90 L 2932.00 4528.10 L 2944.10 4544.00 L 2956.70 4559.40 L 2969.80 4574.60 L 2983.20 4589.30 L 2997.10 4603.70 L 3011.40 4617.60 L 3047.30 4650.50 L 3068.70 4669.40 L 3090.50 4687.90 L 3112.60 4706.00 L 3135.00 4723.80 L 3180.90 4758.70 L 3204.20 4776.00 L 3263.60 4818.60 L 3299.30 4843.20 L 3254.70 4926.90 L 3226.40 4914.30 L 3198.40 4901.20 L 3170.70 4887.60 L 3143.30 4873.50 L 3116.10 4858.90 L 3089.20 4843.80 L 3062.60 4828.20 L 3036.20 4812.10 L 3010.20 4795.60 L 2984.40 4778.50 L 2959.00 4761.00 L 2933.80 4743.00 L 2918.00 4731.20 L 2902.50 4718.90 L 2887.30 4706.30 L 2872.50 4693.30 L 2857.90 4679.90 L 2843.80 4666.10 L 2830.00 4652.00 L 2816.50 4637.50 L 2803.40 4622.70 L 2790.70 4607.60 L 2781.70 4595.90 L 2773.20 4584.00 L 2765.20 4571.70 L 2757.80 4559.10 L 2750.90 4546.20 L 2744.60 4533.00 L 2738.90 4519.50 L 2733.70 4505.70 L 2730.20 4494.10 L 2727.40 4482.30 L 2725.20 4470.40 L 2723.60 4458.40 L 2722.60 4446.30 L 2722.30 4434.10 L 2722.30 4404.30 L 2724.70 4380.50 L 2728.30 4349.40 L 2732.50 4318.50 L 2737.20 4287.60 L 2742.50 4256.80 L 2748.20 4226.20 L 2754.50 4195.60 L 2761.20 4165.10 L 2768.50 4134.70 L 2776.30 4104.50 L 2784.60 4074.40 L 2793.30 4044.40 L 2816.90 3970.60 L 2831.70 3926.90 L 2841.90 3897.90 L 2852.60 3869.10 L 2875.10 3812.00 L 2898.80 3755.50 L 2920.10 3708.20 L 2938.60 3669.70 L 3110.60 3755.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="473" stroke="none" target-height="1257.2" target-width="577" target-x="2722.3" target-y="3669.7"/><path d="M 3265.60 4828.40 L 3434.30 4743.00 L 3390.60 4928.10 L 3367.90 4933.00 L 3348.80 4935.70 L 3337.70 4936.70 L 3326.20 4937.30 L 3314.00 4937.40 L 3297.40 4936.50 L 3289.00 4935.50 L 3280.70 4934.10 L 3272.40 4932.30 L 3264.30 4930.00 L 3256.30 4927.20 L 3248.60 4923.80 L 3241.20 4919.90 L 3230.80 4912.90 L 3225.90 4908.80 L 3221.30 4904.30 L 3265.60 4828.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="475" stroke="none" target-height="194.3999" target-width="213" target-x="3221.3" target-y="4743"/><path d="M 3588.60 4773.30 L 3543.70 4926.50 L 3390.60 4928.10 L 3434.30 4743.00 L 3588.60 4773.30 Z" fill="#e58a7b" fill-rule="nonzero" node-id="477" stroke="none" target-height="185.1001" target-width="198" target-x="3390.6" target-y="4743"/><path d="M 3826.60 2862.30 L 3831.40 2878.70 L 3836.80 2895.00 L 3842.80 2911.00 L 3849.30 2926.80 L 3856.40 2942.40 L 3864.10 2957.70 L 3861.60 2960.20 L 3856.20 2964.50 L 3850.10 2967.80 L 3846.80 2969.00 L 3843.40 2969.90 L 3836.50 2970.80 L 3833.10 2970.80 L 3829.60 2970.50 L 3826.20 2969.90 L 3826.60 2862.30 Z" fill="#df5753" fill-rule="nonzero" node-id="479" stroke="none" target-height="108.5" target-width="37.900146" target-x="3826.2" target-y="2862.3"/><path d="M 3821.60 2863.70 L 3824.00 2863.50 L 3826.40 2862.70 L 3828.60 2861.60 L 3830.60 2860.00 L 3832.50 2858.10 L 3834.30 2855.70 L 3837.00 2850.20 L 3838.10 2847.00 L 3839.30 2840.10 L 3839.50 2836.30 L 3839.30 2832.50 L 3838.10 2825.60 L 3837.00 2822.40 L 3835.80 2819.50 L 3834.30 2816.90 L 3832.50 2814.50 L 3830.60 2812.60 L 3828.60 2811.00 L 3826.40 2809.80 L 3824.00 2809.10 L 3821.60 2808.90 L 3816.90 2809.80 L 3814.70 2811.00 L 3810.70 2814.50 L 3809.00 2816.90 L 3807.50 2819.50 L 3806.20 2822.40 L 3805.10 2825.60 L 3803.90 2832.50 L 3803.70 2836.30 L 3803.90 2840.10 L 3805.10 2847.00 L 3806.20 2850.20 L 3809.00 2855.70 L 3810.70 2858.10 L 3812.60 2860.00 L 3814.70 2861.60 L 3816.90 2862.70 L 3821.60 2863.70 Z" fill="#263238" fill-rule="nonzero" node-id="481" stroke="none" target-height="54.80005" target-width="35.80005" target-x="3803.7" target-y="2808.9"/><path d="M 3816.40 2809.80 L 3852.60 2799.50 L 3849.70 2803.50 L 3844.70 2808.80 L 3839.10 2812.90 L 3834.00 2815.10 L 3831.30 2815.70 L 3828.50 2815.70 L 3825.50 2815.30 L 3823.40 2814.60 L 3821.20 2813.50 L 3816.40 2809.80 Z" fill="#263238" fill-rule="nonzero" node-id="483" stroke="none" target-height="16.199951" target-width="36.200195" target-x="3816.4" target-y="2799.5"/><path d="M 3360.80 3037.40 L 3367.90 3077.40 L 3371.10 3099.20 L 3374.20 3122.60 L 3376.70 3146.30 L 3378.80 3170.90 L 3380.60 3204.00 L 3381.00 3220.60 L 3381.00 3237.20 L 3380.70 3253.70 L 3379.90 3269.90 L 3378.70 3286.00 L 3376.90 3301.70 L 3374.70 3316.90 L 3372.70 3328.20 L 3370.30 3339.10 L 3367.60 3349.60 L 3364.60 3359.70 L 3361.20 3369.80 L 3357.40 3379.30 L 3353.30 3388.30 L 3348.80 3396.70 L 3344.80 3403.30 L 3340.60 3409.60 L 3336.10 3415.40 L 3331.40 3420.80 L 3326.40 3425.90 L 3329.50 3433.90 L 3332.60 3440.10 L 3335.00 3444.40 L 3338.10 3449.40 L 3342.00 3455.10 L 3351.20 3466.50 L 3357.30 3472.90 L 3363.60 3478.90 L 3371.00 3485.10 L 3379.60 3491.50 L 3393.40 3500.40 L 3410.20 3509.30 L 3418.90 3513.20 L 3428.40 3517.10 L 3438.90 3520.80 L 3450.20 3524.30 L 3461.40 3527.30 L 3473.50 3530.00 L 3486.60 3532.50 L 3500.80 3534.60 L 3514.70 3536.20 L 3529.70 3537.40 L 3545.90 3538.20 L 3563.30 3538.50 L 3579.00 3538.30 L 3593.10 3537.80 L 3616.90 3535.90 L 3628.60 3534.30 L 3638.80 3532.60 L 3655.60 3528.70 L 3663.60 3526.10 L 3670.50 3523.40 L 3676.30 3520.70 L 3681.20 3517.90 L 3686.10 3514.60 L 3690.10 3511.30 L 3693.40 3508.00 L 3696.00 3504.70 L 3698.30 3501.00 L 3700.10 3497.30 L 3702.10 3489.90 L 3702.50 3484.80 L 3702.30 3479.70 L 3701.50 3474.50 L 3700.20 3469.50 L 3698.40 3464.60 L 3696.30 3459.70 L 3692.60 3452.80 L 3684.40 3440.60 L 3676.80 3431.40 L 3671.60 3425.90 L 3660.80 3423.10 L 3650.90 3420.00 L 3641.80 3416.70 L 3633.50 3413.30 L 3626.00 3409.60 L 3618.30 3405.40 L 3611.30 3401.00 L 3605.00 3396.40 L 3599.20 3391.70 L 3594.00 3386.90 L 3589.00 3381.60 L 3580.50 3370.50 L 3577.00 3364.80 L 3573.80 3358.90 L 3570.40 3351.20 L 3567.50 3343.40 L 3565.20 3335.20 L 3563.50 3326.90 L 3562.20 3318.40 L 3561.40 3309.80 L 3561.00 3301.00 L 3561.10 3291.90 L 3561.70 3279.90 L 3562.90 3267.70 L 3564.80 3255.30 L 3567.00 3242.90 L 3572.60 3218.20 L 3360.80 3037.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="485" stroke="none" target-height="501.1001" target-width="376.1001" target-x="3326.4" target-y="3037.4"/><path d="M 3300.40 2784.50 L 3304.40 2849.30 L 3308.70 2905.40 L 3312.30 2939.20 L 3316.80 2969.80 L 3319.50 2984.30 L 3322.60 2997.90 L 3326.20 3011.50 L 3330.30 3024.50 L 3334.80 3037.10 L 3338.50 3046.40 L 3347.10 3064.60 L 3352.00 3073.50 L 3357.10 3082.20 L 3362.70 3090.90 L 3368.80 3099.70 L 3375.40 3108.60 L 3389.60 3125.80 L 3397.70 3134.60 L 3406.40 3143.70 L 3416.00 3153.10 L 3425.90 3161.80 L 3435.80 3169.90 L 3445.90 3177.40 L 3456.10 3184.20 L 3466.70 3190.70 L 3477.40 3196.50 L 3488.20 3201.80 L 3499.00 3206.50 L 3509.90 3210.60 L 3521.10 3214.30 L 3532.20 3217.40 L 3543.30 3220.00 L 3554.40 3222.00 L 3565.60 3223.50 L 3576.80 3224.50 L 3588.00 3225.00 L 3599.00 3225.00 L 3610.00 3224.50 L 3620.90 3223.50 L 3631.80 3221.90 L 3642.50 3219.90 L 3653.10 3217.40 L 3663.50 3214.50 L 3673.80 3211.00 L 3683.90 3207.10 L 3693.70 3202.70 L 3703.40 3197.80 L 3712.80 3192.50 L 3722.00 3186.70 L 3730.80 3180.50 L 3739.40 3173.80 L 3747.70 3166.70 L 3755.60 3159.20 L 3763.30 3151.10 L 3770.50 3142.80 L 3777.30 3134.00 L 3783.80 3124.70 L 3789.90 3115.00 L 3795.60 3104.80 L 3800.70 3094.50 L 3805.40 3083.70 L 3809.60 3072.40 L 3813.30 3060.60 L 3816.60 3048.30 L 3820.30 3031.50 L 3823.60 3013.90 L 3826.50 2995.30 L 3828.80 2976.70 L 3830.70 2957.50 L 3832.00 2937.70 L 3832.70 2917.90 L 3832.90 2897.70 L 3832.40 2877.30 L 3831.70 2862.00 L 3829.10 2831.30 L 3825.10 2800.70 L 3822.50 2785.50 L 3819.50 2770.50 L 3816.10 2755.60 L 3812.30 2740.80 L 3808.10 2726.30 L 3803.40 2712.00 L 3798.30 2698.10 L 3792.70 2684.20 L 3786.70 2670.80 L 3780.20 2657.80 L 3773.30 2645.20 L 3767.30 2635.20 L 3761.10 2625.60 L 3754.50 2616.40 L 3747.70 2607.40 L 3740.50 2598.80 L 3733.00 2590.40 L 3725.10 2582.40 L 3716.90 2574.80 L 3708.40 2567.60 L 3699.50 2560.70 L 3690.30 2554.30 L 3680.80 2548.30 L 3670.80 2542.70 L 3660.40 2537.60 L 3649.60 2532.90 L 3639.60 2529.00 L 3629.40 2525.50 L 3619.20 2522.50 L 3608.80 2520.00 L 3598.30 2517.80 L 3587.70 2516.20 L 3577.10 2514.90 L 3566.50 2514.10 L 3555.80 2513.80 L 3545.10 2513.90 L 3534.40 2514.50 L 3523.60 2515.50 L 3512.90 2517.00 L 3502.40 2518.90 L 3492.00 2521.30 L 3481.60 2524.10 L 3471.40 2527.30 L 3461.40 2531.00 L 3451.50 2535.10 L 3441.80 2539.60 L 3432.30 2544.50 L 3423.00 2549.80 L 3413.90 2555.50 L 3405.10 2561.60 L 3388.20 2574.90 L 3380.20 2582.00 L 3372.50 2589.50 L 3365.20 2597.30 L 3358.20 2605.40 L 3351.60 2613.70 L 3345.30 2622.40 L 3339.30 2631.30 L 3333.80 2640.40 L 3328.60 2649.80 L 3323.80 2659.50 L 3319.50 2669.30 L 3315.50 2679.30 L 3312.00 2689.40 L 3309.00 2699.70 L 3306.30 2710.10 L 3302.40 2731.00 L 3301.10 2741.70 L 3300.30 2752.30 L 3299.90 2763.00 L 3299.90 2773.70 L 3300.40 2784.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="487" stroke="none" target-height="711.19995" target-width="533" target-x="3299.9" target-y="2513.8"/><path d="M 3318.80 2576.10 L 3306.00 2580.30 L 3292.80 2584.10 L 3252.90 2594.30 L 3231.30 2600.90 L 3214.80 2607.40 L 3206.90 2611.20 L 3199.20 2615.60 L 3191.90 2620.50 L 3181.60 2628.80 L 3176.70 2633.70 L 3172.00 2638.90 L 3167.70 2644.40 L 3163.60 2650.50 L 3159.70 2657.20 L 3156.00 2664.60 L 3150.00 2680.10 L 3147.40 2689.10 L 3145.00 2698.90 L 3143.20 2708.60 L 3141.70 2719.30 L 3140.50 2731.00 L 3139.80 2743.80 L 3139.50 2756.20 L 3139.60 2769.80 L 3140.20 2784.60 L 3141.30 2800.80 L 3142.70 2816.40 L 3144.70 2833.40 L 3147.20 2851.70 L 3154.50 2897.20 L 3158.00 2921.40 L 3160.80 2944.10 L 3163.00 2965.50 L 3164.90 2987.40 L 3166.30 3007.90 L 3167.70 3045.10 L 3167.80 3063.50 L 3167.00 3096.60 L 3166.10 3111.30 L 3164.40 3131.30 L 3162.40 3149.10 L 3160.10 3165.00 L 3157.20 3180.90 L 3154.30 3194.90 L 3151.20 3207.00 L 3147.80 3219.20 L 3141.40 3238.20 L 3136.30 3250.60 L 3132.20 3259.50 L 3128.10 3267.10 L 3122.70 3275.40 L 3162.30 3282.60 L 3208.70 3289.50 L 3236.70 3293.10 L 3292.80 3299.00 L 3344.20 3303.00 L 3370.90 3304.60 L 3399.20 3305.90 L 3429.10 3306.90 L 3459.10 3307.40 L 3490.30 3307.40 L 3522.90 3307.00 L 3572.00 3305.20 L 3623.20 3301.90 L 3648.90 3299.70 L 3675.00 3297.10 L 3701.40 3294.00 L 3728.20 3290.40 L 3754.80 3286.30 L 3781.60 3281.70 L 3808.50 3276.60 L 3835.70 3270.90 L 3824.50 3249.70 L 3819.20 3239.10 L 3806.20 3211.00 L 3799.00 3194.10 L 3791.80 3176.50 L 3784.60 3157.00 L 3775.40 3130.00 L 3767.10 3101.30 L 3760.00 3071.50 L 3757.10 3056.50 L 3754.80 3041.30 L 3752.90 3026.10 L 3751.90 3014.60 L 3751.30 3003.20 L 3751.20 2980.70 L 3751.80 2969.50 L 3752.90 2958.50 L 3754.50 2947.60 L 3761.80 2911.30 L 3766.10 2888.10 L 3769.40 2867.00 L 3772.10 2845.90 L 3774.10 2827.00 L 3775.40 2810.10 L 3776.20 2793.20 L 3776.50 2778.40 L 3776.30 2765.40 L 3775.80 2752.40 L 3775.00 2741.40 L 3774.00 2732.10 L 3772.00 2718.80 L 3770.10 2709.20 L 3768.00 2701.00 L 3764.90 2692.00 L 3740.90 2680.10 L 3697.20 2659.70 L 3658.50 2642.80 L 3614.50 2625.00 L 3590.80 2616.10 L 3566.80 2607.60 L 3542.20 2599.40 L 3525.60 2594.20 L 3492.50 2584.90 L 3475.90 2580.80 L 3459.60 2577.20 L 3443.60 2574.00 L 3427.60 2571.40 L 3412.10 2569.40 L 3397.20 2568.10 L 3386.00 2567.50 L 3375.20 2567.30 L 3364.90 2567.60 L 3355.00 2568.30 L 3345.10 2569.50 L 3335.80 2571.20 L 3327.00 2573.40 L 3318.80 2576.10 Z" fill="#263238" fill-rule="nonzero" node-id="489" stroke="none" target-height="740.09985" target-width="713" target-x="3122.7" target-y="2567.3"/><path d="M 3712.40 2881.10 L 3712.60 2889.90 L 3713.20 2898.70 L 3714.30 2907.30 L 3715.80 2916.00 L 3717.60 2924.50 L 3719.90 2932.90 L 3725.50 2949.40 L 3732.70 2965.30 L 3741.50 2980.60 L 3745.60 2986.30 L 3749.50 2991.00 L 3753.30 2994.70 L 3757.00 2997.60 L 3761.10 3000.10 L 3765.00 3001.80 L 3768.70 3002.70 L 3775.90 3002.80 L 3779.40 3001.90 L 3782.70 3000.40 L 3786.10 2998.30 L 3789.00 2995.80 L 3791.80 2992.70 L 3794.50 2989.00 L 3797.10 2984.70 L 3799.10 2980.20 L 3801.00 2975.20 L 3804.00 2963.40 L 3804.90 2957.30 L 3805.70 2950.70 L 3806.30 2943.40 L 3806.50 2928.50 L 3806.20 2920.60 L 3804.60 2904.90 L 3801.60 2889.10 L 3797.10 2874.20 L 3794.30 2867.10 L 3791.00 2860.40 L 3787.30 2854.20 L 3784.20 2849.80 L 3780.90 2845.80 L 3777.30 2842.20 L 3773.40 2838.90 L 3768.30 2835.40 L 3763.60 2832.70 L 3759.00 2830.90 L 3754.80 2829.70 L 3750.30 2829.00 L 3746.00 2829.00 L 3742.00 2829.60 L 3738.20 2830.70 L 3734.50 2832.40 L 3731.10 2834.60 L 3727.90 2837.40 L 3724.80 2840.70 L 3719.80 2848.30 L 3717.70 2852.80 L 3715.80 2858.00 L 3713.40 2868.60 L 3712.40 2881.10 Z" fill="#e58a7b" fill-rule="nonzero" node-id="491" stroke="none" target-height="173.80005" target-width="94.1001" target-x="3712.4" target-y="2829"/><path d="M 3238.00 2607.30 L 3236.20 2601.60 L 3235.10 2595.80 L 3234.50 2589.90 L 3234.50 2583.80 L 3235.10 2577.60 L 3236.30 2571.60 L 3237.90 2565.50 L 3240.20 2559.30 L 3243.10 2553.00 L 3246.60 2546.50 L 3250.50 2540.60 L 3254.90 2534.60 L 3260.00 2528.50 L 3265.80 2522.50 L 3272.30 2516.40 L 3278.80 2510.90 L 3286.00 2505.50 L 3293.90 2500.10 L 3302.60 2494.90 L 3312.00 2489.70 L 3321.20 2485.10 L 3331.10 2480.70 L 3341.80 2476.50 L 3353.30 2472.50 L 3365.50 2468.70 L 3377.40 2465.50 L 3390.10 2462.60 L 3403.50 2460.00 L 3417.80 2457.70 L 3432.80 2455.90 L 3447.40 2454.50 L 3462.80 2453.60 L 3478.90 2453.10 L 3495.90 2453.10 L 3513.80 2453.60 L 3531.00 2454.50 L 3549.00 2456.00 L 3567.80 2458.10 L 3587.50 2460.80 L 3608.10 2464.20 L 3623.00 2467.10 L 3637.10 2470.20 L 3650.60 2473.70 L 3663.30 2477.30 L 3675.40 2481.30 L 3687.80 2485.70 L 3710.60 2495.20 L 3721.10 2500.20 L 3731.10 2505.30 L 3743.50 2512.40 L 3755.20 2519.60 L 3766.00 2527.00 L 3776.10 2534.50 L 3786.00 2542.60 L 3795.30 2550.70 L 3803.80 2558.80 L 3811.70 2567.00 L 3819.40 2575.70 L 3826.50 2584.20 L 3833.00 2592.70 L 3839.00 2601.10 L 3846.50 2612.70 L 3853.20 2624.00 L 3859.00 2634.90 L 3864.40 2646.10 L 3869.00 2656.60 L 3872.90 2666.60 L 3879.40 2686.00 L 3884.80 2706.70 L 3888.20 2725.40 L 3889.40 2736.30 L 3835.00 2671.50 L 3837.40 2739.70 L 3560.40 2792.90 L 3238.00 2607.30 Z" fill="#263238" fill-rule="nonzero" node-id="493" stroke="none" target-height="339.7998" target-width="654.8999" target-x="3234.5" target-y="2453.1"/><path d="M 3260.90 3438.60 L 3260.50 3430.40 L 3260.80 3426.40 L 3261.60 3422.40 L 3262.80 3418.50 L 3264.30 3414.70 L 3266.20 3411.10 L 3268.40 3407.70 L 3271.00 3404.40 L 3277.00 3398.90 L 3283.80 3394.60 L 3291.40 3391.80 L 3295.40 3390.80 L 3331.50 3385.10 L 3375.30 3378.70 L 3424.30 3372.20 L 3450.00 3369.20 L 3502.70 3363.80 L 3528.80 3361.80 L 3554.80 3360.10 L 3596.00 3358.80 L 3626.10 3359.00 L 3640.70 3359.70 L 3654.00 3360.80 L 3666.10 3362.20 L 3675.10 3363.70 L 3683.40 3365.50 L 3690.80 3367.50 L 3697.60 3369.70 L 3704.50 3372.30 L 3710.70 3375.20 L 3721.40 3381.30 L 3730.80 3388.50 L 3734.80 3392.20 L 3738.40 3396.00 L 3742.80 3401.50 L 3746.60 3407.10 L 3749.70 3412.70 L 3752.40 3418.60 L 3754.60 3424.50 L 3756.30 3430.40 L 3757.70 3436.30 L 3759.40 3447.90 L 3759.50 3452.40 L 3759.10 3456.80 L 3758.30 3461.10 L 3757.00 3465.50 L 3755.30 3469.60 L 3753.10 3473.50 L 3750.60 3477.10 L 3747.60 3480.50 L 3744.30 3483.60 L 3740.70 3486.20 L 3736.90 3488.50 L 3732.80 3490.40 L 3728.50 3491.80 L 3719.70 3493.20 L 3300.70 3474.60 L 3295.80 3474.00 L 3291.10 3473.00 L 3286.60 3471.40 L 3282.20 3469.30 L 3278.20 3466.70 L 3274.30 3463.70 L 3270.90 3460.20 L 3268.00 3456.40 L 3265.40 3452.30 L 3263.40 3447.90 L 3261.90 3443.30 L 3260.90 3438.60 Z" fill="#429cfd" fill-rule="nonzero" node-id="495" stroke="none" target-height="134.3999" target-width="499" target-x="3260.5" target-y="3358.8"/><g node-id="603"><path d="M 3260.90 3438.60 L 3260.50 3430.40 L 3260.80 3426.40 L 3261.60 3422.40 L 3262.80 3418.50 L 3264.30 3414.70 L 3266.20 3411.10 L 3268.40 3407.70 L 3271.00 3404.40 L 3277.00 3398.90 L 3283.80 3394.60 L 3291.40 3391.80 L 3295.40 3390.80 L 3331.50 3385.10 L 3375.30 3378.70 L 3424.30 3372.20 L 3450.00 3369.20 L 3502.70 3363.80 L 3528.80 3361.80 L 3554.80 3360.10 L 3596.00 3358.80 L 3626.10 3359.00 L 3640.70 3359.70 L 3654.00 3360.80 L 3666.10 3362.20 L 3675.10 3363.70 L 3683.40 3365.50 L 3690.80 3367.50 L 3697.60 3369.70 L 3704.50 3372.30 L 3710.70 3375.20 L 3721.40 3381.30 L 3730.80 3388.50 L 3734.80 3392.20 L 3738.40 3396.00 L 3742.80 3401.50 L 3746.60 3407.10 L 3749.70 3412.70 L 3752.40 3418.60 L 3754.60 3424.50 L 3756.30 3430.40 L 3757.70 3436.30 L 3759.40 3447.90 L 3759.50 3452.40 L 3759.10 3456.80 L 3758.30 3461.10 L 3757.00 3465.50 L 3755.30 3469.60 L 3753.10 3473.50 L 3750.60 3477.10 L 3747.60 3480.50 L 3744.30 3483.60 L 3740.70 3486.20 L 3736.90 3488.50 L 3732.80 3490.40 L 3728.50 3491.80 L 3719.70 3493.20 L 3300.70 3474.60 L 3295.80 3474.00 L 3291.10 3473.00 L 3286.60 3471.40 L 3282.20 3469.30 L 3278.20 3466.70 L 3274.30 3463.70 L 3270.90 3460.20 L 3268.00 3456.40 L 3265.40 3452.30 L 3263.40 3447.90 L 3261.90 3443.30 L 3260.90 3438.60 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="16" node-id="499" stroke="none" target-height="134.3999" target-width="499" target-x="3260.5" target-y="3358.8"/></g><path d="M 3500.60 7605.60 L 3654.40 7712.40 L 3911.80 7363.50 L 3757.90 7256.80 L 3500.60 7605.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="502" stroke="none" target-height="455.6001" target-width="411.19995" target-x="3500.6" target-y="7256.8"/><path d="M 3141.80 7598.60 L 3304.30 7691.20 L 3532.10 7322.20 L 3369.60 7229.60 L 3141.80 7598.60 Z" fill="#e58a7b" fill-rule="nonzero" node-id="504" stroke="none" target-height="461.6001" target-width="390.30005" target-x="3141.8" target-y="7229.6"/><path d="M 3911.50 7363.50 L 3778.90 7543.30 L 3625.10 7436.70 L 3757.70 7256.80 L 3911.50 7363.50 Z" fill="#cf6f64" fill-rule="nonzero" node-id="506" stroke="none" target-height="286.5" target-width="286.3999" target-x="3625.1" target-y="7256.8"/><path d="M 3369.40 7229.60 L 3532.10 7322.40 L 3414.70 7512.50 L 3252.00 7419.70 L 3369.40 7229.60 Z" fill="#cf6f64" fill-rule="nonzero" node-id="508" stroke="none" target-height="282.8999" target-width="280.1001" target-x="3252" target-y="7229.6"/><path d="M 3630.30 4603.50 L 3655.90 4637.40 L 3685.00 4678.10 L 3702.30 4703.10 L 3722.40 4733.10 L 3743.20 4764.80 L 3766.20 4801.10 L 3797.60 4852.60 L 3830.90 4909.80 L 3847.80 4940.10 L 3865.20 4972.00 L 3882.10 5004.00 L 3899.20 5037.50 L 3916.50 5072.40 L 3941.60 5125.50 L 3966.60 5181.30 L 3978.60 5209.60 L 4002.00 5267.70 L 4013.30 5297.60 L 4024.30 5327.50 L 4034.90 5357.90 L 4045.10 5388.80 L 4055.00 5420.00 L 4064.30 5451.40 L 4073.20 5483.10 L 4081.60 5515.10 L 4089.50 5547.50 L 4100.90 5599.50 L 4106.00 5625.80 L 4115.00 5678.80 L 4118.80 5705.40 L 4122.20 5732.10 L 4125.10 5758.90 L 4127.60 5785.80 L 4129.50 5812.80 L 4131.00 5839.80 L 4131.90 5866.80 L 4132.20 5893.90 L 4132.00 5921.10 L 4131.20 5948.30 L 4129.90 5975.50 L 4127.90 6002.60 L 4125.20 6029.80 L 4122.00 6057.00 L 4118.10 6084.30 L 4114.30 6107.50 L 4105.30 6154.90 L 4100.10 6179.10 L 4094.40 6203.60 L 4086.90 6233.90 L 4078.80 6264.50 L 4070.10 6295.50 L 4060.80 6326.80 L 4051.00 6357.80 L 4040.80 6389.00 L 4030.10 6420.30 L 4018.90 6451.90 L 4003.50 6493.70 L 3987.40 6535.40 L 3970.60 6577.20 L 3953.30 6618.70 L 3935.60 6660.00 L 3917.50 6700.90 L 3898.90 6741.60 L 3880.20 6781.80 L 3861.30 6821.30 L 3842.00 6860.60 L 3803.80 6936.50 L 3784.40 6973.80 L 3746.60 7044.80 L 3718.40 7096.40 L 3691.50 7144.50 L 3664.80 7191.10 L 3615.90 7274.50 L 3594.30 7310.60 L 3555.60 7373.50 L 3525.90 7420.70 L 3500.10 7460.50 L 3252.30 7337.50 L 3281.10 7279.00 L 3309.60 7220.30 L 3337.50 7161.40 L 3364.90 7102.30 L 3391.90 7043.00 L 3418.40 6983.50 L 3444.40 6923.70 L 3469.90 6863.80 L 3494.90 6803.60 L 3519.50 6743.20 L 3543.60 6682.70 L 3567.10 6622.00 L 3590.20 6561.00 L 3612.80 6499.90 L 3634.90 6438.60 L 3656.50 6377.20 L 3677.70 6315.50 L 3698.30 6253.60 L 3704.30 6234.30 L 3709.90 6214.80 L 3714.90 6195.30 L 3719.50 6175.70 L 3723.50 6156.00 L 3727.10 6136.20 L 3730.10 6116.30 L 3732.70 6096.40 L 3734.70 6076.40 L 3736.30 6056.40 L 3737.30 6036.30 L 3737.90 6016.20 L 3737.90 5996.10 L 3737.40 5976.00 L 3736.50 5955.90 L 3735.00 5935.80 L 3733.00 5915.70 L 3730.50 5895.60 L 3727.50 5875.50 L 3724.00 5855.60 L 3720.00 5835.90 L 3715.50 5816.30 L 3710.50 5796.80 L 3705.00 5777.40 L 3699.10 5758.20 L 3692.70 5739.10 L 3685.80 5720.30 L 3678.40 5701.60 L 3670.60 5683.10 L 3662.30 5664.80 L 3653.50 5646.60 L 3644.30 5628.80 L 3634.60 5611.10 L 3624.50 5593.70 L 3613.90 5576.50 L 3602.90 5559.50 L 3591.80 5543.80 L 3580.80 5528.90 L 3569.70 5514.60 L 3558.60 5501.00 L 3547.50 5488.10 L 3532.90 5472.00 L 3518.40 5456.90 L 3503.90 5442.70 L 3489.50 5429.20 L 3474.50 5416.10 L 3459.60 5403.70 L 3444.80 5391.90 L 3430.10 5380.90 L 3415.00 5370.00 L 3385.30 5350.00 L 3370.60 5340.80 L 3350.80 5328.80 L 3312.20 5306.90 L 3203.50 5249.00 L 3186.70 5239.60 L 3170.80 5230.20 L 3155.60 5220.80 L 3144.40 5213.40 L 3133.60 5205.80 L 3123.40 5198.10 L 3113.70 5190.20 L 3104.20 5181.90 L 3095.20 5173.30 L 3086.80 5164.30 L 3078.90 5155.10 L 3067.30 5139.40 L 3062.10 5131.00 L 3057.10 5122.40 L 3052.60 5113.30 L 3048.50 5104.20 L 3044.70 5094.60 L 3041.40 5084.50 L 3038.40 5073.90 L 3035.80 5062.80 L 3033.80 5051.90 L 3032.10 5040.30 L 3030.90 5028.00 L 3030.20 5015.10 L 3029.90 5001.30 L 3030.10 4988.10 L 3030.80 4974.10 L 3032.00 4959.30 L 3033.70 4943.50 L 3036.00 4926.80 L 3038.70 4910.90 L 3045.70 4876.10 L 3050.20 4857.10 L 3055.40 4837.10 L 3062.20 4813.00 L 3070.10 4787.20 L 3079.10 4759.60 L 3089.30 4730.00 L 3099.80 4701.40 L 3111.50 4670.80 L 3124.60 4638.20 L 3139.00 4603.50 L 3630.30 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="510" stroke="none" target-height="2857" target-width="1102.3003" target-x="3029.9" target-y="4603.5"/><g node-id="604"><path d="M 3630.30 4603.50 L 3655.90 4637.40 L 3685.00 4678.10 L 3702.30 4703.10 L 3722.40 4733.10 L 3743.20 4764.80 L 3766.20 4801.10 L 3797.60 4852.60 L 3830.90 4909.80 L 3847.80 4940.10 L 3865.20 4972.00 L 3882.10 5004.00 L 3899.20 5037.50 L 3916.50 5072.40 L 3941.60 5125.50 L 3966.60 5181.30 L 3978.60 5209.60 L 4002.00 5267.70 L 4013.30 5297.60 L 4024.30 5327.50 L 4034.90 5357.90 L 4045.10 5388.80 L 4055.00 5420.00 L 4064.30 5451.40 L 4073.20 5483.10 L 4081.60 5515.10 L 4089.50 5547.50 L 4100.90 5599.50 L 4106.00 5625.80 L 4115.00 5678.80 L 4118.80 5705.40 L 4122.20 5732.10 L 4125.10 5758.90 L 4127.60 5785.80 L 4129.50 5812.80 L 4131.00 5839.80 L 4131.90 5866.80 L 4132.20 5893.90 L 4132.00 5921.10 L 4131.20 5948.30 L 4129.90 5975.50 L 4127.90 6002.60 L 4125.20 6029.80 L 4122.00 6057.00 L 4118.10 6084.30 L 4114.30 6107.50 L 4105.30 6154.90 L 4100.10 6179.10 L 4094.40 6203.60 L 4086.90 6233.90 L 4078.80 6264.50 L 4070.10 6295.50 L 4060.80 6326.80 L 4051.00 6357.80 L 4040.80 6389.00 L 4030.10 6420.30 L 4018.90 6451.90 L 4003.50 6493.70 L 3987.40 6535.40 L 3970.60 6577.20 L 3953.30 6618.70 L 3935.60 6660.00 L 3917.50 6700.90 L 3898.90 6741.60 L 3880.20 6781.80 L 3861.30 6821.30 L 3842.00 6860.60 L 3803.80 6936.50 L 3784.40 6973.80 L 3746.60 7044.80 L 3718.40 7096.40 L 3691.50 7144.50 L 3664.80 7191.10 L 3615.90 7274.50 L 3594.30 7310.60 L 3555.60 7373.50 L 3525.90 7420.70 L 3500.10 7460.50 L 3252.30 7337.50 L 3281.10 7279.00 L 3309.60 7220.30 L 3337.50 7161.40 L 3364.90 7102.30 L 3391.90 7043.00 L 3418.40 6983.50 L 3444.40 6923.70 L 3469.90 6863.80 L 3494.90 6803.60 L 3519.50 6743.20 L 3543.60 6682.70 L 3567.10 6622.00 L 3590.20 6561.00 L 3612.80 6499.90 L 3634.90 6438.60 L 3656.50 6377.20 L 3677.70 6315.50 L 3698.30 6253.60 L 3704.30 6234.30 L 3709.90 6214.80 L 3714.90 6195.30 L 3719.50 6175.70 L 3723.50 6156.00 L 3727.10 6136.20 L 3730.10 6116.30 L 3732.70 6096.40 L 3734.70 6076.40 L 3736.30 6056.40 L 3737.30 6036.30 L 3737.90 6016.20 L 3737.90 5996.10 L 3737.40 5976.00 L 3736.50 5955.90 L 3735.00 5935.80 L 3733.00 5915.70 L 3730.50 5895.60 L 3727.50 5875.50 L 3724.00 5855.60 L 3720.00 5835.90 L 3715.50 5816.30 L 3710.50 5796.80 L 3705.00 5777.40 L 3699.10 5758.20 L 3692.70 5739.10 L 3685.80 5720.30 L 3678.40 5701.60 L 3670.60 5683.10 L 3662.30 5664.80 L 3653.50 5646.60 L 3644.30 5628.80 L 3634.60 5611.10 L 3624.50 5593.70 L 3613.90 5576.50 L 3602.90 5559.50 L 3591.80 5543.80 L 3580.80 5528.90 L 3569.70 5514.60 L 3558.60 5501.00 L 3547.50 5488.10 L 3532.90 5472.00 L 3518.40 5456.90 L 3503.90 5442.70 L 3489.50 5429.20 L 3474.50 5416.10 L 3459.60 5403.70 L 3444.80 5391.90 L 3430.10 5380.90 L 3415.00 5370.00 L 3385.30 5350.00 L 3370.60 5340.80 L 3350.80 5328.80 L 3312.20 5306.90 L 3203.50 5249.00 L 3186.70 5239.60 L 3170.80 5230.20 L 3155.60 5220.80 L 3144.40 5213.40 L 3133.60 5205.80 L 3123.40 5198.10 L 3113.70 5190.20 L 3104.20 5181.90 L 3095.20 5173.30 L 3086.80 5164.30 L 3078.90 5155.10 L 3067.30 5139.40 L 3062.10 5131.00 L 3057.10 5122.40 L 3052.60 5113.30 L 3048.50 5104.20 L 3044.70 5094.60 L 3041.40 5084.50 L 3038.40 5073.90 L 3035.80 5062.80 L 3033.80 5051.90 L 3032.10 5040.30 L 3030.90 5028.00 L 3030.20 5015.10 L 3029.90 5001.30 L 3030.10 4988.10 L 3030.80 4974.10 L 3032.00 4959.30 L 3033.70 4943.50 L 3036.00 4926.80 L 3038.70 4910.90 L 3045.70 4876.10 L 3050.20 4857.10 L 3055.40 4837.10 L 3062.20 4813.00 L 3070.10 4787.20 L 3079.10 4759.60 L 3089.30 4730.00 L 3099.80 4701.40 L 3111.50 4670.80 L 3124.60 4638.20 L 3139.00 4603.50 L 3630.30 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="17" node-id="514" stroke="none" target-height="2857" target-width="1102.3003" target-x="3029.9" target-y="4603.5"/></g><g node-id="605"><path d="M 3924.90 5089.60 L 3837.60 5002.80 L 3844.10 5045.40 L 4054.20 6347.10 L 4062.40 6321.30 L 4077.60 6269.40 L 4084.60 6243.30 L 4091.30 6217.10 L 4097.50 6190.80 L 4108.70 6138.00 L 4113.70 6111.40 L 4118.30 6084.70 L 4122.20 6058.00 L 4125.40 6031.30 L 4128.10 6004.70 L 4130.10 5978.00 L 4131.50 5951.40 L 4132.30 5924.70 L 4132.60 5898.00 L 4132.40 5871.40 L 4131.60 5844.90 L 4130.30 5818.40 L 4128.50 5791.90 L 4126.20 5765.50 L 4123.50 5739.20 L 4120.30 5713.00 L 4116.60 5686.90 L 4111.40 5654.30 L 4105.70 5621.90 L 4099.30 5589.80 L 4092.30 5557.90 L 4084.70 5526.10 L 4076.60 5494.60 L 4068.10 5463.50 L 4059.10 5432.60 L 4049.60 5401.80 L 4039.70 5371.50 L 4029.50 5341.60 L 4018.90 5312.10 L 3996.70 5253.70 L 3985.20 5225.30 L 3961.50 5169.50 L 3949.40 5142.20 L 3924.90 5089.60 Z" fill="#000000" fill-opacity="0.4" fill-rule="nonzero" group-id="18" node-id="519" stroke="none" target-height="1344.3003" target-width="295" target-x="3837.6" target-y="5002.8"/></g><path d="M 3898.40 4603.50 L 3926.10 4640.80 L 3977.30 4712.00 L 4023.50 4778.00 L 4049.80 4816.50 L 4106.00 4900.40 L 4135.60 4945.70 L 4166.70 4994.30 L 4198.00 5044.10 L 4230.30 5096.60 L 4273.20 5168.40 L 4316.30 5243.10 L 4337.70 5281.10 L 4358.90 5319.80 L 4379.80 5358.70 L 4400.30 5397.90 L 4420.50 5437.40 L 4440.20 5477.20 L 4459.40 5517.00 L 4478.00 5556.90 L 4491.50 5587.00 L 4504.70 5617.00 L 4529.50 5676.60 L 4541.40 5706.60 L 4552.70 5736.30 L 4563.40 5765.70 L 4573.50 5794.80 L 4583.20 5824.30 L 4592.20 5853.40 L 4600.40 5881.90 L 4608.00 5910.10 L 4613.80 5933.00 L 4619.00 5955.50 L 4627.80 5999.30 L 4631.50 6020.70 L 4634.80 6042.50 L 4637.50 6063.80 L 4639.60 6084.70 L 4641.10 6105.10 L 4642.10 6125.00 L 4642.40 6140.80 L 4642.10 6157.00 L 4641.20 6173.70 L 4639.70 6190.80 L 4637.60 6208.40 L 4635.10 6225.70 L 4632.00 6243.30 L 4628.50 6261.40 L 4624.30 6279.80 L 4619.60 6298.70 L 4613.30 6321.90 L 4606.20 6345.50 L 4598.30 6369.70 L 4589.70 6394.50 L 4580.70 6418.80 L 4571.00 6443.60 L 4560.70 6468.70 L 4549.60 6494.30 L 4526.40 6544.90 L 4501.00 6596.70 L 4483.30 6631.00 L 4464.80 6665.60 L 4445.60 6700.40 L 4425.90 6734.90 L 4405.70 6769.40 L 4385.00 6803.80 L 4363.90 6838.10 L 4320.90 6905.70 L 4298.90 6939.20 L 4254.90 7004.60 L 4232.70 7036.90 L 4188.80 7099.00 L 4156.00 7144.50 L 4124.20 7187.70 L 4092.70 7229.80 L 4033.50 7307.10 L 3979.90 7375.10 L 3933.70 7432.30 L 3882.60 7494.00 L 3855.00 7526.40 L 3621.30 7375.10 L 3647.70 7337.20 L 3678.00 7292.30 L 3717.30 7232.50 L 3739.30 7198.20 L 3763.90 7159.30 L 3788.90 7118.90 L 3815.80 7074.60 L 3843.00 7028.90 L 3871.40 6979.90 L 3909.30 6912.50 L 3928.80 6877.00 L 3967.00 6805.00 L 3986.20 6767.60 L 4004.90 6730.10 L 4023.50 6692.10 L 4041.80 6653.40 L 4059.60 6614.60 L 4076.90 6575.50 L 4093.80 6536.10 L 4106.10 6506.40 L 4117.90 6476.70 L 4140.40 6417.40 L 4151.10 6387.50 L 4161.30 6357.80 L 4170.90 6328.30 L 4179.90 6299.00 L 4188.50 6269.40 L 4196.50 6240.10 L 4203.80 6211.10 L 4210.40 6182.50 L 4208.70 6166.00 L 4206.40 6148.90 L 4203.50 6131.30 L 4200.00 6113.20 L 4195.80 6094.50 L 4191.30 6076.40 L 4186.20 6057.80 L 4180.50 6038.80 L 4174.30 6019.30 L 4167.50 5999.40 L 4158.60 5975.00 L 4148.90 5950.00 L 4138.50 5924.50 L 4127.20 5898.30 L 4115.50 5872.70 L 4103.20 5846.50 L 4090.20 5819.90 L 4076.50 5792.80 L 4047.90 5739.20 L 4017.00 5684.20 L 3995.70 5647.80 L 3973.50 5611.00 L 3950.60 5573.90 L 3927.20 5537.10 L 3903.20 5500.10 L 3878.70 5463.20 L 3853.80 5426.40 L 3803.00 5353.40 L 3777.20 5317.20 L 3725.30 5246.10 L 3699.00 5210.90 L 3647.10 5142.50 L 3608.10 5092.20 L 3570.10 5043.90 L 3532.30 4996.60 L 3496.00 4951.90 L 3460.10 4908.20 L 3393.30 4828.40 L 3362.90 4792.60 L 3307.30 4728.20 L 3261.20 4675.70 L 3226.20 4636.50 L 3196.20 4603.50 L 3898.40 4603.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="522" stroke="none" target-height="2922.9" target-width="1446.2" target-x="3196.2" target-y="4603.5"/><g node-id="606"><path d="M 3898.40 4603.50 L 3926.10 4640.80 L 3977.30 4712.00 L 4023.50 4778.00 L 4049.80 4816.50 L 4106.00 4900.40 L 4135.60 4945.70 L 4166.70 4994.30 L 4198.00 5044.10 L 4230.30 5096.60 L 4273.20 5168.40 L 4316.30 5243.10 L 4337.70 5281.10 L 4358.90 5319.80 L 4379.80 5358.70 L 4400.30 5397.90 L 4420.50 5437.40 L 4440.20 5477.20 L 4459.40 5517.00 L 4478.00 5556.90 L 4491.50 5587.00 L 4504.70 5617.00 L 4529.50 5676.60 L 4541.40 5706.60 L 4552.70 5736.30 L 4563.40 5765.70 L 4573.50 5794.80 L 4583.20 5824.30 L 4592.20 5853.40 L 4600.40 5881.90 L 4608.00 5910.10 L 4613.80 5933.00 L 4619.00 5955.50 L 4627.80 5999.30 L 4631.50 6020.70 L 4634.80 6042.50 L 4637.50 6063.80 L 4639.60 6084.70 L 4641.10 6105.10 L 4642.10 6125.00 L 4642.40 6140.80 L 4642.10 6157.00 L 4641.20 6173.70 L 4639.70 6190.80 L 4637.60 6208.40 L 4635.10 6225.70 L 4632.00 6243.30 L 4628.50 6261.40 L 4624.30 6279.80 L 4619.60 6298.70 L 4613.30 6321.90 L 4606.20 6345.50 L 4598.30 6369.70 L 4589.70 6394.50 L 4580.70 6418.80 L 4571.00 6443.60 L 4560.70 6468.70 L 4549.60 6494.30 L 4526.40 6544.90 L 4501.00 6596.70 L 4483.30 6631.00 L 4464.80 6665.60 L 4445.60 6700.40 L 4425.90 6734.90 L 4405.70 6769.40 L 4385.00 6803.80 L 4363.90 6838.10 L 4320.90 6905.70 L 4298.90 6939.20 L 4254.90 7004.60 L 4232.70 7036.90 L 4188.80 7099.00 L 4156.00 7144.50 L 4124.20 7187.70 L 4092.70 7229.80 L 4033.50 7307.10 L 3979.90 7375.10 L 3933.70 7432.30 L 3882.60 7494.00 L 3855.00 7526.40 L 3621.30 7375.10 L 3647.70 7337.20 L 3678.00 7292.30 L 3717.30 7232.50 L 3739.30 7198.20 L 3763.90 7159.30 L 3788.90 7118.90 L 3815.80 7074.60 L 3843.00 7028.90 L 3871.40 6979.90 L 3909.30 6912.50 L 3928.80 6877.00 L 3967.00 6805.00 L 3986.20 6767.60 L 4004.90 6730.10 L 4023.50 6692.10 L 4041.80 6653.40 L 4059.60 6614.60 L 4076.90 6575.50 L 4093.80 6536.10 L 4106.10 6506.40 L 4117.90 6476.70 L 4140.40 6417.40 L 4151.10 6387.50 L 4161.30 6357.80 L 4170.90 6328.30 L 4179.90 6299.00 L 4188.50 6269.40 L 4196.50 6240.10 L 4203.80 6211.10 L 4210.40 6182.50 L 4208.70 6166.00 L 4206.40 6148.90 L 4203.50 6131.30 L 4200.00 6113.20 L 4195.80 6094.50 L 4191.30 6076.40 L 4186.20 6057.80 L 4180.50 6038.80 L 4174.30 6019.30 L 4167.50 5999.40 L 4158.60 5975.00 L 4148.90 5950.00 L 4138.50 5924.50 L 4127.20 5898.30 L 4115.50 5872.70 L 4103.20 5846.50 L 4090.20 5819.90 L 4076.50 5792.80 L 4047.90 5739.20 L 4017.00 5684.20 L 3995.70 5647.80 L 3973.50 5611.00 L 3950.60 5573.90 L 3927.20 5537.10 L 3903.20 5500.10 L 3878.70 5463.20 L 3853.80 5426.40 L 3803.00 5353.40 L 3777.20 5317.20 L 3725.30 5246.10 L 3699.00 5210.90 L 3647.10 5142.50 L 3608.10 5092.20 L 3570.10 5043.90 L 3532.30 4996.60 L 3496.00 4951.90 L 3460.10 4908.20 L 3393.30 4828.40 L 3362.90 4792.60 L 3307.30 4728.20 L 3261.20 4675.70 L 3226.20 4636.50 L 3196.20 4603.50 L 3898.40 4603.50 Z" fill="#000000" fill-opacity="0.6" fill-rule="nonzero" group-id="19" node-id="526" stroke="none" target-height="2922.9" target-width="1446.2" target-x="3196.2" target-y="4603.5"/></g><path d="M 3003.70 3468.40 L 2999.70 3469.60 L 2995.60 3471.30 L 2991.40 3473.40 L 2987.10 3476.20 L 2982.80 3479.50 L 2977.80 3483.80 L 2972.70 3488.80 L 2967.60 3494.60 L 2962.30 3501.20 L 2955.80 3510.10 L 2949.20 3520.00 L 2942.60 3531.00 L 2930.20 3553.90 L 2915.30 3585.50 L 2906.90 3605.10 L 2891.60 3644.60 L 2884.60 3664.10 L 2872.40 3700.20 L 2859.20 3743.10 L 2852.30 3767.70 L 3154.50 3969.50 L 3163.00 3949.50 L 3177.30 3913.50 L 3188.70 3881.90 L 3194.60 3864.30 L 3205.90 3827.40 L 3211.10 3808.30 L 3218.60 3775.90 L 3223.20 3750.30 L 3224.90 3737.60 L 3227.00 3713.30 L 3227.30 3701.30 L 3227.10 3690.00 L 3226.30 3679.30 L 3225.20 3671.20 L 3223.80 3663.70 L 3222.00 3656.60 L 3219.80 3649.90 L 3214.30 3635.40 L 3208.20 3621.10 L 3201.50 3606.70 L 3194.20 3592.60 L 3186.30 3578.90 L 3178.00 3565.50 L 3164.50 3546.30 L 3157.40 3537.30 L 3150.00 3528.60 L 3142.30 3520.20 L 3134.40 3512.30 L 3126.30 3505.00 L 3118.00 3498.20 L 3109.40 3491.80 L 3100.60 3486.00 L 3091.70 3480.90 L 3082.60 3476.50 L 3075.10 3473.40 L 3067.60 3470.80 L 3059.90 3468.60 L 3052.20 3467.00 L 3044.30 3465.80 L 3036.50 3465.20 L 3028.50 3465.10 L 3020.40 3465.60 L 3012.10 3466.70 L 3003.70 3468.40 Z" fill="#429cfd" fill-rule="nonzero" node-id="529" stroke="none" target-height="504.3999" target-width="375" target-x="2852.3" target-y="3465.1"/><g node-id="607"><path d="M 3062.90 3649.40 L 3041.90 3894.40 L 3154.20 3969.70 L 3163.30 3948.70 L 3171.90 3927.40 L 3180.00 3906.00 L 3187.60 3884.40 L 3194.70 3862.70 L 3201.30 3840.80 L 3207.40 3818.70 L 3213.00 3796.50 L 3218.10 3774.20 L 3222.70 3751.70 L 3062.90 3649.40 Z" fill="#000000" fill-opacity="0.2" fill-rule="nonzero" group-id="20" node-id="533" stroke="none" target-height="320.30005" target-width="180.80005" target-x="3041.9" target-y="3649.4"/></g><path d="M 3987.90 3473.90 L 3990.30 3476.00 L 3992.30 3478.80 L 3994.20 3482.40 L 3996.60 3488.30 L 3998.90 3495.40 L 4002.80 3513.00 L 4005.70 3533.00 L 4006.90 3544.00 L 4008.90 3572.60 L 4009.60 3588.10 L 4010.10 3626.70 L 4010.00 3647.50 L 4008.60 3697.70 L 4005.80 3754.30 L 4001.10 3821.20 L 3994.30 3899.10 L 3985.40 3984.90 L 3974.00 4083.30 L 3967.30 4136.80 L 3951.70 4253.10 L 3932.70 4383.90 L 3911.00 4524.90 L 3898.40 4603.30 L 3138.50 4603.30 L 3141.40 4527.90 L 3143.20 4455.60 L 3143.70 4419.90 L 3143.70 4384.30 L 3143.20 4348.50 L 3141.10 4287.80 L 3138.20 4237.10 L 3134.00 4184.90 L 3131.40 4157.30 L 3125.10 4100.90 L 3117.10 4040.60 L 3107.20 3975.50 L 3098.80 3924.70 L 3089.00 3869.60 L 3078.30 3812.80 L 3065.90 3751.00 L 3052.70 3687.40 L 3037.70 3618.00 L 3021.70 3546.40 L 3003.70 3468.40 L 3035.70 3462.00 L 3067.70 3456.10 L 3099.90 3450.70 L 3132.00 3445.80 L 3164.30 3441.30 L 3196.60 3437.30 L 3229.00 3433.70 L 3261.40 3430.70 L 3293.90 3428.00 L 3360.90 3423.70 L 3395.40 3422.00 L 3429.90 3420.70 L 3464.50 3420.00 L 3499.00 3419.70 L 3533.60 3420.00 L 3568.10 3420.70 L 3602.60 3422.00 L 3637.10 3423.70 L 3671.60 3425.90 L 3699.50 3428.70 L 3756.00 3435.40 L 3783.60 3439.10 L 3836.90 3447.10 L 3885.40 3455.00 L 3926.90 3462.30 L 3987.90 3473.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="536" stroke="none" target-height="1183.5999" target-width="1006.40015" target-x="3003.7" target-y="3419.7"/><path d="M 4065.20 3649.40 L 4100.80 3748.00 L 4133.70 3835.00 L 4161.80 3910.40 L 4176.10 3948.00 L 4234.50 4097.80 L 4256.90 4153.90 L 4260.50 4163.20 L 4260.50 4164.60 L 4258.20 4161.60 L 4253.00 4156.30 L 4247.00 4151.70 L 4243.80 4149.80 L 4234.00 4145.10 L 4228.90 4143.30 L 4223.60 4141.90 L 4218.20 4141.00 L 4212.80 4140.50 L 4208.20 4140.50 L 4203.70 4140.90 L 4194.90 4142.60 L 4190.60 4143.90 L 4186.30 4145.50 L 4181.40 4148.00 L 4178.60 4149.60 L 4176.60 4151.10 L 4175.80 4151.90 L 4175.50 4152.40 L 4178.40 4149.90 L 4180.80 4147.00 L 4188.60 4136.40 L 4195.80 4125.60 L 4202.60 4114.40 L 4209.00 4103.10 L 4223.20 4074.80 L 4231.50 4057.50 L 4247.60 4022.50 L 4268.10 3974.30 L 4292.70 3912.90 L 4307.30 3875.50 L 4335.60 3800.40 L 4417.20 3572.40 L 4509.00 3596.20 L 4502.80 3632.40 L 4496.20 3668.40 L 4481.80 3739.90 L 4465.90 3811.30 L 4448.60 3882.70 L 4432.40 3945.50 L 4417.20 3999.00 L 4400.60 4052.40 L 4384.70 4099.40 L 4377.30 4119.60 L 4361.20 4160.30 L 4355.00 4175.10 L 4348.30 4189.70 L 4341.20 4204.00 L 4333.70 4218.20 L 4325.70 4232.10 L 4317.30 4245.70 L 4310.70 4254.60 L 4303.70 4263.20 L 4296.30 4271.50 L 4290.00 4277.80 L 4283.30 4283.70 L 4276.20 4289.10 L 4268.70 4294.00 L 4261.00 4298.40 L 4252.90 4302.20 L 4245.50 4305.10 L 4237.90 4307.40 L 4230.20 4309.10 L 4222.40 4310.30 L 4214.50 4310.80 L 4206.60 4310.80 L 4199.90 4310.40 L 4193.40 4309.50 L 4186.90 4308.20 L 4180.50 4306.50 L 4174.20 4304.40 L 4168.10 4301.90 L 4162.10 4299.10 L 4156.30 4295.80 L 4149.60 4291.40 L 4137.40 4281.50 L 4126.50 4270.10 L 4121.60 4264.00 L 4117.00 4257.50 L 4112.90 4250.70 L 4107.90 4241.60 L 4099.50 4224.70 L 4072.30 4169.10 L 4054.50 4131.90 L 4025.50 4069.30 L 4003.90 4019.10 L 3956.30 3904.90 L 3930.60 3840.80 L 3911.40 3789.10 L 3902.10 3762.70 L 3884.40 3708.60 L 4065.20 3649.40 Z" fill="#e58a7b" fill-rule="nonzero" node-id="538" stroke="none" target-height="738.3999" target-width="624.6001" target-x="3884.4" target-y="3572.4"/><path d="M 3987.90 3473.90 L 3992.70 3475.20 L 3997.60 3477.10 L 4007.70 3482.20 L 4013.00 3485.50 L 4019.10 3490.00 L 4031.70 3500.80 L 4038.10 3507.20 L 4046.30 3516.10 L 4054.50 3525.80 L 4062.90 3536.50 L 4078.70 3559.00 L 4086.60 3571.10 L 4097.90 3589.60 L 4108.80 3608.70 L 4119.30 3627.90 L 4129.00 3646.90 L 4138.30 3665.70 L 4154.60 3700.60 L 4172.50 3741.90 L 4182.00 3765.60 L 3910.40 3996.70 L 3897.50 3974.40 L 3875.30 3934.10 L 3856.70 3898.70 L 3846.80 3879.00 L 3826.90 3837.40 L 3817.20 3815.80 L 3807.70 3793.80 L 3798.80 3771.70 L 3790.70 3749.90 L 3781.10 3721.10 L 3777.00 3707.40 L 3773.40 3693.50 L 3770.40 3680.40 L 3768.10 3668.00 L 3766.80 3658.50 L 3765.90 3649.60 L 3765.40 3633.40 L 3765.80 3625.40 L 3766.80 3618.00 L 3768.20 3611.40 L 3770.10 3605.30 L 3774.90 3592.60 L 3780.00 3580.60 L 3785.30 3569.20 L 3790.80 3558.50 L 3796.80 3547.80 L 3803.10 3537.90 L 3809.70 3528.60 L 3816.50 3519.90 L 3822.40 3513.30 L 3828.50 3507.10 L 3834.80 3501.30 L 3841.30 3495.90 L 3848.10 3491.00 L 3855.20 3486.50 L 3862.60 3482.40 L 3870.20 3478.80 L 3878.30 3475.60 L 3886.60 3472.80 L 3895.00 3470.60 L 3903.80 3468.90 L 3913.00 3467.70 L 3922.70 3466.90 L 3932.90 3466.70 L 3942.70 3467.00 L 3953.10 3467.80 L 3964.10 3469.20 L 3975.70 3471.20 L 3987.90 3473.90 Z" fill="#429cfd" fill-rule="nonzero" node-id="540" stroke="none" target-height="530" target-width="416.6001" target-x="3765.4" target-y="3466.7"/><path d="M 4460.40 3487.00 L 4555.80 3407.30 L 4622.10 3510.60 L 4573.20 3596.70 L 4565.90 3602.80 L 4553.30 3612.00 L 4545.00 3617.40 L 4532.70 3624.40 L 4518.60 3631.10 L 4511.10 3634.00 L 4503.30 3636.70 L 4495.30 3638.90 L 4487.10 3640.50 L 4478.60 3641.70 L 4472.20 3642.10 L 4465.80 3642.10 L 4459.30 3641.60 L 4452.80 3640.70 L 4446.30 3639.40 L 4439.90 3637.40 L 4433.30 3634.90 L 4426.80 3631.70 L 4423.40 3623.50 L 4420.70 3615.00 L 4418.60 3606.40 L 4417.20 3597.70 L 4416.30 3589.00 L 4416.10 3580.10 L 4416.50 3571.30 L 4417.60 3562.50 L 4419.30 3553.70 L 4421.60 3545.10 L 4424.60 3536.70 L 4428.10 3528.60 L 4432.20 3520.80 L 4436.80 3513.30 L 4441.90 3506.10 L 4447.60 3499.30 L 4453.70 3492.90 L 4460.40 3487.00 Z" fill="#e58a7b" fill-rule="nonzero" node-id="542" stroke="none" target-height="234.80005" target-width="206" target-x="4416.1" target-y="3407.3"/><path d="M 4728.00 3407.50 L 4720.90 3433.50 L 4569.90 3458.80 L 4555.10 3407.30 L 4728.00 3407.50 Z" fill="#e58a7b" fill-rule="nonzero" node-id="544" stroke="none" target-height="51.5" target-width="172.8999" target-x="4555.1" target-y="3407.3"/><path d="M 3873.60 7538.50 L 3601.20 7362.50 L 3650.10 7277.60 L 3956.10 7465.80 L 3873.60 7538.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="546" stroke="none" target-height="260.8999" target-width="354.90015" target-x="3601.2" target-y="7277.6"/><path d="M 3410.90 7678.80 L 3401.90 7677.40 L 3393.10 7675.60 L 3375.90 7670.50 L 3367.60 7667.30 L 3359.40 7663.60 L 3351.40 7659.50 L 3342.40 7654.30 L 3341.50 7653.40 L 3340.90 7652.20 L 3340.90 7649.60 L 3341.50 7648.40 L 3342.40 7647.40 L 3343.60 7646.80 L 3350.00 7644.90 L 3361.50 7641.70 L 3376.30 7638.30 L 3384.50 7636.70 L 3392.80 7635.50 L 3401.20 7634.60 L 3409.10 7634.20 L 3414.30 7634.20 L 3419.00 7634.60 L 3423.30 7635.30 L 3427.50 7636.50 L 3430.90 7638.00 L 3433.80 7639.90 L 3435.70 7641.80 L 3438.40 7646.50 L 3439.10 7649.10 L 3439.00 7654.40 L 3438.60 7657.70 L 3437.70 7660.70 L 3436.50 7663.70 L 3434.90 7666.50 L 3432.90 7669.00 L 3430.70 7671.30 L 3428.20 7673.30 L 3422.00 7676.60 L 3418.40 7677.80 L 3414.70 7678.50 L 3410.90 7678.80 Z M 3357.20 7652.50 L 3367.30 7657.40 L 3376.50 7661.40 L 3384.80 7664.50 L 3397.10 7668.00 L 3407.00 7669.60 L 3411.90 7669.80 L 3416.00 7669.40 L 3419.40 7668.70 L 3422.30 7667.60 L 3424.70 7666.00 L 3426.70 7664.10 L 3428.40 7661.80 L 3429.70 7659.20 L 3430.50 7656.60 L 3430.90 7653.70 L 3430.90 7651.10 L 3430.70 7649.40 L 3430.30 7648.50 L 3426.60 7645.90 L 3423.70 7644.80 L 3419.90 7644.00 L 3416.10 7643.60 L 3411.70 7643.50 L 3399.00 7644.20 L 3390.50 7645.30 L 3382.00 7646.70 L 3364.80 7650.50 L 3357.20 7652.50 Z" fill="#263238" fill-rule="nonzero" node-id="548" stroke="none" target-height="44.59961" target-width="98.200195" target-x="3340.9" target-y="7634.2"/><path d="M 3345.30 7656.60 L 3342.00 7655.20 L 3341.50 7654.10 L 3341.40 7653.00 L 3342.00 7650.90 L 3342.90 7647.20 L 3345.60 7639.00 L 3350.00 7627.80 L 3355.90 7615.30 L 3359.40 7609.00 L 3366.00 7599.20 L 3371.90 7592.50 L 3375.10 7589.60 L 3381.80 7585.30 L 3385.00 7584.10 L 3391.70 7583.10 L 3395.10 7583.40 L 3401.60 7585.30 L 3404.00 7586.30 L 3406.20 7587.60 L 3408.20 7589.30 L 3411.10 7593.60 L 3412.50 7598.60 L 3411.90 7604.80 L 3410.60 7608.50 L 3408.50 7612.50 L 3403.00 7620.20 L 3399.30 7624.20 L 3393.40 7629.90 L 3386.80 7635.50 L 3379.80 7640.60 L 3372.70 7645.30 L 3365.50 7649.50 L 3354.40 7654.90 L 3347.20 7657.30 L 3345.30 7656.60 Z M 3391.60 7591.50 L 3389.20 7591.70 L 3387.00 7592.30 L 3382.00 7594.80 L 3376.40 7599.70 L 3372.40 7604.30 L 3368.60 7609.70 L 3361.90 7621.60 L 3356.30 7633.90 L 3352.00 7645.10 L 3358.30 7642.10 L 3365.20 7638.30 L 3372.00 7634.00 L 3378.60 7629.20 L 3385.00 7624.00 L 3390.50 7618.90 L 3394.00 7615.30 L 3396.80 7611.90 L 3401.10 7605.30 L 3402.30 7602.40 L 3402.80 7599.80 L 3402.60 7597.50 L 3401.10 7595.10 L 3399.70 7594.00 L 3397.30 7592.70 L 3394.50 7591.50 L 3391.60 7590.80 L 3391.60 7591.50 Z" fill="#263238" fill-rule="nonzero" node-id="550" stroke="none" target-height="74.19971" target-width="71.1001" target-x="3341.4" target-y="7583.1"/><path d="M 3751.20 7781.80 L 3746.80 7781.50 L 3742.00 7780.60 L 3737.00 7779.10 L 3727.10 7774.90 L 3714.10 7767.30 L 3706.40 7761.90 L 3698.80 7756.00 L 3684.40 7743.60 L 3677.90 7737.50 L 3666.30 7726.00 L 3665.70 7724.80 L 3665.50 7723.50 L 3666.30 7721.00 L 3668.30 7719.20 L 3669.50 7718.70 L 3670.90 7718.60 L 3689.50 7720.90 L 3704.90 7723.80 L 3722.10 7727.70 L 3730.80 7730.10 L 3747.60 7735.80 L 3755.00 7738.90 L 3759.80 7741.30 L 3767.40 7746.10 L 3770.70 7748.90 L 3773.10 7751.60 L 3775.90 7756.60 L 3776.80 7761.30 L 3775.90 7766.00 L 3773.40 7770.90 L 3771.60 7773.30 L 3769.50 7775.40 L 3767.20 7777.30 L 3764.60 7778.90 L 3761.90 7780.20 L 3759.00 7781.00 L 3751.20 7781.80 Z M 3682.10 7729.30 L 3692.30 7738.90 L 3701.90 7747.10 L 3710.60 7754.00 L 3717.70 7758.90 L 3724.00 7763.00 L 3729.80 7766.30 L 3735.10 7768.80 L 3739.80 7770.70 L 3743.90 7771.90 L 3747.50 7772.60 L 3753.60 7772.80 L 3756.20 7772.20 L 3758.70 7771.20 L 3763.00 7768.20 L 3764.70 7766.20 L 3766.00 7763.90 L 3766.60 7762.60 L 3766.90 7761.20 L 3766.00 7758.40 L 3763.30 7754.90 L 3761.10 7753.00 L 3758.20 7751.00 L 3749.30 7746.50 L 3743.50 7744.10 L 3734.50 7741.10 L 3724.40 7738.10 L 3703.10 7733.10 L 3682.10 7729.30 Z" fill="#263238" fill-rule="nonzero" node-id="552" stroke="none" target-height="63.199707" target-width="111.30005" target-x="3665.5" target-y="7718.6"/><path d="M 3684.70 7728.20 L 3674.00 7727.70 L 3667.70 7726.70 L 3665.00 7723.20 L 3664.80 7722.10 L 3665.00 7720.90 L 3665.40 7719.80 L 3675.90 7708.40 L 3680.70 7703.80 L 3692.80 7693.50 L 3699.70 7688.60 L 3704.40 7685.60 L 3709.30 7682.90 L 3714.30 7680.60 L 3719.40 7678.70 L 3724.50 7677.40 L 3729.60 7676.60 L 3738.10 7677.10 L 3742.20 7678.10 L 3746.20 7679.70 L 3749.90 7681.70 L 3753.40 7684.30 L 3756.30 7687.10 L 3759.70 7692.00 L 3760.70 7694.50 L 3761.20 7696.70 L 3760.80 7701.60 L 3758.70 7706.30 L 3757.20 7708.50 L 3752.40 7712.80 L 3744.10 7717.40 L 3738.90 7719.50 L 3733.50 7721.30 L 3727.70 7722.90 L 3712.10 7726.00 L 3702.70 7727.20 L 3693.30 7727.90 L 3684.70 7728.20 Z M 3678.50 7719.30 L 3685.40 7719.50 L 3700.70 7718.60 L 3716.40 7716.30 L 3731.10 7712.80 L 3737.50 7710.70 L 3741.50 7709.10 L 3745.00 7707.40 L 3747.80 7705.80 L 3752.20 7702.00 L 3753.70 7699.10 L 3753.60 7697.80 L 3752.30 7694.60 L 3749.10 7691.20 L 3746.50 7689.20 L 3743.70 7687.60 L 3740.60 7686.40 L 3734.20 7685.30 L 3731.00 7685.50 L 3723.30 7687.90 L 3716.00 7690.90 L 3708.90 7694.40 L 3702.10 7698.50 L 3695.60 7703.10 L 3689.60 7708.10 L 3678.50 7719.30 Z" fill="#263238" fill-rule="nonzero" node-id="554" stroke="none" target-height="51.600098" target-width="96.3999" target-x="3664.8" target-y="7676.6"/><path d="M 3351.70 7630.80 L 3149.50 7573.60 L 3146.80 7573.00 L 3144.10 7573.00 L 3141.50 7573.40 L 3138.90 7574.30 L 3134.50 7577.50 L 3132.90 7579.50 L 3131.60 7581.90 L 3063.40 7735.30 L 3062.00 7739.30 L 3061.30 7743.50 L 3061.10 7747.70 L 3061.60 7751.90 L 3062.60 7756.00 L 3064.20 7759.90 L 3066.30 7763.60 L 3068.90 7766.90 L 3072.00 7769.80 L 3075.40 7772.30 L 3079.20 7774.20 L 3083.20 7775.60 L 3111.80 7782.90 L 3213.00 7807.30 L 3243.00 7815.20 L 3278.00 7825.00 L 3313.50 7835.60 L 3441.30 7876.60 L 3486.70 7890.10 L 3494.00 7891.90 L 3500.70 7893.10 L 3506.90 7893.80 L 3512.70 7894.00 L 3518.70 7893.70 L 3524.20 7893.10 L 3529.20 7892.10 L 3533.90 7890.80 L 3542.90 7887.00 L 3550.30 7882.20 L 3558.60 7874.30 L 3561.90 7870.10 L 3564.70 7865.50 L 3566.80 7860.90 L 3568.50 7856.20 L 3569.60 7851.40 L 3570.10 7846.80 L 3570.10 7842.40 L 3569.50 7838.00 L 3568.40 7834.10 L 3565.10 7827.90 L 3560.90 7823.80 L 3558.30 7822.10 L 3527.10 7804.70 L 3514.00 7796.80 L 3501.10 7788.40 L 3489.60 7780.50 L 3479.40 7773.10 L 3469.50 7765.30 L 3452.80 7750.80 L 3438.50 7736.40 L 3432.50 7729.60 L 3421.40 7715.90 L 3409.80 7699.30 L 3385.50 7660.20 L 3378.90 7650.40 L 3376.30 7646.90 L 3370.40 7640.90 L 3363.50 7635.90 L 3359.70 7633.90 L 3355.80 7632.20 L 3351.70 7630.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="556" stroke="none" target-height="321" target-width="509" target-x="3061.1" target-y="7573"/><path d="M 3671.80 7698.10 L 3499.10 7578.80 L 3496.80 7577.40 L 3494.30 7576.50 L 3491.70 7576.10 L 3489.00 7576.10 L 3483.90 7577.50 L 3479.60 7580.70 L 3365.10 7703.80 L 3362.50 7707.20 L 3360.50 7710.80 L 3359.00 7714.80 L 3358.00 7718.90 L 3357.70 7723.10 L 3357.90 7727.30 L 3358.80 7731.40 L 3360.20 7735.40 L 3362.10 7739.10 L 3364.60 7742.60 L 3367.50 7745.60 L 3370.80 7748.20 L 3395.30 7764.30 L 3483.20 7820.40 L 3509.10 7837.60 L 3549.80 7865.40 L 3589.30 7894.10 L 3683.30 7963.90 L 3714.50 7986.80 L 3743.60 8007.50 L 3749.90 8011.50 L 3755.80 8014.80 L 3761.50 8017.50 L 3766.90 8019.60 L 3772.60 8021.30 L 3778.00 8022.50 L 3783.10 8023.10 L 3788.00 8023.40 L 3793.00 8023.20 L 3797.60 8022.70 L 3806.30 8020.60 L 3811.70 8018.40 L 3816.60 8015.90 L 3821.10 8012.90 L 3825.20 8009.40 L 3828.80 8005.80 L 3834.40 7997.80 L 3836.40 7993.60 L 3837.80 7989.40 L 3838.70 7985.10 L 3838.90 7981.00 L 3837.70 7974.10 L 3835.00 7968.90 L 3833.10 7966.40 L 3816.20 7948.00 L 3801.30 7930.90 L 3788.10 7914.90 L 3775.40 7898.60 L 3764.20 7883.40 L 3754.50 7869.30 L 3745.10 7854.80 L 3737.00 7841.20 L 3730.00 7828.50 L 3723.40 7815.50 L 3712.70 7791.70 L 3704.00 7768.60 L 3695.50 7741.60 L 3689.80 7721.80 L 3688.20 7717.80 L 3686.30 7714.00 L 3681.30 7706.90 L 3678.50 7703.70 L 3675.30 7700.80 L 3671.80 7698.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="558" stroke="none" target-height="447.2998" target-width="481.19995" target-x="3357.7" target-y="7576.1"/><path d="M 3531.80 7476.30 L 3220.50 7321.50 L 3252.70 7237.00 L 3585.20 7400.20 L 3531.80 7476.30 Z" fill="#429cfd" fill-rule="nonzero" node-id="560" stroke="none" target-height="239.2998" target-width="364.69995" target-x="3220.5" target-y="7237"/><path d="M 3127.00 4558.70 L 3100.20 4629.10 L 3100.90 4632.50 L 3103.40 4635.30 L 3107.70 4637.30 L 3110.30 4637.90 L 3113.20 4638.10 L 3902.20 4638.10 L 3905.60 4637.80 L 3908.60 4637.10 L 3911.30 4635.80 L 3913.30 4634.30 L 3914.30 4633.10 L 3915.00 4631.80 L 3915.40 4630.50 L 3922.00 4562.20 L 3921.80 4560.80 L 3921.30 4559.40 L 3919.10 4556.80 L 3915.80 4554.90 L 3911.60 4553.80 L 3137.10 4553.60 L 3132.60 4554.60 L 3130.50 4555.70 L 3128.70 4557.00 L 3127.00 4558.70 Z" fill="#429cfd" fill-rule="nonzero" node-id="562" stroke="none" target-height="84.5" target-width="821.80005" target-x="3100.2" target-y="4553.6"/><g node-id="608"><path d="M 3127.00 4558.70 L 3100.20 4629.10 L 3100.90 4632.50 L 3103.40 4635.30 L 3107.70 4637.30 L 3110.30 4637.90 L 3113.20 4638.10 L 3902.20 4638.10 L 3905.60 4637.80 L 3908.60 4637.10 L 3911.30 4635.80 L 3913.30 4634.30 L 3914.30 4633.10 L 3915.00 4631.80 L 3915.40 4630.50 L 3922.00 4562.20 L 3921.80 4560.80 L 3921.30 4559.40 L 3919.10 4556.80 L 3915.80 4554.90 L 3911.60 4553.80 L 3137.10 4553.60 L 3132.60 4554.60 L 3130.50 4555.70 L 3128.70 4557.00 L 3127.00 4558.70 Z" fill="#ffffff" fill-opacity="0.4" fill-rule="nonzero" group-id="21" node-id="566" stroke="none" target-height="84.5" target-width="821.80005" target-x="3100.2" target-y="4553.6"/></g><path d="M 3251.30 4644.80 L 3228.50 4644.60 L 3225.50 4643.40 L 3223.80 4641.20 L 3223.60 4640.00 L 3233.40 4551.50 L 3234.60 4549.30 L 3237.40 4547.60 L 3239.30 4547.10 L 3262.00 4547.00 L 3264.10 4547.20 L 3267.10 4548.30 L 3268.20 4549.30 L 3268.80 4550.40 L 3269.00 4551.50 L 3259.20 4640.00 L 3258.00 4642.30 L 3256.70 4643.40 L 3255.10 4644.10 L 3253.40 4644.60 L 3251.30 4644.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="569" stroke="none" target-height="97.799805" target-width="45.399902" target-x="3223.6" target-y="4547"/><path d="M 3737.90 4644.80 L 3715.30 4644.60 L 3711.20 4642.30 L 3710.60 4641.20 L 3710.50 4640.00 L 3720.00 4551.50 L 3720.30 4550.40 L 3721.20 4549.30 L 3722.50 4548.40 L 3724.20 4547.60 L 3726.10 4547.10 L 3750.60 4547.10 L 3753.80 4548.40 L 3755.50 4550.30 L 3746.00 4640.00 L 3745.30 4641.20 L 3744.30 4642.40 L 3743.10 4643.40 L 3741.70 4644.10 L 3740.00 4644.60 L 3737.90 4644.80 Z" fill="#429cfd" fill-rule="nonzero" node-id="571" stroke="none" target-height="97.69971" target-width="45" target-x="3710.5" target-y="4547.1"/><g node-id="609"><path d="M 3233.20 8684.20 L 3348.00 8683.40 L 3456.10 8681.30 L 3507.70 8679.70 L 3555.70 8677.80 L 3602.40 8675.60 L 3644.90 8673.30 L 3685.80 8670.50 L 3721.90 8667.70 L 3756.20 8664.50 L 3784.90 8661.20 L 3819.10 8656.40 L 3832.20 8654.00 L 3845.20 8651.20 L 3854.90 8648.60 L 3861.90 8646.20 L 3866.30 8644.20 L 3869.20 8642.40 L 3871.00 8640.70 L 3871.90 8639.30 L 3872.20 8637.90 L 3871.90 8636.50 L 3871.00 8635.00 L 3869.20 8633.40 L 3866.30 8631.60 L 3861.90 8629.60 L 3854.90 8627.20 L 3845.20 8624.50 L 3832.20 8621.70 L 3803.50 8617.00 L 3784.90 8614.50 L 3756.20 8611.30 L 3721.90 8608.10 L 3685.80 8605.20 L 3644.90 8602.50 L 3602.40 8600.10 L 3507.70 8596.10 L 3403.50 8593.30 L 3291.70 8591.80 L 3174.70 8591.80 L 3062.80 8593.30 L 2958.70 8596.10 L 2910.70 8597.90 L 2864.00 8600.10 L 2821.50 8602.50 L 2780.50 8605.20 L 2744.50 8608.10 L 2710.20 8611.30 L 2681.40 8614.50 L 2662.90 8617.00 L 2647.20 8619.40 L 2634.20 8621.70 L 2621.10 8624.50 L 2611.50 8627.20 L 2604.50 8629.60 L 2600.00 8631.60 L 2597.10 8633.40 L 2595.40 8635.00 L 2594.50 8636.50 L 2594.20 8637.90 L 2594.50 8639.30 L 2597.10 8642.40 L 2600.00 8644.20 L 2604.50 8646.20 L 2611.50 8648.60 L 2621.10 8651.20 L 2634.20 8654.00 L 2647.20 8656.40 L 2662.90 8658.80 L 2681.40 8661.20 L 2710.20 8664.50 L 2744.50 8667.70 L 2780.50 8670.50 L 2821.50 8673.30 L 2864.00 8675.60 L 2910.70 8677.80 L 3010.20 8681.30 L 3062.80 8682.50 L 3118.30 8683.40 L 3233.20 8684.20 Z" fill="#f5f5f5" fill-rule="nonzero" group-id="22" node-id="575" stroke="none" target-height="92.40039" target-width="1278" target-x="2594.2" target-y="8591.8"/></g><path d="M 3622.50 8572.50 L 3565.20 8555.30 L 3507.60 8536.80 L 3479.00 8527.00 L 3451.30 8517.10 L 3424.00 8506.80 L 3398.20 8496.50 L 3365.10 8482.20 L 3334.80 8467.70 L 3301.40 8449.90 L 3301.40 7938.10 L 3530.10 7938.10 L 3535.90 7937.50 L 3541.50 7936.40 L 3547.00 7934.90 L 3552.40 7932.90 L 3562.50 7927.70 L 3571.60 7920.80 L 3579.50 7912.40 L 3582.90 7907.70 L 3585.90 7902.80 L 3590.50 7892.50 L 3592.20 7887.00 L 3593.40 7881.40 L 3594.10 7875.70 L 3594.30 7870.00 L 3594.10 7864.20 L 3593.40 7858.50 L 3592.20 7852.90 L 3590.50 7847.40 L 3585.90 7837.10 L 3582.90 7832.20 L 3579.50 7827.50 L 3571.60 7819.10 L 3562.50 7812.20 L 3557.50 7809.40 L 3552.40 7807.00 L 3547.00 7805.00 L 3541.50 7803.50 L 3535.90 7802.40 L 3530.10 7801.90 L 3302.60 7801.90 L 3302.60 5468.60 L 3165.20 5468.60 L 3165.20 7801.90 L 2933.20 7801.70 L 2928.60 7801.90 L 2924.00 7802.40 L 2919.50 7803.30 L 2915.00 7804.40 L 2906.30 7807.60 L 2898.10 7811.90 L 2890.60 7817.20 L 2887.10 7820.30 L 2883.80 7823.60 L 2880.80 7827.10 L 2875.50 7834.70 L 2871.20 7842.90 L 2868.10 7851.60 L 2866.30 7860.70 L 2865.80 7865.30 L 2865.80 7874.60 L 2866.30 7879.20 L 2867.10 7883.80 L 2868.10 7888.20 L 2871.20 7897.00 L 2873.20 7901.20 L 2878.00 7909.10 L 2883.80 7916.30 L 2887.10 7919.60 L 2890.60 7922.70 L 2898.10 7928.00 L 2902.10 7930.30 L 2906.30 7932.30 L 2910.60 7934.10 L 2919.50 7936.60 L 2924.00 7937.50 L 2928.60 7938.00 L 2933.20 7938.20 L 3165.20 7938.10 L 3165.20 8449.20 L 3162.00 8450.30 L 3158.80 8452.50 L 3145.80 8459.80 L 3131.70 8467.20 L 3116.60 8474.70 L 3101.30 8481.90 L 3068.10 8496.20 L 3042.20 8506.60 L 3015.00 8516.90 L 2987.30 8526.80 L 2958.80 8536.50 L 2901.40 8554.90 L 2844.20 8571.80 L 2840.40 8573.20 L 2836.90 8575.00 L 2833.60 8577.10 L 2830.70 8579.70 L 2828.00 8582.60 L 2825.70 8585.80 L 2823.70 8589.30 L 2822.20 8592.90 L 2821.20 8596.70 L 2820.40 8604.50 L 2820.80 8608.50 L 2821.60 8612.40 L 2822.80 8616.10 L 2824.40 8619.70 L 2826.50 8623.00 L 2829.00 8626.10 L 2831.80 8628.90 L 2834.90 8631.30 L 2841.90 8635.00 L 2845.60 8636.10 L 2849.50 8636.90 L 2853.50 8637.20 L 3613.10 8637.20 L 3616.90 8636.70 L 3624.10 8634.50 L 3630.60 8630.80 L 3633.60 8628.30 L 3636.20 8625.60 L 3640.50 8619.30 L 3642.00 8615.90 L 3643.20 8612.30 L 3643.90 8608.60 L 3644.30 8604.80 L 3643.60 8597.30 L 3641.30 8590.20 L 3639.60 8586.80 L 3637.40 8583.60 L 3632.20 8578.20 L 3626.00 8574.00 L 3622.50 8572.50 Z" fill="#e0e0e0" fill-rule="nonzero" node-id="578" stroke="none" target-height="3168.6" target-width="823.90015" target-x="2820.4" target-y="5468.6"/><path d="M 3657.50 5231.10 L 2809.30 5231.10 L 2800.80 5231.30 L 2792.50 5232.20 L 2784.40 5233.60 L 2776.50 5235.50 L 2768.70 5237.90 L 2761.20 5240.80 L 2754.00 5244.10 L 2747.00 5247.90 L 2740.20 5252.20 L 2733.80 5256.80 L 2727.70 5261.80 L 2722.00 5267.20 L 2716.50 5273.00 L 2711.50 5279.10 L 2706.90 5285.50 L 2702.60 5292.20 L 2698.80 5299.20 L 2695.50 5306.50 L 2692.60 5314.00 L 2690.20 5321.80 L 2688.30 5329.70 L 2686.90 5337.70 L 2686.10 5346.10 L 2685.80 5354.60 L 2685.80 5606.70 L 2686.10 5615.30 L 2686.90 5623.60 L 2688.30 5631.70 L 2690.20 5639.60 L 2692.60 5647.40 L 2695.50 5654.90 L 2698.80 5662.10 L 2702.60 5669.10 L 2706.90 5675.80 L 2711.50 5682.20 L 2716.50 5688.30 L 2722.00 5694.10 L 2727.70 5699.50 L 2733.80 5704.50 L 2740.20 5709.20 L 2747.00 5713.40 L 2754.00 5717.20 L 2761.20 5720.60 L 2768.70 5723.40 L 2776.50 5725.90 L 2784.40 5727.80 L 2792.50 5729.10 L 2800.80 5730.00 L 2809.30 5730.30 L 3657.50 5730.30 L 3666.10 5730.00 L 3674.40 5729.10 L 3682.50 5727.80 L 3690.40 5725.90 L 3698.10 5723.40 L 3705.60 5720.60 L 3719.90 5713.40 L 3726.60 5709.20 L 3739.10 5699.50 L 3744.90 5694.10 L 3750.30 5688.30 L 3755.30 5682.20 L 3759.90 5675.80 L 3764.20 5669.10 L 3768.00 5662.10 L 3771.30 5654.90 L 3774.20 5647.40 L 3776.70 5639.60 L 3778.60 5631.70 L 3779.90 5623.60 L 3780.80 5615.30 L 3781.10 5606.70 L 3781.10 5354.60 L 3780.80 5346.10 L 3779.90 5337.70 L 3778.60 5329.70 L 3776.70 5321.80 L 3774.20 5314.00 L 3771.30 5306.50 L 3768.00 5299.20 L 3764.20 5292.20 L 3759.90 5285.50 L 3755.30 5279.10 L 3750.30 5273.00 L 3744.90 5267.20 L 3739.10 5261.80 L 3733.00 5256.80 L 3726.60 5252.20 L 3719.90 5247.90 L 3712.90 5244.10 L 3705.60 5240.80 L 3698.10 5237.90 L 3690.40 5235.50 L 3682.50 5233.60 L 3674.40 5232.20 L 3666.10 5231.30 L 3657.50 5231.10 Z" fill="#429cfd" fill-rule="nonzero" node-id="580" stroke="none" target-height="499.1997" target-width="1095.3" target-x="2685.8" target-y="5231.1"/><path d="M 2801.50 5730.50 L 2801.50 5773.90 L 2801.80 5779.30 L 2802.60 5784.50 L 2804.00 5789.50 L 2805.90 5794.40 L 2808.30 5799.10 L 2811.10 5803.70 L 2814.40 5808.00 L 2822.30 5816.10 L 2831.60 5823.10 L 2836.90 5826.30 L 2842.40 5829.00 L 2848.20 5831.50 L 2854.30 5833.70 L 2860.70 5835.50 L 2867.20 5836.90 L 2873.90 5837.90 L 2880.80 5838.60 L 2888.00 5838.80 L 3579.80 5838.80 L 3593.90 5837.90 L 3600.60 5836.90 L 3613.50 5833.70 L 3619.60 5831.50 L 3630.80 5826.30 L 3636.20 5823.10 L 3645.50 5816.10 L 3653.40 5808.00 L 3656.70 5803.70 L 3659.50 5799.10 L 3661.90 5794.40 L 3663.80 5789.50 L 3665.20 5784.50 L 3666.00 5779.30 L 3666.30 5773.90 L 3666.30 5730.50 L 2801.50 5730.50 Z" fill="#429cfd" fill-rule="nonzero" node-id="582" stroke="none" target-height="108.299805" target-width="864.80005" target-x="2801.5" target-y="5730.5"/><g node-id="610"><path d="M 2801.50 5730.50 L 2801.50 5773.90 L 2801.80 5779.30 L 2802.60 5784.50 L 2804.00 5789.50 L 2805.90 5794.40 L 2808.30 5799.10 L 2811.10 5803.70 L 2814.40 5808.00 L 2822.30 5816.10 L 2831.60 5823.10 L 2836.90 5826.30 L 2842.40 5829.00 L 2848.20 5831.50 L 2854.30 5833.70 L 2860.70 5835.50 L 2867.20 5836.90 L 2873.90 5837.90 L 2880.80 5838.60 L 2888.00 5838.80 L 3579.80 5838.80 L 3593.90 5837.90 L 3600.60 5836.90 L 3613.50 5833.70 L 3619.60 5831.50 L 3630.80 5826.30 L 3636.20 5823.10 L 3645.50 5816.10 L 3653.40 5808.00 L 3656.70 5803.70 L 3659.50 5799.10 L 3661.90 5794.40 L 3663.80 5789.50 L 3665.20 5784.50 L 3666.00 5779.30 L 3666.30 5773.90 L 3666.30 5730.50 L 2801.50 5730.50 Z" fill="#ffffff" fill-opacity="0.3" fill-rule="nonzero" group-id="23" node-id="586" stroke="none" target-height="108.299805" target-width="864.80005" target-x="2801.5" target-y="5730.5"/></g></svg>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2c99d81d..bb4a9776 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -303,7 +303,7 @@ onMounted(() => {
   width: 100%;
   height: 100%;
   overflow-y: auto;
-  background: url("http://github.com/@/assets/images/login-background-light.jpg") no-repeat center right;
+  background: url("http://github.com/@/assets/images/login-bg.jpg") no-repeat center right;
 
   .login-header {
     position: absolute;
@@ -414,7 +414,7 @@ onMounted(() => {
 
 html.dark {
   .login {
-    background: url("http://github.com/@/assets/images/login-background-dark.jpg") no-repeat center right;
+    background: url("http://github.com/@/assets/images/login-bg-dark.jpg") no-repeat center right;
 
     .login-content {
       background: transparent;

From 024603bbd4b5cf940a8f7e0354e45cc530258683 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 17 Dec 2024 12:42:30 +0800
Subject: [PATCH 101/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96=E5=92=8Cvite=E9=99=8D?=
 =?UTF-8?q?=E7=BA=A76.0.1=EF=BC=88=E9=83=A8=E9=97=A8mac=E6=9C=BA=E5=99=A8?=
 =?UTF-8?q?=E4=B8=8D=E5=85=BC=E5=AE=B9=E9=97=AE=E9=A2=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 1aafaf03..7f43cd8f 100644
--- a/package.json
+++ b/package.json
@@ -68,7 +68,7 @@
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.6.0",
+    "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
     "@eslint/js": "^9.17.0",
     "@types/codemirror": "^5.60.15",
@@ -78,8 +78,8 @@
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.18.0",
-    "@typescript-eslint/parser": "^8.18.0",
+    "@typescript-eslint/eslint-plugin": "^8.18.1",
+    "@typescript-eslint/parser": "^8.18.1",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
@@ -96,7 +96,7 @@
     "postcss-scss": "^4.0.9",
     "prettier": "^3.4.2",
     "sass": "^1.83.0",
-    "stylelint": "^16.11.0",
+    "stylelint": "^16.12.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-scss": "^14.1.0",
@@ -104,12 +104,12 @@
     "stylelint-config-standard": "^36.0.1",
     "terser": "^5.37.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.18.0",
-    "unocss": "0.65.0-beta.3",
+    "typescript-eslint": "^8.18.1",
+    "unocss": "0.65.1",
     "unplugin-auto-import": "^0.18.6",
     "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.0.3",
-    "vite-plugin-mock-dev-server": "^1.8.2",
+    "vite": "^6.0.1",
+    "vite-plugin-mock-dev-server": "^1.8.3",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.1.10"

From 3f0410081692b591ea6bd3043afb31abd61245c6 Mon Sep 17 00:00:00 2001
From: tangheng <best5721@sina.com>
Date: Tue, 17 Dec 2024 17:03:33 +0800
Subject: [PATCH 102/497] =?UTF-8?q?docs:=20:memo:=20.gitignore=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BF=BD=E7=95=A5=E6=96=87=E4=BB=B6package-lock.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0a2a67f1..dccd5ce8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ dist-ssr
 
 stats.html
 pnpm-lock.yaml
+package-lock.json

From 1dec4af9bdf2d57e7ac27d03dc809a08d433bbdb Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 19 Dec 2024 22:08:48 +0800
Subject: [PATCH 103/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E7=99=BB=E5=BD=95=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bb4a9776..454bd8fc 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -173,9 +173,6 @@ const loading = ref(false); // 按钮 loading 状态
 const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 
-const logo = ref(new URL("../../assets/logo.png", import.meta.url).href);
-const loginImage = ref(new URL("../../assets/images/login-image.svg", import.meta.url).href);
-
 const loginData = ref<LoginData>({
   username: "admin",
   password: "123456",
@@ -416,7 +413,7 @@ html.dark {
   .login {
     background: url("http://github.com/@/assets/images/login-bg-dark.jpg") no-repeat center right;
 
-    .login-content {
+    .login-form {
       background: transparent;
       box-shadow: var(--el-box-shadow);
     }

From 4204bbcd5b4784ae4bab9ebed8c3319dedaafcac Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 19 Dec 2024 23:13:33 +0800
Subject: [PATCH 104/497] =?UTF-8?q?fix:=20:bug:=20=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=BC=B9=E7=AA=97=E5=86=8D=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=89=93=E5=BC=80=E8=A1=A8=E5=8D=95=E5=80=BC=E6=9C=AA=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ef260a55..5ad53346 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -507,7 +507,16 @@ function handleDelete(menuId: number) {
 function resetRorm() {
   menuFormRef.value.resetFields();
   menuFormRef.value.clearValidate();
-  formData.value = { ...initialMenuFormData.value };
+  formData.value = {
+    id: undefined,
+    parentId: "0",
+    visible: 1,
+    sort: 1,
+    type: MenuTypeEnum.MENU, // 默认菜单
+    alwaysShow: 0,
+    keepAlive: 1,
+    params: [],
+  };
 }
 
 // 关闭弹窗

From d028b2cecae1e65a79dc73fcfad3c3a7492a98c4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 20 Dec 2024 00:51:46 +0800
Subject: [PATCH 105/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=B9=B4=E5=BA=A6=E4=BA=BA=E6=B0=94=E6=8A=95=E7=A5=A8=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     |  9 +++++++++
 src/views/dashboard/index.vue | 16 +++++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d8e16816..712ae2ce 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,13 @@
 
+ <div >
+  🔥🔥🔥 2024.12.20-12.30
+  ，掘金2024年度人气创作者打榜中，麻烦大家投票支持一下我们，感谢！投票地址：
+  <a href="https://activity.juejin.cn/rank/2024/writer/4187394044331261"  target="_blank">
+  https://activity.juejin.cn/rank/2024/writer/4187394044331261
+  </a>
+</div>
+
+
 <div align="center">
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 71292695..726b6246 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,9 +1,23 @@
 <template>
   <div class="dashboard-container">
+    <el-alert title="With description" type="error">
+      <template #title>
+        🔥🔥🔥 2024.12.20-12.30
+        ，掘金2024年度人气创作者打榜中，麻烦大家投票支持一下我们，感谢！投票地址：
+        <el-link
+          type="primary"
+          href="https://activity.juejin.cn/rank/2024/writer/4187394044331261"
+          target="_blank"
+        >
+          https://activity.juejin.cn/rank/2024/writer/4187394044331261
+        </el-link>
+      </template>
+    </el-alert>
+
     <!-- github 角标 -->
     <github-corner class="github-corner" />
 
-    <el-card shadow="never">
+    <el-card shadow="never" class="mt-2">
       <el-row class="h-80px">
         <el-col :span="18" :xs="24">
           <div class="flex-x-start">

From 4b41db372a8d03e5b045096615795f3beef0555d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 24 Dec 2024 08:00:55 +0800
Subject: [PATCH 106/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 8 ++++----
 README.md       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index 25109d51..576c621c 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -1,17 +1,17 @@
-
 <div align="center">
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.1-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-5.4.3-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.8.1-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.0.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.1-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
 </div>
 
+
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")
 
 <div align="center">
diff --git a/README.md b/README.md
index 712ae2ce..73dea508 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.11-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-5.4.8-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.8.5-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.0.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.1-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>

From fbacbcdc7dd0ebc815e108a15d89060731a12455 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 24 Dec 2024 08:02:34 +0800
Subject: [PATCH 107/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 7f43cd8f..b2544586 100644
--- a/package.json
+++ b/package.json
@@ -78,8 +78,8 @@
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.18.1",
-    "@typescript-eslint/parser": "^8.18.1",
+    "@typescript-eslint/eslint-plugin": "^8.18.2",
+    "@typescript-eslint/parser": "^8.18.2",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
@@ -88,7 +88,7 @@
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-vue": "^9.32.0",
-    "globals": "^15.13.0",
+    "globals": "^15.14.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.2.11",
     "postcss": "^8.4.49",
@@ -104,15 +104,15 @@
     "stylelint-config-standard": "^36.0.1",
     "terser": "^5.37.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.18.1",
+    "typescript-eslint": "^8.18.2",
     "unocss": "0.65.1",
     "unplugin-auto-import": "^0.18.6",
     "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.0.1",
+    "vite": "^6.0.5",
     "vite-plugin-mock-dev-server": "^1.8.3",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
-    "vue-tsc": "^2.1.10"
+    "vue-tsc": "^2.2.0"
   },
   "engines": {
     "node": ">=18.0.0"

From f4ba493fcd9362ba48b3f40a039895658917963b Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 25 Dec 2024 09:14:01 +0800
Subject: [PATCH 108/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=A7=86=E9=A2=91=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更改首页视频地址
---
 src/views/dashboard/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 726b6246..2ac9819b 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -83,10 +83,7 @@
                 视频
               </div>
               <div class="mt-3">
-                <el-link
-                  href="https://space.bilibili.com/1731537706/channel/seriesdetail?sid=4459672"
-                  target="_blank"
-                >
+                <el-link href="https://www.bilibili.com/video/BV1eFUuYyEFj" target="_blank">
                   <SvgIcon icon-class="bilibili" class="text-lg" />
                 </el-link>
               </div>

From a023b4b623e339ec752b62207d52f31d2d88aa59 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 25 Dec 2024 11:40:14 +0800
Subject: [PATCH 109/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=EF=BC=8C=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=8E=89=E5=8D=95=E5=9B=BE=E4=B8=8A=E4=BC=A0=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=A7=8D=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构图片上传，删除掉单图上传，一个图片上传支持多种情况
---
 src/components/Upload/ImageUpload.vue       | 380 ++++++++++++++++++++
 src/components/Upload/MultiImageUpload.vue  | 243 -------------
 src/components/Upload/SingleImageUpload.vue | 159 --------
 src/views/demo/upload.vue                   |  96 ++---
 4 files changed, 400 insertions(+), 478 deletions(-)
 create mode 100644 src/components/Upload/ImageUpload.vue
 delete mode 100644 src/components/Upload/MultiImageUpload.vue
 delete mode 100644 src/components/Upload/SingleImageUpload.vue

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
new file mode 100644
index 00000000..7522f89f
--- /dev/null
+++ b/src/components/Upload/ImageUpload.vue
@@ -0,0 +1,380 @@
+<!-- 图片上传组件 -->
+<template>
+  <!-- 实际的上传组件（隐藏） -->
+  <div style="display: none">
+    <el-upload
+      v-model:file-list="fileList"
+      :before-upload="handleBeforeUpload"
+      :action="http://github.com/props.action"
+      :headers="props.headers"
+      :data="props.data"
+      :name="props.name"
+      :on-success="handleSuccessFile"
+      :on-error="handleError"
+      :accept="props.accept"
+      :limit="props.limit"
+    />
+  </div>
+
+  <!-- 自定义的显示区域 -->
+  <div class="custom-upload-list">
+    <!-- 已上传的图片列表 -->
+    <div v-for="(path, index) in valFileList" :key="index" class="custom-upload-item">
+      <img class="upload-thumbnail" :src="http://github.com/path" alt="" />
+      <div class="upload-actions">
+        <span class="action-item preview" @click="previewImg(path)">
+          <el-icon><zoom-in /></el-icon>
+        </span>
+        <span v-if="props.showDelBtn" class="action-item delete" @click="handleRemove(path)">
+          <el-icon><Delete /></el-icon>
+        </span>
+      </div>
+    </div>
+
+    <!-- 上传按钮 -->
+    <div
+      v-if="valFileList.length < props.limit && props.showUploadBtn"
+      class="custom-upload-trigger"
+      @click="triggerUpload"
+    >
+      <el-icon><Plus /></el-icon>
+    </div>
+  </div>
+
+  <!-- 图片预览组件 -->
+  <el-image-viewer
+    v-if="viewVisible"
+    :zoom-rate="1.2"
+    :initialIndex="initialIndex"
+    :url-list="viewFileList"
+    @close="closePreview"
+  />
+</template>
+<script setup lang="ts">
+import { UploadRawFile, UploadUserFile, UploadFile } from "element-plus";
+import FileAPI from "@/api/file";
+import { getToken } from "@/utils/auth";
+import { ResultEnum } from "@/enums/ResultEnum";
+
+const emit = defineEmits(["update:modelValue", "change"]);
+
+const props = defineProps({
+  /**
+   * 文件路径集合
+   */
+  modelValue: {
+    type: [Array, String],
+    default: () => [],
+  },
+  /**
+   * 上传地址
+   */
+  action: {
+    type: String,
+    default: FileAPI.uploadUrl,
+  },
+  /**
+   * 请求头
+   */
+  headers: {
+    type: Object,
+    default: () => {
+      return {
+        Authorization: getToken(),
+      };
+    },
+  },
+  /**
+   * 请求携带的额外参数
+   */
+  data: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+  /**
+   * 上传文件的参数名
+   */
+  name: {
+    type: String,
+    default: "file",
+  },
+  /**
+   * 文件上传数量限制
+   */
+  limit: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   * 是否显示删除按钮
+   */
+  showDelBtn: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 是否显示上传按钮
+   */
+  showUploadBtn: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 单张图片最大大小,单位MB
+   */
+  maxSize: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   * 上传文件类型
+   */
+  accept: {
+    type: String,
+    default: "image/*",
+  },
+  /**
+   * 支持的文件类型,默认支持所有图片格式
+   * eg:['png','jpg','jpeg','gif']
+   */
+  supportFileType: {
+    type: Array<string>,
+    default: () => [],
+  },
+  /**
+   * 自定义样式
+   */
+  style: {
+    type: Object,
+    default: () => {
+      return {
+        width: "130px",
+        height: "130px",
+      };
+    },
+  },
+});
+
+const viewVisible = ref(false);
+const initialIndex = ref(0);
+
+const fileList = ref([] as UploadUserFile[]);
+const valFileList = ref([] as string[]);
+const viewFileList = ref([] as string[]);
+
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    if (typeof newVal === "string" && !newVal) {
+      fileList.value = [];
+      viewFileList.value = [];
+      valFileList.value = [];
+      return;
+    }
+    const modelValue = typeof newVal === "string" ? [newVal] : (newVal as string[]);
+    const filePaths = fileList.value.map((file) => file.url);
+    // 监听modelValue文件集合值未变化时，跳过赋值
+    if (
+      filePaths.length > 0 &&
+      filePaths.length === modelValue.length &&
+      filePaths.every((x) => modelValue.some((y) => y === x)) &&
+      modelValue.every((y) => filePaths.some((x) => x === y))
+    ) {
+      return;
+    }
+
+    if (modelValue.length <= 0) {
+      fileList.value = [];
+      viewFileList.value = [];
+      valFileList.value = [];
+      return;
+    }
+
+    fileList.value = modelValue.map((filePath) => {
+      return { url: filePath } as UploadUserFile;
+    });
+    valFileList.value = modelValue;
+  },
+  { immediate: true }
+);
+
+/**
+ * 上传成功回调
+ *
+ * @param options
+ */
+const handleSuccessFile = (response: any, file: UploadFile) => {
+  if (response.code === ResultEnum.SUCCESS) {
+    ElMessage.success("上传成功");
+    valFileList.value.push(response.data.url);
+    if (props.limit === 1) {
+      emit("update:modelValue", response.data.url);
+      emit("change", response.data.url);
+    } else {
+      emit("update:modelValue", valFileList.value);
+      emit("change", valFileList.value);
+    }
+    return;
+  } else {
+    ElMessage.error(response.msg || "上传失败");
+  }
+};
+
+const handleError = (error: any) => {
+  ElMessage.error("上传失败");
+};
+
+/**
+ * 删除图片
+ */
+function handleRemove(path: string) {
+  if (path) {
+    FileAPI.deleteByPath(path).then(() => {
+      valFileList.value = valFileList.value.filter((x) => x !== path);
+      // 删除成功回调
+      if (props.limit === 1) {
+        emit("update:modelValue", "");
+        emit("change", "");
+      } else {
+        emit("update:modelValue", valFileList.value);
+        emit("change", valFileList.value);
+      }
+    });
+  }
+}
+
+/**
+ * 限制用户上传文件的格式和大小
+ */
+function handleBeforeUpload(file: UploadRawFile) {
+  // 限制文件大小
+  if (file.size > props.maxSize * 1024 * 1024) {
+    ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
+    return false;
+  }
+  // 判断文件类型
+  // 获取文件后缀名
+  const fileExt = file.name.split(".").pop();
+  if (!fileExt) {
+    ElMessage.warning("上传图片格式错误,支持的文件类型:" + props.supportFileType.join(","));
+    return false;
+  }
+  // 给文件后缀名转换为小写
+  const lowerCaseFileExt = fileExt.toLowerCase();
+  // 判断文件后缀名是否在支持的文件类型中
+  if (props.supportFileType.length > 0) {
+    let isSupport = false;
+    props.supportFileType.forEach((type) => {
+      if (type.toLowerCase() === lowerCaseFileExt) {
+        isSupport = true;
+      }
+    });
+    if (!isSupport) {
+      ElMessage.warning("上传图片格式错误,支持的文件类型:" + props.supportFileType.join(","));
+      return false;
+    }
+  }
+  return true;
+}
+
+/**
+ * 预览图片
+ */
+const previewImg = (path: string) => {
+  viewFileList.value = fileList.value.map((file) => file.url!);
+  initialIndex.value = fileList.value.findIndex((file) => file.url === path);
+  viewVisible.value = true;
+};
+
+/**
+ * 关闭预览
+ */
+const closePreview = () => {
+  viewVisible.value = false;
+};
+
+// 新增一个触发上传的方法
+const triggerUpload = () => {
+  const uploadEl = document.querySelector(".el-upload__input") as HTMLElement;
+  if (uploadEl) {
+    uploadEl.click();
+  }
+};
+</script>
+<style lang="scss" scoped>
+.custom-upload-list {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 8px;
+}
+
+.custom-upload-item {
+  position: relative;
+  width: v-bind("props.style.width");
+  height: v-bind("props.style.height");
+  overflow: hidden;
+  border-radius: 6px;
+
+  .upload-thumbnail {
+    width: 100%;
+    height: 100%;
+    object-fit: cover;
+  }
+
+  .upload-actions {
+    position: absolute;
+    top: 0;
+    left: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+    background-color: rgb(0 0 0 / 50%);
+    opacity: 0;
+    transition: opacity 0.3s;
+
+    &:hover {
+      opacity: 1;
+    }
+
+    .action-item {
+      padding: 8px;
+      color: #fff;
+      cursor: pointer;
+
+      &:hover {
+        color: var(--el-color-primary);
+      }
+    }
+  }
+}
+
+.custom-upload-trigger {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  width: v-bind("props.style.width");
+  height: v-bind("props.style.height");
+  cursor: pointer;
+  border: 1px dashed var(--el-border-color);
+  border-radius: 6px;
+  transition: var(--el-transition-duration);
+
+  &:hover {
+    color: var(--el-color-primary);
+    border-color: var(--el-color-primary);
+  }
+
+  .el-icon {
+    font-size: 20px;
+    color: #999;
+  }
+
+  &:hover .el-icon {
+    color: var(--el-color-primary);
+  }
+}
+</style>
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
deleted file mode 100644
index 5e2c0db1..00000000
--- a/src/components/Upload/MultiImageUpload.vue
+++ /dev/null
@@ -1,243 +0,0 @@
-<!-- 图片上传组件 -->
-<template>
-  <el-upload
-    v-model:file-list="fileList"
-    list-type="picture-card"
-    :class="fileList.length >= props.limit || !props.showUploadBtn ? 'hide' : 'show'"
-    :before-upload="handleBeforeUpload"
-    :action="http://github.com/props.action"
-    :headers="props.headers"
-    :data="props.data"
-    :name="props.name"
-    :on-success="handleSuccessFile"
-    :on-error="handleError"
-    :accept="props.accept"
-    :limit="props.limit"
-  >
-    <el-icon><Plus /></el-icon>
-    <template #file="{ file }">
-      <div style="width: 100%">
-        <img class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" alt="" />
-        <span class="el-upload-list__item-actions">
-          <span class="el-upload-list__item-preview" @click="previewImg(file)">
-            <el-icon><zoom-in /></el-icon>
-          </span>
-          <span
-            v-if="props.showDelBtn"
-            class="el-upload-list__item-delete"
-            @click="handleRemove(file)"
-          >
-            <el-icon><Delete /></el-icon>
-          </span>
-        </span>
-      </div>
-    </template>
-  </el-upload>
-
-  <el-image-viewer
-    v-if="viewVisible"
-    :zoom-rate="1.2"
-    :initialIndex="initialIndex"
-    :url-list="viewFileList"
-    @close="closePreview"
-  />
-</template>
-<script setup lang="ts">
-import { UploadRawFile, UploadUserFile, UploadFile, UploadProps } from "element-plus";
-import FileAPI from "@/api/file";
-import { getToken } from "@/utils/auth";
-import { ResultEnum } from "@/enums/ResultEnum";
-
-const emit = defineEmits(["update:modelValue"]);
-
-const props = defineProps({
-  /**
-   * 文件路径集合
-   */
-  modelValue: {
-    type: Array<string>,
-    default: () => [],
-  },
-  /**
-   * 上传地址
-   */
-  action: {
-    type: String,
-    default: FileAPI.uploadUrl,
-  },
-  /**
-   * 请求头
-   */
-  headers: {
-    type: Object,
-    default: () => {
-      return {
-        Authorization: getToken(),
-      };
-    },
-  },
-  /**
-   * 请求携带的额外参数
-   */
-  data: {
-    type: Object,
-    default: () => {
-      return {};
-    },
-  },
-  /**
-   * 上传文件的参数名
-   */
-  name: {
-    type: String,
-    default: "file",
-  },
-  /**
-   * 文件上传数量限制
-   */
-  limit: {
-    type: Number,
-    default: 10,
-  },
-  /**
-   * 是否显示删除按钮
-   */
-  showDelBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否显示上传按钮
-   */
-  showUploadBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 单张图片最大大小
-   */
-  maxSize: {
-    type: Number,
-    default: 10,
-  },
-  /**
-   * 上传文件类型
-   */
-  accept: {
-    type: String,
-    default: "image/*",
-  },
-});
-
-const viewVisible = ref(false);
-const initialIndex = ref(0);
-
-const fileList = ref([] as UploadUserFile[]);
-const valFileList = ref([] as string[]);
-const viewFileList = ref([] as string[]);
-
-watch(
-  () => props.modelValue,
-  (newVal: string[]) => {
-    const filePaths = fileList.value.map((file) => file.url);
-    // 监听modelValue文件集合值未变化时，跳过赋值
-    if (
-      filePaths.length > 0 &&
-      filePaths.length === newVal.length &&
-      filePaths.every((x) => newVal.some((y) => y === x)) &&
-      newVal.every((y) => filePaths.some((x) => x === y))
-    ) {
-      return;
-    }
-
-    if (newVal.length <= 0) {
-      fileList.value = [];
-      viewFileList.value = [];
-      valFileList.value = [];
-      return;
-    }
-
-    fileList.value = newVal.map((filePath) => {
-      return { url: filePath } as UploadUserFile;
-    });
-    valFileList.value = newVal.map((filePath) => {
-      return filePath;
-    });
-  },
-  { immediate: true }
-);
-
-/**
- * 上传成功回调
- *
- * @param options
- */
-const handleSuccessFile = (response: any, file: UploadFile) => {
-  if (response.code === ResultEnum.SUCCESS) {
-    ElMessage.success("上传成功");
-    valFileList.value.push(response.data.url);
-    emit("update:modelValue", valFileList.value);
-    return;
-  } else {
-    ElMessage.error(response.msg || "上传失败");
-  }
-};
-
-const handleError = (error: any) => {
-  ElMessage.error("上传失败");
-};
-
-/**
- * 删除图片
- */
-function handleRemove(removeFile: UploadFile) {
-  const filePath = removeFile.url;
-  if (filePath) {
-    FileAPI.deleteByPath(filePath).then(() => {
-      valFileList.value = valFileList.value.filter((x) => x !== filePath);
-      // 删除成功回调
-      emit("update:modelValue", valFileList.value);
-    });
-  }
-}
-
-/**
- * 限制用户上传文件的格式和大小
- */
-function handleBeforeUpload(file: UploadRawFile) {
-  if (file.size > props.maxSize * 1024 * 1024) {
-    ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
-    return false;
-  }
-  return true;
-}
-
-/**
- * 预览图片
- */
-const previewImg: UploadProps["onPreview"] = (uploadFile: UploadFile) => {
-  viewFileList.value = fileList.value.map((file) => file.url!);
-  initialIndex.value = fileList.value.findIndex((file) => file.url === uploadFile.url);
-  viewVisible.value = true;
-};
-
-/**
- * 关闭预览
- */
-const closePreview = () => {
-  viewVisible.value = false;
-};
-</script>
-<style lang="scss" scoped>
-.hide {
-  :deep(.el-upload--picture-card) {
-    display: none;
-  }
-}
-
-.show {
-  :deep(.el-upload--picture-card) {
-    display: flex;
-  }
-}
-</style>
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
deleted file mode 100644
index 93dde7be..00000000
--- a/src/components/Upload/SingleImageUpload.vue
+++ /dev/null
@@ -1,159 +0,0 @@
-<!-- 单图上传组件 -->
-<template>
-  <el-upload
-    v-model="imgUrl"
-    class="img-upload"
-    :show-file-list="false"
-    list-type="picture-card"
-    :before-upload="handleBeforeUpload"
-    :http-request="uploadFile"
-    :style="{ width: props.size, height: props.size }"
-    :accept="props.accept"
-  >
-    <template #default>
-      <el-image v-if="imgUrl" :src="http://github.com/imgUrl" />
-
-      <div v-if="imgUrl" class="img-upload__overlay">
-        <el-icon class="img-upload__preview-icon" @click.stop="handlePreview">
-          <ZoomIn />
-        </el-icon>
-
-        <el-icon class="img-upload__delete-icon" @click.stop="handleDelete">
-          <Delete />
-        </el-icon>
-      </div>
-      <el-icon v-else class="img-upload__add-icon">
-        <Plus />
-      </el-icon>
-    </template>
-  </el-upload>
-</template>
-
-<script setup lang="ts">
-import { ElImageViewer, UploadRawFile, UploadRequestOptions } from "element-plus";
-import FileAPI from "@/api/file";
-
-const props = defineProps({
-  modelValue: {
-    type: String,
-    default: "",
-  },
-  maxSize: {
-    type: Number,
-    default: 10, // 默认限制为 10MB
-  },
-  accept: {
-    type: String,
-    default: "",
-  },
-  size: {
-    type: String,
-    default: "150px",
-  },
-});
-
-const emit = defineEmits(["update:modelValue"]);
-const imgUrl = defineModel("modelValue", {
-  type: String,
-  required: true,
-  default: "",
-});
-
-/**
- * 自定义图片上传
- *
- * @param options
- */
-async function uploadFile(options: UploadRequestOptions): Promise<any> {
-  const data = await FileAPI.upload(options.file);
-  imgUrl.value = data.url;
-}
-
-/**
- * 限制用户上传文件的格式和大小
- */
-function handleBeforeUpload(file: UploadRawFile) {
-  if (file.size > props.maxSize * 1024 * 1024) {
-    ElMessage.warning(`上传图片不能大于${props.maxSize}MB`);
-    return false;
-  }
-
-  return true;
-}
-
-/**
- * 预览图片
- */
-function handlePreview() {
-  if (imgUrl.value) {
-    const imageViewerApp = createApp({
-      setup() {
-        return () =>
-          h(ElImageViewer, {
-            urlList: [imgUrl.value],
-            initialIndex: 0,
-            onClose: () => {
-              imageViewerApp.unmount();
-              document.body.removeChild(container);
-            },
-          });
-      },
-    });
-    const container = document.createElement("div");
-    document.body.appendChild(container);
-    imageViewerApp.mount(container);
-  }
-}
-
-/**
- * 删除图片
- */
-function handleDelete() {
-  imgUrl.value = "";
-}
-</script>
-
-<style scoped lang="scss">
-:deep(.el-upload--picture-card) {
-  /*  width: var(--el-upload-picture-card-size);
-  height: var(--el-upload-picture-card-size); */
-  width: 100%;
-  height: 100%;
-}
-
-.img-upload {
-  position: relative;
-  overflow: hidden;
-  cursor: pointer;
-  border: 1px var(--el-border-color) solid;
-  border-radius: 5px;
-
-  &:hover {
-    border-color: var(--el-color-primary);
-  }
-
-  &__delete-icon {
-    margin-left: 5px;
-  }
-
-  &__overlay {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    color: #fff;
-    background-color: var(--el-overlay-color-lighter);
-    border-radius: 6px;
-    opacity: 0;
-    transition: opacity var(--el-transition-duration);
-
-    &:hover {
-      opacity: 1;
-    }
-  }
-}
-</style>
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index e248fc12..abb99eef 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -11,20 +11,11 @@
     </el-link>
 
     <el-form>
-      <el-form-item label="单图上传">
-        <SingleImageUpload v-model="picUrl" />
+      <el-form-item label="绑定值">
+        {{ picUrl }}
       </el-form-item>
-      <el-form-item label="参数说明">
-        <el-table :data="singleImageUploadArgData" border>
-          <el-table-column prop="argsName" label="参数名称" width="300" />
-          <el-table-column prop="type" label="参数类型" width="200" />
-          <el-table-column prop="default" label="默认值" width="400" />
-          <el-table-column prop="desc" label="描述" width="300" />
-        </el-table>
-      </el-form-item>
-
-      <el-form-item label="多图上传">
-        <MultiImageUpload v-model="picUrls" />
+      <el-form-item label="图片上传">
+        <ImageUpload v-model="picUrl" :limit="1" :maxSize="10" />
       </el-form-item>
       <el-form-item label="参数说明">
         <el-table :data="imageUploadArgData" border>
@@ -54,71 +45,12 @@
 // 单图
 const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
 
-const singleImageUploadArgData = [
-  {
-    argsName: "v-model",
-    type: "String",
-    default: "",
-    desc: "已经上传的图片URL",
-  },
-  {
-    argsName: "size",
-    type: "String",
-    default: "150px",
-    desc: "图片上传组件的尺寸大小",
-  },
-  {
-    argsName: "max-size",
-    type: "Number",
-    default: "10",
-    desc: "单个图片上传大小限制(单位M)",
-  },
-  {
-    argsName: "accept",
-    type: "String",
-    default: "",
-    desc: "上传文件类型",
-  },
-];
-
-const imageCprpperUploadArgData = [
-  {
-    argsName: "v-model",
-    type: "Object",
-    default: "",
-    desc: "裁剪后图片Base64编码",
-  },
-  {
-    argsName: "presetMode",
-    type: "String",
-    default: "{ width: 295, height: 413 }",
-    desc: "裁剪窗口的长宽，及裁剪图片大小",
-  },
-  {
-    argsName: "title",
-    type: "String",
-    default: "上传图片",
-    desc: "组件内容",
-  },
-];
-
-const cprpperValue = ref();
-
-// 多图
-const picUrls = ref([
-  "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",
-  "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg",
-  "https://s2.loli.net/2023/05/24/ZPiGbcpR91WqInB.jpg",
-  "https://s2.loli.net/2023/05/24/e1bcnEq3MFdmlNL.jpg",
-  "https://s2.loli.net/2023/05/24/wZTSPj1yDQNcuhU.jpg",
-]);
-
 const imageUploadArgData = [
   {
     argsName: "v-model",
-    type: "Array",
-    default: "[]",
-    desc: "已经上传的图片数组",
+    type: "[Array,String]",
+    default: "[]  |  ''",
+    desc: "已经上传的图片数组,单张图片时为String",
   },
   {
     argsName: "action",
@@ -148,7 +80,7 @@ const imageUploadArgData = [
     argsName: "limit",
     type: "Number",
     default: 10,
-    desc: "上传最大的图片数量",
+    desc: "上传最大的图片数量,单张图片时填写1",
   },
   {
     argsName: "show-del-btn",
@@ -174,6 +106,18 @@ const imageUploadArgData = [
     default: "image/*",
     desc: "上传文件类型",
   },
+  {
+    argsName: "supportFileType",
+    type: "Array",
+    default: "[]",
+    desc: "支持的文件类型,默认支持所有图片格式,eg:['png','jpg','jpeg','gif']",
+  },
+  {
+    argsName: "style",
+    type: "Object",
+    default: "{width: '130px',height: '130px'}",
+    desc: "上传组件的样式",
+  },
 ];
 
 const fileUrls = ref([

From 4513b3e735d9c8632b2ebab349bbd5c29c8ca8d6 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 25 Dec 2024 11:50:17 +0800
Subject: [PATCH 110/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=90=8C=E4=B8=80=E4=B8=AA=E9=A1=B5=E9=9D=A2=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B0=83=E7=94=A8=E7=9A=84=E6=AF=8F=E6=AC=A1?=
 =?UTF-8?q?=E9=83=BD=E6=98=AF=E7=AC=AC=E4=B8=80=E4=B8=AA=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复同一个页面存在多个上传组件时候，点击非第一个上传按钮，触发的上传事件仍然为第一个上传事件的bug
---
 src/components/Upload/ImageUpload.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 7522f89f..b51f1198 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -3,6 +3,7 @@
   <!-- 实际的上传组件（隐藏） -->
   <div style="display: none">
     <el-upload
+      ref="uploadRef"
       v-model:file-list="fileList"
       :before-upload="handleBeforeUpload"
       :action="http://github.com/props.action"
@@ -164,6 +165,9 @@ const fileList = ref([] as UploadUserFile[]);
 const valFileList = ref([] as string[]);
 const viewFileList = ref([] as string[]);
 
+// 添加一个ref来引用el-upload组件
+const uploadRef = ref();
+
 watch(
   () => props.modelValue,
   (newVal) => {
@@ -295,9 +299,10 @@ const closePreview = () => {
   viewVisible.value = false;
 };
 
-// 新增一个触发上传的方法
+// 修改triggerUpload方法
 const triggerUpload = () => {
-  const uploadEl = document.querySelector(".el-upload__input") as HTMLElement;
+  // 通过ref直接访问el-upload组件内的input元素
+  const uploadEl = uploadRef.value.$el.querySelector(".el-upload__input");
   if (uploadEl) {
     uploadEl.click();
   }
@@ -359,6 +364,7 @@ const triggerUpload = () => {
   width: v-bind("props.style.width");
   height: v-bind("props.style.height");
   cursor: pointer;
+  background-color: rgb(255 254 254 / 50%);
   border: 1px dashed var(--el-border-color);
   border-radius: 6px;
   transition: var(--el-transition-duration);

From cc88e50cbe1d76d4907e9648915c1e7a37fa4533 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 25 Dec 2024 12:33:33 +0800
Subject: [PATCH 111/497] =?UTF-8?q?docs:=20:memo:=20=E6=B7=BB=E5=8A=A0=20G?=
 =?UTF-8?q?itCode=20=E7=9A=84=20G-Star=20=E5=BE=BD=E7=AB=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 10 ++++++++++
 README.md       | 11 +++++++++++
 2 files changed, 21 insertions(+)

diff --git a/README.en-US.md b/README.en-US.md
index 576c621c..9fb64d68 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -9,6 +9,16 @@
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
+
+  <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
+     <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
+   </a>     
+  <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
+    <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
+  </a>
+  <a href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
+    <img alt="有来技术" src="https://gitcode.com/youlai/vue3-element-admin/star/badge.svg"/>
+  </a>
 </div>
 
 
diff --git a/README.md b/README.md
index 73dea508..46bf36c6 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,17 @@
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
+
+  <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
+     <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
+   </a>     
+  <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
+    <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
+  </a>
+  <a href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
+    <img alt="有来技术" src="https://gitcode.com/youlai/vue3-element-admin/star/badge.svg"/>
+  </a>
+
 </div>
 
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")

From 8c7bf5cce1e7e0a8d52bae6b22d8ed394bdbf6bf Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 26 Dec 2024 14:22:55 +0800
Subject: [PATCH 112/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=A4=B4=E9=83=A8=E7=9A=84=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/lang/package/en.ts                   |  1 -
 src/lang/package/zh-cn.ts                |  1 -
 src/layout/components/Settings/index.vue |  5 -----
 src/layout/index.vue                     | 10 +++-------
 src/settings.ts                          |  2 --
 src/store/modules/settings.ts            |  9 +++------
 src/types/global.d.ts                    |  2 --
 7 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 1b186248..3b062127 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -56,7 +56,6 @@ export default {
     navigation: "Navigation",
     themeColor: "Theme Color",
     tagsView: "Tags View",
-    fixedHeader: "Fixed Header",
     sidebarLogo: "Sidebar Logo",
     watermark: "Watermark",
   },
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 4bf18c70..0b48e4a3 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -56,7 +56,6 @@ export default {
     navigation: "导航设置",
     themeColor: "主题颜色",
     tagsView: "开启 Tags-View",
-    fixedHeader: "固定 Header",
     sidebarLogo: "侧边栏 Logo",
     watermark: "开启水印",
   },
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 86ec1538..edc7a0da 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -18,11 +18,6 @@
       <el-switch v-model="settingsStore.tagsView" />
     </div>
 
-    <div class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.fixedHeader") }}</span>
-      <el-switch v-model="settingsStore.fixedHeader" />
-    </div>
-
     <div class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.sidebarLogo") }}</span>
       <el-switch v-model="settingsStore.sidebarLogo" />
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 9b3ac6d6..e31547f9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -22,9 +22,7 @@
       </div>
 
       <div :class="{ hasTagsView: showTagsView }" class="main-container">
-        <div :class="{ 'fixed-header': fixedHeader }">
-          <TagsView v-if="showTagsView" />
-        </div>
+        <TagsView v-if="showTagsView" />
         <AppMain />
         <Settings v-if="defaultSettings.showSettings" />
         <!-- 返回顶部 -->
@@ -36,10 +34,8 @@
 
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
-      <div :class="{ 'fixed-header': fixedHeader }">
-        <NavBar v-if="layout === LayoutEnum.LEFT" />
-        <TagsView v-if="showTagsView" />
-      </div>
+      <NavBar v-if="layout === LayoutEnum.LEFT" />
+      <TagsView v-if="showTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
       <!-- 返回顶部 -->
diff --git a/src/settings.ts b/src/settings.ts
index 202eb5cc..60244795 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -17,8 +17,6 @@ const defaultSettings: AppSettings = {
   showSettings: true,
   // 是否显示标签视图
   tagsView: true,
-  // 是否固定头部
-  fixedHeader: true,
   // 是否显示侧边栏Logo
   sidebarLogo: true,
   // 布局方式，默认为左侧布局
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 9dd56638..025d2df8 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -11,8 +11,6 @@ export const useSettingsStore = defineStore("setting", () => {
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
   const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
-  // 固定头部
-  const fixedHeader = useStorage<boolean>("fixedHeader", defaultSettings.fixedHeader);
   // 布局
   const layout = useStorage<string>("layout", defaultSettings.layout);
   // 水印
@@ -25,7 +23,7 @@ export const useSettingsStore = defineStore("setting", () => {
   const themeColor = useStorage<string>("themeColor", defaultSettings.themeColor);
   const theme = useStorage<string>("theme", defaultSettings.theme);
 
-  // 监听主题变化
+  //  监听主题变化
   watch(
     [theme, themeColor],
     ([newTheme, newThemeColor]) => {
@@ -35,9 +33,9 @@ export const useSettingsStore = defineStore("setting", () => {
     },
     { immediate: true }
   );
-  // 设置更改函数
+
+  // 设置映射
   const settingsMap: Record<string, Ref<SettingsValue>> = {
-    fixedHeader,
     tagsView,
     sidebarLogo,
     layout,
@@ -64,7 +62,6 @@ export const useSettingsStore = defineStore("setting", () => {
   return {
     settingsVisible,
     tagsView,
-    fixedHeader,
     sidebarLogo,
     layout,
     themeColor,
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 75a6cca2..dfb3f337 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -58,8 +58,6 @@ declare global {
     version: string;
     /** 是否显示设置 */
     showSettings: boolean;
-    /** 是否固定头部 */
-    fixedHeader: boolean;
     /** 是否显示多标签导航 */
     tagsView: boolean;
     /** 是否显示侧边栏Logo */

From 16e3ef222336b719e7a3dabd8573a53c636766ec Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 26 Dec 2024 14:27:28 +0800
Subject: [PATCH 113/497] =?UTF-8?q?fix(App.vue):=20:bug:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=88=87=E6=8D=A2=E6=B0=B4=E5=8D=B0=E7=9A=84=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E4=BB=A5?=
 =?UTF-8?q?=E5=8F=8A=E9=87=8D=E6=96=B0=E5=88=B7=E6=96=B0=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E9=97=AA=E5=B1=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 79cfba87..6bc6d3ce 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -2,16 +2,13 @@
   <el-config-provider :locale="locale" :size="size">
     <!-- 开启水印 -->
     <el-watermark
-      v-if="watermarkEnabled"
       :font="{ color: fontColor }"
-      :content="defaultSettings.watermarkContent"
+      :content="watermarkEnabled ? defaultSettings.watermarkContent : ''"
       :z-index="9999"
       class="wh-full"
     >
       <router-view />
     </el-watermark>
-    <!-- 关闭水印 -->
-    <router-view v-else />
   </el-config-provider>
 </template>
 

From 5f23b0f060a75a60aa5e0bf5ff7d555993fa2215 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 26 Dec 2024 14:33:46 +0800
Subject: [PATCH 114/497] chore: :hammer: bump version to 2.20.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index b2544586..39e17959 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.20.1",
+  "version": "2.20.2",
   "private": true,
   "type": "module",
   "scripts": {

From 09fe738a8ca2fec582b11c77f399482df9006f5e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 31 Dec 2024 12:57:33 +0800
Subject: [PATCH 115/497] =?UTF-8?q?docs:=20:memo:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=BA=BA=E6=B0=94=E6=8A=95=E7=A5=A8=E7=9B=B8=E5=85=B3=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                     | 10 ----------
 src/views/dashboard/index.vue | 14 --------------
 2 files changed, 24 deletions(-)

diff --git a/README.md b/README.md
index 46bf36c6..a97ac1ae 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,3 @@
-
- <div >
-  🔥🔥🔥 2024.12.20-12.30
-  ，掘金2024年度人气创作者打榜中，麻烦大家投票支持一下我们，感谢！投票地址：
-  <a href="https://activity.juejin.cn/rank/2024/writer/4187394044331261"  target="_blank">
-  https://activity.juejin.cn/rank/2024/writer/4187394044331261
-  </a>
-</div>
-
-
 <div align="center">
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 2ac9819b..6177dcf8 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -1,19 +1,5 @@
 <template>
   <div class="dashboard-container">
-    <el-alert title="With description" type="error">
-      <template #title>
-        🔥🔥🔥 2024.12.20-12.30
-        ，掘金2024年度人气创作者打榜中，麻烦大家投票支持一下我们，感谢！投票地址：
-        <el-link
-          type="primary"
-          href="https://activity.juejin.cn/rank/2024/writer/4187394044331261"
-          target="_blank"
-        >
-          https://activity.juejin.cn/rank/2024/writer/4187394044331261
-        </el-link>
-      </template>
-    </el-alert>
-
     <!-- github 角标 -->
     <github-corner class="github-corner" />
 

From 7c4c8acdebc1e566238734169acf2b364030f5d2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 31 Dec 2024 22:39:51 +0800
Subject: [PATCH 116/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=9C=A8=E6=89=8B=E6=9C=BA=E7=AB=AF?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 454bd8fc..bcd16474 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -138,9 +138,7 @@
     <div class="login-footer">
       <el-text size="small">
         Copyright © 2021 - 2024 youlai.tech All Rights Reserved.
-        <el-link :underline="false" href="http://beian.miit.gov.cn/" target="_blank">
-          皖ICP备20006496号-2
-        </el-link>
+        <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
       </el-text>
     </div>
   </div>
@@ -299,6 +297,7 @@ onMounted(() => {
   justify-content: center;
   width: 100%;
   height: 100%;
+  padding: 20px;
   overflow-y: auto;
   background: url("http://github.com/@/assets/images/login-bg.jpg") no-repeat center right;
 
@@ -336,7 +335,7 @@ onMounted(() => {
 
     @media (width <= 460px) {
       width: 100%;
-      padding: 0 20px;
+      padding: 20px;
     }
 
     .form-title {
@@ -378,9 +377,10 @@ onMounted(() => {
   }
 
   .login-footer {
-    position: absolute;
+    position: fixed;
     bottom: 0;
     width: 100%;
+    padding: 10px 0;
     text-align: center;
   }
 }

From 02ab58a2c52f207d545ea5486435172240f27b90 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 31 Dec 2024 22:54:11 +0800
Subject: [PATCH 117/497] =?UTF-8?q?fix:=20:bug:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=A4=B4=E9=83=A8=E5=8F=98=E9=87=8F=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index e31547f9..d13cd30d 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -62,7 +62,6 @@ const width = useWindowSize().width;
 const WIDTH_DESKTOP = 992; // 响应式布局容器固定宽度  大屏（>=1200px） 中屏（>=992px） 小屏（>=768px）
 const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
 const isOpenSidebar = computed(() => appStore.sidebar.opened);
-const fixedHeader = computed(() => settingsStore.fixedHeader); // 是否固定header
 const showTagsView = computed(() => settingsStore.tagsView); // 是否显示tagsView
 const layout = computed(() => settingsStore.layout); // 布局模式 left top mix
 const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活path

From 09674a3b8907cefd52903150a5c11d3b16dcddc8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 2 Jan 2025 01:12:17 +0800
Subject: [PATCH 118/497] =?UTF-8?q?feat:=20:sparkles:=20=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=94=AF=E6=8C=81=E9=9A=90=E8=97=8F=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/FormTypeEnum.ts   | 1 +
 src/views/codegen/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/enums/FormTypeEnum.ts b/src/enums/FormTypeEnum.ts
index 583c33ae..96c54626 100644
--- a/src/enums/FormTypeEnum.ts
+++ b/src/enums/FormTypeEnum.ts
@@ -11,4 +11,5 @@ export const FormTypeEnum: Record<string, OptionType> = {
   TEXT_AREA: { value: 7, label: "文本域" },
   DATE: { value: 8, label: "日期框" },
   DATE_TIME: { value: 9, label: "日期时间框" },
+  HIDDEN: { value: 10, label: "隐藏域" },
 };
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index f7f24f19..76bd29a1 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -118,7 +118,7 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="包名" prop="packageName">
+              <el-form-item label="主包名" prop="packageName">
                 <el-input v-model="genConfigFormData.packageName" placeholder="com.youlai.boot" />
               </el-form-item>
             </el-col>
@@ -460,7 +460,7 @@ const genConfigFormData = ref<GenConfigForm>({
 const genConfigFormRules = {
   tableName: [{ required: true, message: "请输入表名", trigger: "blur" }],
   businessName: [{ required: true, message: "请输入业务名", trigger: "blur" }],
-  packageName: [{ required: true, message: "请输入包名", trigger: "blur" }],
+  packageName: [{ required: true, message: "请输入主包名", trigger: "blur" }],
   moduleName: [{ required: true, message: "请输入模块名", trigger: "blur" }],
   entityName: [{ required: true, message: "请输入实体名", trigger: "blur" }],
 };

From 890e494e12df38f8def0d7bcb28d46b0dc72bb67 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 3 Jan 2025 07:55:40 +0800
Subject: [PATCH 119/497] =?UTF-8?q?chore:=20:hammer:=20=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=BA=BF=E4=B8=8Awebsocket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.production b/.env.production
index 0246dbdb..17729b65 100644
--- a/.env.production
+++ b/.env.production
@@ -3,4 +3,4 @@ VITE_APP_BASE_API = '/prod-api'
 
 
 # WebSocket端点(可选)
-VITE_APP_WS_ENDPOINT=wss://api.youlai.tech/ws 
+#VITE_APP_WS_ENDPOINT=wss://api.youlai.tech/ws 

From 4b49951f6c4d76eab6488b788427413970db8761 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 3 Jan 2025 07:58:21 +0800
Subject: [PATCH 120/497] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=89=88=E6=9D=83=E5=A3=B0=E6=98=8E=E6=88=AA=E6=AD=A2=E5=B9=B4?=
 =?UTF-8?q?=E4=BB=BD=202024=20=E2=86=92=202025?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index bcd16474..b40c5e6e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -137,7 +137,7 @@
     <!-- 登录页底部 -->
     <div class="login-footer">
       <el-text size="small">
-        Copyright © 2021 - 2024 youlai.tech All Rights Reserved.
+        Copyright © 2021 - 2025 youlai.tech All Rights Reserved.
         <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
       </el-text>
     </div>

From 3cd127f586849adb0e5ad4c8b4d59c17dd732764 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 3 Jan 2025 15:14:12 +0800
Subject: [PATCH 121/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=A1=A8=E5=8D=95=E7=9A=84=E6=96=B9=E6=B3=95=E5=90=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重置表单的方法名修改
---
 src/views/system/menu/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 5ad53346..c4c4b9c3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -424,6 +424,7 @@ function handleOpenDialog(parentId?: string, menuId?: string) {
         });
       } else {
         dialog.title = "新增菜单";
+        // formData.value = { ...initialMenuFormData.value };
         formData.value.parentId = parentId?.toString();
       }
     });
@@ -504,7 +505,7 @@ function handleDelete(menuId: number) {
   );
 }
 
-function resetRorm() {
+function resetForm() {
   menuFormRef.value.resetFields();
   menuFormRef.value.clearValidate();
   formData.value = {
@@ -522,7 +523,7 @@ function resetRorm() {
 // 关闭弹窗
 function handleCloseDialog() {
   dialog.visible = false;
-  resetRorm();
+  resetForm();
 }
 
 onMounted(() => {

From 9bece96e3ef24ba9ff4b0b22b5d64a9a911907a5 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 3 Jan 2025 15:17:11 +0800
Subject: [PATCH 122/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=B3=A8=E9=87=8A=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

去掉注释代码
---
 src/views/system/menu/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index c4c4b9c3..8622309a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -424,7 +424,6 @@ function handleOpenDialog(parentId?: string, menuId?: string) {
         });
       } else {
         dialog.title = "新增菜单";
-        // formData.value = { ...initialMenuFormData.value };
         formData.value.parentId = parentId?.toString();
       }
     });

From f8074085027801c08453f1b5b1a69deb899d4649 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 4 Jan 2025 17:07:29 +0800
Subject: [PATCH 123/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E8=B7=AF=E7=94=B1=E6=95=B0=E6=8D=AE=E6=97=A0=E5=AD=90?=
 =?UTF-8?q?=E7=BA=A7=E6=97=B6children=3D[]=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenuItem.vue    | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index c142180f..e50a77bb 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -3,12 +3,15 @@
     <!--【叶子节点】显示叶子节点或唯一子节点且父节点未配置始终显示 -->
     <template
       v-if="
-        // 判断条件：仅有一个子节点，且父节点未配置始终显示
-        (hasOneShowingChild(item.children, item) &&
-          (!onlyOneChild.children || onlyOneChild.noShowingChildren) &&
-          !item.meta?.alwaysShow) ||
-        // 父节点即使配置了始终显示，但无子节点，也显示为叶子节点
-        (item.meta?.alwaysShow && !item.children)
+        // 未配置始终显示，使用唯一子节点替换父节点显示为叶子节点
+        (!item.meta?.alwaysShow &&
+          hasOneShowingChild(item.children, item) &&
+          (!onlyOneChild.children ||
+            onlyOneChild.children.filter((child: any) => !child.meta?.hidden).length === 0 ||
+            onlyOneChild.noShowingChildren)) ||
+        // 即使配置了始终显示，但无子节点，也显示为叶子节点
+        (item.meta?.alwaysShow &&
+          (!item.children || item.children.filter((child) => !child.meta?.hidden).length === 0))
       "
     >
       <AppLink
@@ -104,13 +107,14 @@ function hasOneShowingChild(children: RouteRecordRaw[] = [], parent: RouteRecord
     return false;
   });
 
-  // 仅有一个或无子节点
+  // 仅有一个节点
   if (showingChildren.length === 1) {
     return true;
   }
 
-  // 无子节点时，设置父节点为唯一显示节点
+  // 无子节点时
   if (showingChildren.length === 0) {
+    // 父节点设置为唯一显示节点，并标记为无子节点
     onlyOneChild.value = { ...parent, path: "", noShowingChildren: true };
     return true;
   }

From c51d3a744bee6dcf89924919addab52bab11fe52 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 4 Jan 2025 17:11:43 +0800
Subject: [PATCH 124/497] chore: :hammer: bump version to 2.20.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39e17959..fc40bae2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.20.2",
+  "version": "2.20.3",
   "private": true,
   "type": "module",
   "scripts": {

From eda105b86f767c739bf271f84d8ea37ddfbc1aef Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 4 Jan 2025 23:36:58 +0800
Subject: [PATCH 125/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20Element-Plus=20=E5=86=85=E7=BD=AE=E8=BF=87=E6=B8=A1?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB=E6=9B=BF=E6=8D=A2=20animate.css=20=E5=8A=A8?=
 =?UTF-8?q?=E7=94=BB=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                            | 23 +++++++++++------------
 src/components/Breadcrumb/index.vue     |  2 +-
 src/layout/components/AppMain/index.vue |  2 +-
 src/main.ts                             |  1 -
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index fc40bae2..38413510 100644
--- a/package.json
+++ b/package.json
@@ -49,12 +49,11 @@
     "@vueuse/core": "^10.11.1",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "5.1.10",
-    "animate.css": "^4.1.1",
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
-    "echarts": "^5.5.1",
-    "element-plus": "^2.9.1",
+    "echarts": "^5.6.0",
+    "element-plus": "^2.9.2",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -72,14 +71,14 @@
     "@commitlint/config-conventional": "^19.6.0",
     "@eslint/js": "^9.17.0",
     "@types/codemirror": "^5.60.15",
-    "@types/lodash": "^4.17.13",
-    "@types/node": "^22.10.2",
+    "@types/lodash": "^4.17.14",
+    "@types/node": "^22.10.5",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.17",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.18.2",
-    "@typescript-eslint/parser": "^8.18.2",
+    "@typescript-eslint/eslint-plugin": "^8.19.0",
+    "@typescript-eslint/parser": "^8.19.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
@@ -90,12 +89,12 @@
     "eslint-plugin-vue": "^9.32.0",
     "globals": "^15.14.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.2.11",
+    "lint-staged": "^15.3.0",
     "postcss": "^8.4.49",
     "postcss-html": "^1.7.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.4.2",
-    "sass": "^1.83.0",
+    "sass": "^1.83.1",
     "stylelint": "^16.12.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
@@ -104,11 +103,11 @@
     "stylelint-config-standard": "^36.0.1",
     "terser": "^5.37.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.18.2",
-    "unocss": "0.65.1",
+    "typescript-eslint": "^8.19.0",
+    "unocss": "0.65.3",
     "unplugin-auto-import": "^0.18.6",
     "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.0.5",
+    "vite": "^6.0.7",
     "vite-plugin-mock-dev-server": "^1.8.3",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 06e16ec9..61f567a4 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-breadcrumb class="flex-y-center">
-    <transition-group enter-active-class="animate__animated animate__fadeInRight">
+    <transition-group name="el-fade-in-right">
       <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
         <span
           v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1"
diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index 398ee216..7ebe4bc6 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -2,7 +2,7 @@
   <section class="app-main" :style="{ height: appMainHeight }">
     <router-view>
       <template #default="{ Component, route }">
-        <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
+        <transition name="el-fade-in">
           <keep-alive :include="cachedViews">
             <component :is="Component" :key="route.path" />
           </keep-alive>
diff --git a/src/main.ts b/src/main.ts
index ce19b13b..c1c1a4e4 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,7 +10,6 @@ import "element-plus/theme-chalk/dark/css-vars.css";
 import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
-import "animate.css";
 
 const app = createApp(App);
 // 注册插件

From 25dfc1e72aaff619ef1cd981e109a54c98169480 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Mon, 6 Jan 2025 10:29:15 +0800
Subject: [PATCH 126/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=96=B0=E5=A2=9E=E9=80=9A=E7=9F=A5=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E7=BC=96=E8=BE=91=E5=99=A8=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构新增通知的时候，编辑器的问题
---
 src/components/WangEditor/index.vue | 1 +
 src/views/system/notice/index.vue   | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index bc63be4d..f79062de 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -13,6 +13,7 @@
       v-model="modelValue"
       :default-config="editorConfig"
       :mode="mode"
+      style="height: 500px; overflow-y: hidden"
       @on-change="handleChange"
       @on-created="handleCreated"
     />
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index f8e4db0b..a7eec8fe 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -177,7 +177,9 @@
           <el-input v-model="formData.title" placeholder="通知标题" clearable />
         </el-form-item>
         <el-form-item label="通知内容" prop="content">
-          <WangEditor v-model="formData.content" style="min-height: 480px; max-height: 500px" />
+          <div style="border: 1px solid #dcdfe6; border-radius: 4px">
+            <WangEditor v-model="formData.content" style="min-height: 480px" />
+          </div>
         </el-form-item>
         <el-form-item label="通知类型" prop="type">
           <Dict v-model="formData.type" code="notice_type" />

From 25129cf0872f12261162f729ae0a8b39c6ac9e6c Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Mon, 6 Jan 2025 10:47:47 +0800
Subject: [PATCH 127/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E9=80=9A=E7=9F=A5=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构通知预览
---
 .../system/notice/components/NoticeDetail.vue     | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue
index f07a88fb..dd20a4c5 100644
--- a/src/views/system/notice/components/NoticeDetail.vue
+++ b/src/views/system/notice/components/NoticeDetail.vue
@@ -42,7 +42,7 @@
         {{ notice.publishTime }}
       </el-descriptions-item>
       <el-descriptions-item label="公告内容：">
-        <div v-html="notice.content" />
+        <div class="notice-content" v-html="notice.content" />
       </el-descriptions-item>
     </el-descriptions>
   </el-dialog>
@@ -77,4 +77,15 @@ defineExpose({
 });
 </script>
 
-<style scoped></style>
+<style scoped>
+.notice-content {
+  width: 100%;
+  overflow-x: hidden;
+}
+
+/* 由于 v-html 内容不受 scoped 样式影响，需要使用 :deep() */
+:deep(.notice-content img) {
+  max-width: 100%;
+  height: auto;
+}
+</style>

From ea5e7230043b11f062ee55d5df135b8e2a7fa713 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 7 Jan 2025 12:32:50 +0800
Subject: [PATCH 128/497] =?UTF-8?q?fix:=20:bug:=20=E5=B7=B2=E7=9F=A5?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 侧边栏LOGO动画未替换element-plus内置动画库
---
 src/layout/components/Sidebar/components/SidebarLogo.vue   | 2 +-
 .../components/Sidebar/components/SidebarMenuItem.vue      | 7 ++-----
 vite.config.ts                                             | 1 -
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 867fedb7..bfe760f7 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="logo">
-    <transition enter-active-class="animate__animated animate__fadeInLeft">
+    <transition enter-active-class="el-fade-in-left">
       <router-link :key="+collapse" class="wh-full flex-center" to="/">
         <img :src="http://github.com/logo" class="w20px h20px" />
         <span v-if="!collapse" class="title">
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index e50a77bb..329a9b8f 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -6,12 +6,9 @@
         // 未配置始终显示，使用唯一子节点替换父节点显示为叶子节点
         (!item.meta?.alwaysShow &&
           hasOneShowingChild(item.children, item) &&
-          (!onlyOneChild.children ||
-            onlyOneChild.children.filter((child: any) => !child.meta?.hidden).length === 0 ||
-            onlyOneChild.noShowingChildren)) ||
+          (!onlyOneChild.children || onlyOneChild.noShowingChildren)) ||
         // 即使配置了始终显示，但无子节点，也显示为叶子节点
-        (item.meta?.alwaysShow &&
-          (!item.children || item.children.filter((child) => !child.meta?.hidden).length === 0))
+        (item.meta?.alwaysShow && !item.children)
       "
     >
       <AppLink
diff --git a/vite.config.ts b/vite.config.ts
index 0a7f00bd..440429a1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -35,7 +35,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
           api: "modern-compiler",
           additionalData: `
             @use "@/styles/variables.scss" as *;
-            @use "element-plus/theme-chalk/src/index.scss" as *; 
           `,
         },
       },

From cf56a355754f2ade200c308c980f5957797c6f61 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 8 Jan 2025 14:18:06 +0800
Subject: [PATCH 129/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E8=BF=87=E6=B8=A1=E5=8A=A8=E7=94=BB=E6=95=88=E6=9E=9C?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Breadcrumb/index.vue                      | 2 +-
 src/layout/components/AppMain/index.vue                  | 2 +-
 src/layout/components/Sidebar/components/SidebarLogo.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 61f567a4..859cce60 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-breadcrumb class="flex-y-center">
-    <transition-group name="el-fade-in-right">
+    <transition-group name="el-fade-in-linear" mode="out-in">
       <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
         <span
           v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1"
diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index 7ebe4bc6..8f33f3c4 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -2,7 +2,7 @@
   <section class="app-main" :style="{ height: appMainHeight }">
     <router-view>
       <template #default="{ Component, route }">
-        <transition name="el-fade-in">
+        <transition name="el-fade-in-linear" mode="out-in">
           <keep-alive :include="cachedViews">
             <component :is="Component" :key="route.path" />
           </keep-alive>
diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index bfe760f7..2c72e50d 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="logo">
-    <transition enter-active-class="el-fade-in-left">
+    <transition name="el-fade-in-linear" mode="out-in">
       <router-link :key="+collapse" class="wh-full flex-center" to="/">
         <img :src="http://github.com/logo" class="w20px h20px" />
         <span v-if="!collapse" class="title">

From b5eaf1f21b02212fe6e299f4e3a6118a781ba85b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 8 Jan 2025 23:20:56 +0800
Subject: [PATCH 130/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E9=9D=A2=E5=8C=85=E5=B1=91=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Breadcrumb/index.vue | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue
index 859cce60..9d49e1f5 100644
--- a/src/components/Breadcrumb/index.vue
+++ b/src/components/Breadcrumb/index.vue
@@ -1,18 +1,16 @@
 <template>
   <el-breadcrumb class="flex-y-center">
-    <transition-group name="el-fade-in-linear" mode="out-in">
-      <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
-        <span
-          v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1"
-          class="color-gray-400"
-        >
-          {{ translateRouteTitle(item.meta.title) }}
-        </span>
-        <a v-else @click.prevent="handleLink(item)">
-          {{ translateRouteTitle(item.meta.title) }}
-        </a>
-      </el-breadcrumb-item>
-    </transition-group>
+    <el-breadcrumb-item v-for="(item, index) in breadcrumbs" :key="item.path">
+      <span
+        v-if="item.redirect === 'noredirect' || index === breadcrumbs.length - 1"
+        class="color-gray-400"
+      >
+        {{ translateRouteTitle(item.meta.title) }}
+      </span>
+      <a v-else @click.prevent="handleLink(item)">
+        {{ translateRouteTitle(item.meta.title) }}
+      </a>
+    </el-breadcrumb-item>
   </el-breadcrumb>
 </template>
 

From 01b8a6840c7b905a0fefa1f0e584143f8465fc57 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 13 Jan 2025 18:25:48 +0800
Subject: [PATCH 131/497] =?UTF-8?q?chore:=20:hammer:=20=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=8F=91=E9=80=81=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E5=92=8C=E5=BE=AE=E4=BF=A1=E7=99=BB=E5=BD=95=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/user.ts      |  36 +++++++------
 src/views/login/index.vue   |  20 +++----
 src/views/profile/index.vue | 103 +++++++++++++++++++-----------------
 3 files changed, 83 insertions(+), 76 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 998c94a4..7045f6c3 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -163,22 +163,17 @@ const UserAPI = {
     });
   },
 
-  /**
-   *   发送手机/邮箱验证码
-   *
-   * @param contact 联系方式  手机号/邮箱
-   * @param contactType 联系方式类型 MOBILE:手机;EMAIL:邮箱
-   */
-  sendVerificationCode(contact: string, contactType: string) {
+  /** 发送短信验证码（绑定或更换手机号）*/
+  sendMobileCode(mobile: string) {
     return request({
-      url: `${USER_BASE_URL}/send-verification-code`,
-      method: "get",
-      params: { contact: contact, contactType: contactType },
+      url: `${USER_BASE_URL}/mobile/code`,
+      method: "post",
+      params: { mobile: mobile },
     });
   },
 
-  /** 绑定个人中心用户手机 */
-  bindMobile(data: MobileBindingForm) {
+  /** 绑定或更换手机号 */
+  bindOrChangeMobile(data: MobileUpdateForm) {
     return request({
       url: `${USER_BASE_URL}/mobile`,
       method: "put",
@@ -186,8 +181,17 @@ const UserAPI = {
     });
   },
 
-  /** 绑定个人中心用户邮箱 */
-  bindEmail(data: EmailBindingForm) {
+  /** 发送邮箱验证码（绑定或更换邮箱）*/
+  sendEmailCode(email: string) {
+    return request({
+      url: `${USER_BASE_URL}/email/code`,
+      method: "post",
+      params: { email: email },
+    });
+  },
+
+  /** 绑定或更换邮箱 */
+  bindOrChangeEmail(data: EmailUpdateForm) {
     return request({
       url: `${USER_BASE_URL}/email`,
       method: "put",
@@ -364,7 +368,7 @@ export interface PasswordChangeForm {
 }
 
 /** 修改手机表单 */
-export interface MobileBindingForm {
+export interface MobileUpdateForm {
   /** 手机号 */
   mobile?: string;
   /** 验证码 */
@@ -372,7 +376,7 @@ export interface MobileBindingForm {
 }
 
 /** 修改邮箱表单 */
-export interface EmailBindingForm {
+export interface EmailUpdateForm {
   /** 邮箱 */
   email?: string;
   /** 验证码 */
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index b40c5e6e..84e7784a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -16,7 +16,7 @@
 
     <!-- 登录页内容 -->
     <div class="login-form">
-      <el-form ref="loginFormRef" :model="loginData" :rules="loginRules">
+      <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules">
         <div class="form-title">
           <h2>{{ defaultSettings.title }}</h2>
           <el-dropdown style="position: absolute; right: 0">
@@ -52,7 +52,7 @@
             </el-icon>
             <el-input
               ref="username"
-              v-model="loginData.username"
+              v-model="loginFormData.username"
               :placeholder="$t('login.username')"
               name="username"
               size="large"
@@ -69,7 +69,7 @@
                 <Lock />
               </el-icon>
               <el-input
-                v-model="loginData.password"
+                v-model="loginFormData.password"
                 :placeholder="$t('login.password')"
                 type="password"
                 name="password"
@@ -88,7 +88,7 @@
           <div class="input-wrapper">
             <svg-icon icon-class="captcha" class="mx-2" />
             <el-input
-              v-model="loginData.captchaCode"
+              v-model="loginFormData.captchaCode"
               auto-complete="off"
               size="large"
               class="flex-1"
@@ -148,7 +148,7 @@
 import { LocationQuery, useRoute } from "vue-router";
 import { useI18n } from "vue-i18n";
 
-import AuthAPI, { type LoginData } from "@/api/auth";
+import AuthAPI, { type LoginFormData } from "@/api/auth";
 import router from "@/router";
 
 import type { FormInstance } from "element-plus";
@@ -171,7 +171,7 @@ const loading = ref(false); // 按钮 loading 状态
 const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 
-const loginData = ref<LoginData>({
+const loginFormData = ref<LoginFormData>({
   username: "admin",
   password: "123456",
   captchaKey: "",
@@ -212,7 +212,7 @@ const loginRules = computed(() => {
 // 获取验证码
 function getCaptcha() {
   AuthAPI.getCaptcha().then((data) => {
-    loginData.value.captchaKey = data.captchaKey;
+    loginFormData.value.captchaKey = data.captchaKey;
     captchaBase64.value = data.captchaBase64;
   });
 }
@@ -223,7 +223,7 @@ async function handleLoginSubmit() {
     if (valid) {
       loading.value = true;
       userStore
-        .login(loginData.value)
+        .login(loginFormData.value)
         .then(async () => {
           await userStore.getUserInfo();
           // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常
@@ -281,8 +281,8 @@ function checkCapslock(event: KeyboardEvent) {
 
 // 设置登录凭证
 const setLoginCredentials = (username: string, password: string) => {
-  loginData.value.username = username;
-  loginData.value.password = password;
+  loginFormData.value.username = username;
+  loginFormData.value.password = password;
 };
 
 onMounted(() => {
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index a231e051..e36f06b3 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -204,21 +204,17 @@
       <el-form
         v-else-if="dialog.type === DialogType.MOBILE"
         ref="mobileBindingFormRef"
-        :model="mobileBindingForm"
+        :model="mobileUpdateForm"
         :rules="mobileBindingRules"
         :label-width="100"
       >
         <el-form-item label="手机号码" prop="mobile">
-          <el-input v-model="mobileBindingForm.mobile" style="width: 250px" />
+          <el-input v-model="mobileUpdateForm.mobile" style="width: 250px" />
         </el-form-item>
         <el-form-item label="验证码" prop="code">
-          <el-input v-model="mobileBindingForm.code" style="width: 250px">
+          <el-input v-model="mobileUpdateForm.code" style="width: 250px">
             <template #append>
-              <el-button
-                class="ml-5"
-                :disabled="mobileCountdown > 0"
-                @click="handleSendVerificationCode('MOBILE')"
-              >
+              <el-button class="ml-5" :disabled="mobileCountdown > 0" @click="handleSendMobileCode">
                 {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
@@ -230,21 +226,17 @@
       <el-form
         v-else-if="dialog.type === DialogType.EMAIL"
         ref="emailBindingFormRef"
-        :model="emailBindingForm"
+        :model="emailUpdateForm"
         :rules="emailBindingRules"
         :label-width="100"
       >
         <el-form-item label="邮箱" prop="email">
-          <el-input v-model="emailBindingForm.email" style="width: 250px" />
+          <el-input v-model="emailUpdateForm.email" style="width: 250px" />
         </el-form-item>
         <el-form-item label="验证码" prop="code">
-          <el-input v-model="emailBindingForm.code" style="width: 250px">
+          <el-input v-model="emailUpdateForm.code" style="width: 250px">
             <template #append>
-              <el-button
-                class="ml-5"
-                :disabled="emailCountdown > 0"
-                @click="handleSendVerificationCode('EMAIL')"
-              >
+              <el-button class="ml-5" :disabled="emailCountdown > 0" @click="handleSendEmailCode">
                 {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
@@ -265,8 +257,8 @@
 import UserAPI, {
   UserProfileVO,
   PasswordChangeForm,
-  MobileBindingForm,
-  EmailBindingForm,
+  MobileUpdateForm,
+  EmailUpdateForm,
   UserProfileForm,
 } from "@/api/system/user";
 
@@ -291,8 +283,8 @@ const dialog = reactive({
 
 const userProfileForm = reactive<UserProfileForm>({});
 const passwordChangeForm = reactive<PasswordChangeForm>({});
-const mobileBindingForm = reactive<MobileBindingForm>({});
-const emailBindingForm = reactive<EmailBindingForm>({});
+const mobileUpdateForm = reactive<MobileUpdateForm>({});
+const emailUpdateForm = reactive<EmailUpdateForm>({});
 
 const mobileCountdown = ref(0);
 const mobileTimer = ref<NodeJS.Timeout | null>(null);
@@ -361,23 +353,24 @@ const handleOpenDialog = (type: DialogType) => {
 };
 
 /**
- *  发送验证码
- *
- * @param contactType 联系方式类型 MOBILE: 手机号码  EMAIL: 邮箱
+ * 发送手机验证码
  */
-const handleSendVerificationCode = async (contactType: string) => {
-  if (contactType === "MOBILE") {
-    if (!mobileBindingForm.mobile) {
-      ElMessage.error("请输入手机号");
-      return;
-    }
-    // 验证手机号格式
-    const reg = /^1[3-9]\d{9}$/;
-    if (!reg.test(mobileBindingForm.mobile)) {
-      ElMessage.error("手机号格式不正确");
-      return;
-    }
+function handleSendMobileCode() {
+  if (!mobileUpdateForm.mobile) {
+    ElMessage.error("请输入手机号");
+    return;
+  }
+  // 验证手机号格式
+  const reg = /^1[3-9]\d{9}$/;
+  if (!reg.test(mobileUpdateForm.mobile)) {
+    ElMessage.error("手机号格式不正确");
+    return;
+  }
+  // 发送短信验证码
+  UserAPI.sendMobileCode(mobileUpdateForm.mobile).then(() => {
+    ElMessage.success("验证码发送成功");
 
+    // 倒计时 60s 重新发送
     mobileCountdown.value = 60;
     mobileTimer.value = setInterval(() => {
       if (mobileCountdown.value > 0) {
@@ -386,18 +379,28 @@ const handleSendVerificationCode = async (contactType: string) => {
         clearInterval(mobileTimer.value!);
       }
     }, 1000);
-  } else if (contactType === "EMAIL") {
-    if (!emailBindingForm.email) {
-      ElMessage.error("请输入邮箱");
-      return;
-    }
-    // 验证邮箱格式
-    const reg = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/;
-    if (!reg.test(emailBindingForm.email)) {
-      ElMessage.error("邮箱格式不正确");
-      return;
-    }
+  });
+}
+
+/**
+ * 发送邮箱验证码
+ */
+function handleSendEmailCode() {
+  if (!emailUpdateForm.email) {
+    ElMessage.error("请输入邮箱");
+    return;
+  }
+  // 验证邮箱格式
+  const reg = /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/;
+  if (!reg.test(emailUpdateForm.email)) {
+    ElMessage.error("邮箱格式不正确");
+    return;
+  }
 
+  // 发送邮箱验证码
+  UserAPI.sendEmailCode(emailUpdateForm.email).then(() => {
+    ElMessage.success("验证码发送成功");
+    // 倒计时 60s 重新发送
     emailCountdown.value = 60;
     emailTimer.value = setInterval(() => {
       if (emailCountdown.value > 0) {
@@ -406,8 +409,8 @@ const handleSendVerificationCode = async (contactType: string) => {
         clearInterval(emailTimer.value!);
       }
     }, 1000);
-  }
-};
+  });
+}
 
 /**
  * 提交表单
@@ -429,13 +432,13 @@ const handleSubmit = async () => {
       dialog.visible = false;
     });
   } else if (dialog.type === DialogType.MOBILE) {
-    UserAPI.bindMobile(mobileBindingForm).then(() => {
+    UserAPI.bindOrChangeMobile(mobileUpdateForm).then(() => {
       ElMessage.success("手机号绑定成功");
       dialog.visible = false;
       loadUserProfile();
     });
   } else if (dialog.type === DialogType.EMAIL) {
-    UserAPI.bindEmail(emailBindingForm).then(() => {
+    UserAPI.bindOrChangeEmail(emailUpdateForm).then(() => {
       ElMessage.success("邮箱绑定成功");
       dialog.visible = false;
       loadUserProfile();

From 2cae42e8d9e9892e67aa8a363a6e36b6ce59554a Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 13 Jan 2025 18:28:03 +0800
Subject: [PATCH 132/497] =?UTF-8?q?style:=20:lipstick:=20mock=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=A0=B9=E6=8D=AE=20prettier=20=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/base.ts              |  5 +----
 mock/notice.mock.ts       | 11 ++++-------
 mock/role.mock.ts         |  9 ++++-----
 mock/user.mock.ts         | 28 ++++++++++------------------
 src/api/auth/index.ts     | 18 ++++++++++--------
 src/store/modules/user.ts |  8 ++++----
 6 files changed, 33 insertions(+), 46 deletions(-)

diff --git a/mock/base.ts b/mock/base.ts
index 438e1c1c..e68e642f 100644
--- a/mock/base.ts
+++ b/mock/base.ts
@@ -3,8 +3,5 @@ import { createDefineMock } from "vite-plugin-mock-dev-server";
 
 export const defineMock = createDefineMock((mock) => {
   // 拼接url
-  mock.url = path.join(
-    import.meta.env.VITE_APP_BASE_API + "/api/v1/",
-    mock.url
-  );
+  mock.url = path.join(import.meta.env.VITE_APP_BASE_API + "/api/v1/", mock.url);
 });
diff --git a/mock/notice.mock.ts b/mock/notice.mock.ts
index 7b5a37f0..c140c163 100644
--- a/mock/notice.mock.ts
+++ b/mock/notice.mock.ts
@@ -127,8 +127,7 @@ export default defineMock([
           },
           {
             id: 10,
-            title:
-              "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
+            title: "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
             publishStatus: 1,
             type: 1,
             publisherName: "系统管理员",
@@ -150,7 +149,7 @@ export default defineMock([
   {
     url: "notices",
     method: ["POST"],
-    body({ body }) {
+    body() {
       return {
         code: "00000",
         data: null,
@@ -220,8 +219,7 @@ export default defineMock([
         list: [
           {
             id: 10,
-            title:
-              "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
+            title: "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
             type: 1,
             level: "L",
             publisherName: "系统管理员",
@@ -403,8 +401,7 @@ const noticeMap: Record<string, any> = {
   },
   10: {
     id: 10,
-    title:
-      "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
+    title: "v2.16.1 版本修复了 WebSocket 重复连接导致的后台线程阻塞问题，优化了通知公告。",
     publishStatus: 1,
     type: 1,
     publisherName: "系统管理员",
diff --git a/mock/role.mock.ts b/mock/role.mock.ts
index cc870267..ee856999 100644
--- a/mock/role.mock.ts
+++ b/mock/role.mock.ts
@@ -214,14 +214,13 @@ export default defineMock([
   {
     url: "roles/:id/menuIds",
     method: ["GET"],
-    body: ({ params }) => {
+    body: ({}) => {
       return {
         code: "00000",
         data: [
-          1, 2, 31, 32, 33, 88, 3, 70, 71, 72, 4, 73, 75, 74, 5, 76, 77, 78, 6,
-          79, 81, 84, 85, 86, 87, 40, 41, 26, 30, 20, 21, 22, 23, 24, 89, 90,
-          91, 36, 37, 38, 39, 93, 94, 95, 97, 102, 89, 90, 91, 93, 94, 95, 97,
-          102, 103, 104,
+          1, 2, 31, 32, 33, 88, 3, 70, 71, 72, 4, 73, 75, 74, 5, 76, 77, 78, 6, 79, 81, 84, 85, 86,
+          87, 40, 41, 26, 30, 20, 21, 22, 23, 24, 89, 90, 91, 36, 37, 38, 39, 93, 94, 95, 97, 102,
+          89, 90, 91, 93, 94, 95, 97, 102, 103, 104,
         ],
         msg: "一切ok",
       };
diff --git a/mock/user.mock.ts b/mock/user.mock.ts
index e82a2e15..57c8482d 100644
--- a/mock/user.mock.ts
+++ b/mock/user.mock.ts
@@ -10,8 +10,7 @@ export default defineMock([
         userId: 2,
         username: "admin",
         nickname: "系统管理员",
-        avatar:
-          "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+        avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
         roles: ["ADMIN"],
         perms: [
           "sys:notice:edit",
@@ -65,8 +64,7 @@ export default defineMock([
             nickname: "系统管理员",
             mobile: "17621210366",
             gender: 1,
-            avatar:
-              "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+            avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
             email: "",
             status: 1,
             deptId: 1,
@@ -78,8 +76,7 @@ export default defineMock([
             nickname: "测试小用户",
             mobile: "17621210366",
             gender: 1,
-            avatar:
-              "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+            avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
             email: "youlaitech@163.com",
             status: 1,
             deptId: 3,
@@ -161,10 +158,8 @@ export default defineMock([
     url: "users/_export",
     method: ["GET"],
     headers: {
-      "Content-Disposition":
-        "attachment; filename=%E7%94%A8%E6%88%B7%E5%88%97%E8%A1%A8.xlsx",
-      "Content-Type":
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+      "Content-Disposition": "attachment; filename=%E7%94%A8%E6%88%B7%E5%88%97%E8%A1%A8.xlsx",
+      "Content-Type": "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
     },
   },
 
@@ -177,8 +172,7 @@ export default defineMock([
         id: 2,
         username: "admin",
         nickname: "系统管理员",
-        avatar:
-          "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+        avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
         gender: 1,
         mobile: "17621210366",
         email: null,
@@ -192,7 +186,7 @@ export default defineMock([
   {
     url: "users/profile",
     method: ["PUT"],
-    body({ query }) {
+    body() {
       return {
         code: "00000",
         data: null,
@@ -204,7 +198,7 @@ export default defineMock([
   {
     url: "users/password",
     method: ["PUT"],
-    body({ query }) {
+    body() {
       return {
         code: "00000",
         data: null,
@@ -222,8 +216,7 @@ const userMap: Record<string, any> = {
     nickname: "系统管理员",
     mobile: "17621210366",
     gender: 1,
-    avatar:
-      "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+    avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
     email: "",
     status: 1,
     deptId: 1,
@@ -235,8 +228,7 @@ const userMap: Record<string, any> = {
     nickname: "测试小用户",
     mobile: "17621210366",
     gender: 1,
-    avatar:
-      "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
+    avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
     email: "youlaitech@163.com",
     status: 1,
     deptId: 3,
diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index 7728ad61..ec95620c 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -4,7 +4,7 @@ const AUTH_BASE_URL = "/api/v1/auth";
 
 const AuthAPI = {
   /** 登录接口*/
-  login(data: LoginData) {
+  login(data: LoginFormData) {
     const formData = new FormData();
     formData.append("username", data.username);
     formData.append("password", data.password);
@@ -22,17 +22,19 @@ const AuthAPI = {
 
   /** 刷新 token 接口*/
   refreshToken(refreshToken: string) {
+    const formData = new FormData();
+    formData.append("refreshToken", refreshToken);
     return request<any, LoginResult>({
       url: `${AUTH_BASE_URL}/refresh-token`,
       method: "post",
-      data: { refreshToken: refreshToken },
+      data: formData,
       headers: {
         Authorization: "no-auth",
       },
     });
   },
 
-  /** 注销接口*/
+  /** 注销接口 */
   logout() {
     return request({
       url: `${AUTH_BASE_URL}/logout`,
@@ -42,7 +44,7 @@ const AuthAPI = {
 
   /** 获取验证码接口*/
   getCaptcha() {
-    return request<any, CaptchaResult>({
+    return request<any, CaptchaInfo>({
       url: `${AUTH_BASE_URL}/captcha`,
       method: "get",
     });
@@ -51,8 +53,8 @@ const AuthAPI = {
 
 export default AuthAPI;
 
-/** 登录请求参数 */
-export interface LoginData {
+/** 登录表单数据 */
+export interface LoginFormData {
   /** 用户名 */
   username: string;
   /** 密码 */
@@ -75,8 +77,8 @@ export interface LoginResult {
   expiresIn: number;
 }
 
-/** 验证码响应 */
-export interface CaptchaResult {
+/** 验证码信息 */
+export interface CaptchaInfo {
   /** 验证码缓存key */
   captchaKey: string;
   /** 验证码图片Base64字符串 */
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 273e4fcb..5812f7a5 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -2,7 +2,7 @@ import { store } from "@/store";
 import { usePermissionStoreHook } from "@/store/modules/permission";
 import { useDictStoreHook } from "@/store/modules/dict";
 
-import AuthAPI, { type LoginData } from "@/api/auth";
+import AuthAPI, { type LoginFormData } from "@/api/auth";
 import UserAPI, { type UserInfo } from "@/api/system/user";
 
 import { setToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
@@ -13,12 +13,12 @@ export const useUserStore = defineStore("user", () => {
   /**
    * 登录
    *
-   * @param {LoginData}
+   * @param {LoginFormData}
    * @returns
    */
-  function login(loginData: LoginData) {
+  function login(LoginFormData: LoginFormData) {
     return new Promise<void>((resolve, reject) => {
-      AuthAPI.login(loginData)
+      AuthAPI.login(LoginFormData)
         .then((data) => {
           const { tokenType, accessToken, refreshToken } = data;
           setToken(tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx

From 3413d3fcbe4d2b80685a0ec62a460b7cdb40b0ff Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Tue, 14 Jan 2025 11:03:22 +0800
Subject: [PATCH 133/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E5=A2=9E=E5=8A=A0=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

导入增加错误提示信息
---
 src/api/system/user.ts                        |   2 +-
 src/types/global.d.ts                         |  13 ++
 .../system/user/components/UserImport.vue     | 187 ++++++++++++------
 3 files changed, 137 insertions(+), 65 deletions(-)

diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index 7045f6c3..b58e6f50 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -126,7 +126,7 @@ const UserAPI = {
   import(deptId: number, file: File) {
     const formData = new FormData();
     formData.append("file", file);
-    return request({
+    return request<any, ExcelResult>({
       url: `${USER_BASE_URL}/import`,
       method: "post",
       params: { deptId: deptId },
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index dfb3f337..efc4ba45 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -89,5 +89,18 @@ declare global {
     /** 子列表  */
     children?: OptionType[];
   }
+  /**
+   * 导入结果
+   */
+  interface ExcelResult {
+    /** 状态码 */
+    code: string;
+    /** 无效数据条数 */
+    invalidCount: number;
+    /** 有效数据条数 */
+    validCount: number;
+    /** 错误信息 */
+    messageList: Array<string>;
+  }
 }
 export {};
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index bfe37fd7..573bdca6 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -1,70 +1,97 @@
 <template>
-  <el-dialog
-    v-model="visible"
-    :align-center="true"
-    title="导入数据"
-    width="600px"
-    @close="handleClose"
-  >
-    <el-scrollbar max-height="60vh">
-      <el-form
-        ref="importFormRef"
-        label-width="auto"
-        style="padding-right: var(--el-dialog-padding-primary)"
-        :model="importFormData"
-        :rules="importFormRules"
-      >
-        <el-form-item label="文件名" prop="files">
-          <el-upload
-            ref="uploadRef"
-            v-model:file-list="importFormData.files"
-            class="w-full"
-            accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-            :drag="true"
-            :limit="1"
-            :auto-upload="false"
-            :on-exceed="handleFileExceed"
-          >
-            <el-icon class="el-icon--upload"><upload-filled /></el-icon>
-            <div class="el-upload__text">
-              将文件拖到此处，或
-              <em>点击上传</em>
-            </div>
-            <template #tip>
-              <div class="el-upload__tip">
-                格式为*.xlsx / *.xls，文件不超过一个
-                <el-link
-                  type="primary"
-                  icon="download"
-                  :underline="false"
-                  @click="handleDownloadTemplate"
-                >
-                  下载模板
-                </el-link>
-              </div>
-            </template>
-          </el-upload>
-        </el-form-item>
-      </el-form>
-    </el-scrollbar>
-    <template #footer>
-      <div style="padding-right: var(--el-dialog-padding-primary)">
-        <el-button
-          type="primary"
-          :disabled="importFormData.files.length === 0"
-          @click="handleUpload"
+  <div>
+    <el-dialog
+      v-model="visible"
+      :align-center="true"
+      title="导入数据"
+      width="600px"
+      @close="handleClose"
+    >
+      <el-scrollbar max-height="60vh">
+        <el-form
+          ref="importFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData"
+          :rules="importFormRules"
         >
-          确 定
-        </el-button>
-        <el-button @click="handleClose">取 消</el-button>
-      </div>
-    </template>
-  </el-dialog>
+          <el-form-item label="文件名" prop="files">
+            <el-upload
+              ref="uploadRef"
+              v-model:file-list="importFormData.files"
+              class="w-full"
+              accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
+              :drag="true"
+              :limit="1"
+              :auto-upload="false"
+              :on-exceed="handleFileExceed"
+            >
+              <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+              <div class="el-upload__text">
+                将文件拖到此处，或
+                <em>点击上传</em>
+              </div>
+              <template #tip>
+                <div class="el-upload__tip">
+                  格式为*.xlsx / *.xls，文件不超过一个
+                  <el-link
+                    type="primary"
+                    icon="download"
+                    :underline="false"
+                    @click="handleDownloadTemplate"
+                  >
+                    下载模板
+                  </el-link>
+                </div>
+              </template>
+            </el-upload>
+          </el-form-item>
+        </el-form>
+      </el-scrollbar>
+      <template #footer>
+        <div style="padding-right: var(--el-dialog-padding-primary)">
+          <el-button v-if="resultData.length > 0" type="primary" @click="handleShowResult">
+            错误信息
+          </el-button>
+          <el-button
+            type="primary"
+            :disabled="importFormData.files.length === 0"
+            @click="handleUpload"
+          >
+            确 定
+          </el-button>
+          <el-button @click="handleClose">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-dialog v-model="resultVisible" title="导入结果" width="600px">
+      <el-alert
+        :title="`导入结果：${invalidCount}条无效数据，${validCount}条有效数据`"
+        type="warning"
+        :closable="false"
+      />
+      <el-table :data="resultData" style="width: 100%; max-height: 400px">
+        <el-table-column prop="index" align="center" width="100" type="index" label="序号" />
+        <el-table-column prop="message" label="错误信息" width="400">
+          <template #default="scope">
+            {{ scope.row }}
+          </template>
+        </el-table-column>
+      </el-table>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="handleCloseResult">关闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
 </template>
 
 <script lang="ts" setup>
 import { ElMessage, type UploadUserFile } from "element-plus";
 import UserAPI from "@/api/system/user";
+import { ResultEnum } from "@/enums/ResultEnum";
 
 const emit = defineEmits(["import-success"]);
 const visible = defineModel("modelValue", {
@@ -73,6 +100,11 @@ const visible = defineModel("modelValue", {
   default: false,
 });
 
+const resultVisible = ref(false);
+const resultData = ref<string[]>([]);
+const invalidCount = ref(0);
+const validCount = ref(0);
+
 const importFormRef = ref(null);
 const uploadRef = ref(null);
 
@@ -82,6 +114,15 @@ const importFormData = reactive<{
   files: [],
 });
 
+watch(visible, (newValue) => {
+  if (newValue) {
+    resultData.value = [];
+    resultVisible.value = false;
+    invalidCount.value = 0;
+    validCount.value = 0;
+  }
+});
+
 const importFormRules = {
   files: [{ required: true, message: "文件不能为空", trigger: "blur" }],
 };
@@ -122,15 +163,33 @@ const handleUpload = async () => {
   }
 
   try {
-    await UserAPI.import(1, importFormData.files[0].raw as File);
-    ElMessage.success("上传成功");
-    emit("import-success");
-    handleClose();
+    const result = await UserAPI.import(1, importFormData.files[0].raw as File);
+    if (result.code === ResultEnum.SUCCESS && result.invalidCount === 0) {
+      ElMessage.success("导入成功，导入数据：" + result.validCount + "条");
+      emit("import-success");
+      handleClose();
+    } else {
+      ElMessage.error("上传失败");
+      resultVisible.value = true;
+      resultData.value = result.messageList;
+      invalidCount.value = result.invalidCount;
+      validCount.value = result.validCount;
+    }
   } catch (error) {
     ElMessage.error("上传失败");
   }
 };
 
+// 显示错误信息
+const handleShowResult = () => {
+  resultVisible.value = true;
+};
+
+// 关闭错误信息弹窗
+const handleCloseResult = () => {
+  resultVisible.value = false;
+};
+
 // 关闭弹窗
 const handleClose = () => {
   importFormData.files.length = 0;

From 80aae1902daeea0ba1fd751b367a8d2f6eb583dd Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 15 Jan 2025 17:04:14 +0800
Subject: [PATCH 134/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=9C=E7=A8=8B=E5=88=A0=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

上传图片增加参数是否同步删除服务端文件
---
 src/components/Upload/ImageUpload.vue | 24 ++++++++++++++++++++++--
 src/views/demo/upload.vue             |  6 ++++++
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index b51f1198..495d398a 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -144,6 +144,14 @@ const props = defineProps({
     type: Array<string>,
     default: () => [],
   },
+
+  /**
+   * 是否同步删除
+   */
+  isSyncDelete: {
+    type: Boolean,
+    default: true,
+  },
   /**
    * 自定义样式
    */
@@ -235,7 +243,19 @@ const handleError = (error: any) => {
  */
 function handleRemove(path: string) {
   if (path) {
-    FileAPI.deleteByPath(path).then(() => {
+    if (props.isSyncDelete) {
+      FileAPI.deleteByPath(path).then(() => {
+        valFileList.value = valFileList.value.filter((x) => x !== path);
+        // 删除成功回调
+        if (props.limit === 1) {
+          emit("update:modelValue", "");
+          emit("change", "");
+        } else {
+          emit("update:modelValue", valFileList.value);
+          emit("change", valFileList.value);
+        }
+      });
+    } else {
       valFileList.value = valFileList.value.filter((x) => x !== path);
       // 删除成功回调
       if (props.limit === 1) {
@@ -245,7 +265,7 @@ function handleRemove(path: string) {
         emit("update:modelValue", valFileList.value);
         emit("change", valFileList.value);
       }
-    });
+    }
   }
 }
 
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index abb99eef..802cbf88 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -112,6 +112,12 @@ const imageUploadArgData = [
     default: "[]",
     desc: "支持的文件类型,默认支持所有图片格式,eg:['png','jpg','jpeg','gif']",
   },
+  {
+    argsName: "isSyncDelete",
+    type: "Boolean",
+    default: "true",
+    desc: "是否同步删除服务端文件(默认是，如果为否，则只会删除当前上传的图片，已经上传到服务端到图片不会删除)",
+  },
   {
     argsName: "style",
     type: "Object",

From 7cb40b93ed3b071af994963359502f8399c9d9ee Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 15 Jan 2025 17:07:42 +0800
Subject: [PATCH 135/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=94=B9?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更改示例注释
---
 src/views/demo/upload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 802cbf88..6f6d8114 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -62,7 +62,7 @@ const imageUploadArgData = [
     argsName: "headers",
     type: "Object",
     default: "{Authorization: localStorage.getItem(TOKEN_KEY),}",
-    desc: "提示文本类型",
+    desc: "上传请求头",
   },
   {
     argsName: "data",

From 88abfec6aa36a84f6a1a2ee822c00a3cb1178851 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 15 Jan 2025 17:37:33 +0800
Subject: [PATCH 136/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E6=97=B6=E5=80=99=E4=BC=A0=E9=80=92null?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复多图时候传递null报错的bug
---
 src/components/Upload/ImageUpload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 495d398a..3af213db 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -197,7 +197,7 @@ watch(
       return;
     }
 
-    if (modelValue.length <= 0) {
+    if (!modelValue || modelValue.length <= 0) {
       fileList.value = [];
       viewFileList.value = [];
       valFileList.value = [];

From 182b8f04ab4d33aa985bdde8f861cac418faa64b Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 15 Jan 2025 17:40:15 +0800
Subject: [PATCH 137/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E4=B8=BA=E5=8D=95=E5=9B=BE=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

图片上传组件默认为单图上传
---
 src/components/Upload/ImageUpload.vue | 2 +-
 src/views/demo/upload.vue             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 3af213db..5b259677 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -106,7 +106,7 @@ const props = defineProps({
    */
   limit: {
     type: Number,
-    default: 10,
+    default: 1,
   },
   /**
    * 是否显示删除按钮
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 6f6d8114..dc9c3dfc 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -15,7 +15,7 @@
         {{ picUrl }}
       </el-form-item>
       <el-form-item label="图片上传">
-        <ImageUpload v-model="picUrl" :limit="1" :maxSize="10" />
+        <ImageUpload v-model="picUrl" :maxSize="10" />
       </el-form-item>
       <el-form-item label="参数说明">
         <el-table :data="imageUploadArgData" border>
@@ -43,7 +43,7 @@
 
 <script setup lang="ts">
 // 单图
-const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
+const picUrl = ref(null);
 
 const imageUploadArgData = [
   {
@@ -79,8 +79,8 @@ const imageUploadArgData = [
   {
     argsName: "limit",
     type: "Number",
-    default: 10,
-    desc: "上传最大的图片数量,单张图片时填写1",
+    default: 1,
+    desc: "上传最大的图片数量,多张图片时填写最大上传数量，默认单张图片",
   },
   {
     argsName: "show-del-btn",

From 859116f5763cb02c04830c37f1a7766f2ad461a1 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 15 Jan 2025 17:42:22 +0800
Subject: [PATCH 138/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=B5=8B=E8=AF=95=E5=9B=BE=E7=89=87=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加测试图片地址
---
 src/views/demo/upload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index dc9c3dfc..901a3edd 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -43,7 +43,7 @@
 
 <script setup lang="ts">
 // 单图
-const picUrl = ref(null);
+const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
 
 const imageUploadArgData = [
   {

From d27b50bc669b7ca37067b423f86b259b6cc82537 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 19 Jan 2025 22:37:39 +0800
Subject: [PATCH 139/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 38413510..8e205405 100644
--- a/package.json
+++ b/package.json
@@ -53,14 +53,14 @@
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.2",
+    "element-plus": "^2.9.3",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^6.3.0",
     "pinia": "^2.3.0",
-    "qs": "^6.13.1",
+    "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-i18n": "9.9.1",
@@ -69,33 +69,33 @@
   "devDependencies": {
     "@commitlint/cli": "^19.6.1",
     "@commitlint/config-conventional": "^19.6.0",
-    "@eslint/js": "^9.17.0",
+    "@eslint/js": "^9.18.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash": "^4.17.14",
-    "@types/node": "^22.10.5",
+    "@types/node": "^22.10.7",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.17",
+    "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.19.0",
-    "@typescript-eslint/parser": "^8.19.0",
+    "@typescript-eslint/eslint-plugin": "^8.20.0",
+    "@typescript-eslint/parser": "^8.20.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "1.9.4",
-    "eslint": "^9.17.0",
+    "eslint": "^9.18.0",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-plugin-prettier": "^5.2.1",
+    "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-vue": "^9.32.0",
     "globals": "^15.14.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.3.0",
-    "postcss": "^8.4.49",
-    "postcss-html": "^1.7.0",
+    "lint-staged": "^15.4.1",
+    "postcss": "^8.5.1",
+    "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.4.2",
-    "sass": "^1.83.1",
-    "stylelint": "^16.12.0",
+    "sass": "^1.83.4",
+    "stylelint": "^16.13.2",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^5.1.1",
     "stylelint-config-recommended-scss": "^14.1.0",
@@ -103,7 +103,7 @@
     "stylelint-config-standard": "^36.0.1",
     "terser": "^5.37.0",
     "typescript": "5.5.4",
-    "typescript-eslint": "^8.19.0",
+    "typescript-eslint": "^8.20.0",
     "unocss": "0.65.3",
     "unplugin-auto-import": "^0.18.6",
     "unplugin-vue-components": "^0.27.5",

From 4b86d26070e0d9ab1b86deb2fc3dfe58bf8e0ee7 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 19 Jan 2025 22:39:32 +0800
Subject: [PATCH 140/497] chore: :hammer: bump version to 2.20.4

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8e205405..ff1502d3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.20.3",
+  "version": "2.20.4",
   "private": true,
   "type": "module",
   "scripts": {

From f4380d56a320d3a0b9ba631f3db1330605571450 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 20 Jan 2025 14:24:32 +0800
Subject: [PATCH 141/497] =?UTF-8?q?fix:=20:bug:=20=E5=88=B7=E6=96=B0token?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=82=E9=85=8D=E5=90=8E=E7=AB=AF=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/api/auth/index.ts b/src/api/auth/index.ts
index ec95620c..64fb97b2 100644
--- a/src/api/auth/index.ts
+++ b/src/api/auth/index.ts
@@ -22,19 +22,17 @@ const AuthAPI = {
 
   /** 刷新 token 接口*/
   refreshToken(refreshToken: string) {
-    const formData = new FormData();
-    formData.append("refreshToken", refreshToken);
     return request<any, LoginResult>({
       url: `${AUTH_BASE_URL}/refresh-token`,
       method: "post",
-      data: formData,
+      params: { refreshToken: refreshToken },
       headers: {
         Authorization: "no-auth",
       },
     });
   },
 
-  /** 注销接口 */
+  /** 注销登录接口 */
   logout() {
     return request({
       url: `${AUTH_BASE_URL}/logout`,

From e769d3752380f7bf57f1705963ecb40908e055c4 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Tue, 21 Jan 2025 15:12:14 +0800
Subject: [PATCH 142/497] =?UTF-8?q?fix(IconSelect=20component):=20:bug:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=8AIconSelect=E3=80=8B=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=20Tab=20name=E4=B8=A2=E5=A4=B1=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84element=E5=9B=BE=E6=A0=87=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/IconSelect/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 44a4a8ba..006158a1 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -126,7 +126,7 @@ function loadIcons() {
 }
 
 function handleTabClick(tabPane: any) {
-  activeTab.value = tabPane.name;
+  activeTab.value = tabPane.props.name;
   filterIcons();
 }
 

From b375352c227541db7c2475d60930acc05c4f5751 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 22 Jan 2025 12:48:12 +0800
Subject: [PATCH 143/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=20wangeditor-next=20=E6=9B=BF=E6=8D=A2=20wangeditor?=
 =?UTF-8?q?=20=EF=BC=8C=E9=87=8D=E6=9E=84=E7=AE=80=E5=8C=96=E5=AF=8C?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                        |  4 +-
 src/components/WangEditor/index.vue | 88 +++++++++++++++++------------
 src/views/demo/wang-editor.vue      | 10 +++-
 src/views/system/notice/index.vue   |  9 +--
 4 files changed, 61 insertions(+), 50 deletions(-)

diff --git a/package.json b/package.json
index ff1502d3..4b20ea47 100644
--- a/package.json
+++ b/package.json
@@ -47,8 +47,8 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.0.0",
     "@vueuse/core": "^10.11.1",
-    "@wangeditor/editor": "^5.1.23",
-    "@wangeditor/editor-for-vue": "5.1.10",
+    "@wangeditor-next/editor": "^5.6.29",
+    "@wangeditor-next/editor-for-vue": "^5.1.14",
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index f79062de..47f290d8 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,80 +1,94 @@
+<!--
+ * wangEditor 富文本编辑器组件
+ * Copyright © 2021-present 有来开源组织
+ * 
+ * 本组件基于 wangEditor-next 进行二次封装，支持 Vue 3.x
+ * 作者：有来开源-Ray 
+ *
+ * 使用请保留本段注释，感谢支持开源！
+ * 参考官方示例：https://stackblitz.com/edit/vue3-wangeditor-demo-8emmc7?file=src%2Fcomponents%2FBasicEditor.vue
+ * 
+ * 开源协议：MIT License
+ * 详情参见：https://opensource.org/licenses/MIT
+ -->
+
 <template>
-  <div class="editor-wrapper">
+  <div style="z-index: 999; border: 1px solid #ccc">
     <!-- 工具栏 -->
     <Toolbar
-      id="toolbar-container"
       :editor="editorRef"
+      mode="simple"
       :default-config="toolbarConfig"
-      :mode="mode"
+      style="border-bottom: 1px solid #ccc"
     />
     <!-- 编辑器 -->
     <Editor
-      id="editor-container"
       v-model="modelValue"
+      :style="{ height: height, overflowY: 'hidden' }"
       :default-config="editorConfig"
-      :mode="mode"
-      style="height: 500px; overflow-y: hidden"
-      @on-change="handleChange"
+      mode="simple"
       @on-created="handleCreated"
     />
   </div>
 </template>
 
 <script setup lang="ts">
-import { Editor, Toolbar } from "@wangeditor/editor-for-vue";
+import "@wangeditor-next/editor/dist/css/style.css";
+import { Toolbar, Editor } from "@wangeditor-next/editor-for-vue";
+import { IToolbarConfig, IEditorConfig } from "@wangeditor-next/editor";
 
-// API 引用
+// 文件上传 API
 import FileAPI from "@/api/file";
 
-const props = defineProps({
-  modelValue: {
-    type: [String],
-    default: "",
-  },
-  excludeKeys: {
-    type: Array<string>,
-    default: [],
+// 上传图片回调函数类型
+type InsertFnType = (url: string, alt: string, href: string) => void;
+
+defineProps({
+  height: {
+    type: String,
+    default: "500px",
   },
 });
 
 const emit = defineEmits(["update:modelValue"]);
 
-const modelValue = useVModel(props, "modelValue", emit);
+// 双向绑定
+const modelValue = defineModel("modelValue", {
+  type: String,
+  required: false,
+});
+
+// 编辑器实例，必须用 shallowRef，重要！
+const editorRef = shallowRef();
+
+// 工具栏配置
+const toolbarConfig = ref<Partial<IToolbarConfig>>({});
 
-const editorRef = shallowRef(); // 编辑器实例，必须用 shallowRef
-const mode = ref("simple"); // 编辑器模式
-const toolbarConfig = ref({
-  excludeKeys: props.excludeKeys,
-}); // 工具条配置
 // 编辑器配置
-const editorConfig = ref({
+const editorConfig = ref<Partial<IEditorConfig>>({
   placeholder: "请输入内容...",
   MENU_CONF: {
     uploadImage: {
-      // 自定义图片上传
-      async customUpload(file: any, insertFn: any) {
-        FileAPI.upload(file).then((data) => {
-          insertFn(data.url);
+      customUpload(file: File, insertFn: InsertFnType) {
+        // 上传图片
+        FileAPI.upload(file).then((res) => {
+          // 插入图片
+          insertFn(res.url, res.name, res.url);
         });
       },
-    },
+    } as any,
   },
 });
 
+// 记录 editor 实例，重要！
 const handleCreated = (editor: any) => {
-  editorRef.value = editor; // 记录 editor 实例，重要！
+  editorRef.value = editor;
 };
 
-function handleChange(editor: any) {
-  modelValue.value = editor.getHtml();
-}
-
-// 组件销毁时，也及时销毁编辑器
+// 组件销毁时，也及时销毁编辑器，重要！
 onBeforeUnmount(() => {
   const editor = editorRef.value;
   if (editor == null) return;
   editor.destroy();
 });
 </script>
-
-<style src="http://github.com/@wangeditor/editor/dist/css/style.css"></style>
diff --git a/src/views/demo/wang-editor.vue b/src/views/demo/wang-editor.vue
index 67db92d0..560f0ecb 100644
--- a/src/views/demo/wang-editor.vue
+++ b/src/views/demo/wang-editor.vue
@@ -1,8 +1,8 @@
 <!-- wangEditor富文本编辑器示例 -->
 <script setup lang="ts">
-import Editor from "@/components/WangEditor/index.vue";
+import WangEditor from "@/components/WangEditor/index.vue";
 
-const value = ref("初始内容");
+const value = ref("初始化内容");
 </script>
 
 <template>
@@ -15,6 +15,10 @@ const value = ref("初始内容");
     >
       示例源码 请点击>>>>
     </el-link>
-    <editor v-model="value" style="z-index: 99999; height: calc(100vh - 180px)" />
+    <WangEditor v-model="value" height="400px" />
+
+    <div style="margin-top: 10px">
+      <textarea v-model="value" readonly style="width: 100%; height: 200px; outline: none" />
+    </div>
   </div>
 </template>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index a7eec8fe..eb40926d 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -177,9 +177,7 @@
           <el-input v-model="formData.title" placeholder="通知标题" clearable />
         </el-form-item>
         <el-form-item label="通知内容" prop="content">
-          <div style="border: 1px solid #dcdfe6; border-radius: 4px">
-            <WangEditor v-model="formData.content" style="min-height: 480px" />
-          </div>
+          <WangEditor v-model="formData.content" />
         </el-form-item>
         <el-form-item label="通知类型" prop="type">
           <Dict v-model="formData.type" code="notice_type" />
@@ -411,8 +409,3 @@ onMounted(() => {
   handleQuery();
 });
 </script>
-<style>
-.editor-wrapper {
-  border: 1px solid #dcdfe6;
-}
-</style>

From 71bf5c8493daa39f5dddc752036eca61a976eeab Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 22 Jan 2025 13:46:34 +0800
Subject: [PATCH 144/497] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E8=87=B3=E9=A2=84=E6=9E=84=E5=BB=BA=E4=B8=BA?=
 =?UTF-8?q?=E9=9D=99=E6=80=81=E8=B5=84=E6=BA=90=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E6=B5=8F=E8=A7=88=E5=99=A8=E5=8A=A8=E6=80=81=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E7=94=A8=E6=88=B7=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/vite.config.ts b/vite.config.ts
index 440429a1..13dec1e2 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -104,13 +104,19 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "axios",
         "@vueuse/core",
         "sortablejs",
+        "stomp/stompjs",
         "exceljs",
         "path-to-regexp",
         "echarts",
         "@wangeditor/editor",
         "@wangeditor/editor-for-vue",
         "vue-i18n",
+        "nprogress",
+        "qs",
         "path-browserify",
+        "@element-plus/icons-vue",
+        "element-plus/es/locale/lang/zh-cn",
+        "element-plus/es/locale/lang/en",
         "element-plus/es/components/form/style/css",
         "element-plus/es/components/form-item/style/css",
         "element-plus/es/components/button/style/css",
@@ -178,6 +184,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "element-plus/es/components/progress/style/css",
         "element-plus/es/components/image-viewer/style/css",
         "element-plus/es/components/empty/style/css",
+        "element-plus/es/components/message/style/css",
       ],
     },
     // 构建配置

From 9e6727062a568f389919d4e63a2a1c147bc0036b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 22 Jan 2025 13:59:31 +0800
Subject: [PATCH 145/497] =?UTF-8?q?docs:=20:memo:=20wangeditor=20=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/WangEditor/index.vue | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index 47f290d8..4ea98f38 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -1,15 +1,11 @@
 <!--
- * wangEditor 富文本编辑器组件
- * Copyright © 2021-present 有来开源组织
- * 
- * 本组件基于 wangEditor-next 进行二次封装，支持 Vue 3.x
- * 作者：有来开源-Ray 
+ * 基于 wangEditor-next 的富文本编辑器组件二次封装
+ * 版权所有 © 2021-present 有来开源组织
  *
- * 使用请保留本段注释，感谢支持开源！
- * 参考官方示例：https://stackblitz.com/edit/vue3-wangeditor-demo-8emmc7?file=src%2Fcomponents%2FBasicEditor.vue
- * 
- * 开源协议：MIT License
- * 详情参见：https://opensource.org/licenses/MIT
+ * 开源协议：https://opensource.org/licenses/MIT
+ * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
+ *
+ * 在使用时，请保留此注释，感谢您对开源的支持！
  -->
 
 <template>

From 1bc339201bd6951d32c63d84608ef5906857be0a Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 22 Jan 2025 16:44:40 +0800
Subject: [PATCH 146/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86=E5=A2=9E=E5=8A=A0email=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E4=BF=AE=E5=A4=8Dtable-select=E6=80=A7?=
 =?UTF-8?q?=E5=88=AB=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用户管理增加email字段，修复table-select性别不显示的问题
---
 src/views/demo/table-select/config/select.ts |  9 ++++++++-
 src/views/demo/table-select/index.vue        | 13 ++++++++++---
 src/views/system/user/index.vue              |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index 6ae6db3b..8e77944a 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -97,7 +97,14 @@ const selectConfig: ISelectConfig = {
     { label: "编号", align: "center", prop: "id", width: 100 },
     { label: "用户名", align: "center", prop: "username" },
     { label: "用户昵称", align: "center", prop: "nickname", width: 120 },
-    { label: "性别", align: "center", prop: "genderLabel", width: 100 },
+    {
+      label: "性别",
+      align: "center",
+      prop: "gender",
+      width: 100,
+      templet: "custom",
+      slotName: "gender",
+    },
     { label: "部门", align: "center", prop: "deptName", width: 120 },
     { label: "手机号码", align: "center", prop: "mobile", width: 120 },
     {
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index 79240293..3456b451 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -1,13 +1,14 @@
 <!-- 列表选择器示例 -->
 <script setup lang="ts">
 import selectConfig from "./config/select";
-
+import { useDictStore } from "@/store";
+const dictStore = useDictStore();
 interface IUser {
   id: number;
   username: string;
   nickname: string;
   mobile: string;
-  genderLabel: string;
+  gender: string;
   avatar: string;
   email: string | null;
   status: number;
@@ -20,8 +21,11 @@ function handleConfirm(data: IUser[]) {
   selectedUser.value = data[0];
 }
 const text = computed(() => {
+  // 获取字典数据
+  const dictData = dictStore.getDictionary("gender");
+  const genderLabel = dictData.find((item: any) => item.value == selectedUser.value?.gender)?.label;
   return selectedUser.value
-    ? `${selectedUser.value.username} - ${selectedUser.value.genderLabel} - ${selectedUser.value.deptName}`
+    ? `${selectedUser.value.username} - ${genderLabel} - ${selectedUser.value.deptName}`
     : "";
 });
 </script>
@@ -42,6 +46,9 @@ const text = computed(() => {
           {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
         </el-tag>
       </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row.gender" code="gender" />
+      </template>
     </table-select>
   </div>
 </template>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 51113d70..f25996bb 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -101,6 +101,7 @@
             </el-table-column>
             <el-table-column label="部门" width="120" align="center" prop="deptName" />
             <el-table-column label="手机号码" align="center" prop="mobile" width="120" />
+            <el-table-column label="邮箱" align="center" prop="email" width="160" />
             <el-table-column label="状态" align="center" prop="status" width="80">
               <template #default="scope">
                 <el-tag :type="scope.row.status == 1 ? 'success' : 'info'">

From b7043117bec0eeb619fea0e176d1414ab467f2dd Mon Sep 17 00:00:00 2001
From: "lishichanglgx@163.com" <lishichanglgx@163.com>
Date: Wed, 22 Jan 2025 17:59:52 +0800
Subject: [PATCH 147/497] =?UTF-8?q?pagination=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pagination/index.vue | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 9cbaeafa..759b4ce5 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -16,7 +16,7 @@
 </template>
 
 <script setup lang="ts">
-defineProps({
+const props = defineProps({
   total: {
     required: true,
     type: Number as PropType<number>,
@@ -59,7 +59,19 @@ const pageSize = defineModel("limit", {
   default: 10,
 });
 
+watch(
+  props.total,
+  (newVal: number) => {
+    const lastPage = Math.ceil(newVal / pageSize.value)
+    if (newVal > 0 && currentPage.value > lastPage) {
+      currentPage.value = lastPage
+      emit("pagination", { page: currentPage.value, limit: pageSize.value });
+    }
+  }
+);
+
 function handleSizeChange(val: number) {
+  currentPage.value = 1
   emit("pagination", { page: currentPage.value, limit: val });
 }
 

From 67f3e455e9dba1b71b815856ff05405206dec262 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 24 Jan 2025 10:43:29 +0800
Subject: [PATCH 148/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复上传文件大小限制的问题
---
 src/components/Upload/FileUpload.vue | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 2dd485fb..fed6f0b8 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -108,7 +108,7 @@ const props = defineProps({
    */
   maxSize: {
     type: Number,
-    default: 2 * 1024 * 1024,
+    default: 10,
   },
   /**
    * 上传文件类型
@@ -221,15 +221,19 @@ watch(
  * 限制用户上传文件的大小
  */
 function handleBeforeUpload(file: UploadRawFile) {
-  if (file.size > props.maxSize) {
-    ElMessage.warning("上传文件不能大于" + props.maxSize + "M");
+  if (file.size > props.maxSize * 1024 * 1024) {
+    ElMessage.warning("上传文件不能大于" + props.maxSize + "Mb");
     return false;
   }
   uploadPercent.value = 0;
   showUploadPercent.value = true;
   return true;
 }
-
+/**
+ * 上传成功回调方法
+ * @param response 响应题
+ * @param file 上传文件
+ */
 const handleSuccessFile = (response: any, file: UploadFile) => {
   showUploadPercent.value = false;
   uploadPercent.value = 0;

From e9b9b8f16358cf5bec774fccc772b2439261db6c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 26 Jan 2025 20:30:34 +0800
Subject: [PATCH 149/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/ImageUpload.vue | 225 +++++++++++---------------
 1 file changed, 98 insertions(+), 127 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 5b259677..26064389 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -4,14 +4,13 @@
   <div style="display: none">
     <el-upload
       ref="uploadRef"
-      v-model:file-list="fileList"
+      :file-list="fileList"
+      :http-request="handleUpload"
       :before-upload="handleBeforeUpload"
-      :action="http://github.com/props.action"
-      :headers="props.headers"
-      :data="props.data"
-      :name="props.name"
-      :on-success="handleSuccessFile"
+      :on-success="handleSuccess"
       :on-error="handleError"
+      :data="props.additionalParams"
+      :name="props.fileParamName"
       :accept="props.accept"
       :limit="props.limit"
     />
@@ -47,48 +46,21 @@
     v-if="viewVisible"
     :zoom-rate="1.2"
     :initialIndex="initialIndex"
-    :url-list="viewFileList"
+    :url-list="previewImgUrls"
     @close="closePreview"
   />
 </template>
 <script setup lang="ts">
-import { UploadRawFile, UploadUserFile, UploadFile } from "element-plus";
-import FileAPI from "@/api/file";
-import { getToken } from "@/utils/auth";
-import { ResultEnum } from "@/enums/ResultEnum";
+import { UploadRawFile, UploadUserFile, UploadRequestOptions } from "element-plus";
+import FileAPI, { FileInfo } from "@/api/file";
 
-const emit = defineEmits(["update:modelValue", "change"]);
+const emit = defineEmits(["update:modelValue"]);
 
 const props = defineProps({
   /**
-   * 文件路径集合
+   * 附加的参数
    */
-  modelValue: {
-    type: [Array, String],
-    default: () => [],
-  },
-  /**
-   * 上传地址
-   */
-  action: {
-    type: String,
-    default: FileAPI.uploadUrl,
-  },
-  /**
-   * 请求头
-   */
-  headers: {
-    type: Object,
-    default: () => {
-      return {
-        Authorization: getToken(),
-      };
-    },
-  },
-  /**
-   * 请求携带的额外参数
-   */
-  data: {
+  additionalParams: {
     type: Object,
     default: () => {
       return {};
@@ -97,7 +69,7 @@ const props = defineProps({
   /**
    * 上传文件的参数名
    */
-  name: {
+  fileParamName: {
     type: String,
     default: "file",
   },
@@ -145,13 +117,6 @@ const props = defineProps({
     default: () => [],
   },
 
-  /**
-   * 是否同步删除
-   */
-  isSyncDelete: {
-    type: Boolean,
-    default: true,
-  },
   /**
    * 自定义样式
    */
@@ -164,108 +129,60 @@ const props = defineProps({
       };
     },
   },
+
+  /**
+   * 是否多图上传
+   */
+  multiple: {
+    type: Boolean,
+    default: false,
+  },
+});
+
+// 定义v-model
+const modelValue = defineModel("modelValue", {
+  type: [String, Array] as PropType<string | string[]>,
+  required: true,
+  default: () => "",
 });
 
 const viewVisible = ref(false);
 const initialIndex = ref(0);
 
-const fileList = ref([] as UploadUserFile[]);
-const valFileList = ref([] as string[]);
-const viewFileList = ref([] as string[]);
+const fileList = ref<UploadUserFile[]>([]); // 默认上传文件
+const previewImgUrls = ref<string[]>([]);
 
 // 添加一个ref来引用el-upload组件
 const uploadRef = ref();
 
 watch(
-  () => props.modelValue,
-  (newVal) => {
-    if (typeof newVal === "string" && !newVal) {
-      fileList.value = [];
-      viewFileList.value = [];
-      valFileList.value = [];
-      return;
-    }
-    const modelValue = typeof newVal === "string" ? [newVal] : (newVal as string[]);
-    const filePaths = fileList.value.map((file) => file.url);
-    // 监听modelValue文件集合值未变化时，跳过赋值
-    if (
-      filePaths.length > 0 &&
-      filePaths.length === modelValue.length &&
-      filePaths.every((x) => modelValue.some((y) => y === x)) &&
-      modelValue.every((y) => filePaths.some((x) => x === y))
-    ) {
-      return;
-    }
-
-    if (!modelValue || modelValue.length <= 0) {
-      fileList.value = [];
-      viewFileList.value = [];
-      valFileList.value = [];
+  () => modelValue.value,
+  (newValue) => {
+    if (!props.multiple) {
       return;
+    } else {
+      if (Array.isArray(newValue)) {
+        fileList.value = newValue.map((filePath) => {
+          return { url: filePath } as UploadUserFile;
+        });
+      }
     }
-
-    fileList.value = modelValue.map((filePath) => {
-      return { url: filePath } as UploadUserFile;
-    });
-    valFileList.value = modelValue;
   },
   { immediate: true }
 );
 
-/**
- * 上传成功回调
- *
- * @param options
- */
-const handleSuccessFile = (response: any, file: UploadFile) => {
-  if (response.code === ResultEnum.SUCCESS) {
-    ElMessage.success("上传成功");
-    valFileList.value.push(response.data.url);
-    if (props.limit === 1) {
-      emit("update:modelValue", response.data.url);
-      emit("change", response.data.url);
-    } else {
-      emit("update:modelValue", valFileList.value);
-      emit("change", valFileList.value);
-    }
-    return;
-  } else {
-    ElMessage.error(response.msg || "上传失败");
-  }
-};
-
-const handleError = (error: any) => {
-  ElMessage.error("上传失败");
-};
-
 /**
  * 删除图片
  */
 function handleRemove(path: string) {
   if (path) {
-    if (props.isSyncDelete) {
-      FileAPI.deleteByPath(path).then(() => {
-        valFileList.value = valFileList.value.filter((x) => x !== path);
-        // 删除成功回调
-        if (props.limit === 1) {
-          emit("update:modelValue", "");
-          emit("change", "");
-        } else {
-          emit("update:modelValue", valFileList.value);
-          emit("change", valFileList.value);
-        }
-      });
-    } else {
-      valFileList.value = valFileList.value.filter((x) => x !== path);
-      // 删除成功回调
-      if (props.limit === 1) {
-        emit("update:modelValue", "");
-        emit("change", "");
+    FileAPI.deleteByPath(path).then(() => {
+      if (Array.isArray(modelValue.value)) {
+        modelValue.value = modelValue.value.filter((x) => x !== path);
       } else {
-        emit("update:modelValue", valFileList.value);
-        emit("change", valFileList.value);
+        modelValue.value = "";
       }
-    }
+    });
   }
 }
 
@@ -303,11 +220,65 @@ function handleBeforeUpload(file: UploadRawFile) {
   return true;
 }
 
+/*
+ * 上传文件
+ */
+function handleUpload(options: UploadRequestOptions) {
+  return new Promise((resolve, reject) => {
+    const { file, onSuccess, onError } = options;
+
+    const formData = new FormData();
+    formData.append(props.fileParamName, file);
+
+    // 处理附加参数
+    Object.keys(props.additionalParams).forEach((key) => {
+      formData.append(key, props.additionalParams[key]);
+    });
+
+    FileAPI.upload(formData)
+      .then((data) => {
+        onSuccess(data);
+        resolve(data);
+      })
+      .catch((error) => {
+        onError(error);
+        reject(error);
+      });
+  });
+}
+
+/**
+ * 上传成功回调
+ *
+ * @param fileInfo 上传成功后的文件信息
+ */
+const handleSuccess = (fileInfo: FileInfo) => {
+  ElMessage.success("上传成功");
+  valFileList.value.push(fileInfo.url);
+  if (!props.multiple) {
+    emit("update:modelValue", fileInfo.url);
+    emit("change", fileInfo.url);
+  } else {
+    emit("update:modelValue", valFileList.value);
+    emit("change", valFileList.value);
+  }
+  return;
+};
+
+/**
+ * 上传失败回调
+ *
+ * @param error 上传失败的错误信息
+ */
+const handleError = (error: any) => {
+  ElMessage.error("上传失败");
+};
+
 /**
  * 预览图片
  */
 const previewImg = (path: string) => {
-  viewFileList.value = fileList.value.map((file) => file.url!);
+  previewImgUrls.value = fileList.value.map((file) => file.url!);
   initialIndex.value = fileList.value.findIndex((file) => file.url === path);
   viewVisible.value = true;
 };

From 636a723dfc0763b8f57a723bc48003da198af7b6 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 28 Jan 2025 23:59:25 +0800
Subject: [PATCH 150/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/ImageUpload.vue | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 26064389..08aed9ab 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -108,14 +108,6 @@ const props = defineProps({
     type: String,
     default: "image/*",
   },
-  /**
-   * 支持的文件类型,默认支持所有图片格式
-   * eg:['png','jpg','jpeg','gif']
-   */
-  supportFileType: {
-    type: Array<string>,
-    default: () => [],
-  },
 
   /**
    * 自定义样式
@@ -150,6 +142,7 @@ const viewVisible = ref(false);
 const initialIndex = ref(0);
 
 const fileList = ref<UploadUserFile[]>([]); // 默认上传文件
+const uploadedImgUrls = ref<string[]>([]); // 已上传的图片
 const previewImgUrls = ref<string[]>([]);
 
 // 添加一个ref来引用el-upload组件
@@ -254,13 +247,12 @@ function handleUpload(options: UploadRequestOptions) {
  */
 const handleSuccess = (fileInfo: FileInfo) => {
   ElMessage.success("上传成功");
-  valFileList.value.push(fileInfo.url);
-  if (!props.multiple) {
-    emit("update:modelValue", fileInfo.url);
-    emit("change", fileInfo.url);
+  const { url } = fileInfo;
+  uploadedImgUrls.value.push(url);
+  if (props.multiple && Array.isArray(modelValue.value)) {
+    modelValue.value.push(url);
   } else {
-    emit("update:modelValue", valFileList.value);
-    emit("change", valFileList.value);
+    modelValue.value = url;
   }
   return;
 };

From b0143936bfe3bf8a881bc1d95855d3579a59689a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 30 Jan 2025 23:59:40 +0800
Subject: [PATCH 151/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/ImageUpload.vue | 61 ++++++++-------------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
index 08aed9ab..0bbe42ea 100644
--- a/src/components/Upload/ImageUpload.vue
+++ b/src/components/Upload/ImageUpload.vue
@@ -19,7 +19,7 @@
   <!-- 自定义的显示区域 -->
   <div class="custom-upload-list">
     <!-- 已上传的图片列表 -->
-    <div v-for="(path, index) in valFileList" :key="index" class="custom-upload-item">
+    <div v-for="(path, index) in uploadedImageUrls" :key="index" class="custom-upload-item">
       <img class="upload-thumbnail" :src="http://github.com/path" alt="" />
       <div class="upload-actions">
         <span class="action-item preview" @click="previewImg(path)">
@@ -33,7 +33,7 @@
 
     <!-- 上传按钮 -->
     <div
-      v-if="valFileList.length < props.limit && props.showUploadBtn"
+      v-if="uploadedImageUrls.length < props.limit && props.showUploadBtn"
       class="custom-upload-trigger"
       @click="triggerUpload"
     >
@@ -43,10 +43,10 @@
 
   <!-- 图片预览组件 -->
   <el-image-viewer
-    v-if="viewVisible"
+    v-if="previewVisible"
     :zoom-rate="1.2"
-    :initialIndex="initialIndex"
-    :url-list="previewImgUrls"
+    :initialIndex="previewImageIndex"
+    :url-list="uploadedImageUrls"
     @close="closePreview"
   />
 </template>
@@ -121,7 +121,6 @@ const props = defineProps({
       };
     },
   },
-
   /**
    * 是否多图上传
    */
@@ -138,12 +137,11 @@ const modelValue = defineModel("modelValue", {
   default: () => "",
 });
 
-const viewVisible = ref(false);
-const initialIndex = ref(0);
+const previewVisible = ref(false); // 是否显示预览
+const previewImageIndex = ref(0); // 预览的图片索引
 
 const fileList = ref<UploadUserFile[]>([]); // 默认上传文件
-const uploadedImgUrls = ref<string[]>([]); // 已上传的图片
-const previewImgUrls = ref<string[]>([]);
+const uploadedImageUrls = ref<string[]>([]); // 已上传的图片
 
 // 添加一个ref来引用el-upload组件
 const uploadRef = ref();
@@ -151,14 +149,13 @@ const uploadRef = ref();
 watch(
   () => modelValue.value,
   (newValue) => {
-    if (!props.multiple) {
-      return;
+    if (Array.isArray(newValue)) {
+      fileList.value = newValue.map((filePath) => {
+        return { url: filePath } as UploadUserFile;
+      });
     } else {
-      if (Array.isArray(newValue)) {
-        fileList.value = newValue.map((filePath) => {
-          return { url: filePath } as UploadUserFile;
-        });
-      }
+      fileList.value = [];
+      uploadedImageUrls.value = [];
     }
   },
   { immediate: true }
@@ -188,28 +185,6 @@ function handleBeforeUpload(file: UploadRawFile) {
     ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
     return false;
   }
-  // 判断文件类型
-  // 获取文件后缀名
-  const fileExt = file.name.split(".").pop();
-  if (!fileExt) {
-    ElMessage.warning("上传图片格式错误,支持的文件类型:" + props.supportFileType.join(","));
-    return false;
-  }
-  // 给文件后缀名转换为小写
-  const lowerCaseFileExt = fileExt.toLowerCase();
-  // 判断文件后缀名是否在支持的文件类型中
-  if (props.supportFileType.length > 0) {
-    let isSupport = false;
-    props.supportFileType.forEach((type) => {
-      if (type.toLowerCase() === lowerCaseFileExt) {
-        isSupport = true;
-      }
-    });
-    if (!isSupport) {
-      ElMessage.warning("上传图片格式错误,支持的文件类型:" + props.supportFileType.join(","));
-      return false;
-    }
-  }
   return true;
 }
 
@@ -248,7 +223,7 @@ function handleUpload(options: UploadRequestOptions) {
 const handleSuccess = (fileInfo: FileInfo) => {
   ElMessage.success("上传成功");
   const { url } = fileInfo;
-  uploadedImgUrls.value.push(url);
+  uploadedImageUrls.value.push(url);
   if (props.multiple && Array.isArray(modelValue.value)) {
     modelValue.value.push(url);
   } else {
@@ -270,16 +245,16 @@ const handleError = (error: any) => {
  * 预览图片
  */
 const previewImg = (path: string) => {
-  previewImgUrls.value = fileList.value.map((file) => file.url!);
+  previewImageUrls.value = fileList.value.map((file) => file.url!);
   initialIndex.value = fileList.value.findIndex((file) => file.url === path);
-  viewVisible.value = true;
+  previewVisible.value = true;
 };
 
 /**
  * 关闭预览
  */
 const closePreview = () => {
-  viewVisible.value = false;
+  previewVisible.value = false;
 };
 
 // 修改triggerUpload方法

From 488795f94a761ec5b7f18496259f728c6ee982d4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 1 Feb 2025 00:00:28 +0800
Subject: [PATCH 152/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=A4=9A?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8A=E4=BC=A0=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/MultiImageUpload.vue | 237 +++++++++++++++++++++
 1 file changed, 237 insertions(+)
 create mode 100644 src/components/Upload/MultiImageUpload.vue

diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
new file mode 100644
index 00000000..1c11a033
--- /dev/null
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -0,0 +1,237 @@
+<!-- 图片上传组件 -->
+<template>
+  <div>
+    <el-upload
+      v-model:file-list="fileList"
+      list-type="picture-card"
+      :before-upload="handleBeforeUpload"
+      :http-request="handleUpload"
+      :data="props.additionalParams"
+      :name="props.fileParamName"
+      :on-success="handleSuccess"
+      :on-error="handleError"
+      :on-exceed="handleExceed"
+      :accept="props.accept"
+      :limit="props.limit"
+    >
+      <el-icon><Plus /></el-icon>
+      <template #file="{ file }">
+        <div style="width: 100%">
+          <image class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" />
+          <span class="el-upload-list__item-actions">
+            <!-- 预览 -->
+            <span class="el-upload-list__item-preview" @click="handlePreviewImage(file.url!)">
+              <el-icon><zoom-in /></el-icon>
+            </span>
+            <!-- 删除 -->
+            <span class="el-upload-list__item-delete" @click="handleRemove(file.url!)">
+              <el-icon><Delete /></el-icon>
+            </span>
+          </span>
+        </div>
+      </template>
+    </el-upload>
+
+    <el-image-viewer
+      v-if="previewVisible"
+      :zoom-rate="1.2"
+      :previewImageIndex="previewImageIndex"
+      :url-list="modelValue"
+      @close="handlePreviewClose"
+    />
+  </div>
+</template>
+<script setup lang="ts">
+import { UploadRawFile, UploadRequestOptions, UploadUserFile } from "element-plus";
+import FileAPI, { FileInfo } from "@/api/file";
+
+const emit = defineEmits(["update:modelValue"]);
+
+const props = defineProps({
+  /**
+   * 请求携带的额外参数
+   */
+  additionalParams: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+  /**
+   * 上传文件的参数名
+   */
+  fileParamName: {
+    type: String,
+    default: "file",
+  },
+  /**
+   * 文件上传数量限制
+   */
+  limit: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   *
+   */
+  maxFileSize: {
+    type: Number,
+    default: 10,
+  },
+  /**
+   * 上传文件类型
+   */
+  accept: {
+    type: String,
+    default: "image/*", //  默认支持所有图片格式 ，如果需要指定格式，格式如下：'.png,.jpg,.jpeg,.gif,.bmp'
+  },
+});
+
+const previewVisible = ref(false); // 是否显示预览
+const previewImageIndex = ref(0); // 预览图片的索引
+
+const modelValue = defineModel("modelValue", {
+  type: [Array] as PropType<string[]>,
+  required: true,
+  default: () => [],
+});
+
+const fileList = ref<UploadUserFile[]>([]);
+
+// modelValue 监听转换所需的 fileList
+watch(
+  modelValue,
+  (value) => {
+    console.log("modelValue 发生变化:", value);
+    fileList.value = value.map((url) => {
+      return {
+        url,
+      } as UploadUserFile;
+    });
+  },
+  {
+    immediate: true,
+  }
+);
+
+/**
+ * 删除图片
+ */
+function handleRemove(imageUrl: string) {
+  FileAPI.delete(imageUrl).then(() => {
+    modelValue.value = modelValue.value.filter((url) => url !== imageUrl);
+  });
+}
+
+/**
+ * 上传文件超出限制
+ */
+function handleExceed(files: File[], uploadFiles: UploadUserFile[]) {
+  ElMessage.warning("最多只能上传" + props.limit + "张图片");
+}
+
+/**
+ * 限制用户上传文件的格式和大小
+ */
+function handleBeforeUpload(file: UploadRawFile) {
+  // 校验文件类型：虽然 accept 属性限制了用户在文件选择器中可选的文件类型，但仍需在上传时再次校验文件实际类型，确保符合 accept 的规则
+  const acceptTypes = props.accept.split(",").map((type) => type.trim());
+
+  // 检查文件格式是否符合 accept
+  const isValidType = acceptTypes.some((type) => {
+    if (type === "image/*") {
+      // 如果是 image/*，检查 MIME 类型是否以 "image/" 开头
+      return file.type.startsWith("image/");
+    } else if (type.startsWith(".")) {
+      // 如果是扩展名 (.png, .jpg)，检查文件名是否以指定扩展名结尾
+      return file.name.toLowerCase().endsWith(type);
+    } else {
+      // 如果是具体的 MIME 类型 (image/png, image/jpeg)，检查是否完全匹配
+      return file.type === type;
+    }
+  });
+
+  if (!isValidType) {
+    ElMessage.warning(`上传文件的格式不正确，仅支持：${props.accept}`);
+    return false;
+  }
+
+  // 限制文件大小
+  if (file.size > props.maxSize * 1024 * 1024) {
+    ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
+    return false;
+  }
+  return true;
+}
+
+/*
+ * 上传文件
+ */
+function handleUpload(options: UploadRequestOptions) {
+  return new Promise((resolve, reject) => {
+    const file = options.file;
+
+    const formData = new FormData();
+    formData.append(props.fileParamName, file);
+
+    // 处理附加参数
+    Object.keys(props.additionalParams).forEach((key) => {
+      formData.append(key, props.additionalParams[key]);
+    });
+
+    FileAPI.upload(formData)
+      .then((data) => {
+        resolve(data);
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
+/**
+ * 上传成功回调
+ *
+ * @param fileInfo 上传成功后的文件信息
+ */
+const handleSuccess = (fileInfo: FileInfo) => {
+  ElMessage.success("上传成功");
+  modelValue.value = [...modelValue.value, fileInfo.url];
+};
+
+/**
+ * 上传失败回调
+ */
+const handleError = (error: any) => {
+  console.log("handleError");
+  ElMessage.error("上传失败: " + error.message);
+};
+
+/**
+ * 预览图片
+ */
+const handlePreviewImage = (imageUrl: string) => {
+  previewImageIndex.value = modelValue.value.findIndex((url) => url === imageUrl);
+  previewVisible.value = true;
+};
+
+/**
+ * 关闭预览
+ */
+const handlePreviewClose = () => {
+  previewVisible.value = false;
+};
+</script>
+<style lang="scss" scoped>
+.hide {
+  :deep(.el-upload--picture-card) {
+    display: none;
+  }
+}
+
+.show {
+  :deep(.el-upload--picture-card) {
+    display: flex;
+  }
+}
+</style>

From 2d31f354cb9db536c7c5e0a4143031a8070d8d42 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Feb 2025 22:05:42 +0800
Subject: [PATCH 153/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=92=8C=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=87=8D=E6=9E=84=EF=BC=8C=E7=B2=BE=E7=AE=80=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=92=8C=E9=99=8D=E4=BD=8E=E4=BB=A3=E7=A0=81=E5=A4=8D?=
 =?UTF-8?q?=E6=9D=82=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file/index.ts                       |  15 +-
 src/components/Upload/FileUpload.vue        | 283 ++++++----------
 src/components/Upload/ImageUpload.vue       | 344 --------------------
 src/components/Upload/MultiImageUpload.vue  | 127 +++-----
 src/components/Upload/SingleImageUpload.vue | 202 ++++++++++++
 src/types/components.d.ts                   |   2 +-
 src/views/demo/upload.vue                   |  16 +-
 7 files changed, 364 insertions(+), 625 deletions(-)
 delete mode 100644 src/components/Upload/ImageUpload.vue
 create mode 100644 src/components/Upload/SingleImageUpload.vue

diff --git a/src/api/file/index.ts b/src/api/file/index.ts
index 509e6955..c2076a19 100644
--- a/src/api/file/index.ts
+++ b/src/api/file/index.ts
@@ -1,19 +1,12 @@
 import request from "@/utils/request";
 
 const FileAPI = {
-  /**
-   * 文件上传地址
-   */
-  uploadUrl: import.meta.env.VITE_APP_BASE_API + "/api/v1/files",
-
   /**
    * 上传文件
    *
-   * @param file
+   * @param formData
    */
-  upload(file: File) {
-    const formData = new FormData();
-    formData.append("file", file);
+  upload(formData: FormData) {
     return request<any, FileInfo>({
       url: "/api/v1/files",
       method: "post",
@@ -29,7 +22,7 @@ const FileAPI = {
    *
    * @param filePath 文件完整路径
    */
-  deleteByPath(filePath?: string) {
+  delete(filePath?: string) {
     return request({
       url: "/api/v1/files",
       method: "delete",
@@ -42,7 +35,7 @@ const FileAPI = {
    * @param url
    * @param fileName
    */
-  downloadFile(url: string, fileName?: string) {
+  download(url: string, fileName?: string) {
     return request({
       url: url,
       method: "get",
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index fed6f0b8..15cacd61 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -3,53 +3,41 @@
   <div>
     <el-upload
       v-model:file-list="fileList"
-      :class="props.showUploadBtn ? 'show-upload-btn' : 'hide-upload-btn'"
       :style="props.style"
-      multiple
-      :headers="props.headers"
-      :data="props.data"
-      :name="props.name"
       :before-upload="handleBeforeUpload"
-      :on-remove="handleRemove"
+      :http-request="handleUpload"
       :on-progress="handleProgress"
-      :on-success="handleSuccessFile"
+      :on-success="handleSuccess"
       :on-error="handleError"
-      :action="http://github.com/props.action"
       :accept="props.accept"
       :limit="props.limit"
+      multiple
     >
-      <el-button
-        v-if="props.showUploadBtn"
-        type="primary"
-        :disabled="fileList.length >= props.limit"
-      >
+      <!-- 上传文件按钮 -->
+      <el-button type="primary" :disabled="fileList.length >= props.limit">
         {{ props.uploadBtnText }}
       </el-button>
-      <template v-if="props.showTip" #tip>
-        <div class="el-upload__tip">
-          {{ props.tip }}
-        </div>
-      </template>
+
+      <!-- 文件列表 -->
       <template #file="{ file }">
         <div class="el-upload-list__item-info">
-          <a class="el-upload-list__item-name" @click="downloadFile(file)">
+          <a class="el-upload-list__item-name" @click="handleDownload(file)">
             <el-icon><Document /></el-icon>
             <span class="el-upload-list__item-file-name">{{ file.name }}</span>
-            <span v-if="props.showDelBtn" class="el-icon--close" @click.stop="handleRemove(file)">
+            <span class="el-icon--close" @click="handleRemove(file.url!)">
               <el-icon><Close /></el-icon>
             </span>
           </a>
         </div>
       </template>
     </el-upload>
+
     <el-progress
-      v-if="showUploadPercent"
       :style="{
-        display: showUploadPercent ? 'inline-flex' : 'none',
+        display: showProgress ? 'inline-flex' : 'none',
         width: '100%',
       }"
-      :percentage="uploadPercent"
-      :color="customColorMethod"
+      :percentage="progressPercent"
     />
   </div>
 </template>
@@ -57,30 +45,28 @@
 import {
   UploadRawFile,
   UploadUserFile,
-  UploadFile,
   UploadProgressEvent,
-  UploadFiles,
+  UploadRequestOptions,
 } from "element-plus";
 
-import FileAPI from "@/api/file";
-import { getToken } from "@/utils/auth";
-import { ResultEnum } from "@/enums/ResultEnum";
+import FileAPI, { FileInfo } from "@/api/file";
 
-const emit = defineEmits(["update:modelValue"]);
 const props = defineProps({
   /**
-   * 文件集合
+   * 请求携带的额外参数
    */
-  modelValue: {
-    type: Array<UploadUserFile>,
-    default: () => [],
+  data: {
+    type: Object,
+    default: () => {
+      return {};
+    },
   },
   /**
-   * 上传地址
+   * 上传文件的参数名
    */
-  action: {
+  name: {
     type: String,
-    default: FileAPI.uploadUrl,
+    default: "file",
   },
   /**
    * 文件上传数量限制
@@ -89,24 +75,10 @@ const props = defineProps({
     type: Number,
     default: 10,
   },
-  /**
-   * 是否显示删除按钮
-   */
-  showDelBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否显示上传按钮
-   */
-  showUploadBtn: {
-    type: Boolean,
-    default: true,
-  },
   /**
    * 单个文件上传大小限制(单位MB)
    */
-  maxSize: {
+  maxFileSize: {
     type: Number,
     default: 10,
   },
@@ -124,47 +96,7 @@ const props = defineProps({
     type: String,
     default: "上传文件",
   },
-  /**
-   * 是否展示提示信息
-   */
-  showTip: {
-    type: Boolean,
-    default: false,
-  },
-  /**
-   * 提示信息内容
-   */
-  tip: {
-    type: String,
-    default: "",
-  },
-  /**
-   * 请求头
-   */
-  headers: {
-    type: Object,
-    default: () => {
-      return {
-        Authorization: getToken(),
-      };
-    },
-  },
-  /**
-   * 请求携带的额外参数
-   */
-  data: {
-    type: Object,
-    default: () => {
-      return {};
-    },
-  },
-  /**
-   * 上传文件的参数名
-   */
-  name: {
-    type: String,
-    default: "file",
-  },
+
   /**
    * 样式
    */
@@ -178,119 +110,108 @@ const props = defineProps({
   },
 });
 
-const fileList = ref([] as UploadUserFile[]);
-const valFileList = ref([] as UploadUserFile[]);
-const showUploadPercent = ref(false);
-const uploadPercent = ref(0);
-
-watch(
-  () => props.modelValue,
-  (newVal: UploadUserFile[]) => {
-    const filePaths = fileList.value.map((file) => file.url);
-    const fileNames = fileList.value.map((file) => file.name);
-    // 监听modelValue文件集合值未变化时，跳过赋值
-    if (
-      filePaths.length > 0 &&
-      filePaths.length === newVal.length &&
-      filePaths.every((x) => newVal.some((y) => y.url === x)) &&
-      newVal.every((y) => filePaths.some((x) => x === y.url)) &&
-      fileNames.every((x) => newVal.some((y) => y.name === x)) &&
-      newVal.every((y) => fileNames.some((x) => x === y.name))
-    ) {
-      return;
-    }
+const modelValue = defineModel("modelValue", {
+  type: [Array] as PropType<string[]>,
+  required: true,
+  default: () => [],
+});
 
-    if (newVal.length <= 0) {
-      fileList.value = [];
-      valFileList.value = [];
-      return;
-    }
+const fileList = ref([] as UploadUserFile[]);
 
-    fileList.value = newVal.map((file) => {
-      return { name: file.name, url: file.url } as UploadFile;
-    });
+const showProgress = ref(false);
+const progressPercent = ref(0);
 
-    valFileList.value = newVal.map((file) => {
-      return { name: file.name, url: file.url } as UploadFile;
+// 监听 modelValue 转换用于显示的 fileList
+watch(
+  modelValue,
+  (value) => {
+    fileList.value = value.map((url) => {
+      const name = url.substring(url.lastIndexOf("/") + 1);
+      return {
+        name: name,
+        url: url,
+      } as UploadUserFile;
     });
   },
-  { immediate: true }
+  {
+    immediate: true,
+  }
 );
 
 /**
- * 限制用户上传文件的大小
+ * 上传前校验
  */
 function handleBeforeUpload(file: UploadRawFile) {
-  if (file.size > props.maxSize * 1024 * 1024) {
-    ElMessage.warning("上传文件不能大于" + props.maxSize + "Mb");
+  // 限制文件大小
+  if (file.size > props.maxFileSize * 1024 * 1024) {
+    ElMessage.warning("上传图片不能大于" + props.maxFileSize + "M");
     return false;
   }
-  uploadPercent.value = 0;
-  showUploadPercent.value = true;
   return true;
 }
-/**
- * 上传成功回调方法
- * @param response 响应题
- * @param file 上传文件
+
+/*
+ * 上传文件
  */
-const handleSuccessFile = (response: any, file: UploadFile) => {
-  showUploadPercent.value = false;
-  uploadPercent.value = 0;
-  if (response.code === ResultEnum.SUCCESS) {
-    ElMessage.success("上传成功");
-    valFileList.value.push({
-      name: file.name,
-      url: response.data.url,
+function handleUpload(options: UploadRequestOptions) {
+  return new Promise((resolve, reject) => {
+    const file = options.file;
+
+    const formData = new FormData();
+    formData.append(props.name, file);
+
+    // 处理附加参数
+    Object.keys(props.data).forEach((key) => {
+      formData.append(key, props.data[key]);
     });
-    emit("update:modelValue", valFileList.value);
-    return;
-  } else {
-    ElMessage.error(response.msg || "上传失败");
-  }
-};
 
-const handleError = (error: any) => {
-  showUploadPercent.value = false;
-  uploadPercent.value = 0;
-  ElMessage.error("上传失败");
+    FileAPI.upload(formData)
+      .then((data) => {
+        resolve(data);
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
+/**
+ * 上传进度
+ *
+ * @param event
+ */
+const handleProgress = (event: UploadProgressEvent) => {
+  progressPercent.value = event.percent;
 };
 
-const customColorMethod = (percentage: number) => {
-  if (percentage < 30) {
-    return "#909399";
-  }
-  if (percentage < 70) {
-    return "#375ee8";
-  }
-  return "#67c23a";
+/**
+ * 上传成功
+ */
+const handleSuccess = (fileInfo: FileInfo) => {
+  ElMessage.success("上传成功");
+  modelValue.value = [...modelValue.value, fileInfo.url];
 };
 
-const handleProgress = (event: UploadProgressEvent) => {
-  uploadPercent.value = event.percent;
+const handleError = (error: any) => {
+  ElMessage.error("上传失败");
 };
 
 /**
  * 删除文件
  */
-function handleRemove(removeFile: UploadUserFile) {
-  const filePath = removeFile.url;
-  if (filePath) {
-    FileAPI.deleteByPath(filePath).then(() => {
-      // 删除成功回调
-      valFileList.value = valFileList.value.filter((file) => file.url !== filePath);
-      emit("update:modelValue", valFileList.value);
-    });
-  }
+function handleRemove(fileUrl: string) {
+  FileAPI.delete(fileUrl).then(() => {
+    modelValue.value = modelValue.value.filter((url) => url !== fileUrl);
+  });
 }
 
 /**
  * 下载文件
  */
-function downloadFile(file: UploadUserFile) {
-  const filePath = file.url;
-  if (filePath) {
-    FileAPI.downloadFile(filePath, file.name);
+function handleDownload(file: UploadUserFile) {
+  const { url, name } = file;
+  if (url) {
+    FileAPI.download(url, name);
   }
 }
 </script>
@@ -313,16 +234,4 @@ function downloadFile(file: UploadUserFile) {
 :deep(.el-upload-list__item) {
   margin: 0;
 }
-
-.show-upload-btn {
-  :deep(.el-upload) {
-    display: inline-flex;
-  }
-}
-
-.hide-upload-btn {
-  :deep(.el-upload) {
-    display: none;
-  }
-}
 </style>
diff --git a/src/components/Upload/ImageUpload.vue b/src/components/Upload/ImageUpload.vue
deleted file mode 100644
index 0bbe42ea..00000000
--- a/src/components/Upload/ImageUpload.vue
+++ /dev/null
@@ -1,344 +0,0 @@
-<!-- 图片上传组件 -->
-<template>
-  <!-- 实际的上传组件（隐藏） -->
-  <div style="display: none">
-    <el-upload
-      ref="uploadRef"
-      :file-list="fileList"
-      :http-request="handleUpload"
-      :before-upload="handleBeforeUpload"
-      :on-success="handleSuccess"
-      :on-error="handleError"
-      :data="props.additionalParams"
-      :name="props.fileParamName"
-      :accept="props.accept"
-      :limit="props.limit"
-    />
-  </div>
-
-  <!-- 自定义的显示区域 -->
-  <div class="custom-upload-list">
-    <!-- 已上传的图片列表 -->
-    <div v-for="(path, index) in uploadedImageUrls" :key="index" class="custom-upload-item">
-      <img class="upload-thumbnail" :src="http://github.com/path" alt="" />
-      <div class="upload-actions">
-        <span class="action-item preview" @click="previewImg(path)">
-          <el-icon><zoom-in /></el-icon>
-        </span>
-        <span v-if="props.showDelBtn" class="action-item delete" @click="handleRemove(path)">
-          <el-icon><Delete /></el-icon>
-        </span>
-      </div>
-    </div>
-
-    <!-- 上传按钮 -->
-    <div
-      v-if="uploadedImageUrls.length < props.limit && props.showUploadBtn"
-      class="custom-upload-trigger"
-      @click="triggerUpload"
-    >
-      <el-icon><Plus /></el-icon>
-    </div>
-  </div>
-
-  <!-- 图片预览组件 -->
-  <el-image-viewer
-    v-if="previewVisible"
-    :zoom-rate="1.2"
-    :initialIndex="previewImageIndex"
-    :url-list="uploadedImageUrls"
-    @close="closePreview"
-  />
-</template>
-<script setup lang="ts">
-import { UploadRawFile, UploadUserFile, UploadRequestOptions } from "element-plus";
-import FileAPI, { FileInfo } from "@/api/file";
-
-const emit = defineEmits(["update:modelValue"]);
-
-const props = defineProps({
-  /**
-   * 附加的参数
-   */
-  additionalParams: {
-    type: Object,
-    default: () => {
-      return {};
-    },
-  },
-  /**
-   * 上传文件的参数名
-   */
-  fileParamName: {
-    type: String,
-    default: "file",
-  },
-  /**
-   * 文件上传数量限制
-   */
-  limit: {
-    type: Number,
-    default: 1,
-  },
-  /**
-   * 是否显示删除按钮
-   */
-  showDelBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否显示上传按钮
-   */
-  showUploadBtn: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 单张图片最大大小,单位MB
-   */
-  maxSize: {
-    type: Number,
-    default: 10,
-  },
-  /**
-   * 上传文件类型
-   */
-  accept: {
-    type: String,
-    default: "image/*",
-  },
-
-  /**
-   * 自定义样式
-   */
-  style: {
-    type: Object,
-    default: () => {
-      return {
-        width: "130px",
-        height: "130px",
-      };
-    },
-  },
-  /**
-   * 是否多图上传
-   */
-  multiple: {
-    type: Boolean,
-    default: false,
-  },
-});
-
-// 定义v-model
-const modelValue = defineModel("modelValue", {
-  type: [String, Array] as PropType<string | string[]>,
-  required: true,
-  default: () => "",
-});
-
-const previewVisible = ref(false); // 是否显示预览
-const previewImageIndex = ref(0); // 预览的图片索引
-
-const fileList = ref<UploadUserFile[]>([]); // 默认上传文件
-const uploadedImageUrls = ref<string[]>([]); // 已上传的图片
-
-// 添加一个ref来引用el-upload组件
-const uploadRef = ref();
-
-watch(
-  () => modelValue.value,
-  (newValue) => {
-    if (Array.isArray(newValue)) {
-      fileList.value = newValue.map((filePath) => {
-        return { url: filePath } as UploadUserFile;
-      });
-    } else {
-      fileList.value = [];
-      uploadedImageUrls.value = [];
-    }
-  },
-  { immediate: true }
-);
-
-/**
- * 删除图片
- */
-function handleRemove(path: string) {
-  if (path) {
-    FileAPI.deleteByPath(path).then(() => {
-      if (Array.isArray(modelValue.value)) {
-        modelValue.value = modelValue.value.filter((x) => x !== path);
-      } else {
-        modelValue.value = "";
-      }
-    });
-  }
-}
-
-/**
- * 限制用户上传文件的格式和大小
- */
-function handleBeforeUpload(file: UploadRawFile) {
-  // 限制文件大小
-  if (file.size > props.maxSize * 1024 * 1024) {
-    ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
-    return false;
-  }
-  return true;
-}
-
-/*
- * 上传文件
- */
-function handleUpload(options: UploadRequestOptions) {
-  return new Promise((resolve, reject) => {
-    const { file, onSuccess, onError } = options;
-
-    const formData = new FormData();
-    formData.append(props.fileParamName, file);
-
-    // 处理附加参数
-    Object.keys(props.additionalParams).forEach((key) => {
-      formData.append(key, props.additionalParams[key]);
-    });
-
-    FileAPI.upload(formData)
-      .then((data) => {
-        onSuccess(data);
-        resolve(data);
-      })
-      .catch((error) => {
-        onError(error);
-        reject(error);
-      });
-  });
-}
-
-/**
- * 上传成功回调
- *
- * @param fileInfo 上传成功后的文件信息
- */
-const handleSuccess = (fileInfo: FileInfo) => {
-  ElMessage.success("上传成功");
-  const { url } = fileInfo;
-  uploadedImageUrls.value.push(url);
-  if (props.multiple && Array.isArray(modelValue.value)) {
-    modelValue.value.push(url);
-  } else {
-    modelValue.value = url;
-  }
-  return;
-};
-
-/**
- * 上传失败回调
- *
- * @param error 上传失败的错误信息
- */
-const handleError = (error: any) => {
-  ElMessage.error("上传失败");
-};
-
-/**
- * 预览图片
- */
-const previewImg = (path: string) => {
-  previewImageUrls.value = fileList.value.map((file) => file.url!);
-  initialIndex.value = fileList.value.findIndex((file) => file.url === path);
-  previewVisible.value = true;
-};
-
-/**
- * 关闭预览
- */
-const closePreview = () => {
-  previewVisible.value = false;
-};
-
-// 修改triggerUpload方法
-const triggerUpload = () => {
-  // 通过ref直接访问el-upload组件内的input元素
-  const uploadEl = uploadRef.value.$el.querySelector(".el-upload__input");
-  if (uploadEl) {
-    uploadEl.click();
-  }
-};
-</script>
-<style lang="scss" scoped>
-.custom-upload-list {
-  display: flex;
-  flex-wrap: wrap;
-  gap: 8px;
-}
-
-.custom-upload-item {
-  position: relative;
-  width: v-bind("props.style.width");
-  height: v-bind("props.style.height");
-  overflow: hidden;
-  border-radius: 6px;
-
-  .upload-thumbnail {
-    width: 100%;
-    height: 100%;
-    object-fit: cover;
-  }
-
-  .upload-actions {
-    position: absolute;
-    top: 0;
-    left: 0;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-    background-color: rgb(0 0 0 / 50%);
-    opacity: 0;
-    transition: opacity 0.3s;
-
-    &:hover {
-      opacity: 1;
-    }
-
-    .action-item {
-      padding: 8px;
-      color: #fff;
-      cursor: pointer;
-
-      &:hover {
-        color: var(--el-color-primary);
-      }
-    }
-  }
-}
-
-.custom-upload-trigger {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: v-bind("props.style.width");
-  height: v-bind("props.style.height");
-  cursor: pointer;
-  background-color: rgb(255 254 254 / 50%);
-  border: 1px dashed var(--el-border-color);
-  border-radius: 6px;
-  transition: var(--el-transition-duration);
-
-  &:hover {
-    color: var(--el-color-primary);
-    border-color: var(--el-color-primary);
-  }
-
-  .el-icon {
-    font-size: 20px;
-    color: #999;
-  }
-
-  &:hover .el-icon {
-    color: var(--el-color-primary);
-  }
-}
-</style>
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index 1c11a033..4a790079 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -1,57 +1,52 @@
 <!-- 图片上传组件 -->
 <template>
-  <div>
-    <el-upload
-      v-model:file-list="fileList"
-      list-type="picture-card"
-      :before-upload="handleBeforeUpload"
-      :http-request="handleUpload"
-      :data="props.additionalParams"
-      :name="props.fileParamName"
-      :on-success="handleSuccess"
-      :on-error="handleError"
-      :on-exceed="handleExceed"
-      :accept="props.accept"
-      :limit="props.limit"
-    >
-      <el-icon><Plus /></el-icon>
-      <template #file="{ file }">
-        <div style="width: 100%">
-          <image class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" />
-          <span class="el-upload-list__item-actions">
-            <!-- 预览 -->
-            <span class="el-upload-list__item-preview" @click="handlePreviewImage(file.url!)">
-              <el-icon><zoom-in /></el-icon>
-            </span>
-            <!-- 删除 -->
-            <span class="el-upload-list__item-delete" @click="handleRemove(file.url!)">
-              <el-icon><Delete /></el-icon>
-            </span>
+  <el-upload
+    v-model:file-list="fileList"
+    list-type="picture-card"
+    :before-upload="handleBeforeUpload"
+    :http-request="handleUpload"
+    :on-success="handleSuccess"
+    :on-error="handleError"
+    :on-exceed="handleExceed"
+    :accept="props.accept"
+    :limit="props.limit"
+    multiple
+  >
+    <el-icon><Plus /></el-icon>
+    <template #file="{ file }">
+      <div style="width: 100%">
+        <img class="el-upload-list__item-thumbnail" :src="http://github.com/file.url" />
+        <span class="el-upload-list__item-actions">
+          <!-- 预览 -->
+          <span @click="handlePreviewImage(file.url!)">
+            <el-icon><zoom-in /></el-icon>
           </span>
-        </div>
-      </template>
-    </el-upload>
-
-    <el-image-viewer
-      v-if="previewVisible"
-      :zoom-rate="1.2"
-      :previewImageIndex="previewImageIndex"
-      :url-list="modelValue"
-      @close="handlePreviewClose"
-    />
-  </div>
+          <!-- 删除 -->
+          <span @click="handleRemove(file.url!)">
+            <el-icon><Delete /></el-icon>
+          </span>
+        </span>
+      </div>
+    </template>
+  </el-upload>
+
+  <el-image-viewer
+    v-if="previewVisible"
+    :zoom-rate="1.2"
+    :initial-index="previewImageIndex"
+    :url-list="modelValue"
+    @close="handlePreviewClose"
+  />
 </template>
 <script setup lang="ts">
 import { UploadRawFile, UploadRequestOptions, UploadUserFile } from "element-plus";
 import FileAPI, { FileInfo } from "@/api/file";
 
-const emit = defineEmits(["update:modelValue"]);
-
 const props = defineProps({
   /**
    * 请求携带的额外参数
    */
-  additionalParams: {
+  data: {
     type: Object,
     default: () => {
       return {};
@@ -60,7 +55,7 @@ const props = defineProps({
   /**
    * 上传文件的参数名
    */
-  fileParamName: {
+  name: {
     type: String,
     default: "file",
   },
@@ -72,7 +67,7 @@ const props = defineProps({
     default: 10,
   },
   /**
-   *
+   * 单个文件的最大允许大小
    */
   maxFileSize: {
     type: Number,
@@ -98,7 +93,7 @@ const modelValue = defineModel("modelValue", {
 
 const fileList = ref<UploadUserFile[]>([]);
 
-// modelValue 监听转换所需的 fileList
+// 监听 modelValue 转换用于显示的 fileList
 watch(
   modelValue,
   (value) => {
@@ -124,14 +119,7 @@ function handleRemove(imageUrl: string) {
 }
 
 /**
- * 上传文件超出限制
- */
-function handleExceed(files: File[], uploadFiles: UploadUserFile[]) {
-  ElMessage.warning("最多只能上传" + props.limit + "张图片");
-}
-
-/**
- * 限制用户上传文件的格式和大小
+ * 上传前校验
  */
 function handleBeforeUpload(file: UploadRawFile) {
   // 校验文件类型：虽然 accept 属性限制了用户在文件选择器中可选的文件类型，但仍需在上传时再次校验文件实际类型，确保符合 accept 的规则
@@ -157,8 +145,8 @@ function handleBeforeUpload(file: UploadRawFile) {
   }
 
   // 限制文件大小
-  if (file.size > props.maxSize * 1024 * 1024) {
-    ElMessage.warning("上传图片不能大于" + props.maxSize + "M");
+  if (file.size > props.maxFileSize * 1024 * 1024) {
+    ElMessage.warning("上传图片不能大于" + props.maxFileSize + "M");
     return false;
   }
   return true;
@@ -172,11 +160,11 @@ function handleUpload(options: UploadRequestOptions) {
     const file = options.file;
 
     const formData = new FormData();
-    formData.append(props.fileParamName, file);
+    formData.append(props.name, file);
 
     // 处理附加参数
-    Object.keys(props.additionalParams).forEach((key) => {
-      formData.append(key, props.additionalParams[key]);
+    Object.keys(props.data).forEach((key) => {
+      formData.append(key, props.data[key]);
     });
 
     FileAPI.upload(formData)
@@ -189,10 +177,15 @@ function handleUpload(options: UploadRequestOptions) {
   });
 }
 
+/**
+ * 上传文件超出限制
+ */
+function handleExceed(files: File[], uploadFiles: UploadUserFile[]) {
+  ElMessage.warning("最多只能上传" + props.limit + "张图片");
+}
+
 /**
  * 上传成功回调
- *
- * @param fileInfo 上传成功后的文件信息
  */
 const handleSuccess = (fileInfo: FileInfo) => {
   ElMessage.success("上传成功");
@@ -222,16 +215,4 @@ const handlePreviewClose = () => {
   previewVisible.value = false;
 };
 </script>
-<style lang="scss" scoped>
-.hide {
-  :deep(.el-upload--picture-card) {
-    display: none;
-  }
-}
-
-.show {
-  :deep(.el-upload--picture-card) {
-    display: flex;
-  }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
new file mode 100644
index 00000000..817d5788
--- /dev/null
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -0,0 +1,202 @@
+<!-- 单图上传组件 -->
+<template>
+  <el-upload
+    v-model="modelValue"
+    class="single-upload"
+    list-type="picture-card"
+    :accept="props.accept"
+    :before-upload="handleBeforeUpload"
+    :http-request="handleUpload"
+    :on-success="onSuccess"
+    :on-error="onError"
+    multiple
+  >
+    <template #default>
+      <el-image v-if="modelValue" :src="http://github.com/modelValue" />
+      <el-icon v-if="modelValue" class="single-upload__delete-btn" @click.stop="handleDelete">
+        <CircleCloseFilled />
+      </el-icon>
+      <el-icon v-else class="single-upload__add-btn">
+        <Plus />
+      </el-icon>
+    </template>
+  </el-upload>
+</template>
+
+<script setup lang="ts">
+import { ElImageViewer, UploadRawFile, UploadRequestOptions } from "element-plus";
+import FileAPI, { FileInfo } from "@/api/file";
+
+const props = defineProps({
+  /**
+   * 请求携带的额外参数
+   */
+  data: {
+    type: Object,
+    default: () => {
+      return {};
+    },
+  },
+  /**
+   * 上传文件的参数名
+   */
+  name: {
+    type: String,
+    default: "file",
+  },
+  /**
+   * 文件大小允许最大（单位：MB）
+   */
+  maxFileSize: {
+    type: Number,
+    default: 10,
+  },
+
+  /**
+   * 接收文件类型
+   */
+  accept: {
+    type: String,
+    default: "image/*", //  默认支持所有图片格式 ，如果需要指定格式，格式如下：'.png,.jpg,.jpeg,.gif,.bmp'
+  },
+
+  /**
+   * 自定义样式
+   */
+  style: {
+    type: Object,
+    default: () => {
+      return {
+        width: "130px",
+        height: "130px",
+      };
+    },
+  },
+});
+
+const modelValue = defineModel("modelValue", {
+  type: String,
+  required: true,
+  default: () => "",
+});
+
+/**
+ * 限制用户上传文件的格式和大小
+ */
+function handleBeforeUpload(file: UploadRawFile) {
+  // 校验文件类型：虽然 accept 属性限制了用户在文件选择器中可选的文件类型，但仍需在上传时再次校验文件实际类型，确保符合 accept 的规则
+  const acceptTypes = props.accept.split(",").map((type) => type.trim());
+
+  // 检查文件格式是否符合 accept
+  const isValidType = acceptTypes.some((type) => {
+    if (type === "image/*") {
+      // 如果是 image/*，检查 MIME 类型是否以 "image/" 开头
+      return file.type.startsWith("image/");
+    } else if (type.startsWith(".")) {
+      // 如果是扩展名 (.png, .jpg)，检查文件名是否以指定扩展名结尾
+      return file.name.toLowerCase().endsWith(type);
+    } else {
+      // 如果是具体的 MIME 类型 (image/png, image/jpeg)，检查是否完全匹配
+      return file.type === type;
+    }
+  });
+
+  if (!isValidType) {
+    ElMessage.warning(`上传文件的格式不正确，仅支持：${props.accept}`);
+    return false;
+  }
+
+  // 限制文件大小
+  if (file.size > props.maxFileSize * 1024 * 1024) {
+    ElMessage.warning("上传图片不能大于" + props.maxFileSize + "M");
+    return false;
+  }
+  return true;
+}
+
+/*
+ * 上传图片
+ */
+function handleUpload(options: UploadRequestOptions) {
+  return new Promise((resolve, reject) => {
+    const file = options.file;
+
+    const formData = new FormData();
+    formData.append(props.name, file);
+
+    // 处理附加参数
+    Object.keys(props.data).forEach((key) => {
+      formData.append(key, props.data[key]);
+    });
+
+    FileAPI.upload(formData)
+      .then((data) => {
+        resolve(data);
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+}
+
+/**
+ * 删除图片
+ */
+function handleDelete() {
+  modelValue.value = "";
+}
+
+/**
+ * 上传成功回调
+ *
+ * @param fileInfo 上传成功后的文件信息
+ */
+const onSuccess = (fileInfo: FileInfo) => {
+  ElMessage.success("上传成功");
+  modelValue.value = fileInfo.url;
+};
+
+/**
+ * 上传失败回调
+ */
+const onError = (error: any) => {
+  console.log("onError");
+  ElMessage.error("上传失败: " + error.message);
+};
+</script>
+
+<style scoped lang="scss">
+:deep(.el-upload--picture-card) {
+  /*  width: var(--el-upload-picture-card-size);
+  height: var(--el-upload-picture-card-size); */
+  width: v-bind("props.style.width");
+  height: v-bind("props.style.height");
+}
+
+.single-upload {
+  position: relative;
+  overflow: hidden;
+  cursor: pointer;
+  border: 1px var(--el-border-color) solid;
+  border-radius: 5px;
+
+  &:hover {
+    border-color: var(--el-color-primary);
+  }
+
+  &__delete-btn {
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    font-size: 16px;
+    color: #ff7901;
+    cursor: pointer;
+    background: #fff;
+    border-radius: 100%;
+
+    :hover {
+      color: #ff4500;
+    }
+  }
+}
+</style>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index fcc072db..d03a6b64 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -84,12 +84,12 @@ declare module "vue" {
     SidebarMenuItem: (typeof import("./../layout/components/Sidebar/components/SidebarMenuItem.vue"))["default"];
     SidebarMenuItemTitle: (typeof import("./../layout/components/Sidebar/components/SidebarMenuItemTitle.vue"))["default"];
     SidebarMixTopMenu: (typeof import("./../layout/components/Sidebar/components/SidebarMixTopMenu.vue"))["default"];
+    SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     SizeSelect: (typeof import("./../components/SizeSelect/index.vue"))["default"];
     SvgIcon: (typeof import("./../components/SvgIcon/index.vue"))["default"];
     TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"];
     TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"];
     ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
-    SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
   }
   export interface ComponentCustomProperties {
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 901a3edd..b97b71f9 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -15,7 +15,8 @@
         {{ picUrl }}
       </el-form-item>
       <el-form-item label="图片上传">
-        <ImageUpload v-model="picUrl" :maxSize="10" />
+        <MultiImageUpload v-model="picUrls" :maxFileSize="10" :limit="3" accept=".png" />
+        <SingleImageUpload v-model="picUrl" accept=".png" style="width: 120px; height: 120px" />
       </el-form-item>
       <el-form-item label="参数说明">
         <el-table :data="imageUploadArgData" border>
@@ -42,8 +43,11 @@
 </template>
 
 <script setup lang="ts">
+import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue";
+
 // 单图
 const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
+const picUrls = ref(["https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg"]);
 
 const imageUploadArgData = [
   {
@@ -127,14 +131,8 @@ const imageUploadArgData = [
 ];
 
 const fileUrls = ref([
-  {
-    name: "file one.jpg",
-    url: "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",
-  },
-  {
-    name: "file two.jpg",
-    url: "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg",
-  },
+  "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",
+  "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg",
 ]);
 
 const fileUploadArgData = [

From 49317acee7896090abd9e2efb069e90712775b5c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Feb 2025 23:12:00 +0800
Subject: [PATCH 154/497] =?UTF-8?q?fix(pagination):=20:bug:=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8Dwatch=E7=9B=91=E5=90=ACprops.total=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E7=9A=84TypeScript=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closed #IBJY7R
---
 src/components/Pagination/index.vue | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 759b4ce5..3a7e53dc 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -53,6 +53,7 @@ const currentPage = defineModel("page", {
   required: true,
   default: 1,
 });
+
 const pageSize = defineModel("limit", {
   type: Number,
   required: true,
@@ -60,18 +61,18 @@ const pageSize = defineModel("limit", {
 });
 
 watch(
-  props.total,
+  () => props.total,
   (newVal: number) => {
-    const lastPage = Math.ceil(newVal / pageSize.value)
+    const lastPage = Math.ceil(newVal / pageSize.value);
     if (newVal > 0 && currentPage.value > lastPage) {
-      currentPage.value = lastPage
+      currentPage.value = lastPage;
       emit("pagination", { page: currentPage.value, limit: pageSize.value });
     }
   }
 );
 
 function handleSizeChange(val: number) {
-  currentPage.value = 1
+  currentPage.value = 1;
   emit("pagination", { page: currentPage.value, limit: val });
 }
 

From 729524e7844d0bb6682f4659b7c534f744305dff Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Feb 2025 23:16:19 +0800
Subject: [PATCH 155/497] =?UTF-8?q?fix:=20:bug:=20=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E4=B9=8B=E5=90=8E=E5=AF=BC=E8=87=B4=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/MultiImageUpload.vue | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index 4a790079..6dc39b32 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -93,28 +93,17 @@ const modelValue = defineModel("modelValue", {
 
 const fileList = ref<UploadUserFile[]>([]);
 
-// 监听 modelValue 转换用于显示的 fileList
-watch(
-  modelValue,
-  (value) => {
-    console.log("modelValue 发生变化:", value);
-    fileList.value = value.map((url) => {
-      return {
-        url,
-      } as UploadUserFile;
-    });
-  },
-  {
-    immediate: true,
-  }
-);
-
 /**
  * 删除图片
  */
 function handleRemove(imageUrl: string) {
   FileAPI.delete(imageUrl).then(() => {
-    modelValue.value = modelValue.value.filter((url) => url !== imageUrl);
+    const index = modelValue.value.indexOf(imageUrl);
+    if (index !== -1) {
+      // 直接修改数组避免触发整体更新
+      modelValue.value.splice(index, 1);
+      fileList.value.splice(index, 1); // 同步更新 fileList
+    }
   });
 }
 
@@ -187,9 +176,14 @@ function handleExceed(files: File[], uploadFiles: UploadUserFile[]) {
 /**
  * 上传成功回调
  */
-const handleSuccess = (fileInfo: FileInfo) => {
+const handleSuccess = (fileInfo: FileInfo, uploadFile: UploadUserFile) => {
   ElMessage.success("上传成功");
-  modelValue.value = [...modelValue.value, fileInfo.url];
+  const index = fileList.value.findIndex((file) => file.uid === uploadFile.uid);
+  if (index !== -1) {
+    fileList.value[index].url = fileInfo.url;
+    fileList.value[index].status = "success";
+    modelValue.value[index] = fileInfo.url;
+  }
 };
 
 /**
@@ -214,5 +208,9 @@ const handlePreviewImage = (imageUrl: string) => {
 const handlePreviewClose = () => {
   previewVisible.value = false;
 };
+
+onMounted(() => {
+  fileList.value = modelValue.value.map((url) => ({ url }) as UploadUserFile);
+});
 </script>
 <style lang="scss" scoped></style>

From 3b7c026716c5da0203bc8ec185ceadf6ead8aa20 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Feb 2025 23:25:38 +0800
Subject: [PATCH 156/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E7=BB=84=E4=BB=B6=E7=A4=BA=E4=BE=8B=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/upload.vue | 192 +-------------------------------------
 1 file changed, 4 insertions(+), 188 deletions(-)

diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index b97b71f9..5c833fd7 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -11,33 +11,17 @@
     </el-link>
 
     <el-form>
-      <el-form-item label="绑定值">
-        {{ picUrl }}
-      </el-form-item>
-      <el-form-item label="图片上传">
-        <MultiImageUpload v-model="picUrls" :maxFileSize="10" :limit="3" accept=".png" />
+      <el-form-item label="单图上传">
         <SingleImageUpload v-model="picUrl" accept=".png" style="width: 120px; height: 120px" />
       </el-form-item>
-      <el-form-item label="参数说明">
-        <el-table :data="imageUploadArgData" border>
-          <el-table-column prop="argsName" label="参数名称" width="300" />
-          <el-table-column prop="type" label="参数类型" width="200" />
-          <el-table-column prop="default" label="默认值" width="400" />
-          <el-table-column prop="desc" label="描述" width="300" />
-        </el-table>
+
+      <el-form-item label="多图上传">
+        <MultiImageUpload v-model="picUrls" />
       </el-form-item>
 
       <el-form-item label="文件上传">
         <FileUpload v-model="fileUrls" />
       </el-form-item>
-      <el-form-item label="参数说明">
-        <el-table :data="fileUploadArgData" border>
-          <el-table-column prop="argsName" label="参数名称" width="300" />
-          <el-table-column prop="type" label="参数类型" width="200" />
-          <el-table-column prop="default" label="默认值" width="400" />
-          <el-table-column prop="desc" label="描述" width="300" />
-        </el-table>
-      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -49,176 +33,8 @@ import MultiImageUpload from "@/components/Upload/MultiImageUpload.vue";
 const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
 const picUrls = ref(["https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg"]);
 
-const imageUploadArgData = [
-  {
-    argsName: "v-model",
-    type: "[Array,String]",
-    default: "[]  |  ''",
-    desc: "已经上传的图片数组,单张图片时为String",
-  },
-  {
-    argsName: "action",
-    type: "String",
-    default: "FileAPI.uploadUrl",
-    desc: "文件上传地址",
-  },
-  {
-    argsName: "headers",
-    type: "Object",
-    default: "{Authorization: localStorage.getItem(TOKEN_KEY),}",
-    desc: "上传请求头",
-  },
-  {
-    argsName: "data",
-    type: "Object",
-    default: "{}",
-    desc: "请求携带的额外参数",
-  },
-  {
-    argsName: "name",
-    type: "String",
-    default: "file",
-    desc: "上传文件的参数名",
-  },
-  {
-    argsName: "limit",
-    type: "Number",
-    default: 1,
-    desc: "上传最大的图片数量,多张图片时填写最大上传数量，默认单张图片",
-  },
-  {
-    argsName: "show-del-btn",
-    type: "Boolean",
-    default: true,
-    desc: "是否显示删除按钮",
-  },
-  {
-    argsName: "show-upload-btn",
-    type: "Boolean",
-    default: true,
-    desc: "是否显示上传按钮",
-  },
-  {
-    argsName: "max-size",
-    type: "Number",
-    default: "10",
-    desc: "单个图片上传大小限制(单位MB)",
-  },
-  {
-    argsName: "accept",
-    type: "String",
-    default: "image/*",
-    desc: "上传文件类型",
-  },
-  {
-    argsName: "supportFileType",
-    type: "Array",
-    default: "[]",
-    desc: "支持的文件类型,默认支持所有图片格式,eg:['png','jpg','jpeg','gif']",
-  },
-  {
-    argsName: "isSyncDelete",
-    type: "Boolean",
-    default: "true",
-    desc: "是否同步删除服务端文件(默认是，如果为否，则只会删除当前上传的图片，已经上传到服务端到图片不会删除)",
-  },
-  {
-    argsName: "style",
-    type: "Object",
-    default: "{width: '130px',height: '130px'}",
-    desc: "上传组件的样式",
-  },
-];
-
 const fileUrls = ref([
   "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",
   "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg",
 ]);
-
-const fileUploadArgData = [
-  {
-    argsName: "v-model",
-    type: "Arrays",
-    default: "[]",
-    desc: "已经上传的文件数组",
-  },
-  {
-    argsName: "action",
-    type: "String",
-    default: "FileAPI.uploadUrl",
-    desc: "文件上传地址",
-  },
-  {
-    argsName: "limit",
-    type: "Number",
-    default: 10,
-    desc: "上传最大的文件数量",
-  },
-  {
-    argsName: "show-del-btn",
-    type: "Boolean",
-    default: true,
-    desc: "是否显示删除按钮",
-  },
-  {
-    argsName: "show-upload-btn",
-    type: "Boolean",
-    default: true,
-    desc: "是否显示上传按钮",
-  },
-  {
-    argsName: "max-size",
-    type: "Number",
-    default: "10",
-    desc: "单个文件上传大小限制(单位MB)",
-  },
-  {
-    argsName: "accept",
-    type: "String",
-    default: "*",
-    desc: "上传文件类型",
-  },
-  {
-    argsName: "upload-btn-text",
-    type: "String",
-    default: "上传文件",
-    desc: "上传按钮文本",
-  },
-  {
-    argsName: "show-tip",
-    type: "Boolean",
-    default: false,
-    desc: "是否显示提示",
-  },
-  {
-    argsName: "tip",
-    type: "String",
-    default: '""',
-    desc: "提示文本",
-  },
-  {
-    argsName: "headers",
-    type: "Object",
-    default: "{Authorization: localStorage.getItem(TOKEN_KEY),}",
-    desc: "提示文本类型",
-  },
-  {
-    argsName: "data",
-    type: "Object",
-    default: "{}",
-    desc: "请求携带的额外参数",
-  },
-  {
-    argsName: "name",
-    type: "String",
-    default: "file",
-    desc: "上传文件的参数名",
-  },
-  {
-    argsName: "style",
-    type: "Object",
-    default: "{width:'300px'}",
-    desc: "上传组件的样式",
-  },
-];
 </script>

From 4b3f2fb51ac4045a5b776796c082c3017a111ae1 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Feb 2025 23:39:23 +0800
Subject: [PATCH 157/497] =?UTF-8?q?fix:=20:bug:=20=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/file/index.ts               | 16 ++++++++++++++++
 src/components/WangEditor/index.vue |  2 +-
 src/views/demo/signature.vue        |  2 +-
 src/views/profile/index.vue         |  2 +-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/api/file/index.ts b/src/api/file/index.ts
index c2076a19..0b109772 100644
--- a/src/api/file/index.ts
+++ b/src/api/file/index.ts
@@ -17,6 +17,22 @@ const FileAPI = {
     });
   },
 
+  /**
+   * 上传文件
+   */
+  uploadFile(file: File) {
+    const formData = new FormData();
+    formData.append("file", file);
+    return request<any, FileInfo>({
+      url: "/api/v1/files",
+      method: "post",
+      data: formData,
+      headers: {
+        "Content-Type": "multipart/form-data",
+      },
+    });
+  },
+
   /**
    * 删除文件
    *
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index 4ea98f38..883e23c5 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -67,7 +67,7 @@ const editorConfig = ref<Partial<IEditorConfig>>({
     uploadImage: {
       customUpload(file: File, insertFn: InsertFnType) {
         // 上传图片
-        FileAPI.upload(file).then((res) => {
+        FileAPI.uploadFile(file).then((res) => {
           // 插入图片
           insertFn(res.url, res.name, res.url);
         });
diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue
index c755921b..dd00ad92 100644
--- a/src/views/demo/signature.vue
+++ b/src/views/demo/signature.vue
@@ -68,7 +68,7 @@ const handleToFile = async () => {
   const file = dataURLtoFile(canvas.value.toDataURL(), "签名.png");
 
   if (!file) return;
-  const data = await FileAPI.upload(file);
+  const data = await FileAPI.uploadFile(file);
   handleClearSign();
   imgUrl.value = data.url;
 };
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index e36f06b3..999d9f50 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -458,7 +458,7 @@ const handleFileChange = async (event: Event) => {
   if (file) {
     // 调用文件上传API
     try {
-      const data = await FileAPI.upload(file);
+      const data = await FileAPI.uploadFile(file);
       // 更新用户头像
       userProfile.value.avatar = data.url;
       // 更新用户信息

From 05c1a2412af788d44e8b9acb2825a156b26e4097 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 3 Feb 2025 22:59:11 +0800
Subject: [PATCH 158/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=8D=95?=
 =?UTF-8?q?=E5=9B=BE=E4=B8=8A=E4=BC=A0=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/SingleImageUpload.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index 817d5788..ec1673bf 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -4,6 +4,7 @@
     v-model="modelValue"
     class="single-upload"
     list-type="picture-card"
+    :show-file-list="false"
     :accept="props.accept"
     :before-upload="handleBeforeUpload"
     :http-request="handleUpload"
@@ -24,7 +25,7 @@
 </template>
 
 <script setup lang="ts">
-import { ElImageViewer, UploadRawFile, UploadRequestOptions } from "element-plus";
+import { UploadRawFile, UploadRequestOptions } from "element-plus";
 import FileAPI, { FileInfo } from "@/api/file";
 
 const props = defineProps({
@@ -45,7 +46,7 @@ const props = defineProps({
     default: "file",
   },
   /**
-   * 文件大小允许最大（单位：MB）
+   * 最大文件大小（单位：M）
    */
   maxFileSize: {
     type: Number,
@@ -53,11 +54,11 @@ const props = defineProps({
   },
 
   /**
-   * 接收文件类型
+   * 上传图片格式，默认支持所有图片(image/*)，指定格式示例：'.png,.jpg,.jpeg,.gif,.bmp'
    */
   accept: {
     type: String,
-    default: "image/*", //  默认支持所有图片格式 ，如果需要指定格式，格式如下：'.png,.jpg,.jpeg,.gif,.bmp'
+    default: "image/*",
   },
 
   /**
@@ -67,8 +68,8 @@ const props = defineProps({
     type: Object,
     default: () => {
       return {
-        width: "130px",
-        height: "130px",
+        width: "150px",
+        height: "150px",
       };
     },
   },

From 868da0bed8526dc33fe9be5d425208413897aa03 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 3 Feb 2025 23:00:22 +0800
Subject: [PATCH 159/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=BC=95=E7=94=A8=E5=92=8C=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/upload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index 5c833fd7..c590dc58 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -12,7 +12,7 @@
 
     <el-form>
       <el-form-item label="单图上传">
-        <SingleImageUpload v-model="picUrl" accept=".png" style="width: 120px; height: 120px" />
+        <SingleImageUpload v-model="picUrl" />
       </el-form-item>
 
       <el-form-item label="多图上传">

From 9cabd4eeaf3c94f31c7f63174abf383aacd537a3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 3 Feb 2025 23:01:32 +0800
Subject: [PATCH 160/497] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7=E5=BC=8F=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/SingleImageUpload.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index ec1673bf..3ce77c7f 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -62,7 +62,7 @@ const props = defineProps({
   },
 
   /**
-   * 自定义样式
+   * 自定义样式，用于设置组件的宽度和高度等其他样式
    */
   style: {
     type: Object,

From cf153228fbe3b58397747e7e5c2c901f5e8bff49 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 3 Feb 2025 23:03:07 +0800
Subject: [PATCH 161/497] chore: :hammer: bump version to 2.21.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4b20ea47..a4008383 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.20.4",
+  "version": "2.21.1",
   "private": true,
   "type": "module",
   "scripts": {

From 8e7f62aeb2c6bfbc62b8dccabad6c73e64388a30 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 01:26:49 +0800
Subject: [PATCH 162/497] =?UTF-8?q?fix:=20:bug:=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=9D=9E=E8=A2=AB=E5=8A=A8=E4=BA=8B=E4=BB=B6=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=EF=BC=8C=E6=8F=90=E5=8D=87=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 1 +
 src/main.ts  | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a4008383..fbc43ce9 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
+    "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
     "element-plus": "^2.9.3",
     "exceljs": "^4.4.0",
diff --git a/src/main.ts b/src/main.ts
index c1c1a4e4..04b24c19 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,7 +10,6 @@ import "element-plus/theme-chalk/dark/css-vars.css";
 import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
-
 const app = createApp(App);
 // 注册插件
 app.use(setupPlugins);

From b9da1e7f71173cfeac348d6863934c6be66cafca Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 21:55:08 +0800
Subject: [PATCH 163/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=AE=BF?=
 =?UTF-8?q?=E9=97=AE=E8=B6=8B=E5=8A=BF=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dashboard/components/visit-trend.vue      | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/src/views/dashboard/components/visit-trend.vue b/src/views/dashboard/components/visit-trend.vue
index 24fef6ad..b2ac7bad 100644
--- a/src/views/dashboard/components/visit-trend.vue
+++ b/src/views/dashboard/components/visit-trend.vue
@@ -23,7 +23,7 @@
       </div>
     </template>
 
-    <div :id="id" :class="className" :style="{ height, width }" />
+    <div :id="id" :style="{ height, width }" />
   </el-card>
 </template>
 
@@ -32,33 +32,27 @@ import * as echarts from "echarts";
 import LogAPI, { VisitTrendVO } from "@/api/system/log";
 import { dayjs } from "element-plus";
 
-// 日期范围
-const recentDaysRange = ref(7);
-// 图表对象
-const chart: Ref<echarts.ECharts | null> = ref(null);
-
 const props = defineProps({
   id: {
     type: String,
     default: "VisitTrend",
   },
-  className: {
-    type: String,
-    default: "",
-  },
   width: {
     type: String,
-    default: "200px",
-    required: true,
+    default: "100%",
   },
   height: {
     type: String,
-    default: "200px",
-    required: true,
+    default: "500px",
   },
 });
 
-/** 设置图表  */
+// 日期范围
+const recentDaysRange = ref(7);
+// 图表对象
+const chart: Ref<echarts.ECharts | null> = ref(null);
+
+// 图表配置
 const setChartOptions = (data: VisitTrendVO) => {
   if (!chart.value) {
     return;
@@ -69,7 +63,7 @@ const setChartOptions = (data: VisitTrendVO) => {
       trigger: "axis",
     },
     legend: {
-      data: ["浏览量(PV)", "IP"],
+      data: ["浏览量(PV)", "访客数(UV)"],
       bottom: 0,
     },
     grid: {
@@ -108,7 +102,7 @@ const setChartOptions = (data: VisitTrendVO) => {
         },
       },
       {
-        name: "IP",
+        name: "访客数(UV)",
         type: "line",
         data: data.ipList,
         areaStyle: {
@@ -194,14 +188,10 @@ const handleResize = () => {
 onMounted(() => {
   chart.value = markRaw(echarts.init(document.getElementById(props.id) as HTMLDivElement));
   loadData();
-
+  // 监听窗口大小变化
   window.addEventListener("resize", handleResize);
 });
 
-onBeforeUnmount(() => {
-  window.removeEventListener("resize", handleResize);
-});
-
 onActivated(() => {
   handleResize();
 });

From 3627bd8d1f227cec9cbf72450a0a61b957708663 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 21:58:27 +0800
Subject: [PATCH 164/497] =?UTF-8?q?fix:=20:bug:=20=E8=A7=A3=E5=86=B3?=
 =?UTF-8?q?=E9=9D=9E=E8=A2=AB=E5=8A=A8=E4=BA=8B=E4=BB=B6=E7=9B=91=E5=90=AC?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=EF=BC=8C=E6=8F=90=E5=8D=87=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main.ts b/src/main.ts
index 04b24c19..60d79365 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -10,6 +10,9 @@ import "element-plus/theme-chalk/dark/css-vars.css";
 import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
+// 自动为某些默认事件（如 touchstart、wheel 等）添加 { passive: true },提升滚动性能并消除控制台的非被动事件监听警告
+import "default-passive-events";
+
 const app = createApp(App);
 // 注册插件
 app.use(setupPlugins);

From 24d444f2959bddc8f9b62e2e20ff33ae26bf75a5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 22:09:25 +0800
Subject: [PATCH 165/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=8A=A8?=
 =?UTF-8?q?=E6=80=81=E8=B7=AF=E7=94=B1=E5=8A=A0=E8=BD=BD=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=96=B9=E4=BE=BF=E7=90=86=E8=A7=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Sidebar/components/SidebarMenu.vue        |  7 +-
 .../Sidebar/components/SidebarMixTopMenu.vue  | 10 +-
 src/layout/components/Sidebar/index.vue       |  8 +-
 src/layout/index.vue                          |  8 +-
 src/store/modules/permission.ts               | 93 ++++++++++---------
 5 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 828e7bb2..5664e426 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -15,7 +15,7 @@
   >
     <!-- 菜单项 -->
     <SidebarMenuItem
-      v-for="route in menuList"
+      v-for="route in data"
       :key="route.path"
       :item="route"
       :base-path="resolveFullPath(route.path)"
@@ -26,6 +26,7 @@
 <script lang="ts" setup>
 import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
+import type { RouteRecordRaw } from "vue-router";
 
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, useAppStore } from "@/store";
@@ -34,8 +35,8 @@ import { isExternal } from "@/utils/index";
 import variables from "@/styles/variables.module.scss";
 
 const props = defineProps({
-  menuList: {
-    type: Array<any>,
+  data: {
+    type: Array<RouteRecordRaw>,
     required: true,
     default: () => [],
   },
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index be2097ca..3e421766 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -28,17 +28,11 @@
 </template>
 
 <script lang="ts" setup>
-/**
- * 导入模块：先外部库，再内部模块，最后导入样式和工具类
- */
 import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore } from "@/store";
 import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
 
-/**
- * 定义状态：先定义 reactive、ref 或 computed 状态
- */
 const router = useRouter();
 const appStore = useAppStore();
 const permissionStore = usePermissionStore();
@@ -64,8 +58,8 @@ appStore.activeTopMenu(activeTopMenuPath);
  */
 const handleMenuSelect = (routePath: string) => {
   appStore.activeTopMenu(routePath); // 设置激活的顶部菜单
-  permissionStore.setMixLeftMenus(routePath); // 更新左侧菜单
-  navigateToFirstLeftMenu(permissionStore.mixLeftMenus); // 跳转到左侧第一个菜单
+  permissionStore.setMixedLayoutLeftRoutes(routePath); // 更新左侧菜单
+  navigateToFirstLeftMenu(permissionStore.mixedLayoutLeftRoutes); // 跳转到左侧第一个菜单
 };
 
 /**
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 022c4594..02073c66 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,20 +1,20 @@
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
-    <!-- 混合布局顶部  -->
+    <!-- 混合 -->
     <div v-if="isMixLayout" class="flex w-full">
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
       <NavbarRight />
     </div>
 
-    <!-- 顶部布局顶部 || 左侧布局左侧 -->
+    <!-- 顶部 || 左侧 -->
     <template v-else>
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <el-scrollbar>
-        <SidebarMenu :menu-list="permissionStore.routes" base-path="" />
+        <SidebarMenu :data="permissionStore.routes" base-path="" />
       </el-scrollbar>
 
-      <!-- 顶部布局导航 -->
+      <!-- 顶部导航 -->
       <NavbarRight v-if="isTopLayout" />
     </template>
   </div>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d13cd30d..d3c60c78 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -14,7 +14,7 @@
     <div v-if="layout === LayoutEnum.MIX" class="mix-container">
       <div class="mix-container-sidebar">
         <el-scrollbar>
-          <SidebarMenu :menu-list="mixLeftMenus" :base-path="activeTopMenuPath" />
+          <SidebarMenu :data="mixedLayoutLeftRoutes" :base-path="activeTopMenuPath" />
         </el-scrollbar>
         <div class="sidebar-toggle">
           <hamburger :is-active="appStore.sidebar.opened" @toggle-click="toggleSidebar" />
@@ -65,12 +65,12 @@ const isOpenSidebar = computed(() => appStore.sidebar.opened);
 const showTagsView = computed(() => settingsStore.tagsView); // 是否显示tagsView
 const layout = computed(() => settingsStore.layout); // 布局模式 left top mix
 const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活path
-const mixLeftMenus = computed(() => permissionStore.mixLeftMenus); // 混合布局左侧菜单
+const mixedLayoutLeftRoutes = computed(() => permissionStore.mixedLayoutLeftRoutes); // 混合布局左侧菜单
 
 watch(
   () => activeTopMenuPath.value,
   (newVal: string) => {
-    permissionStore.setMixLeftMenus(newVal);
+    permissionStore.setMixedLayoutLeftRoutes(newVal);
   },
   {
     deep: true,
@@ -280,8 +280,8 @@ watch(route, () => {
   &.mobile {
     .sidebar-container {
       pointer-events: none;
-      transition-duration: 0.3s;
       transform: translate3d(-210px, 0, 0);
+      transition-duration: 0.3s;
     }
 
     .main-container {
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index de3a0c3f..ed93ee5b 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -8,22 +8,24 @@ const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
-  // 所有路由，包括静态和动态路由
+  // 储所有路由，包括静态路由和动态路由
   const routes = ref<RouteRecordRaw[]>([]);
-  // 混合模式左侧菜单
-  const mixLeftMenus = ref<RouteRecordRaw[]>([]);
-  // 路由是否已加载
+  // 混合模式左侧菜单路由
+  const mixedLayoutLeftRoutes = ref<RouteRecordRaw[]>([]);
+  // 路由是否加载完成
   const isRoutesLoaded = ref(false);
 
   /**
-   * 生成动态路由
+   * 获取后台动态路由数据，解析并注册到全局路由
+   *
+   * @returns Promise<RouteRecordRaw[]> 解析后的动态路由列表
    */
   function generateRoutes() {
     return new Promise<RouteRecordRaw[]>((resolve, reject) => {
       MenuAPI.getRoutes()
         .then((data) => {
-          const dynamicRoutes = transformRoutes(data);
-          routes.value = constantRoutes.concat(dynamicRoutes);
+          const dynamicRoutes = parseDynamicRoutes(data);
+          routes.value = [...constantRoutes, ...dynamicRoutes];
           isRoutesLoaded.value = true;
           resolve(dynamicRoutes);
         })
@@ -34,14 +36,14 @@ export const usePermissionStore = defineStore("permission", () => {
   }
 
   /**
-   * 混合模式菜单下根据顶部菜单路径设置左侧菜单
+   * 根据父菜单路径设置混合模式左侧菜单
    *
-   * @param topMenuPath - 顶部菜单路径
+   * @param parentPath 父菜单的路径，用于查找对应的菜单项
    */
-  const setMixLeftMenus = (topMenuPath: string) => {
-    const matchedItem = routes.value.find((item) => item.path === topMenuPath);
+  const setMixedLayoutLeftRoutes = (parentPath: string) => {
+    const matchedItem = routes.value.find((item) => item.path === parentPath);
     if (matchedItem && matchedItem.children) {
-      mixLeftMenus.value = matchedItem.children;
+      mixedLayoutLeftRoutes.value = matchedItem.children;
     }
   };
 
@@ -49,59 +51,62 @@ export const usePermissionStore = defineStore("permission", () => {
    * 重置路由
    */
   const resetRouter = () => {
-    // 删除动态路由，保留静态路由
-    routes.value.forEach((route) => {
-      if (route.name && !constantRoutes.find((r) => r.name === route.name)) {
-        // 从 router 实例中移除动态路由
+    // 清空本地存储的路由和菜单数据
+    routes.value = [];
+    mixedLayoutLeftRoutes.value = [];
+    // 从 Vue Router 中移除所有动态注册的路由
+    router.getRoutes().forEach((route) => {
+      if (route.name) {
         router.removeRoute(route.name);
       }
     });
-
-    routes.value = [];
-    mixLeftMenus.value = [];
     isRoutesLoaded.value = false;
   };
 
   return {
     routes,
-    generateRoutes,
-    mixLeftMenus,
-    setMixLeftMenus,
+    mixedLayoutLeftRoutes,
     isRoutesLoaded,
+    generateRoutes,
+    setMixedLayoutLeftRoutes,
     resetRouter,
   };
 });
 
 /**
- * 转换路由数据为组件
+ * 解析后端返回的路由数据并转换为 Vue Router 兼容的路由配置
+ *
+ * 1. 遍历 `rawRoutes` 并转换为 `RouteRecordRaw` 格式。
+ * 2. 若 `component` 为 `"Layout"`，则替换为 `Layout` 组件。
+ * 3. 若 `component` 为字符串路径，则动态加载对应的 Vue 组件，找不到则默认 `404.vue`。
+ * 4. 递归解析 `children`，确保子路由也被正确转换。
+ *
+ * @param rawRoutes 后端返回的原始路由数据
+ * @returns 解析后的路由配置数组
  */
-const transformRoutes = (routes: RouteVO[]) => {
-  const asyncRoutes: RouteRecordRaw[] = [];
-  routes.forEach((route) => {
-    const tmpRoute = { ...route } as RouteRecordRaw;
-    // 顶级目录，替换为 Layout 组件
-    if (tmpRoute.component?.toString() == "Layout") {
-      tmpRoute.component = Layout;
-    } else {
-      // 其他菜单，根据组件路径动态加载组件
-      const component = modules[`../../views/${tmpRoute.component}.vue`];
-      if (component) {
-        tmpRoute.component = component;
-      } else {
-        tmpRoute.component = modules["../../views/error-page/404.vue"];
-      }
-    }
+const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
+  const parsedRoutes: RouteRecordRaw[] = [];
+
+  rawRoutes.forEach((route) => {
+    const normalizedRoute = { ...route } as RouteRecordRaw;
 
-    if (tmpRoute.children) {
-      tmpRoute.children = transformRoutes(route.children);
+    // 处理组件路径
+    normalizedRoute.component =
+      normalizedRoute.component?.toString() === "Layout"
+        ? Layout
+        : modules[`../../views/${normalizedRoute.component}.vue`] ||
+          modules["../../views/error-page/404.vue"];
+
+    // 递归解析子路由
+    if (normalizedRoute.children) {
+      normalizedRoute.children = parseDynamicRoutes(route.children);
     }
 
-    asyncRoutes.push(tmpRoute);
+    parsedRoutes.push(normalizedRoute);
   });
 
-  return asyncRoutes;
+  return parsedRoutes;
 };
-
 /**
  * 在组件外使用 Pinia store 实例 @see https://pinia.vuejs.org/core-concepts/outside-component-usage.html
  */

From 004448c469109e841cddcd9a7115b7ef7d71f21c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 22:23:14 +0800
Subject: [PATCH 166/497] =?UTF-8?q?chore:=20:hammer:=20stylelint=20?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E6=9C=AA=E7=9F=A5=E5=B1=9E=E6=80=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .stylelintrc.cjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index e6b1be15..69587661 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -26,6 +26,7 @@ module.exports = {
     "keyframes-name-pattern": null, // 动画帧节点样式命名规则
     "no-descending-specificity": null, // 允许无降序特异性
     "no-empty-source": null, // 允许空样式
+    "declaration-property-value-no-unknown": null, // 允许未知属性值
     // 允许 global 、export 、deep伪类
     "selector-pseudo-class-no-unknown": [
       true,

From a784966f97422bd2902efa5337937446aeef028e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 22:24:00 +0800
Subject: [PATCH 167/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E8=AE=BF=E9=97=AE=E8=B6=8B=E5=8A=BF=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=AD=90=E7=BB=84=E4=BB=B6=E5=8F=82=E6=95=B0=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6177dcf8..44075baa 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -197,7 +197,7 @@
     <el-row :gutter="10" class="mt-5">
       <!-- 访问趋势统计图 -->
       <el-col :xs="24" :span="16">
-        <VisitTrend id="VisitTrend" width="100%" height="400px" />
+        <VisitTrend id="VisitTrend" height="400px" />
       </el-col>
       <!-- 通知公告 -->
       <el-col :xs="24" :span="8">

From 8f18631f1f01c0d4ca15bdd6bf0db181c9011315 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 22:29:49 +0800
Subject: [PATCH 168/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E7=9A=84=E9=A2=84=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 13dec1e2..c13ceba7 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -104,12 +104,9 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "axios",
         "@vueuse/core",
         "sortablejs",
-        "stomp/stompjs",
         "exceljs",
         "path-to-regexp",
         "echarts",
-        "@wangeditor/editor",
-        "@wangeditor/editor-for-vue",
         "vue-i18n",
         "nprogress",
         "qs",

From e041c5575c4ccce349f32b0accc154128bb32445 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Feb 2025 22:44:23 +0800
Subject: [PATCH 169/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 56 ++++++++++++++++++++++++++--------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index fbc43ce9..bd910359 100644
--- a/package.json
+++ b/package.json
@@ -46,8 +46,8 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.0.0",
-    "@vueuse/core": "^10.11.1",
-    "@wangeditor-next/editor": "^5.6.29",
+    "@vueuse/core": "^12.5.0",
+    "@wangeditor-next/editor": "^5.6.31",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
@@ -59,56 +59,56 @@
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "path-to-regexp": "^6.3.0",
-    "pinia": "^2.3.0",
+    "path-to-regexp": "^8.2.0",
+    "pinia": "^2.3.1",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
-    "vue-i18n": "9.9.1",
+    "vue-i18n": "^11.1.0",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.6.1",
-    "@commitlint/config-conventional": "^19.6.0",
-    "@eslint/js": "^9.18.0",
+    "@commitlint/cli": "^19.7.1",
+    "@commitlint/config-conventional": "^19.7.1",
+    "@eslint/js": "^9.19.0",
     "@types/codemirror": "^5.60.15",
-    "@types/lodash": "^4.17.14",
-    "@types/node": "^22.10.7",
+    "@types/lodash": "^4.17.15",
+    "@types/node": "^22.13.1",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.20.0",
-    "@typescript-eslint/parser": "^8.20.0",
+    "@typescript-eslint/eslint-plugin": "^8.23.0",
+    "@typescript-eslint/parser": "^8.23.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
-    "cz-git": "1.9.4",
-    "eslint": "^9.18.0",
-    "eslint-config-prettier": "^9.1.0",
+    "cz-git": "^1.11.0",
+    "eslint": "^9.19.0",
+    "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-vue": "^9.32.0",
     "globals": "^15.14.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.4.1",
+    "lint-staged": "^15.4.3",
     "postcss": "^8.5.1",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.4.2",
-    "sass": "^1.83.4",
-    "stylelint": "^16.13.2",
+    "sass": "^1.84.0",
+    "stylelint": "^16.14.1",
     "stylelint-config-html": "^1.1.0",
-    "stylelint-config-recess-order": "^5.1.1",
+    "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
-    "stylelint-config-recommended-vue": "^1.5.0",
-    "stylelint-config-standard": "^36.0.1",
-    "terser": "^5.37.0",
-    "typescript": "5.5.4",
-    "typescript-eslint": "^8.20.0",
-    "unocss": "0.65.3",
-    "unplugin-auto-import": "^0.18.6",
-    "unplugin-vue-components": "^0.27.5",
-    "vite": "^6.0.7",
+    "stylelint-config-recommended-vue": "^1.6.0",
+    "stylelint-config-standard": "^37.0.0",
+    "terser": "^5.38.0",
+    "typescript": "^5.7.3",
+    "typescript-eslint": "^8.23.0",
+    "unocss": "65.4.3",
+    "unplugin-auto-import": "^19.0.0",
+    "unplugin-vue-components": "^28.0.0",
+    "vite": "^6.1.0",
     "vite-plugin-mock-dev-server": "^1.8.3",
     "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",

From dd275dae271cefcbf8fd00ee50cfa74d11387845 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 7 Feb 2025 23:57:57 +0800
Subject: [PATCH 170/497] =?UTF-8?q?chore:=20:hammer:=20=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=20SVG=20=E5=8A=A0=E8=BD=BD=E6=96=B9=E5=BC=8F=E7=94=B1=20vite-p?=
 =?UTF-8?q?lugin-svg-icons=20=E5=88=87=E6=8D=A2=E4=B8=BA=20@unocss/preset-?=
 =?UTF-8?q?icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 src/components/CURD/PageContent.vue           |  2 +-
 src/components/Fullscreen/index.vue           |  2 +-
 src/components/Hamburger/index.vue            |  2 +-
 src/components/IconSelect/index.vue           |  4 +-
 src/components/LangSelect/index.vue           |  2 +-
 src/components/MenuSearch/index.vue           | 15 ++++---
 src/components/SizeSelect/index.vue           |  2 +-
 src/components/SvgIcon/index.vue              | 41 ------------------
 .../NavBar/components/NavbarRight.vue         |  2 +-
 .../components/SidebarMenuItemTitle.vue       | 43 +++++++++++--------
 .../Sidebar/components/SidebarMixTopMenu.vue  |  2 +-
 src/layout/components/TagsView/index.vue      | 12 +++---
 src/layout/index.vue                          |  4 +-
 src/main.ts                                   |  2 -
 src/types/components.d.ts                     |  1 -
 src/views/codegen/index.vue                   |  2 +-
 src/views/dashboard/index.vue                 | 18 ++++----
 src/views/demo/icons.vue                      |  5 +--
 src/views/login/index.vue                     | 11 ++---
 src/views/system/menu/index.vue               |  2 +-
 uno.config.ts                                 | 37 +++++++++++++++-
 vite.config.ts                                | 16 +++----
 23 files changed, 111 insertions(+), 118 deletions(-)
 delete mode 100644 src/components/SvgIcon/index.vue

diff --git a/package.json b/package.json
index bd910359..8c18e62e 100644
--- a/package.json
+++ b/package.json
@@ -71,6 +71,7 @@
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
     "@eslint/js": "^9.19.0",
+    "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash": "^4.17.15",
     "@types/node": "^22.13.1",
@@ -110,7 +111,6 @@
     "unplugin-vue-components": "^28.0.0",
     "vite": "^6.1.0",
     "vite-plugin-mock-dev-server": "^1.8.3",
-    "vite-plugin-svg-icons": "^2.0.1",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.2.0"
   },
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index e8a408f7..188eb578 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -240,7 +240,7 @@
                   </el-icon>
                 </template>
                 <template v-else>
-                  <svg-icon :icon-class="scope.row[col.prop]" />
+                  <div class="i-svg:{{ scope.row[col.prop] }}" />
                 </template>
               </template>
             </template>
diff --git a/src/components/Fullscreen/index.vue b/src/components/Fullscreen/index.vue
index bd85b4b4..bd888fe3 100644
--- a/src/components/Fullscreen/index.vue
+++ b/src/components/Fullscreen/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div @click="toggle">
-    <svg-icon :icon-class="isFullscreen ? 'fullscreen-exit' : 'fullscreen'" />
+    <div :class="`i-svg:` + (isFullscreen ? 'fullscreen-exit' : 'fullscreen')" />
   </div>
 </template>
 
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 1c0642a4..6bc47abc 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -4,7 +4,7 @@
     class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
     @click="toggleClick"
   >
-    <svg-icon icon-class="collapse" :class="{ hamburger: true, 'is-active': isActive }" />
+    <div :class="['i-svg:collapse', { hamburger: true, 'is-active': isActive }]" />
   </div>
 </template>
 
diff --git a/src/components/IconSelect/index.vue b/src/components/IconSelect/index.vue
index 006158a1..b96e93e4 100644
--- a/src/components/IconSelect/index.vue
+++ b/src/components/IconSelect/index.vue
@@ -11,7 +11,7 @@
                   <component :is="selectedIcon.replace('el-icon-', '')" />
                 </el-icon>
                 <template v-else>
-                  <svg-icon :icon-class="selectedIcon" />
+                  <div :class="`i-svg:${selectedIcon}`" />
                 </template>
               </template>
               <template #suffix>
@@ -52,7 +52,7 @@
                   @click="selectIcon(icon)"
                 >
                   <el-tooltip :content="icon" placement="bottom" effect="light">
-                    <svg-icon :icon-class="icon" />
+                    <div :class="`i-svg:${icon}`" />
                   </el-tooltip>
                 </li>
               </ul>
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 2f35582e..2dbf7381 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dropdown trigger="click" @command="handleLanguageChange">
     <div>
-      <svg-icon icon-class="language" :size="size" />
+      <div class="i-svg:language" />
     </div>
     <template #dropdown>
       <el-dropdown-menu>
diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 7c2787a1..f78e0e63 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div @click="openSearchModal">
-    <svg-icon icon-class="search" />
+    <div class="i-svg:search" />
     <el-dialog
       v-model="isModalVisible"
       width="30%"
@@ -38,8 +38,8 @@
             <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
               <component :is="item.icon.replace('el-icon-', '')" />
             </el-icon>
-            <svg-icon v-else-if="item.icon" :icon-class="item.icon" />
-            <svg-icon v-else icon-class="menu" />
+            <div v-else-if="item.icon" :class="`i-svg:${item.icon}`" />
+            <div v-else class="i-svg:menu" />
             {{ item.title }}
           </li>
         </ul>
@@ -48,14 +48,15 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <svg-icon icon-class="enter" size="20px" />
+          <div class="i-svg:enter w-5 h-5" />
           <span>选择</span>
 
-          <svg-icon icon-class="down" size="20px" class="ml-5" />
-          <svg-icon icon-class="up" size="20px" class="ml-1" />
+          <div class="i-svg:down w-5 h-5 ml-5" />
+          <div class="i-svg:up w-5 h-5 ml-5" />
           <span>切换</span>
 
-          <svg-icon icon-class="esc" size="20px" class="ml-5" />
+          <div class="i-svg:esc w-5 h-5ml-5" />
+
           <span>退出</span>
         </div>
       </template>
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 6ab38f7c..4cb97b28 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -3,7 +3,7 @@
   <el-tooltip :content="$t('sizeSelect.tooltip')" effect="dark" placement="bottom">
     <el-dropdown trigger="click" @command="handleSizeChange">
       <div>
-        <svg-icon icon-class="size" />
+        <div class="i-svg:size" />
       </div>
       <template #dropdown>
         <el-dropdown-menu>
diff --git a/src/components/SvgIcon/index.vue b/src/components/SvgIcon/index.vue
deleted file mode 100644
index 0fdd7357..00000000
--- a/src/components/SvgIcon/index.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <svg aria-hidden="true" class="svg-icon" :style="'width:' + size + ';height:' + size">
-    <use :xlink:href="http://github.com/symbolId" :fill="color" />
-  </svg>
-</template>
-
-<script setup lang="ts">
-const props = defineProps({
-  prefix: {
-    type: String,
-    default: "icon",
-  },
-  iconClass: {
-    type: String,
-    required: false,
-    default: "",
-  },
-  color: {
-    type: String,
-    default: "",
-  },
-  size: {
-    type: String,
-    default: "1em",
-  },
-});
-
-const symbolId = computed(() => `#${props.prefix}-${props.iconClass}`);
-</script>
-
-<style scoped>
-.svg-icon {
-  display: inline-block;
-  width: 1em;
-  height: 1em;
-  overflow: hidden;
-  vertical-align: -0.15em; /* 因icon大小被设置为和字体大小一致，而span等标签的下边缘会和字体的基线对齐，故需设置一个往下的偏移比例，来纠正视觉上的未对齐效果 */
-  outline: none;
-  fill: currentcolor; /* 定义元素的颜色，currentColor是一个变量，这个变量的值就表示当前元素的color值，如果当前元素未设置color值，则从父元素继承 */
-}
-</style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index c4ad28ac..9ff86ea0 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -23,7 +23,7 @@
 
     <!-- 设置面板 -->
     <div v-if="defaultSettings.showSettings" @click="settingStore.settingsVisible = true">
-      <SvgIcon icon-class="setting" />
+      <div class="i-svg:setting" />
     </div>
   </div>
 </template>
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
index 06bfef1a..d284c021 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
@@ -1,10 +1,13 @@
 <template>
-  <!-- 根据 icon 类型决定使用的不同类型的图标组件 -->
-  <el-icon v-if="icon && icon.startsWith('el-icon')" class="sub-el-icon">
-    <component :is="icon.replace('el-icon-', '')" />
-  </el-icon>
-  <svg-icon v-else-if="icon" :icon-class="icon" />
-  <svg-icon v-else icon-class="menu" />
+  <template v-if="icon">
+    <el-icon v-if="isElIcon" class="el-icon">
+      <component :is="iconComponent" />
+    </el-icon>
+    <div v-else :class="`i-svg:${icon}`" />
+  </template>
+  <template v-else>
+    <div class="i-svg:menu" />
+  </template>
   <!-- 菜单标题 -->
   <span v-if="title" class="ml-1">{{ translateRouteTitle(title) }}</span>
 </template>
@@ -12,30 +15,34 @@
 <script setup lang="ts">
 import { translateRouteTitle } from "@/utils/i18n";
 
-defineProps({
-  icon: {
-    type: String,
-    default: "",
-  },
-  title: {
-    type: String,
-    default: "",
-  },
-});
+const props = defineProps<{
+  icon?: string;
+  title?: string;
+}>();
+
+const isElIcon = computed(() => props.icon?.startsWith("el-icon"));
+const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
 </script>
 
 <style lang="scss" scoped>
-.sub-el-icon {
+.el-icon {
   width: 14px !important;
   margin-right: 0 !important;
   color: currentcolor;
 }
 
+[class^="i-svg:"] {
+  width: 14px;
+  height: 14px;
+  margin-right: 0;
+  color: currentcolor !important;
+}
+
 .hideSidebar {
   .el-sub-menu,
   .el-menu-item {
     .svg-icon,
-    .sub-el-icon {
+    .el-icon {
       margin-left: 20px;
     }
   }
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 3e421766..228c77f9 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -15,7 +15,7 @@
             <el-icon v-if="route.meta.icon.startsWith('el-icon')" class="sub-el-icon">
               <component :is="route.meta.icon.replace('el-icon-', '')" />
             </el-icon>
-            <svg-icon v-else :icon-class="route.meta.icon" />
+            <div v-else :class="`i-svg:${route.meta.icon}`" />
           </template>
           <span v-if="route.path === '/'">首页</span>
           <span v-else-if="route.meta && route.meta.title" class="ml-1">
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 0e1ce48f..b672db25 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -28,27 +28,27 @@
       :style="{ left: left + 'px', top: top + 'px' }"
     >
       <li @click="refreshSelectedTag(selectedTag)">
-        <svg-icon icon-class="refresh" />
+        <div class="i-svg:refresh" />
         刷新
       </li>
       <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
-        <svg-icon icon-class="close" />
+        <div class="i-svg:close" />
         关闭
       </li>
       <li @click="closeOtherTags">
-        <svg-icon icon-class="close_other" />
+        <div class="i-svg:close_other" />
         关闭其它
       </li>
       <li v-if="!isFirstView()" @click="closeLeftTags">
-        <svg-icon icon-class="close_left" />
+        <div class="i-svg:close_left" />
         关闭左侧
       </li>
       <li v-if="!isLastView()" @click="closeRightTags">
-        <svg-icon icon-class="close_right" />
+        <div class="i-svg:close_right" />
         关闭右侧
       </li>
       <li @click="closeAllTags(selectedTag)">
-        <svg-icon icon-class="close_all" />
+        <div class="i-svg:close_all" />
         关闭所有
       </li>
     </ul>
diff --git a/src/layout/index.vue b/src/layout/index.vue
index d3c60c78..a75570c1 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -27,7 +27,7 @@
         <Settings v-if="defaultSettings.showSettings" />
         <!-- 返回顶部 -->
         <el-backtop target=".app-main">
-          <svg-icon icon-class="backtop" size="24px" />
+          <div class="i-svg:backtop w-6 h-6" />
         </el-backtop>
       </div>
     </div>
@@ -40,7 +40,7 @@
       <Settings v-if="defaultSettings.showSettings" />
       <!-- 返回顶部 -->
       <el-backtop target=".app-main">
-        <svg-icon icon-class="backtop" size="24px" />
+        <div class="i-svg:backtop w-6 h-6" />
       </el-backtop>
     </div>
   </div>
diff --git a/src/main.ts b/src/main.ts
index 60d79365..5485bacf 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -2,8 +2,6 @@ import { createApp } from "vue";
 import App from "./App.vue";
 import setupPlugins from "@/plugins";
 
-// 本地SVG图标
-import "virtual:svg-icons-register";
 // 暗黑主题样式
 import "element-plus/theme-chalk/dark/css-vars.css";
 // 暗黑模式自定义变量
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index d03a6b64..a0d61654 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -86,7 +86,6 @@ declare module "vue" {
     SidebarMixTopMenu: (typeof import("./../layout/components/Sidebar/components/SidebarMixTopMenu.vue"))["default"];
     SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     SizeSelect: (typeof import("./../components/SizeSelect/index.vue"))["default"];
-    SvgIcon: (typeof import("./../components/SvgIcon/index.vue"))["default"];
     TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"];
     TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"];
     ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index 76bd29a1..d961912f 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -354,7 +354,7 @@
                 @node-click="handleFileTreeNodeClick"
               >
                 <template #default="{ data }">
-                  <svg-icon :icon-class="getFileTreeNodeIcon(data.label)" />
+                  <div :class="`i-svg:${getFileTreeNodeIcon(data.label)}`" />
                   <span class="ml-1">{{ data.label }}</span>
                 </template>
               </el-tree>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 44075baa..1915f2c5 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -27,15 +27,15 @@
               </div>
               <div class="mt-3">
                 <el-link href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
-                  <SvgIcon icon-class="gitee" class="text-lg color-#f76560" />
+                  <div class="i-svg:gitee text-lg color-#F76560" />
                 </el-link>
                 <el-divider direction="vertical" />
                 <el-link href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
-                  <SvgIcon icon-class="github" class="text-lg color-#4080ff" />
+                  <div class="i-svg:github text-lg color-#4080FF" />
                 </el-link>
                 <el-divider direction="vertical" />
                 <el-link href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
-                  <SvgIcon icon-class="gitcode" class="text-lg color-#ff9a2e" />
+                  <div class="i-svg:gitcode text-lg color-#FF9A2E" />
                 </el-link>
               </div>
             </el-col>
@@ -47,18 +47,18 @@
               </div>
               <div class="mt-3">
                 <el-link href="https://juejin.cn/post/7228990409909108793" target="_blank">
-                  <SvgIcon icon-class="juejin" class="text-lg" />
+                  <div class="i-svg:juejin text-lg" />
                 </el-link>
                 <el-divider direction="vertical" />
                 <el-link
                   href="https://youlai.blog.csdn.net/article/details/130191394"
                   target="_blank"
                 >
-                  <SvgIcon icon-class="csdn" class="text-lg" />
+                  <div class="i-svg:csdn text-lg" />
                 </el-link>
                 <el-divider direction="vertical" />
                 <el-link href="https://www.cnblogs.com/haoxianrui/p/17331952.html" target="_blank">
-                  <SvgIcon icon-class="cnblogs" class="text-lg" />
+                  <div class="i-svg:cnblogs text-lg" />
                 </el-link>
               </div>
             </el-col>
@@ -70,7 +70,7 @@
               </div>
               <div class="mt-3">
                 <el-link href="https://www.bilibili.com/video/BV1eFUuYyEFj" target="_blank">
-                  <SvgIcon icon-class="bilibili" class="text-lg" />
+                  <div class="i-svg:bilibili text-lg" />
                 </el-link>
               </div>
             </el-col>
@@ -125,7 +125,7 @@
                     {{ formatGrowthRate(visitStatsData.uvGrowthRate) }}
                   </span>
                 </div>
-                <svg-icon icon-class="visitor" size="2em" />
+                <div class="i-svg:visitor w-8 h-8" />
               </div>
 
               <div class="flex-x-between mt-2 text-sm text-gray">
@@ -181,7 +181,7 @@
                     {{ formatGrowthRate(visitStatsData.pvGrowthRate) }}
                   </span>
                 </div>
-                <svg-icon icon-class="browser" size="2em" />
+                <div class="i-svg:browser w-8 h-8" />
               </div>
 
               <div class="flex-x-between mt-2 text-sm text-gray">
diff --git a/src/views/demo/icons.vue b/src/views/demo/icons.vue
index 73a7aef4..d6b8c242 100644
--- a/src/views/demo/icons.vue
+++ b/src/views/demo/icons.vue
@@ -7,7 +7,7 @@
             <copy-button :text="generateIconCode(item)">
               <el-tooltip effect="dark" :content="generateIconCode(item)" placement="top">
                 <div class="icon-item">
-                  <svg-icon :icon-class="item" />
+                  <div :class="`i-svg:${item}`" />
                   <span>{{ item }}</span>
                 </div>
               </el-tooltip>
@@ -36,7 +36,6 @@
 </template>
 
 <script setup lang="ts">
-import SvgIcon from "@/components/SvgIcon/index.vue";
 import * as ElementPlusIconsVue from "@element-plus/icons-vue";
 
 defineOptions({
@@ -87,7 +86,7 @@ const svg_icons: string[] = [
 const icons = ref(ElementPlusIconsVue);
 
 function generateIconCode(symbol: any) {
-  return `<svg-icon icon-class="${symbol}" />`;
+  return `<div class="i-svg:${symbol}" />`;
 }
 
 function generateElementIconCode(symbol: any) {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 84e7784a..edf30fde 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -86,7 +86,8 @@
         <!-- 验证码 -->
         <el-form-item prop="captchaCode">
           <div class="input-wrapper">
-            <svg-icon icon-class="captcha" class="mx-2" />
+            <div class="i-svg:captcha mx-2" />
+
             <el-input
               v-model="loginFormData.captchaCode"
               auto-complete="off"
@@ -126,10 +127,10 @@
           <el-text size="small">{{ $t("login.otherLoginMethods") }}</el-text>
         </el-divider>
         <div class="third-party-login">
-          <svg-icon icon-class="wechat" class="icon" />
-          <svg-icon icon-class="qq" class="icon" />
-          <svg-icon icon-class="github" class="icon" />
-          <svg-icon icon-class="gitee" class="icon" />
+          <div class="i-svg:wechat" />
+          <div class="i-svg:qq" />
+          <div class="i-svg:github" />
+          <div class="i-svg:gitee" />
         </div>
       </el-form>
     </div>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 8622309a..60cd0854 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -48,7 +48,7 @@
               </el-icon>
             </template>
             <template v-else-if="scope.row.icon">
-              <svg-icon :icon-class="scope.row.icon" />
+              <div :class="`i-svg:${scope.row.icon}`" />
             </template>
             {{ scope.row.name }}
           </template>
diff --git a/uno.config.ts b/uno.config.ts
index 1e194025..51c7f939 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -10,6 +10,25 @@ import {
   transformerVariantGroup,
 } from "unocss";
 
+import { FileSystemIconLoader } from "@iconify/utils/lib/loader/node-loaders";
+
+import fs from "fs";
+
+const iconsDir = "./src/assets/icons";
+
+// 读取本地 SVG 目录，自动生成 safelist
+const generateSafeList = () => {
+  try {
+    return fs
+      .readdirSync(iconsDir)
+      .filter((file) => file.endsWith(".svg"))
+      .map((file) => `i-svg:${file.replace(".svg", "")}`);
+  } catch (error) {
+    console.error("无法读取图标目录:", error);
+    return [];
+  }
+};
+
 export default defineConfig({
   shortcuts: {
     "flex-center": "flex justify-center items-center",
@@ -32,7 +51,22 @@ export default defineConfig({
   presets: [
     presetUno(),
     presetAttributify(),
-    presetIcons(),
+    presetIcons({
+      extraProperties: {
+        display: "inline-block",
+        width: "1em",
+        height: "1em",
+      },
+      collections: {
+        svg: FileSystemIconLoader(iconsDir, (svg) => {
+          // 如果 `fill` 没有定义，则添加 `fill="currentColor"`
+          if (!svg.includes('fill="')) {
+            return svg.replace(/^<svg /, '<svg fill="currentColor" ');
+          }
+          return svg;
+        }),
+      },
+    }),
     presetTypography(),
     presetWebFonts({
       fonts: {
@@ -40,5 +74,6 @@ export default defineConfig({
       },
     }),
   ],
+  safelist: generateSafeList(),
   transformers: [transformerDirectives(), transformerVariantGroup()],
 });
diff --git a/vite.config.ts b/vite.config.ts
index c13ceba7..9b3e3927 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,11 +1,10 @@
 import vue from "@vitejs/plugin-vue";
-import { type UserConfig, type ConfigEnv, loadEnv, defineConfig } from "vite";
+import { type ConfigEnv, loadEnv, defineConfig } from "vite";
 
 import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
 import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
 
-import { createSvgIconsPlugin } from "vite-plugin-svg-icons";
 import mockDevServerPlugin from "vite-plugin-mock-dev-server";
 
 import UnoCSS from "unocss/vite";
@@ -19,8 +18,10 @@ const __APP_INFO__ = {
 };
 
 const pathSrc = resolve(__dirname, "src");
+
 // Vite配置  https://cn.vitejs.dev/config
-export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
+
+export default defineConfig(({ mode }: ConfigEnv) => {
   const env = loadEnv(mode, process.cwd());
   return {
     resolve: {
@@ -56,9 +57,7 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
     plugins: [
       vue(),
       env.VITE_MOCK_DEV_SERVER === "true" ? mockDevServerPlugin() : null,
-      UnoCSS({
-        hmrTopLevelAwait: false,
-      }),
+      UnoCSS(),
       // 自动导入配置 https://github.com/sxzz/element-plus-best-practices/blob/main/vite.config.ts
       AutoImport({
         // 导入 Vue 函数，如：ref, reactive, toRef 等
@@ -88,11 +87,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         dts: false,
         // dts: "src/types/components.d.ts",
       }),
-      createSvgIconsPlugin({
-        // 缓存图标位置
-        iconDirs: [resolve(pathSrc, "assets/icons")],
-        symbolId: "icon-[dir]-[name]",
-      }),
     ],
     // 预加载项目必需的组件
     optimizeDeps: {

From 407d999e7183031d18c1cae0ec57c3a314c251ae Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 8 Feb 2025 11:05:16 +0800
Subject: [PATCH 171/497] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uno.config.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/uno.config.ts b/uno.config.ts
index 51c7f939..c7b114e3 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -1,4 +1,4 @@
-// uno.config.ts
+// https://unocss.nodejs.cn/guide/config-file
 import {
   defineConfig,
   presetAttributify,
@@ -11,9 +11,9 @@ import {
 } from "unocss";
 
 import { FileSystemIconLoader } from "@iconify/utils/lib/loader/node-loaders";
-
 import fs from "fs";
 
+// 本地SVG图标目录
 const iconsDir = "./src/assets/icons";
 
 // 读取本地 SVG 目录，自动生成 safelist
@@ -52,11 +52,13 @@ export default defineConfig({
     presetUno(),
     presetAttributify(),
     presetIcons({
+      // 额外属性
       extraProperties: {
         display: "inline-block",
         width: "1em",
         height: "1em",
       },
+      // 图表集合
       collections: {
         svg: FileSystemIconLoader(iconsDir, (svg) => {
           // 如果 `fill` 没有定义，则添加 `fill="currentColor"`

From 7b8298a8c5d39efc6a989a4250d40c751d551914 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 8 Feb 2025 11:06:33 +0800
Subject: [PATCH 172/497] chore: :hammer: bump version to 2.22.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 8c18e62e..28bd0d9e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.21.1",
+  "version": "2.22.0",
   "private": true,
   "type": "module",
   "scripts": {

From dc85bb0afe329555414975d8101a888c338fac54 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 8 Feb 2025 11:18:20 +0800
Subject: [PATCH 173/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=89=80=E6=9C=89=E8=B7=AF=E7=94=B1=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E6=B3=A8=E9=94=80=E5=90=8E=E9=87=8D=E6=96=B0=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E9=A1=B5=E9=9D=A2=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.ts | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index ed93ee5b..6a8e532b 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -51,15 +51,16 @@ export const usePermissionStore = defineStore("permission", () => {
    * 重置路由
    */
   const resetRouter = () => {
-    // 清空本地存储的路由和菜单数据
-    routes.value = [];
-    mixedLayoutLeftRoutes.value = [];
-    // 从 Vue Router 中移除所有动态注册的路由
-    router.getRoutes().forEach((route) => {
-      if (route.name) {
+    //  从 router 实例中移除动态路由
+    routes.value.forEach((route) => {
+      if (route.name && !constantRoutes.find((r) => r.name === route.name)) {
         router.removeRoute(route.name);
       }
     });
+
+    // 清空本地存储的路由和菜单数据
+    routes.value = [];
+    mixedLayoutLeftRoutes.value = [];
     isRoutesLoaded.value = false;
   };
 

From 5656760940ab8c8722642f063a83b49617720e6d Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Sat, 8 Feb 2025 16:38:11 +0800
Subject: [PATCH 174/497] =?UTF-8?q?refactor(Menu):=20:recycle:=20=E6=B5=85?=
 =?UTF-8?q?=E8=89=B2=E4=B8=BB=E9=A2=98Menu=E8=89=B2=E7=B3=BB=E6=90=AD?=
 =?UTF-8?q?=E9=85=8D=E6=94=B9=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1.浅色主题下以白色背景为核心默认使用el-element浅色系配色。
2.浅色主题下支持悬浮、选中状态颜色根据主题色变化。3.修改浅色主题的侧边栏logo文字颜色。

# #182
---
 .../components/NavBar/components/NavbarRight.vue |  5 -----
 .../Sidebar/components/SidebarLogo.vue           |  2 +-
 .../Sidebar/components/SidebarMenu.vue           | 10 +++++++---
 .../Sidebar/components/SidebarMenuItem.vue       |  6 ++++--
 .../Sidebar/components/SidebarMixTopMenu.vue     | 12 ++++++++----
 src/styles/variables.scss                        | 16 +++++++++++-----
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index c4ad28ac..b53bd0d7 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -70,9 +70,4 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
 .dark .navbar__right > *:hover {
   background: rgb(255 255 255 / 20%);
 }
-
-.layout-top .navbar__right > *,
-.layout-mix .navbar__right > * {
-  color: #fff;
-}
 </style>
diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 2c72e50d..420afc1e 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -34,7 +34,7 @@ defineProps({
     margin-left: 10px;
     font-size: 14px;
     font-weight: bold;
-    color: white;
+    color: $sidebar-logo-text-color;
   }
 }
 
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 828e7bb2..0701ef65 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -4,9 +4,10 @@
     ref="menuRef"
     :default-active="currentRoute.path"
     :collapse="!appStore.sidebar.opened"
-    :background-color="variables['menu-background']"
-    :text-color="variables['menu-text']"
-    :active-text-color="variables['menu-active-text']"
+    :background-color="theme === 'dark' ? variables['menu-background'] : undefined"
+    :text-color="theme === 'dark' ? variables['menu-text'] : undefined"
+    :active-text-color="theme === 'dark' ? variables['menu-active-text'] : undefined"
+    :popper-effect="theme"
     :unique-opened="false"
     :collapse-transition="false"
     :mode="menuMode"
@@ -59,6 +60,9 @@ const menuMode = computed(() => {
   return settingsStore.layout === LayoutEnum.TOP ? "horizontal" : "vertical";
 });
 
+// 获取主题
+const theme = computed(() => settingsStore.theme);
+
 /**
  * 获取完整路径
  *
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 329a9b8f..35579937 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -187,7 +187,9 @@ function resolvePath(routePath: string) {
   }
 }
 
-.el-menu-item:hover {
-  background-color: $menu-hover;
+html.dark {
+  .el-menu-item:hover {
+    background-color: $menu-hover;
+  }
 }
 </style>
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index be2097ca..613ed94a 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -4,9 +4,9 @@
     <el-menu
       mode="horizontal"
       :default-active="activePath"
-      :background-color="variables['menu-background']"
-      :text-color="variables['menu-text']"
-      :active-text-color="variables['menu-active-text']"
+      :background-color="theme === 'dark' ? variables['menu-background'] : undefined"
+      :text-color="theme === 'dark' ? variables['menu-text'] : undefined"
+      :active-text-color="theme === 'dark' ? variables['menu-active-text'] : undefined"
       @select="handleMenuSelect"
     >
       <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
@@ -32,7 +32,7 @@
  * 导入模块：先外部库，再内部模块，最后导入样式和工具类
  */
 import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
-import { usePermissionStore, useAppStore } from "@/store";
+import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
 
@@ -42,10 +42,14 @@ import variables from "@/styles/variables.module.scss";
 const router = useRouter();
 const appStore = useAppStore();
 const permissionStore = usePermissionStore();
+const settingsStore = useSettingsStore();
 
 // 当前激活的顶部菜单路径
 const activePath = computed(() => appStore.activeTopMenuPath);
 
+// 获取主题
+const theme = computed(() => settingsStore.theme);
+
 // 顶部菜单列表
 const topMenus = ref<RouteRecordRaw[]>([]);
 
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 7948a7c6..96c09235 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -25,11 +25,15 @@
 /** 全局SCSS变量 */
 
 :root {
-  --menu-background: #304156;
-  --menu-text: #bfcbd9;
-  --menu-active-text: var(--el-menu-active-color);
-  --menu-hover: #263445;
-  --sidebar-logo-background: #2d3748;
+  --menu-background: #fff;
+  --menu-text: #212121; // 菜单文字颜色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
+  --menu-active-text: var(
+    --el-menu-active-color
+  ); // 菜单激活文字颜色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
+
+  --menu-hover: #e6f4ff; // 菜单悬停背景色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
+  --sidebar-logo-background: #f5f5f5;
+  --sidebar-logo-text-color: #333;
 
   // 修复表格 fixed 列被选中后由于透明色导致叠字的 bug
   .el-table {
@@ -44,6 +48,7 @@ html.dark {
   --menu-active-text: var(--el-menu-active-color);
   --menu-hover: rgb(0 0 0 / 20%);
   --sidebar-logo-background: rgb(0 0 0 / 20%);
+  --sidebar-logo-text-color: #fff;
 }
 
 $menu-background: var(--menu-background); // 菜单背景色
@@ -51,6 +56,7 @@ $menu-text: var(--menu-text); // 菜单文字颜色
 $menu-active-text: var(--menu-active-text); // 菜单激活文字颜色
 $menu-hover: var(--menu-hover); // 菜单悬停背景色
 $sidebar-logo-background: var(--sidebar-logo-background); // 侧边栏 Logo 背景色
+$sidebar-logo-text-color: var(--sidebar-logo-text-color); // 侧边栏 Logo 文字颜色
 
 $sidebar-width: 210px; // 侧边栏宽度
 $sidebar-width-collapsed: 54px; // 侧边栏收缩宽度

From 3b3a2cf1c962d9e15229c9471d41d1ce6b197d6a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 8 Feb 2025 20:15:24 +0800
Subject: [PATCH 175/497] =?UTF-8?q?fix:=20:bug:=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E6=96=B9=E6=A1=88=E8=87=B3=20@unocss/preset-icons?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closed #IBKZ2I
---
 src/components/CURD/PageContent.vue                 | 1 -
 src/views/profile/index.vue                         | 4 ++--
 src/views/system/notice/components/NoticeDetail.vue | 3 +--
 uno.config.ts                                       | 6 ++----
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 188eb578..44f46bb4 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -453,7 +453,6 @@
 </template>
 
 <script setup lang="ts">
-import SvgIcon from "@/components/SvgIcon/index.vue";
 import { hasAuth } from "@/plugins/permission";
 import { useDateFormat, useThrottleFn } from "@vueuse/core";
 import {
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 999d9f50..3af1cd20 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -59,14 +59,14 @@
               </el-descriptions-item>
               <el-descriptions-item>
                 <template #label>
-                  <SvgIcon icon-class="tree" />
+                  <div class="i-svg:tree" />
                   部门
                 </template>
                 {{ userProfile.deptName }}
               </el-descriptions-item>
               <el-descriptions-item>
                 <template #label>
-                  <SvgIcon icon-class="role" />
+                  <div class="i-svg:role" />
                   角色
                 </template>
                 {{ userProfile.roleNames }}
diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue
index dd20a4c5..d573c3e9 100644
--- a/src/views/system/notice/components/NoticeDetail.vue
+++ b/src/views/system/notice/components/NoticeDetail.vue
@@ -13,8 +13,7 @@
         <div class="dialog-toolbar">
           <!-- 全屏/退出全屏按钮 -->
           <el-button circle @click="toggleFullscreen">
-            <SvgIcon v-if="isFullscreen" icon-class="fullscreen-exit" />
-            <SvgIcon v-else icon-class="fullscreen" />
+            <div :class="`i-svg:${isFullscreen ? 'fullscreen-exit' : 'fullscreen'}`" />
           </el-button>
           <!-- 关闭按钮 -->
           <el-button circle @click="handleClose">
diff --git a/uno.config.ts b/uno.config.ts
index c7b114e3..4ea11316 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -60,12 +60,10 @@ export default defineConfig({
       },
       // 图表集合
       collections: {
+        // svg 是图标集合名称，使用 `i-svg:图标名` 调用
         svg: FileSystemIconLoader(iconsDir, (svg) => {
           // 如果 `fill` 没有定义，则添加 `fill="currentColor"`
-          if (!svg.includes('fill="')) {
-            return svg.replace(/^<svg /, '<svg fill="currentColor" ');
-          }
-          return svg;
+          return svg.includes('fill="') ? svg : svg.replace(/^<svg /, '<svg fill="currentColor" ');
         }),
       },
     }),

From 3f591527b773415fb5bb0397d0dc84c659adc6b7 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 9 Feb 2025 09:52:59 +0800
Subject: [PATCH 176/497] =?UTF-8?q?fix:=20:bug:=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=20unocss=20=E5=8A=A0=E8=BD=BD=E7=9A=84svg?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=94=B6=E7=BC=A9?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=B7=A6=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Sidebar/components/SidebarMenuItemTitle.vue  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
index d284c021..aa7cbcc9 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
@@ -34,17 +34,19 @@ const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
 [class^="i-svg:"] {
   width: 14px;
   height: 14px;
-  margin-right: 0;
   color: currentcolor !important;
 }
 
 .hideSidebar {
   .el-sub-menu,
   .el-menu-item {
-    .svg-icon,
     .el-icon {
       margin-left: 20px;
     }
   }
+
+  [class^="i-svg:"] {
+    margin-left: 20px;
+  }
 }
 </style>

From ee9f69687444b02154c9c2134144bb92eb1a65b1 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Mon, 10 Feb 2025 16:00:53 +0800
Subject: [PATCH 177/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=BC=BA=E5=A4=B1=20@types/lodash-es=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E8=87=B4=20lodash-es=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 28bd0d9e..e5e3a490 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.22.0",
+  "version": "2.22.1",
   "private": true,
   "type": "module",
   "scripts": {
@@ -73,7 +73,7 @@
     "@eslint/js": "^9.19.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
-    "@types/lodash": "^4.17.15",
+    "@types/lodash-es": "^4.17.12",
     "@types/node": "^22.13.1",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",

From 56b636f658e7398b0f646f66d744b95ca023667a Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 11:11:36 +0800
Subject: [PATCH 178/497] =?UTF-8?q?refactor:=20:recycle:=20stylelint?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E6=9B=B4=E5=8A=A0=E8=BD=BB=E9=87=8F=E7=81=B5?=
 =?UTF-8?q?=E6=B4=BB=E7=9A=84recommended=E6=9B=BF=E4=BB=A3standard?=
 =?UTF-8?q?=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .stylelintrc.cjs | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index 69587661..427857df 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -1,13 +1,15 @@
 module.exports = {
-  // 继承推荐规范配置
   extends: [
-    "stylelint-config-standard",
+    "stylelint-config-recommended",
     "stylelint-config-recommended-scss",
     "stylelint-config-recommended-vue/scss",
     "stylelint-config-html/vue",
     "stylelint-config-recess-order",
   ],
-  // 指定不同文件对应的解析器
+
+  plugins: [
+    "stylelint-prettier", // 统一代码风格，格式冲突时以 Prettier 规则为准
+  ],
   overrides: [
     {
       files: ["**/*.{vue,html}"],
@@ -18,30 +20,19 @@ module.exports = {
       customSyntax: "postcss-scss",
     },
   ],
-  // 自定义规则
   rules: {
-    "import-notation": "string", // 指定导入CSS文件的方式("string"|"url")
-    "selector-class-pattern": null, // 选择器类名命名规则
-    "custom-property-pattern": null, // 自定义属性命名规则
-    "keyframes-name-pattern": null, // 动画帧节点样式命名规则
-    "no-descending-specificity": null, // 允许无降序特异性
-    "no-empty-source": null, // 允许空样式
-    "declaration-property-value-no-unknown": null, // 允许未知属性值
-    // 允许 global 、export 、deep伪类
+    "prettier/prettier": true, // 强制执行 Prettier 格式化规则（需配合 .prettierrc 配置文件）
+
+    "no-empty-source": null, //  允许空的样式文件
+    "declaration-property-value-no-unknown": null, // 允许非常规数值格式 ,如 height: calc(100% - 50)
+    // 允许使用未知伪类
     "selector-pseudo-class-no-unknown": [
       true,
       {
         ignorePseudoClasses: ["global", "export", "deep"],
       },
     ],
-    // 允许未知属性
-    "property-no-unknown": [
-      true,
-      {
-        ignoreProperties: [],
-      },
-    ],
-    // 允许未知规则
+    // 允许使用未知伪元素
     "at-rule-no-unknown": [
       true,
       {

From fc0767899bd54a61d713299fe914159430ae55fa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 11:20:39 +0800
Subject: [PATCH 179/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8vue3.3=E6=96=B0=E7=89=B9=E6=80=A7defineModel=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E7=BB=84=E4=BB=B6=E4=BC=A0=E5=80=BC=E7=9A=84=E5=8F=8C?=
 =?UTF-8?q?=E5=90=91=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Settings/components/LayoutSelect.vue      | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/layout/components/Settings/components/LayoutSelect.vue b/src/layout/components/Settings/components/LayoutSelect.vue
index ff8fb1a3..565dc41d 100644
--- a/src/layout/components/Settings/components/LayoutSelect.vue
+++ b/src/layout/components/Settings/components/LayoutSelect.vue
@@ -4,7 +4,7 @@
       <div
         class="layout-item left"
         :class="{ 'is-active': modelValue === LayoutEnum.LEFT }"
-        @click="updateValue(LayoutEnum.LEFT)"
+        @click="handleLayoutChange(LayoutEnum.LEFT)"
       >
         <div />
         <div />
@@ -15,7 +15,7 @@
       <div
         class="layout-item top"
         :class="{ 'is-active': modelValue === LayoutEnum.TOP }"
-        @click="updateValue(LayoutEnum.TOP)"
+        @click="handleLayoutChange(LayoutEnum.TOP)"
       >
         <div />
         <div />
@@ -26,7 +26,7 @@
       <div
         class="layout-item mix"
         :class="{ 'is-active': modelValue === LayoutEnum.MIX }"
-        @click="updateValue(LayoutEnum.MIX)"
+        @click="handleLayoutChange(LayoutEnum.MIX)"
       >
         <div />
         <div />
@@ -38,14 +38,19 @@
 <script lang="ts" setup>
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-const props = defineProps({
-  modelValue: String,
+const modelValue = defineModel("modelValue", {
+  type: String,
+  required: true,
+  default: () => "",
 });
 
-const emit = defineEmits(["update:modelValue"]);
-
-function updateValue(layout: string) {
-  emit("update:modelValue", layout);
+/**
+ * 变换布局
+ *
+ * @param layout
+ */
+function handleLayoutChange(layout: string) {
+  modelValue.value = layout;
 }
 </script>
 

From ff432684c2d85ccdce70099018ef7027b4699b8b Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 11:58:23 +0800
Subject: [PATCH 180/497] =?UTF-8?q?fix:=20:bug:=20=E4=BC=98=E5=8C=96=20esl?=
 =?UTF-8?q?int=20=E9=85=8D=E7=BD=AE=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=A3=80=E6=B5=8B=20vue=20=E6=96=87=E4=BB=B6=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js | 118 ++++++++++++++++++++---------------------------
 1 file changed, 51 insertions(+), 67 deletions(-)

diff --git a/eslint.config.js b/eslint.config.js
index f5997a7f..10453720 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -1,115 +1,99 @@
+// https://eslint.nodejs.cn/docs/latest/use/configure/configuration-files
+
 import globals from "globals";
-import js from "@eslint/js";
+import pluginJs from "@eslint/js"; // JavaScript 规则
+import pluginVue from "eslint-plugin-vue"; // Vue 规则
+import pluginTypeScript from "@typescript-eslint/eslint-plugin"; // TypeScript 规则
 
-// ESLint 核心插件
-import pluginVue from "eslint-plugin-vue";
-import pluginTypeScript from "@typescript-eslint/eslint-plugin";
+import parserVue from "vue-eslint-parser"; // Vue 解析器
+import parserTypeScript from "@typescript-eslint/parser"; // TypeScript 解析器
 
-// Prettier 插件及配置
-import configPrettier from "eslint-config-prettier";
-import pluginPrettier from "eslint-plugin-prettier";
+import configPrettier from "eslint-config-prettier"; // 禁用与 Prettier 冲突的规则
+import pluginPrettier from "eslint-plugin-prettier"; // 运行 Prettier 规则
 
-// 解析器
-import * as parserVue from "vue-eslint-parser";
-import * as parserTypeScript from "@typescript-eslint/parser";
+// 解析自动导入配置
+import fs from "fs";
+const autoImportConfig = JSON.parse(fs.readFileSync(".eslintrc-auto-import.json", "utf-8"));
 
-// 定义 ESLint 配置
+/** @type {import('eslint').Linter.Config[]} */
 export default [
-  // 通用 JavaScript 配置
+  // 指定检查文件和忽略文件
+  {
+    files: ["**/*.{js,mjs,cjs,ts,vue}"],
+    ignores: ["**/*.d.ts"],
+  },
+  // 全局配置
   {
-    ...js.configs.recommended,
-    ignores: ["**/.*", "dist/*", "*.d.ts", "public/*", "src/assets/**"],
     languageOptions: {
       globals: {
-        ...globals.browser, // 浏览器变量 (window, document 等)
-        ...globals.node, // Node.js 变量 (process, require 等)
+        ...globals.browser,
+        ...globals.node,
+        ...autoImportConfig.globals,
+        ...{
+          PageQuery: "readonly",
+          PageResult: "readonly",
+          OptionType: "readonly",
+          ResponseData: "readonly",
+          ExcelResult: "readonly",
+          TagView: "readonly",
+          AppSettings: "readonly",
+          __APP_INFO__: "readonly",
+        },
       },
     },
-    plugins: {
-      prettier: pluginPrettier,
-    },
+    plugins: { prettier: pluginPrettier },
     rules: {
-      ...configPrettier.rules,
-      ...pluginPrettier.configs.recommended.rules,
-      "no-debug": "off", // 禁止 debugger
-      "prettier/prettier": [
+      ...configPrettier.rules, // 关闭与 Prettier 冲突的规则
+      ...pluginPrettier.configs.recommended.rules, // 启用 Prettier 规则
+      "prettier/prettier": "error", // 强制 Prettier 格式化
+      "no-unused-vars": [
         "error",
         {
-          endOfLine: "auto", // 自动识别换行符
+          argsIgnorePattern: "^_", // 忽略以 _ 开头的变量未使用警告
+          varsIgnorePattern: "^[A-Z0-9_]+$", // 忽略变量名为大写字母、数字或下划线组合的未使用警告（枚举定义未使用场景）
+          ignoreRestSiblings: true, // 忽略解构赋值中同级未使用变量的警告
         },
       ],
     },
   },
+  // JavaScript 配置
+  pluginJs.configs.recommended,
 
   // TypeScript 配置
   {
-    files: ["**/*.?([cm])ts"],
+    files: ["**/*.ts"],
+    ignores: ["**/*.d.ts"], // 排除d.ts文件
     languageOptions: {
       parser: parserTypeScript,
       parserOptions: {
         sourceType: "module",
       },
     },
-    plugins: {
-      "@typescript-eslint": pluginTypeScript,
-    },
+    plugins: { "@typescript-eslint": pluginTypeScript },
     rules: {
-      ...pluginTypeScript.configs.strict.rules,
+      ...pluginTypeScript.configs.strict.rules, // TypeScript 严格规则
       "@typescript-eslint/no-explicit-any": "off", // 允许使用 any
       "@typescript-eslint/no-empty-function": "off", // 允许空函数
       "@typescript-eslint/no-empty-object-type": "off", // 允许空对象类型
-      "@typescript-eslint/consistent-type-imports": [
-        "error",
-        { disallowTypeAnnotations: false, fixStyle: "inline-type-imports" },
-      ], // 统一类型导入风格
     },
   },
 
-  // TypeScript 声明文件的特殊配置
-  {
-    files: ["**/*.d.ts"],
-    rules: {
-      "eslint-comments/no-unlimited-disable": "off",
-      "unused-imports/no-unused-vars": "off",
-      "@typescript-eslint/ban-ts-comment": "off", // 允许使用 @ts-nocheck 注释
-    },
-  },
-
-  // JavaScript (commonjs) 配置
-  {
-    files: ["**/*.?([cm])js"],
-    rules: {
-      "@typescript-eslint/no-var-requires": "off", // 允许 require
-    },
-  },
-
-  // Vue 文件配置
+  // Vue 配置
   {
     files: ["**/*.vue"],
     languageOptions: {
       parser: parserVue,
       parserOptions: {
-        parser: "@typescript-eslint/parser",
+        parser: parserTypeScript,
         sourceType: "module",
       },
     },
-    plugins: {
-      vue: pluginVue,
-    },
+    plugins: { vue: pluginVue, "@typescript-eslint": pluginTypeScript },
     processor: pluginVue.processors[".vue"],
     rules: {
-      ...pluginVue.configs["vue3-recommended"].rules,
+      ...pluginVue.configs["vue3-recommended"].rules, // Vue 3 推荐规则
       "vue/no-v-html": "off", // 允许 v-html
-      "vue/require-default-prop": "off", // 允许没有默认值的 prop
-      "vue/multi-word-component-names": "off", // 关闭组件名称多词要求
-      "vue/html-self-closing": [
-        "error",
-        {
-          html: { void: "always", normal: "always", component: "always" },
-          svg: "always",
-          math: "always",
-        },
-      ], // 自闭合标签
+      "vue/multi-word-component-names": "off", // 允许单个单词组件名
     },
   },
 ];

From e865b33bd96e30f48710d631f11937948b266c4e Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 12:39:00 +0800
Subject: [PATCH 181/497] =?UTF-8?q?fix:=20:bug:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84emit=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/WangEditor/index.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index 883e23c5..bfb6577b 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -37,7 +37,7 @@ import { IToolbarConfig, IEditorConfig } from "@wangeditor-next/editor";
 import FileAPI from "@/api/file";
 
 // 上传图片回调函数类型
-type InsertFnType = (url: string, alt: string, href: string) => void;
+type InsertFnType = (_url: string, _alt: string, _href: string) => void;
 
 defineProps({
   height: {
@@ -45,9 +45,6 @@ defineProps({
     default: "500px",
   },
 });
-
-const emit = defineEmits(["update:modelValue"]);
-
 // 双向绑定
 const modelValue = defineModel("modelValue", {
   type: String,

From cd72290d06a877a4f197391583fa5533ea9e85ee Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 13:40:27 +0800
Subject: [PATCH 182/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md                                  | 32 +++++++++----------
 commitlint.config.cjs                         |  4 +--
 src/components/CURD/PageContent.vue           |  3 +-
 src/components/CURD/PageForm.vue              |  6 ++--
 src/components/CURD/PageModal.vue             |  8 ++---
 src/components/TableSelect/index.vue          |  6 ++--
 src/components/Upload/FileUpload.vue          |  8 +++--
 src/components/Upload/MultiImageUpload.vue    |  2 +-
 .../NavBar/components/NavbarRight.vue         |  8 ++---
 .../Sidebar/components/SidebarMenuItem.vue    |  4 +--
 src/layout/components/Sidebar/index.vue       | 10 +++---
 src/layout/components/TagsView/index.vue      | 24 +++++---------
 src/layout/index.vue                          | 27 ++++++++--------
 src/styles/reset.scss                         |  4 +--
 src/utils/request.ts                          | 24 +++++++-------
 src/views/codegen/index.vue                   |  3 +-
 src/views/dashboard/index.vue                 |  1 -
 src/views/error/404.vue                       |  2 +-
 src/views/profile/index.vue                   |  7 ++--
 src/views/system/config/index.vue             |  4 +--
 src/views/system/dept/index.vue               |  4 +--
 src/views/system/dict/data.vue                |  4 +--
 src/views/system/dict/index.vue               |  8 ++---
 src/views/system/log/index.vue                |  2 +-
 src/views/system/menu/index.vue               |  4 +--
 .../system/notice/components/MyNotice.vue     |  2 +-
 src/views/system/notice/index.vue             |  4 +--
 src/views/system/role/index.vue               |  6 ++--
 src/views/system/user/components/DeptTree.vue |  2 +-
 .../system/user/components/UserImport.vue     |  5 +--
 src/views/system/user/index.vue               |  5 ++-
 31 files changed, 113 insertions(+), 120 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fd2cef30..aef3f6da 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 
 ## ✨ feat
 
-- 支持后端文件导入([#142](https://github.com/youlaitech/vue3-element-admin/pull/142)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 支持后端文件导入([#142](https://github.com/youlaitech/vue3-element-admin/pull/142)) [@cshaptx4869](https://github.com/cshaptx4869)
 
 
 ## 🐛 fix
@@ -15,7 +15,7 @@
 
 ## ✨ feat
 
-- 操作栏增加render配置参数([#138](https://github.com/youlaitech/vue3-element-admin/pull/140)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 操作栏增加render配置参数([#138](https://github.com/youlaitech/vue3-element-admin/pull/140)) [@cshaptx4869](https://github.com/cshaptx4869)
 - 左侧工具栏增加type配置参数([#141](https://github.com/youlaitech/vue3-element-admin/pull/141)) [@diamont1001](https://github.com/diamont1001)
 
 ## ♻️ refactor
@@ -27,7 +27,7 @@
 
 ## ✨ feat
 
-- 支持默认工具栏的导入([#138](https://github.com/youlaitech/vue3-element-admin/pull/138)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 支持默认工具栏的导入([#138](https://github.com/youlaitech/vue3-element-admin/pull/138)) [@cshaptx4869](https://github.com/cshaptx4869)
 -  添加CURD导入示例([19e7bb](https://github.com/youlaitech/vue3-element-admin/commit/eab91effd6a01d5a3d9257249c8d06aa252b3bf8)) [@cshaptx4869](https://github.com/cshaptx4869)
 
 ## ♻️ refactor
@@ -40,13 +40,13 @@
 
 ## ✨ feat
 
-- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/131)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 支持表格远程筛选([#131](https://github.com/youlaitech/vue3-element-admin/pull/131)) [@cshaptx4869](https://github.com/cshaptx4869)
 - 支持标签输入框([#132](https://github.com/youlaitech/vue3-element-admin/pull/132)) [@cshaptx4869](https://github.com/cshaptx4869)
-- 表单项支持tips配置([#133](https://github.com/youlaitech/vue3-element-admin/pull/133)) [@cshaptx4869](https://github.com/cshaptx4869) 
-- 前端导出支持全量数据([#134](https://github.com/youlaitech/vue3-element-admin/pull/134)) [@cshaptx4869](https://github.com/cshaptx4869) 
-- 支持选中数据导出([#135](https://github.com/youlaitech/vue3-element-admin/pull/135)) [@cshaptx4869](https://github.com/cshaptx4869) 
-- 表格默认工具栏的导出、搜索按钮增加权限点控制([883128](https://github.com/youlaitech/vue3-element-admin/commit/8831289b655f2cc086ecdababaa89f8d8a087c42)) [@cshaptx4869](https://github.com/cshaptx4869) 
-- 页签title支持动态设置([23876a](https://github.com/youlaitech/vue3-element-admin/commit/23876aa396143bf77cb5c86af8d6023d9ff6555a)) [@haoxianrui](https://github.com/haoxianrui) 
+- 表单项支持tips配置([#133](https://github.com/youlaitech/vue3-element-admin/pull/133)) [@cshaptx4869](https://github.com/cshaptx4869)
+- 前端导出支持全量数据([#134](https://github.com/youlaitech/vue3-element-admin/pull/134)) [@cshaptx4869](https://github.com/cshaptx4869)
+- 支持选中数据导出([#135](https://github.com/youlaitech/vue3-element-admin/pull/135)) [@cshaptx4869](https://github.com/cshaptx4869)
+- 表格默认工具栏的导出、搜索按钮增加权限点控制([883128](https://github.com/youlaitech/vue3-element-admin/commit/8831289b655f2cc086ecdababaa89f8d8a087c42)) [@cshaptx4869](https://github.com/cshaptx4869)
+- 页签title支持动态设置([23876a](https://github.com/youlaitech/vue3-element-admin/commit/23876aa396143bf77cb5c86af8d6023d9ff6555a)) [@haoxianrui](https://github.com/haoxianrui)
 
 ## ♻️ refactor
 - 默认工具栏支持自定义([#136](https://github.com/youlaitech/vue3-element-admin/pull/136)) [@cshaptx4869](https://github.com/cshaptx4869)
@@ -59,9 +59,9 @@
 
 ## ✨ feat
 
-- 增加pagination、request、parseData配置参数([#119](https://github.com/youlaitech/vue3-element-admin/pull/119)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 增加pagination、request、parseData配置参数([#119](https://github.com/youlaitech/vue3-element-admin/pull/119)) [@cshaptx4869](https://github.com/cshaptx4869)
 - 增加返回顶部功能([#120](https://github.com/youlaitech/vue3-element-admin/pull/120)) [@cshaptx4869](https://github.com/cshaptx4869)
-- 支持前端导出([#126](https://github.com/youlaitech/vue3-element-admin/pull/126)) [@cshaptx4869](https://github.com/cshaptx4869) 
+- 支持前端导出([#126](https://github.com/youlaitech/vue3-element-admin/pull/126)) [@cshaptx4869](https://github.com/cshaptx4869)
 
 ## ♻️ refactor
 - 重构布局样式(解决页面抖动问题)([#116](https://github.com/youlaitech/vue3-element-admin/pull/116)) [@cshaptx4869](https://github.com/cshaptx4869)
@@ -174,7 +174,7 @@
 - 本地缓存的 token 变量重命名（author by [haoxianrui](https://github.com/haoxianrui)）
 - 完善 Vite 环境变量类型声明（author by [haoxianrui](https://github.com/haoxianrui)）
 
-## 🐛 fix 
+## 🐛 fix
 - 修复构建时提示iconComponent.name可能为undefined的报错 （author by [wangji1042](https://github.com/wangji1042)）
 - 修复浏览器密码自动填充时可能存在的报错 （author by [cshaptx4869](https://github.com/cshaptx4869)）
 - 修复eslint报错（author by [cshaptx4869](https://github.com/cshaptx4869)）
@@ -211,7 +211,7 @@
 ## ♻️ refactor
 - 项目配置按钮移入navbar（author by [cshaptx4869](https://github.com/cshaptx4869)）
 - 优化user数据定义（author by [cshaptx4869](https://github.com/cshaptx4869)）
-- 统一设置栏的 SVG 图标风格 
+- 统一设置栏的 SVG 图标风格
 
 ## 🐛 fix
 - 规整一些开发依赖（author by [cshaptx4869](https://github.com/cshaptx4869)）
@@ -241,7 +241,7 @@
 # 2.8.1 (2024/01/10)
 
 ## ✨ feat
-- 替换 Mock 解决方案 vite-plugin-mock 为 vite-plugin-mock-dev-server 适配 Vite5 
+- 替换 Mock 解决方案 vite-plugin-mock 为 vite-plugin-mock-dev-server 适配 Vite5
 
 # 2.8.0 (2023/12/27)
 
@@ -280,7 +280,7 @@
 ## ✨ feat
 - 菜单管理新增目录只有一级子路由是否始终显示(alwaysShow)和路由页面是否缓存(keepAlive)的配置
 - 接口文档新增 swagger、knife4j
-- 引入和支持 tsx 
+- 引入和支持 tsx
 
 ## ♻️ refactor
 - 代码瘦身，整理并删除未使用的 svg
@@ -329,7 +329,7 @@
 - 字典组件封装（author by [haoxr](https://juejin.cn/user/4187394044331261/posts)）
 
 ## 🐛 fix
-- 分页组件hidden无效 
+- 分页组件hidden无效
 - 签名无法保存至后端
 - Git 提交 stylelint 校验部分机器报错
 
diff --git a/commitlint.config.cjs b/commitlint.config.cjs
index 4ecb995f..5f556e2c 100644
--- a/commitlint.config.cjs
+++ b/commitlint.config.cjs
@@ -74,9 +74,7 @@ module.exports = {
     breaklineNumber: 100,
     breaklineChar: "|",
     skipQuestions: [],
-    issuePrefixes: [
-      { value: "closed", name: "closed:   ISSUES has been processed" },
-    ],
+    issuePrefixes: [{ value: "closed", name: "closed:   ISSUES has been processed" }],
     customIssuePrefixAlign: "top",
     emptyIssuePrefixAlias: "skip",
     customIssuePrefixAlias: "custom",
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 44f46bb4..a65e3c78 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -586,6 +586,7 @@ cols.value.forEach((item) => {
     fields.push(item.prop);
   }
 });
+
 const enum ExportsOriginEnum {
   CURRENT = "current",
   SELECTED = "selected",
@@ -950,7 +951,7 @@ function exportPageData(formData: IObject = {}) {
 }
 
 // 浏览器保存文件
-function saveXlsx(fileData: BlobPart, fileName: string) {
+function saveXlsx(fileData: any, fileName: string) {
   const fileType =
     "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8";
 
diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
index 199f4041..7fff077b 100644
--- a/src/components/CURD/PageForm.vue
+++ b/src/components/CURD/PageForm.vue
@@ -69,7 +69,7 @@
               <slot
                 :name="item.slotName ?? item.prop"
                 :prop="item.prop"
-                :formData="formData"
+                :form-data="formData"
                 :attrs="item.attrs"
               />
             </template>
@@ -137,11 +137,11 @@ function getFormData(key?: string) {
 // 设置表单值
 function setFormData(data: IObject) {
   for (const key in formData) {
-    if (formData.hasOwnProperty(key) && key in data) {
+    if (Object.prototype.hasOwnProperty.call(formData, key) && key in data) {
       formData[key] = data[key];
     }
   }
-  if (data?.hasOwnProperty(props.pk)) {
+  if (Object.prototype.hasOwnProperty.call(data, props.pk)) {
     formData[props.pk] = data[props.pk];
   }
 }
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index 87465d69..e2e3f2c7 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -90,7 +90,7 @@
                   <slot
                     :name="item.slotName ?? item.prop"
                     :prop="item.prop"
-                    :formData="formData"
+                    :form-data="formData"
                     :attrs="item.attrs"
                   />
                 </template>
@@ -208,7 +208,7 @@
                     <slot
                       :name="item.slotName ?? item.prop"
                       :prop="item.prop"
-                      :formData="formData"
+                      :form-data="formData"
                       :attrs="item.attrs"
                     />
                   </template>
@@ -294,11 +294,11 @@ function getFormData(key?: string) {
 // 设置表单值
 function setFormData(data: IObject) {
   for (const key in formData) {
-    if (formData.hasOwnProperty(key) && key in data) {
+    if (Object.prototype.hasOwnProperty.call(formData, key) && key in data) {
       formData[key] = data[key];
     }
   }
-  if (data?.hasOwnProperty(pk)) {
+  if (Object.prototype.hasOwnProperty.call(data, pk)) {
     formData[pk] = data[pk];
   }
 }
diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue
index 54fc7630..95fb808b 100644
--- a/src/components/TableSelect/index.vue
+++ b/src/components/TableSelect/index.vue
@@ -143,7 +143,7 @@
 
 <script lang="ts" setup>
 import { ref, reactive, computed } from "vue";
-import { onClickOutside, useResizeObserver } from "@vueuse/core";
+import { useResizeObserver } from "@vueuse/core";
 import type { FormInstance, PopoverProps, TableInstance } from "element-plus";
 
 // 对象类型
@@ -157,7 +157,7 @@ export interface ISelectConfig<T = any> {
   // popover组件属性
   popover?: Partial<Omit<PopoverProps, "visible" | "v-model:visible">>;
   // 列表的网络请求函数(需返回promise)
-  indexAction: (queryParams: T) => Promise<any>;
+  indexAction: (_queryParams: T) => Promise<any>;
   // 主键名(跨页选择必填,默认为id)
   pk?: string;
   // 多选
@@ -284,7 +284,7 @@ const selectedItems = ref<IObject[]>([]);
 const confirmText = computed(() => {
   return selectedItems.value.length > 0 ? `已选(${selectedItems.value.length})` : "确 定";
 });
-function handleSelect(selection: any[], row: any) {
+function handleSelect(selection: any[], _row: any) {
   if (isMultiple || selection.length === 0) {
     // 多选
     selectedItems.value = selection;
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 15cacd61..55b34b60 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -192,7 +192,11 @@ const handleSuccess = (fileInfo: FileInfo) => {
   modelValue.value = [...modelValue.value, fileInfo.url];
 };
 
-const handleError = (error: any) => {
+/**
+ * 上传失败
+ */
+const handleError = (_error: any) => {
+  console.error(_error);
   ElMessage.error("上传失败");
 };
 
@@ -223,8 +227,8 @@ function handleDownload(file: UploadUserFile) {
   color: var(--el-text-color-regular);
   cursor: pointer;
   opacity: 0.75;
-  transition: opacity var(--el-transition-duration);
   transform: translateY(-50%);
+  transition: opacity var(--el-transition-duration);
 }
 
 :deep(.el-upload-list) {
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index 6dc39b32..a66b94c0 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -169,7 +169,7 @@ function handleUpload(options: UploadRequestOptions) {
 /**
  * 上传文件超出限制
  */
-function handleExceed(files: File[], uploadFiles: UploadUserFile[]) {
+function handleExceed() {
   ElMessage.warning("最多只能上传" + props.limit + "张图片");
 }
 
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 9ff86ea0..b5693a96 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -67,12 +67,12 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
   margin: 10px 0;
 }
 
-.dark .navbar__right > *:hover {
-  background: rgb(255 255 255 / 20%);
-}
-
 .layout-top .navbar__right > *,
 .layout-mix .navbar__right > * {
   color: #fff;
 }
+
+.dark .navbar__right > *:hover {
+  color: #ccc;
+}
 </style>
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 329a9b8f..b9b935df 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -149,10 +149,10 @@ function resolvePath(routePath: string) {
 
     & > span {
       display: inline-block;
+      visibility: hidden;
       width: 0;
       height: 0;
       overflow: hidden;
-      visibility: hidden;
     }
   }
 
@@ -178,10 +178,10 @@ function resolvePath(routePath: string) {
     .el-sub-menu {
       & > .el-sub-menu__title > span {
         display: inline-block;
+        visibility: hidden;
         width: 0;
         height: 0;
         overflow: hidden;
-        visibility: hidden;
       }
     }
   }
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 02073c66..0d0108ac 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
-    <!-- 混合 -->
-    <div v-if="isMixLayout" class="flex w-full">
+    <!-- 混合布局 -->
+    <div v-if="layout == LayoutEnum.MIX" class="flex w-full">
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
       <NavbarRight />
     </div>
 
-    <!-- 顶部 || 左侧 -->
+    <!-- 顶部布局 || 左侧布局 -->
     <template v-else>
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <el-scrollbar>
@@ -15,7 +15,7 @@
       </el-scrollbar>
 
       <!-- 顶部导航 -->
-      <NavbarRight v-if="isTopLayout" />
+      <NavbarRight v-if="layout == LayoutEnum.TOP" />
     </template>
   </div>
 </template>
@@ -33,8 +33,6 @@ const permissionStore = usePermissionStore();
 const sidebarLogo = computed(() => settingsStore.sidebarLogo);
 const layout = computed(() => settingsStore.layout);
 
-const isMixLayout = computed(() => layout.value === LayoutEnum.MIX);
-const isTopLayout = computed(() => layout.value === LayoutEnum.TOP);
 const isSidebarCollapsed = computed(() => !appStore.sidebar.opened);
 </script>
 
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index b672db25..38947e3c 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -187,25 +187,17 @@ function isAffix(tag: TagView) {
 }
 
 function isFirstView() {
-  try {
-    return (
-      selectedTag.value.path === "/dashboard" ||
-      selectedTag.value.fullPath === tagsViewStore.visitedViews[1].fullPath
-    );
-  } catch (err) {
-    return false;
-  }
+  return (
+    selectedTag.value.path === "/dashboard" ||
+    selectedTag.value.fullPath === tagsViewStore.visitedViews[1]?.fullPath
+  );
 }
 
 function isLastView() {
-  try {
-    return (
-      selectedTag.value.fullPath ===
-      tagsViewStore.visitedViews[tagsViewStore.visitedViews.length - 1].fullPath
-    );
-  } catch (err) {
-    return false;
-  }
+  return (
+    selectedTag.value.fullPath ===
+    tagsViewStore.visitedViews[tagsViewStore.visitedViews.length - 1]?.fullPath
+  );
 }
 
 function refreshSelectedTag(view: TagView) {
diff --git a/src/layout/index.vue b/src/layout/index.vue
index a75570c1..1f709c5a 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -21,8 +21,8 @@
         </div>
       </div>
 
-      <div :class="{ hasTagsView: showTagsView }" class="main-container">
-        <TagsView v-if="showTagsView" />
+      <div :class="{ hasTagsView: isShowTagsView }" class="main-container">
+        <TagsView v-if="isShowTagsView" />
         <AppMain />
         <Settings v-if="defaultSettings.showSettings" />
         <!-- 返回顶部 -->
@@ -33,9 +33,9 @@
     </div>
 
     <!-- 左侧和顶部布局 -->
-    <div v-else :class="{ hasTagsView: showTagsView }" class="main-container">
+    <div v-else :class="{ hasTagsView: isShowTagsView }" class="main-container">
       <NavBar v-if="layout === LayoutEnum.LEFT" />
-      <TagsView v-if="showTagsView" />
+      <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
       <!-- 返回顶部 -->
@@ -62,7 +62,7 @@ const width = useWindowSize().width;
 const WIDTH_DESKTOP = 992; // 响应式布局容器固定宽度  大屏（>=1200px） 中屏（>=992px） 小屏（>=768px）
 const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
 const isOpenSidebar = computed(() => appStore.sidebar.opened);
-const showTagsView = computed(() => settingsStore.tagsView); // 是否显示tagsView
+const isShowTagsView = computed(() => settingsStore.tagsView); // 是否显示tagsView
 const layout = computed(() => settingsStore.layout); // 布局模式 left top mix
 const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活path
 const mixedLayoutLeftRoutes = computed(() => permissionStore.mixedLayoutLeftRoutes); // 混合布局左侧菜单
@@ -245,8 +245,10 @@ watch(route, () => {
 }
 
 .hideSidebar {
-  .main-container {
-    margin-left: $sidebar-width-collapsed;
+  &.layout-left {
+    .main-container {
+      margin-left: $sidebar-width-collapsed;
+    }
   }
 
   &.layout-top {
@@ -280,7 +282,7 @@ watch(route, () => {
   &.mobile {
     .sidebar-container {
       pointer-events: none;
-      transform: translate3d(-210px, 0, 0);
+      transform: translate3d(-$sidebar-width, 0, 0);
       transition-duration: 0.3s;
     }
 
@@ -291,13 +293,10 @@ watch(route, () => {
 }
 
 .mobile {
-  .main-container {
+  .layout-mix,
+  .layout-top,
+  .layout-left {
     margin-left: 0;
   }
-
-  &.layout-top {
-    // 顶部模式全局变量修改
-    --el-menu-item-height: $navbar-height;
-  }
 }
 </style>
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index a20f04a5..56689def 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -25,8 +25,8 @@ body {
   width: 100%;
   height: 100%;
   margin: 0;
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB",
-    "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei",
+    "微软雅黑", Arial, sans-serif;
   line-height: inherit;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 1a8211dc..fb797d30 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -44,7 +44,8 @@ service.interceptors.response.use(
     ElMessage.error(msg || "系统出错");
     return Promise.reject(new Error(msg || "Error"));
   },
-  async (error: any) => {
+  async (error) => {
+    console.error("request error", error); // for debug
     // 非 2xx 状态码处理 401、403、500 等
     const { config, response } = error;
     if (response) {
@@ -64,20 +65,21 @@ service.interceptors.response.use(
 
 export default service;
 
-// 刷新 Token 的锁
+// 是否正在刷新标识，避免重复刷新
 let isRefreshing = false;
-// 因 Token 过期导致失败的请求队列
-let requestsQueue: Array<() => void> = [];
+// 因 Token 过期导致的请求等待队列
+const waitingQueue: Array<() => void> = [];
 
 // 刷新 Token 处理
 async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
   return new Promise((resolve) => {
-    const requestCallback = () => {
+    // 封装需要重试的请求
+    const retryRequest = () => {
       config.headers.Authorization = getToken();
       resolve(service(config));
     };
 
-    requestsQueue.push(requestCallback);
+    waitingQueue.push(retryRequest);
 
     if (!isRefreshing) {
       isRefreshing = true;
@@ -86,13 +88,13 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
       useUserStoreHook()
         .refreshToken()
         .then(() => {
-          // Token 刷新成功，执行请求队列
-          requestsQueue.forEach((callback) => callback());
-          requestsQueue = [];
+          // 依次重试队列中所有请求, 重试后清空队列
+          waitingQueue.forEach((callback) => callback());
+          waitingQueue.length = 0;
         })
-        .catch((error) => {
+        .catch((error: any) => {
           console.log("handleTokenRefresh error", error);
-          // Token 刷新失败，清除用户数据并跳转到登录
+          // 刷新 Token 失败，跳转登录页
           ElNotification({
             title: "提示",
             message: "您的会话已过期，请重新登录",
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index d961912f..66809295 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -437,7 +437,7 @@ interface TreeNode {
 }
 const treeData = ref<TreeNode[]>([]);
 
-const queryFormRef = ref(ElForm);
+const queryFormRef = ref();
 const queryParams = reactive<TablePageQuery>({
   pageNum: 1,
   pageSize: 10,
@@ -535,7 +535,6 @@ const initSort = () => {
     ghostClass: "sortable-ghost", //拖拽样式
     handle: ".sortable-handle", //拖拽区域
     easing: "cubic-bezier(1, 0, 0, 1)",
-    onStart: (item: any) => {},
 
     // 结束拖动事件
     onEnd: (item: any) => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 1915f2c5..f2621f78 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -236,7 +236,6 @@ defineOptions({
   name: "Dashboard",
   inheritAttrs: false,
 });
-
 import VisitTrend from "./components/visit-trend.vue";
 
 import router from "@/router";
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index 005c09eb..efd7e393 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -89,8 +89,8 @@ function back() {
     }
 
     &__return-home {
-      display: block;
       float: left;
+      display: block;
       width: 110px;
       height: 36px;
       font-size: 14px;
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 3af1cd20..68b4e7c5 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -268,7 +268,7 @@ import { Camera } from "@element-plus/icons-vue";
 
 const userProfile = ref<UserProfileVO>({});
 
-enum DialogType {
+const enum DialogType {
   ACCOUNT = "account",
   PASSWORD = "password",
   MOBILE = "mobile",
@@ -287,10 +287,10 @@ const mobileUpdateForm = reactive<MobileUpdateForm>({});
 const emailUpdateForm = reactive<EmailUpdateForm>({});
 
 const mobileCountdown = ref(0);
-const mobileTimer = ref<NodeJS.Timeout | null>(null);
+const mobileTimer = ref();
 
 const emailCountdown = ref(0);
-const emailTimer = ref<NodeJS.Timeout | null>(null);
+const emailTimer = ref();
 
 // 修改密码校验规则
 const passwordChangeRules = {
@@ -466,6 +466,7 @@ const handleFileChange = async (event: Event) => {
         avatar: data.url,
       });
     } catch (error) {
+      console.error("头像上传失败：" + error);
       ElMessage.error("头像上传失败");
     }
   }
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 0955806f..034efa23 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -137,8 +137,8 @@ defineOptions({
 
 import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
 
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
+const queryFormRef = ref();
+const dataFormRef = ref();
 
 const loading = ref(false);
 const selectIds = ref<number[]>([]);
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 9ecc354a..45a39a2d 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -160,8 +160,8 @@ defineOptions({
 
 import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/system/dept";
 
-const queryFormRef = ref(ElForm);
-const deptFormRef = ref(ElForm);
+const queryFormRef = ref();
+const deptFormRef = ref();
 
 const loading = ref(false);
 const selectIds = ref<number[]>([]);
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index 2f7a3c65..e8cf6253 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -144,8 +144,8 @@ const route = useRoute();
 
 const dictCode = ref(route.query.dictCode as string);
 
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
+const queryFormRef = ref();
+const dataFormRef = ref();
 
 const loading = ref(false);
 const ids = ref<number[]>([]);
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 32517f01..39260418 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -57,7 +57,7 @@
               link
               size="small"
               icon="edit"
-              @click.stop="handleEditClick(scope.row.id, scope.row.name)"
+              @click.stop="handleEditClick(scope.row.id)"
             >
               编辑
             </el-button>
@@ -133,8 +133,8 @@ import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict"
 
 import router from "@/router";
 
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
+const queryFormRef = ref();
+const dataFormRef = ref();
 
 const loading = ref(false);
 const ids = ref<number[]>([]);
@@ -198,7 +198,7 @@ function handleAddClick() {
  *
  * @param id 字典ID
  */
-function handleEditClick(id: number, name: string) {
+function handleEditClick(id: number) {
   dialog.visible = true;
   dialog.title = "修改字典";
   DictAPI.getFormData(id).then((data) => {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 13cca4ef..f0b8367c 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -62,7 +62,7 @@ defineOptions({
 
 import LogAPI, { LogPageVO, LogPageQuery } from "@/api/system/log";
 
-const queryFormRef = ref(ElForm);
+const queryFormRef = ref();
 
 const loading = ref(false);
 const total = ref(0);
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 60cd0854..23bab330 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -338,8 +338,8 @@ defineOptions({
 import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu";
 import { MenuTypeEnum } from "@/enums/MenuTypeEnum";
 
-const queryFormRef = ref(ElForm);
-const menuFormRef = ref(ElForm);
+const queryFormRef = ref();
+const menuFormRef = ref();
 
 const loading = ref(false);
 const dialog = reactive({
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index 9aa09bec..e8900b30 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -87,7 +87,7 @@ defineOptions({
 
 import NoticeAPI, { NoticePageVO, NoticePageQuery } from "@/api/system/notice";
 
-const queryFormRef = ref(ElForm);
+const queryFormRef = ref();
 const noticeDetailRef = ref();
 
 const pageData = ref<NoticePageVO[]>([]);
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index eb40926d..b6980f00 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -223,8 +223,8 @@ defineOptions({
 import NoticeAPI, { NoticePageVO, NoticeForm, NoticePageQuery } from "@/api/system/notice";
 import UserAPI from "@/api/system/user";
 
-const queryFormRef = ref(ElForm);
-const dataFormRef = ref(ElForm);
+const queryFormRef = ref();
+const dataFormRef = ref();
 const noticeDetailRef = ref();
 
 const loading = ref(false);
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 3f279355..4730579c 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -211,9 +211,9 @@ defineOptions({
 import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role";
 import MenuAPI from "@/api/system/menu";
 
-const queryFormRef = ref(ElForm);
-const roleFormRef = ref(ElForm);
-const permTreeRef = ref<InstanceType<typeof ElTree>>();
+const queryFormRef = ref();
+const roleFormRef = ref();
+const permTreeRef = ref();
 
 const loading = ref(false);
 const ids = ref<number[]>([]);
diff --git a/src/views/system/user/components/DeptTree.vue b/src/views/system/user/components/DeptTree.vue
index 9558f36e..5fcfe452 100644
--- a/src/views/system/user/components/DeptTree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -30,7 +30,7 @@ const props = defineProps({
 });
 
 const deptList = ref<OptionType[]>(); // 部门列表
-const deptTreeRef = ref(ElTree); // 部门树
+const deptTreeRef = ref(); // 部门树
 const deptName = ref(); // 部门名称
 
 const emits = defineEmits(["node-click"]);
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 573bdca6..923bc384 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -175,8 +175,9 @@ const handleUpload = async () => {
       invalidCount.value = result.invalidCount;
       validCount.value = result.validCount;
     }
-  } catch (error) {
-    ElMessage.error("上传失败");
+  } catch (error: any) {
+    console.error(error);
+    ElMessage.error("上传失败：" + error);
   }
 };
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f25996bb..7e651331 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -249,9 +249,8 @@ defineOptions({
   name: "User",
   inheritAttrs: false,
 });
-
-const queryFormRef = ref(ElForm);
-const userFormRef = ref(ElForm);
+const queryFormRef = ref();
+const userFormRef = ref();
 
 const queryParams = reactive<UserPageQuery>({
   pageNum: 1,

From 6b279a272a4b21a6cdc626a35b189776ae3f8148 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 13:50:10 +0800
Subject: [PATCH 183/497] =?UTF-8?q?chore:=20:hammer:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=20eslint=20=E5=92=8C=20=20stylelint=20=E7=9A=84=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index e5e3a490..dd30df77 100644
--- a/package.json
+++ b/package.json
@@ -9,9 +9,9 @@
     "preview": "vite preview",
     "build-only": "vite build",
     "type-check": "vue-tsc --noEmit",
-    "lint:eslint": "eslint --fix ./src",
-    "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,tsx,css,less,scss,vue,html,md}\"",
-    "lint:stylelint": "stylelint  \"**/*.{css,scss,vue}\" --fix",
+    "lint:eslint": "eslint --cache \"src/**/*.{vue,ts}\" --fix",
+    "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,css,scss,vue,html,md}\"",
+    "lint:stylelint": "stylelint --cache \"**/*.{css,scss,vue}\" --fix",
     "lint:lint-staged": "lint-staged",
     "preinstall": "npx only-allow pnpm",
     "prepare": "husky",
@@ -100,9 +100,10 @@
     "stylelint": "^16.14.1",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
+    "stylelint-config-recommended": "^15.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.6.0",
-    "stylelint-config-standard": "^37.0.0",
+    "stylelint-prettier": "^5.0.3",
     "terser": "^5.38.0",
     "typescript": "^5.7.3",
     "typescript-eslint": "^8.23.0",

From f5dbff0d9e3d5b9e8db6d0b576f7ebdcd6740fc2 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 17:19:31 +0800
Subject: [PATCH 184/497] =?UTF-8?q?refactor:=20:recycle:=20eCharts=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=BA=E6=8C=89=E9=9C=80=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=98=A6=E8=BA=AB=E6=89=93=E5=8C=85=E4=BD=93?=
 =?UTF-8?q?=E7=A7=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ECharts/index.vue              |  76 +++++++
 src/types/components.d.ts                     |   1 +
 .../dashboard/components/visit-trend.vue      | 199 ------------------
 src/views/dashboard/index.vue                 | 198 ++++++++++++++---
 4 files changed, 247 insertions(+), 227 deletions(-)
 create mode 100644 src/components/ECharts/index.vue
 delete mode 100644 src/views/dashboard/components/visit-trend.vue

diff --git a/src/components/ECharts/index.vue b/src/components/ECharts/index.vue
new file mode 100644
index 00000000..f4afa719
--- /dev/null
+++ b/src/components/ECharts/index.vue
@@ -0,0 +1,76 @@
+<!--
+ * 基于 ECharts 的 Vue3 图表组件
+ * 版权所有 © 2021-present 有来开源组织
+ *
+ * 开源协议：https://opensource.org/licenses/MIT
+ * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
+ *
+ * 在使用时，请保留此注释，感谢您对开源的支持！
+ -->
+
+<template>
+  <div ref="chartRef" :style="{ width, height }"></div>
+</template>
+
+<script setup lang="ts">
+import * as echarts from "echarts/core";
+import { CanvasRenderer } from "echarts/renderers";
+import { BarChart, LineChart, PieChart } from "echarts/charts";
+import { GridComponent, TooltipComponent, LegendComponent } from "echarts/components";
+
+import { useResizeObserver } from "@vueuse/core";
+
+// 按需注册组件
+echarts.use([
+  CanvasRenderer,
+  BarChart,
+  LineChart,
+  PieChart,
+  GridComponent,
+  TooltipComponent,
+  LegendComponent,
+]);
+
+const props = defineProps<{
+  options: echarts.EChartsCoreOption;
+  width?: string;
+  height?: string;
+}>();
+
+const chartRef = ref<HTMLDivElement | null>(null);
+let chartInstance: echarts.ECharts | null = null;
+
+// 初始化图表
+const initChart = () => {
+  if (chartRef.value) {
+    chartInstance = echarts.init(chartRef.value);
+    if (props.options) {
+      chartInstance.setOption(props.options);
+    }
+  }
+};
+
+// 监听尺寸变化，自动调整
+useResizeObserver(chartRef, () => {
+  chartInstance?.resize();
+});
+
+// 监听 options 变化，更新图表
+watch(
+  () => props.options,
+  (newOptions) => {
+    if (chartInstance && newOptions) {
+      chartInstance.setOption(newOptions);
+    }
+  },
+  { deep: true }
+);
+
+onMounted(() => {
+  nextTick(() => initChart());
+});
+
+onBeforeUnmount(() => {
+  chartInstance?.dispose();
+});
+</script>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index a0d61654..d9ef9c47 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -13,6 +13,7 @@ declare module "vue" {
     CURD: (typeof import("./../components/CURD/index.vue"))["default"];
     Dict: (typeof import("./../components/Dict/index.vue"))["default"];
     DictLabel: (typeof import("./../components/Dict/DictLabel.vue"))["default"];
+    ECharts: (typeof import("./../components/ECharts/index.vue"))["default"];
     ElBacktop: (typeof import("element-plus/es"))["ElBacktop"];
     ElBreadcrumb: (typeof import("element-plus/es"))["ElBreadcrumb"];
     ElBreadcrumbItem: (typeof import("element-plus/es"))["ElBreadcrumbItem"];
diff --git a/src/views/dashboard/components/visit-trend.vue b/src/views/dashboard/components/visit-trend.vue
deleted file mode 100644
index b2ac7bad..00000000
--- a/src/views/dashboard/components/visit-trend.vue
+++ /dev/null
@@ -1,199 +0,0 @@
-<!--  线 + 柱混合图 -->
-<template>
-  <el-card>
-    <template #header>
-      <div class="flex-x-between">
-        <div class="flex-y-center">
-          访问趋势
-          <el-tooltip effect="dark" content="点击试试下载" placement="bottom">
-            <el-icon
-              class="cursor-pointer hover:color-#4080FF ml-1"
-              name="el-icon-download"
-              @click="handleDownloadChart"
-            >
-              <Download />
-            </el-icon>
-          </el-tooltip>
-        </div>
-
-        <el-radio-group v-model="recentDaysRange" size="small" @change="handleDateRangeChange">
-          <el-radio-button label="近7天" :value="7" />
-          <el-radio-button label="近30天" :value="30" />
-        </el-radio-group>
-      </div>
-    </template>
-
-    <div :id="id" :style="{ height, width }" />
-  </el-card>
-</template>
-
-<script setup lang="ts">
-import * as echarts from "echarts";
-import LogAPI, { VisitTrendVO } from "@/api/system/log";
-import { dayjs } from "element-plus";
-
-const props = defineProps({
-  id: {
-    type: String,
-    default: "VisitTrend",
-  },
-  width: {
-    type: String,
-    default: "100%",
-  },
-  height: {
-    type: String,
-    default: "500px",
-  },
-});
-
-// 日期范围
-const recentDaysRange = ref(7);
-// 图表对象
-const chart: Ref<echarts.ECharts | null> = ref(null);
-
-// 图表配置
-const setChartOptions = (data: VisitTrendVO) => {
-  if (!chart.value) {
-    return;
-  }
-
-  const options = {
-    tooltip: {
-      trigger: "axis",
-    },
-    legend: {
-      data: ["浏览量(PV)", "访客数(UV)"],
-      bottom: 0,
-    },
-    grid: {
-      left: "1%",
-      right: "5%",
-      bottom: "10%",
-      containLabel: true,
-    },
-    xAxis: {
-      type: "category",
-      data: data.dates,
-    },
-    yAxis: {
-      type: "value",
-      splitLine: {
-        show: true,
-        lineStyle: {
-          type: "dashed",
-        },
-      },
-    },
-    series: [
-      {
-        name: "浏览量(PV)",
-        type: "line",
-        data: data.pvList,
-        areaStyle: {
-          color: "rgba(64, 158, 255, 0.1)",
-        },
-        smooth: true,
-        itemStyle: {
-          color: "#4080FF",
-        },
-        lineStyle: {
-          color: "#4080FF",
-        },
-      },
-      {
-        name: "访客数(UV)",
-        type: "line",
-        data: data.ipList,
-        areaStyle: {
-          color: "rgba(103, 194, 58, 0.1)",
-        },
-        smooth: true,
-        itemStyle: {
-          color: "#67C23A",
-        },
-        lineStyle: {
-          color: "#67C23A",
-        },
-      },
-    ],
-  };
-
-  chart.value.setOption(options);
-};
-
-// 加载数据
-const loadData = () => {
-  const endDate = new Date();
-  const startDate = dayjs()
-    .subtract(recentDaysRange.value - 1, "day")
-    .toDate();
-
-  const visitTrendQuery = {
-    startDate: dayjs(startDate).format("YYYY-MM-DD"),
-    endDate: dayjs(endDate).format("YYYY-MM-DD"),
-  };
-
-  LogAPI.getVisitTrend(visitTrendQuery).then((data) => {
-    setChartOptions(data);
-  });
-};
-
-// 日期范围变化
-const handleDateRangeChange = () => {
-  loadData();
-};
-
-// 下载图表
-const handleDownloadChart = () => {
-  if (!chart.value) {
-    return;
-  }
-
-  // 获取画布图表地址信息
-  const img = new Image();
-  img.src = chart.value.getDataURL({
-    type: "png",
-    pixelRatio: 1,
-    backgroundColor: "#fff",
-  });
-  // 当图片加载完成后，生成 URL 并下载
-  img.onload = () => {
-    const canvas = document.createElement("canvas");
-    canvas.width = img.width;
-    canvas.height = img.height;
-    const ctx = canvas.getContext("2d");
-    if (ctx) {
-      ctx.drawImage(img, 0, 0, img.width, img.height);
-      const link = document.createElement("a");
-      link.download = "访问趋势.png";
-      link.href = canvas.toDataURL("image/png", 0.9);
-      document.body.appendChild(link);
-      link.click();
-      link.remove();
-    }
-  };
-};
-
-// 窗口大小变化时，重置图表大小
-const handleResize = () => {
-  setTimeout(() => {
-    if (chart.value) {
-      chart.value.resize();
-    }
-  }, 100);
-};
-
-// 初始化图表
-onMounted(() => {
-  chart.value = markRaw(echarts.init(document.getElementById(props.id) as HTMLDivElement));
-  loadData();
-  // 监听窗口大小变化
-  window.addEventListener("resize", handleResize);
-});
-
-onActivated(() => {
-  handleResize();
-});
-</script>
-<style lang="scss" scoped></style>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index f2621f78..f784e3e2 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -8,7 +8,7 @@
         <el-col :span="18" :xs="24">
           <div class="flex-x-start">
             <img
-              class="wh-80px rounded-full"
+              class="w80px h80px rounded-full"
               :src="http://github.com/userStore.userInfo.avatar%20+'?imageView2/1/w/80/h/80'"
             />
             <div class="ml-5">
@@ -116,7 +116,11 @@
                 <div class="flex-y-center">
                   <span class="text-lg">{{ visitStatsData.todayUvCount }}</span>
                   <span
-                    :class="['text-xs', 'ml-2', getGrowthRateClass(visitStatsData.uvGrowthRate)]"
+                    :class="[
+                      'text-xs',
+                      'ml-2',
+                      computeGrowthRateClass(visitStatsData.uvGrowthRate),
+                    ]"
                   >
                     <el-icon>
                       <Top v-if="visitStatsData.uvGrowthRate > 0" />
@@ -172,7 +176,11 @@
                 <div class="flex-y-center">
                   <span class="text-lg">{{ visitStatsData.todayPvCount }}</span>
                   <span
-                    :class="['text-xs', 'ml-2', getGrowthRateClass(visitStatsData.pvGrowthRate)]"
+                    :class="[
+                      'text-xs',
+                      'ml-2',
+                      computeGrowthRateClass(visitStatsData.pvGrowthRate),
+                    ]"
                   >
                     <el-icon>
                       <Top v-if="visitStatsData.pvGrowthRate > 0" />
@@ -197,7 +205,18 @@
     <el-row :gutter="10" class="mt-5">
       <!-- 访问趋势统计图 -->
       <el-col :xs="24" :span="16">
-        <VisitTrend id="VisitTrend" height="400px" />
+        <el-card>
+          <template #header>
+            <div class="flex-x-between">
+              <span>访问趋势</span>
+              <el-radio-group v-model="visitTrendDateRange" size="small">
+                <el-radio-button label="近7天" :value="7" />
+                <el-radio-button label="近30天" :value="30" />
+              </el-radio-group>
+            </div>
+          </template>
+          <ECharts :options="visitTrendChartOptions" height="400px" />
+        </el-card>
       </el-col>
       <!-- 通知公告 -->
       <el-col :xs="24" :span="8">
@@ -206,7 +225,7 @@
             <div class="flex-x-between">
               <div class="flex-y-center">通知公告</div>
               <el-link type="primary">
-                <span class="text-xs" @click="handleViewMoreNotice">查看更多</span>
+                <span class="text-xs" @click="navigateToNoticePage">查看更多</span>
                 <el-icon class="text-xs"><ArrowRight /></el-icon>
               </el-link>
             </div>
@@ -218,7 +237,7 @@
               <el-text truncated class="!mx-2 flex-1 !text-xs !text-gray">
                 {{ item.title }}
               </el-text>
-              <el-link @click="handleOpenNoticeDetail(item.id)">
+              <el-link @click="openNoticeDetail(item.id)">
                 <el-icon class="text-sm"><View /></el-icon>
               </el-link>
             </div>
@@ -236,38 +255,44 @@ defineOptions({
   name: "Dashboard",
   inheritAttrs: false,
 });
-import VisitTrend from "./components/visit-trend.vue";
 
+import { dayjs } from "element-plus";
 import router from "@/router";
-
-import LogAPI, { VisitStatsVO } from "@/api/system/log";
+import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log";
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
-
 import { useUserStore } from "@/store/modules/user";
 import { formatGrowthRate } from "@/utils";
 
+const userStore = useUserStore();
+
 const noticeDetailRef = ref();
 
+// 当前通知公告列表
 const notices = ref<NoticePageVO[]>([]);
 
-const userStore = useUserStore();
-const date: Date = new Date();
+// 当前时间（用于计算问候语）
+const currentDate = new Date();
+
+// 问候语：根据当前小时返回不同问候语
 const greetings = computed(() => {
-  const hours = date.getHours();
+  const hours = currentDate.getHours();
+  const nickname = userStore.userInfo.nickname;
   if (hours >= 6 && hours < 8) {
     return "晨起披衣出草堂，轩窗已自喜微凉🌅！";
   } else if (hours >= 8 && hours < 12) {
-    return "上午好，" + userStore.userInfo.nickname + "！";
+    return `上午好，${nickname}！`;
   } else if (hours >= 12 && hours < 18) {
-    return "下午好，" + userStore.userInfo.nickname + "！";
+    return `下午好，${nickname}！`;
   } else if (hours >= 18 && hours < 24) {
-    return "晚上好，" + userStore.userInfo.nickname + "！";
+    return `晚上好，${nickname}！`;
   } else {
     return "偷偷向银河要了一把碎星，只等你闭上眼睛撒入你的梦中，晚安🌛！";
   }
 });
 
+// 访客统计数据加载状态
 const visitStatsLoading = ref(true);
+// 访客统计数据
 const visitStatsData = ref<VisitStatsVO>({
   todayUvCount: 0,
   uvGrowthRate: 0,
@@ -277,8 +302,15 @@ const visitStatsData = ref<VisitStatsVO>({
   totalPvCount: 0,
 });
 
-// 加载访问统计数据
-const loadVisitStatsData = async () => {
+// 访问趋势日期范围（单位：天）
+const visitTrendDateRange = ref(7);
+// 访问趋势图表配置
+const visitTrendChartOptions = ref();
+
+/**
+ * 获取访客统计数据
+ */
+const fetchVisitStatsData = () => {
   LogAPI.getVisitStats()
     .then((data) => {
       visitStatsData.value = data;
@@ -288,12 +320,102 @@ const loadVisitStatsData = async () => {
     });
 };
 
-// 根据增长率获取样式
-const getGrowthRateClass = (growthRate?: number): string => {
+/**
+ * 获取访问趋势数据，并更新图表配置
+ */
+const fetchVisitTrendData = () => {
+  const startDate = dayjs()
+    .subtract(visitTrendDateRange.value - 1, "day")
+    .toDate();
+  const endDate = new Date();
+
+  LogAPI.getVisitTrend({
+    startDate: dayjs(startDate).format("YYYY-MM-DD"),
+    endDate: dayjs(endDate).format("YYYY-MM-DD"),
+  }).then((data) => {
+    updateVisitTrendChartOptions(data);
+  });
+};
+
+/**
+ * 更新访问趋势图表的配置项
+ *
+ * @param data - 访问趋势数据
+ */
+const updateVisitTrendChartOptions = (data: VisitTrendVO) => {
+  console.log("Updating visit trend chart options");
+
+  visitTrendChartOptions.value = {
+    tooltip: {
+      trigger: "axis",
+    },
+    legend: {
+      data: ["浏览量(PV)", "访客数(UV)"],
+      bottom: 0,
+    },
+    grid: {
+      left: "1%",
+      right: "5%",
+      bottom: "10%",
+      containLabel: true,
+    },
+    xAxis: {
+      type: "category",
+      data: data.dates,
+    },
+    yAxis: {
+      type: "value",
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: "dashed",
+        },
+      },
+    },
+    series: [
+      {
+        name: "浏览量(PV)",
+        type: "line",
+        data: data.pvList,
+        areaStyle: {
+          color: "rgba(64, 158, 255, 0.1)",
+        },
+        smooth: true,
+        itemStyle: {
+          color: "#4080FF",
+        },
+        lineStyle: {
+          color: "#4080FF",
+        },
+      },
+      {
+        name: "访客数(UV)",
+        type: "line",
+        data: data.ipList,
+        areaStyle: {
+          color: "rgba(103, 194, 58, 0.1)",
+        },
+        smooth: true,
+        itemStyle: {
+          color: "#67C23A",
+        },
+        lineStyle: {
+          color: "#67C23A",
+        },
+      },
+    ],
+  };
+};
+
+/**
+ * 根据增长率计算对应的 CSS 类名
+ *
+ * @param growthRate - 增长率数值
+ */
+const computeGrowthRateClass = (growthRate?: number): string => {
   if (!growthRate) {
     return "color-[--el-color-info]";
   }
-
   if (growthRate > 0) {
     return "color-[--el-color-danger]";
   } else if (growthRate < 0) {
@@ -303,25 +425,45 @@ const getGrowthRateClass = (growthRate?: number): string => {
   }
 };
 
-const loadMyNotice = () => {
+/**
+ * 获取当前用户的通知公告数据
+ */
+const fetchMyNotices = () => {
   NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 10 }).then((data) => {
     notices.value = data.list;
   });
 };
 
-// 查看更多
-function handleViewMoreNotice() {
+/**
+ * 跳转至通知公告详情页面（查看更多通知）
+ */
+function navigateToNoticePage() {
   router.push({ path: "/myNotice" });
 }
 
-// 打开通知公告
-function handleOpenNoticeDetail(id: string) {
+/**
+ * 打开指定通知详情
+ *
+ * @param id - 通知 ID
+ */
+function openNoticeDetail(id: string) {
   noticeDetailRef.value.openNotice(id);
 }
 
+// 监听访问趋势日期范围的变化，重新获取趋势数据
+watch(
+  () => visitTrendDateRange.value,
+  (newVal) => {
+    console.log("Visit trend date range changed:", newVal);
+    fetchVisitTrendData();
+  },
+  { immediate: true }
+);
+
+// 组件挂载后加载访客统计数据和通知公告数据
 onMounted(() => {
-  loadVisitStatsData();
-  loadMyNotice();
+  fetchVisitStatsData();
+  fetchMyNotices();
 });
 </script>
 

From 94c815eb58680375ea9b4cd9b90c6289372bd8bd Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 17:22:08 +0800
Subject: [PATCH 185/497] =?UTF-8?q?style:=20:lipstick:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E7=A9=BA=E8=A1=8C=E3=80=81=E4=BC=98=E5=8C=96=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .stylelintrc.cjs                    | 1 -
 eslint.config.js                    | 2 +-
 src/components/CURD/PageContent.vue | 1 -
 vite.config.ts                      | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index 427857df..215713f3 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -22,7 +22,6 @@ module.exports = {
   ],
   rules: {
     "prettier/prettier": true, // 强制执行 Prettier 格式化规则（需配合 .prettierrc 配置文件）
-
     "no-empty-source": null, //  允许空的样式文件
     "declaration-property-value-no-unknown": null, // 允许非常规数值格式 ,如 height: calc(100% - 50)
     // 允许使用未知伪类
diff --git a/eslint.config.js b/eslint.config.js
index 10453720..d952d1e7 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -49,7 +49,7 @@ export default [
       "no-unused-vars": [
         "error",
         {
-          argsIgnorePattern: "^_", // 忽略以 _ 开头的变量未使用警告
+          argsIgnorePattern: "^_", // 忽略参数名以 _ 开头的参数未使用警告
           varsIgnorePattern: "^[A-Z0-9_]+$", // 忽略变量名为大写字母、数字或下划线组合的未使用警告（枚举定义未使用场景）
           ignoreRestSiblings: true, // 忽略解构赋值中同级未使用变量的警告
         },
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index a65e3c78..f079d934 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -586,7 +586,6 @@ cols.value.forEach((item) => {
     fields.push(item.prop);
   }
 });
-
 const enum ExportsOriginEnum {
   CURRENT = "current",
   SELECTED = "selected",
diff --git a/vite.config.ts b/vite.config.ts
index 9b3e3927..02dfbd4f 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -20,7 +20,6 @@ const __APP_INFO__ = {
 const pathSrc = resolve(__dirname, "src");
 
 // Vite配置  https://cn.vitejs.dev/config
-
 export default defineConfig(({ mode }: ConfigEnv) => {
   const env = loadEnv(mode, process.cwd());
   return {

From 24057c3314c8048728ae44a4ed7a46350dc34627 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Wed, 12 Feb 2025 23:38:22 +0800
Subject: [PATCH 186/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AD=98?=
 =?UTF-8?q?=E5=85=A5localStorage=E7=A7=BB=E9=99=A4=E5=89=8D=E7=BC=80?=
 =?UTF-8?q?=EF=BC=8Cwebsocket=20hook=E9=87=8D=E6=9E=84=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/hooks/useStomp.ts                         | 151 ++++++++++++++++++
 .../NavBar/components/Notification.vue        |  19 ++-
 .../NavBar/components/UserProfile.vue         |   2 +-
 src/plugins/index.ts                          |   3 -
 src/plugins/permission.ts                     |   4 +-
 src/store/modules/user.ts                     |  10 +-
 src/utils/auth.ts                             |   6 +-
 src/utils/request.ts                          |   8 +-
 src/utils/websocket.ts                        |  93 -----------
 src/views/demo/websocket.vue                  | 139 ++++++++--------
 11 files changed, 247 insertions(+), 190 deletions(-)
 create mode 100644 src/hooks/useStomp.ts
 delete mode 100644 src/utils/websocket.ts

diff --git a/.env.development b/.env.development
index 55b854a1..10bd8d14 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ VITE_APP_API_URL=https://api.youlai.tech # 线上
 # VITE_APP_API_URL=http://localhost:8989    # 本地
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws
-VITE_APP_WS_ENDPOINT=
+VITE_APP_WS_ENDPOINT=ws://localhost:8989/ws
 
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/src/hooks/useStomp.ts b/src/hooks/useStomp.ts
new file mode 100644
index 00000000..b13d394a
--- /dev/null
+++ b/src/hooks/useStomp.ts
@@ -0,0 +1,151 @@
+import { ref, watch, onMounted } from "vue";
+import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
+import { getAccessToken } from "@/utils/auth";
+
+export interface UseStompOptions {
+  /** WebSocket 地址，不传时使用 VITE_APP_WS_ENDPOINT 环境变量 */
+  brokerURL?: string;
+  /** 用于鉴权的 token，不传时使用 getToken() 的返回值 */
+  token?: string;
+  /** 重连延迟，单位毫秒，默认为 5000 */
+  reconnectDelay?: number;
+  /** 是否开启调试日志 */
+  debug?: boolean;
+}
+
+export function useStomp(options: UseStompOptions = {}) {
+  // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
+  const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
+  const defaultToken = getAccessToken();
+
+  // 将 brokerURL 定义为响应式 ref，便于动态修改
+  const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
+  const token = options.token ?? defaultToken;
+
+  // 连接状态标记
+  const isConnected = ref(false);
+  // 存储所有订阅
+  const subscriptions = new Map<string, StompSubscription>();
+
+  // 用于保存 STOMP 客户端的实例
+  let client: Client | null = null;
+
+  /**
+   * 初始化 STOMP 客户端
+   * 只有在 brokerURL 非空时才会初始化客户端
+   */
+  const initializeClient = () => {
+    if (!brokerURL.value) {
+      console.warn(
+        "brokerURL is required. Please set the WebSocket URL in your .env file (VITE_APP_WS_ENDPOINT)."
+      );
+      return;
+    }
+
+    if (!client) {
+      client = new Client({
+        brokerURL: brokerURL.value,
+        reconnectDelay: options.reconnectDelay ?? 5000,
+        debug: options.debug ? (msg) => console.log("[STOMP]", msg) : () => {},
+        connectHeaders: {
+          Authorization: `Bearer ${token}`,
+        },
+        heartbeatIncoming: 4000,
+        heartbeatOutgoing: 4000,
+      });
+
+      client.onConnect = (frame) => {
+        isConnected.value = true;
+        console.log("STOMP connected", frame);
+      };
+
+      client.onStompError = (frame) => {
+        console.error("Broker reported error: " + frame.headers["message"]);
+        console.error("Additional details: " + frame.body);
+      };
+
+      client.onWebSocketClose = (evt) => {
+        isConnected.value = false;
+        console.warn("WebSocket closed", evt);
+      };
+    }
+  };
+
+  // 监听 brokerURL 的变化，若地址改变则重新初始化
+  watch(brokerURL, (newURL, oldURL) => {
+    if (newURL !== oldURL) {
+      console.log(`brokerURL changed from ${oldURL} to ${newURL}`);
+      // 断开当前连接，重新激活客户端
+      if (client && client.connected) {
+        client.deactivate();
+      }
+      brokerURL.value = newURL;
+      initializeClient(); // 重新初始化客户端
+    }
+  });
+
+  // 在组件挂载时检查并初始化客户端
+  onMounted(() => {
+    initializeClient();
+  });
+
+  /**
+   * 激活连接（如果已经连接或正在激活则直接返回）
+   */
+  const connect = () => {
+    if (client && (client.connected || client.active)) {
+      console.log("Already connected or connecting, skipping connect() call.");
+      return;
+    }
+    client?.activate();
+  };
+
+  /**
+   * 订阅指定主题
+   * @param destination 目标主题地址
+   * @param callback 接收到消息时的回调函数
+   * @returns 返回订阅 id，用于后续取消订阅
+   */
+  const subscribe = (destination: string, callback: (message: IMessage) => void): string => {
+    if (client) {
+      const subscription = client.subscribe(destination, callback);
+      subscriptions.set(subscription.id, subscription);
+      return subscription.id;
+    }
+    return "";
+  };
+
+  /**
+   * 取消指定订阅
+   * @param subscriptionId 要取消的订阅 id
+   */
+  const unsubscribe = (subscriptionId: string) => {
+    const subscription = subscriptions.get(subscriptionId);
+    if (subscription) {
+      subscription.unsubscribe();
+      subscriptions.delete(subscriptionId);
+    }
+  };
+
+  /**
+   * 主动断开连接（如果未连接则不执行）
+   */
+  const disconnect = () => {
+    if (client && !(client.connected || client.active)) {
+      console.log("Already disconnected, skipping disconnect() call.");
+      return;
+    }
+    client?.deactivate();
+    isConnected.value = false;
+  };
+
+  return {
+    client,
+    isConnected,
+    connect,
+    subscribe,
+    unsubscribe,
+    disconnect,
+    brokerURL, // 暴露 brokerURL 以便组件中动态修改
+  };
+}
diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index bc6069b0..06d55b2c 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -167,8 +167,8 @@
 
 <script setup lang="ts">
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
-import WebSocketManager from "@/utils/websocket";
 import router from "@/router";
+import { useStomp } from "@/hooks/useStomp";
 
 const activeTab = ref("notice");
 const notices = ref<NoticePageVO[]>([]);
@@ -176,15 +176,23 @@ const messages = ref<any[]>([]);
 const tasks = ref<any[]>([]);
 const noticeDetailRef = ref();
 
+// 初始化 useStomp hook（这里仅用于订阅通知消息），同时调用 connect 建立连接
+const { connect, subscribe, disconnect } = useStomp({
+  debug: true,
+});
+
 // 获取未读消息列表并连接 WebSocket
 onMounted(() => {
   NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
     notices.value = data.list;
   });
 
-  WebSocketManager.subscribeToTopic("/user/queue/message", (message) => {
+  // 建立连接
+  connect();
+
+  subscribe("/user/queue/message", (message) => {
     console.log("收到消息：", message);
-    const data = JSON.parse(message);
+    const data = JSON.parse(message.body);
     const id = data.id;
     if (!notices.value.some((notice) => notice.id == id)) {
       notices.value.unshift({
@@ -224,6 +232,11 @@ function markAllAsRead() {
     notices.value = [];
   });
 }
+
+onBeforeUnmount(() => {
+  // 如果需要取消订阅，可以在这里调用 disconnect 或 unsubscribe（本示例直接断开连接）
+  disconnect();
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
index 32c3e706..670a386d 100644
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ b/src/layout/components/NavBar/components/UserProfile.vue
@@ -1,7 +1,7 @@
 <template>
   <el-dropdown trigger="click">
     <div class="flex-center h100% p13px">
-      <img :src="http://github.com/userStore.userInfo.avatar" class="rounded-full mr-10px w24px h24px" />
+      <img :src="http://github.com/userStore.userInfo.avatar" class="rounded-full mr10px w24px h24px" />
       <span>{{ userStore.userInfo.username }}</span>
     </div>
     <template #dropdown>
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index df853d88..e5262519 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -6,7 +6,6 @@ import { setupRouter } from "@/router";
 import { setupStore } from "@/store";
 import { setupElIcons } from "./icons";
 import { setupPermission } from "./permission";
-import webSocketManager from "@/utils/websocket";
 import { InstallCodeMirror } from "codemirror-editor-vue3";
 
 export default {
@@ -23,8 +22,6 @@ export default {
     setupElIcons(app);
     // 路由守卫
     setupPermission();
-    // 初始化 WebSocket
-    webSocketManager.setupWebSocket();
     // 注册 CodeMirror
     app.use(InstallCodeMirror);
   },
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 09096cef..04604e92 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,6 +1,6 @@
 import type { NavigationGuardNext, RouteLocationNormalized, RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
-import { getToken } from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 
@@ -11,7 +11,7 @@ export function setupPermission() {
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
 
-    const isLogin = !!getToken(); // 判断是否登录
+    const isLogin = !!getAccessToken(); // 判断是否登录
     if (isLogin) {
       if (to.path === "/login") {
         // 已登录，访问登录页，跳转到首页
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 5812f7a5..9bd019fa 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -5,7 +5,7 @@ import { useDictStoreHook } from "@/store/modules/dict";
 import AuthAPI, { type LoginFormData } from "@/api/auth";
 import UserAPI, { type UserInfo } from "@/api/system/user";
 
-import { setToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
+import { setAccessToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
 
 export const useUserStore = defineStore("user", () => {
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
@@ -20,8 +20,8 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.login(LoginFormData)
         .then((data) => {
-          const { tokenType, accessToken, refreshToken } = data;
-          setToken(tokenType + " " + accessToken); // Bearer eyJhbGciOiJIUzI1NiJ9.xxx.xxx
+          const { accessToken, refreshToken } = data;
+          setAccessToken(accessToken); // eyJhbGciOiJIUzI1NiJ9.xxx.xxx
           setRefreshToken(refreshToken);
           resolve();
         })
@@ -77,8 +77,8 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.refreshToken(refreshToken)
         .then((data) => {
-          const { tokenType, accessToken, refreshToken } = data;
-          setToken(tokenType + " " + accessToken);
+          const { accessToken, refreshToken } = data;
+          setAccessToken(accessToken);
           setRefreshToken(refreshToken);
           resolve();
         })
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index bd3e9b3e..cfbedf84 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -3,11 +3,11 @@ const ACCESS_TOKEN_KEY = "access_token";
 // 刷新 token 缓存的 key
 const REFRESH_TOKEN_KEY = "refresh_token";
 
-function getToken(): string {
+function getAccessToken(): string {
   return localStorage.getItem(ACCESS_TOKEN_KEY) || "";
 }
 
-function setToken(token: string) {
+function setAccessToken(token: string) {
   localStorage.setItem(ACCESS_TOKEN_KEY, token);
 }
 
@@ -24,4 +24,4 @@ function clearToken() {
   localStorage.removeItem(REFRESH_TOKEN_KEY);
 }
 
-export { getToken, setToken, clearToken, getRefreshToken, setRefreshToken };
+export { getAccessToken, setAccessToken, clearToken, getRefreshToken, setRefreshToken };
diff --git a/src/utils/request.ts b/src/utils/request.ts
index fb797d30..86959e88 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -2,7 +2,7 @@ import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axio
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user";
 import { ResultEnum } from "@/enums/ResultEnum";
-import { getToken } from "@/utils/auth";
+import { getAccessToken } from "@/utils/auth";
 import router from "@/router";
 
 // 创建 axios 实例
@@ -16,10 +16,10 @@ const service = axios.create({
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    const accessToken = getToken();
+    const accessToken = getAccessToken();
     // 如果 Authorization 设置为 no-auth，则不携带 Token，用于登录、刷新 Token 等接口
     if (config.headers.Authorization !== "no-auth" && accessToken) {
-      config.headers.Authorization = accessToken;
+      config.headers.Authorization = `Bearer ${accessToken}`;
     } else {
       delete config.headers.Authorization;
     }
@@ -75,7 +75,7 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
   return new Promise((resolve) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      config.headers.Authorization = getToken();
+      config.headers.Authorization = getAccessToken();
       resolve(service(config));
     };
 
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
deleted file mode 100644
index bd8fadb6..00000000
--- a/src/utils/websocket.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import { Client } from "@stomp/stompjs";
-import { getToken } from "@/utils/auth";
-
-class WebSocketManager {
-  private client: Client | null = null;
-  private messageHandlers: Map<string, ((message: string) => void)[]> = new Map();
-  private reconnectAttempts = 0;
-  private maxReconnectAttempts = 3; // 自定义最大重试次数
-  private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
-
-  // 初始化 WebSocket 客户端
-  setupWebSocket() {
-    const endpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
-
-    // 如果没有配置 WebSocket 端点或显式关闭，直接返回
-    if (!endpoint) {
-      console.log("WebSocket 已被禁用，如需打开请在配置文件中配置 VITE_APP_WS_ENDPOINT");
-      return;
-    }
-
-    if (this.client && this.client.connected) {
-      console.log("客户端已存在并且连接正常");
-      return this.client;
-    }
-
-    this.client = new Client({
-      brokerURL: endpoint,
-      connectHeaders: {
-        Authorization: getToken(),
-      },
-      heartbeatIncoming: 30000,
-      heartbeatOutgoing: 30000,
-      reconnectDelay: 0, // 设置为 0 禁用重连
-      onConnect: () => {
-        console.log(`连接到 WebSocket 服务器: ${endpoint}`);
-        this.reconnectAttempts = 0; // 重置重连计数
-        this.messageHandlers.forEach((handlers, topic) => {
-          handlers.forEach((handler) => {
-            this.subscribeToTopic(topic, handler);
-          });
-        });
-      },
-      onStompError: (frame) => {
-        console.error(`连接错误: ${frame.headers["message"]}`);
-        console.error(`错误详情: ${frame.body}`);
-      },
-      onDisconnect: () => {
-        console.log(`WebSocket 连接已断开: ${endpoint}`);
-        this.reconnectAttempts++;
-        if (this.reconnectAttempts < this.maxReconnectAttempts) {
-          console.log(`正在尝试重连... 尝试次数: ${this.reconnectAttempts}`);
-        } else {
-          console.log("重连次数已达上限，停止重连");
-          this.client?.deactivate();
-        }
-      },
-    });
-
-    this.client.activate();
-  }
-
-  // 订阅主题
-  public subscribeToTopic(topic: string, onMessage: (message: string) => void) {
-    console.log(`正在订阅主题: ${topic}`);
-    if (!this.client || !this.client.connected) {
-      this.setupWebSocket();
-    }
-
-    if (this.messageHandlers.has(topic)) {
-      this.messageHandlers.get(topic)?.push(onMessage);
-    } else {
-      this.messageHandlers.set(topic, [onMessage]);
-    }
-
-    if (this.client?.connected) {
-      this.client.subscribe(topic, (message) => {
-        const handlers = this.messageHandlers.get(topic);
-        handlers?.forEach((handler) => handler(message.body));
-      });
-    }
-  }
-
-  // 断开 WebSocket 连接
-  public disconnect() {
-    if (this.client) {
-      console.log("断开 WebSocket 连接");
-      this.client.deactivate();
-      this.client = null;
-    }
-  }
-}
-
-export default new WebSocketManager();
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 1550a169..873c77ac 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -13,6 +13,7 @@
         <el-card>
           <el-row>
             <el-col :span="16">
+              <!-- 输入框允许修改 websocket 地址（注意：修改后不会自动更新已创建的 hook 实例） -->
               <el-input v-model="socketEndpoint" class="w-220px" />
               <el-button
                 type="primary"
@@ -94,98 +95,88 @@
 </template>
 
 <script setup lang="ts">
-import { Client } from "@stomp/stompjs";
-
+import { useStomp } from "@/hooks/useStomp";
+import { getAccessToken } from "@/utils/auth"; // 此处可与 hook 内 getToken 保持一致
 import { useUserStoreHook } from "@/store/modules/user";
-import { getToken } from "@/utils/auth";
 
 const userStore = useUserStoreHook();
-const isConnected = ref(false);
+// 用于手动调整 WebSocket 地址
 const socketEndpoint = ref(import.meta.env.VITE_APP_WS_ENDPOINT);
-
-const receiver = ref("root");
-
+// 同步连接状态
+const isConnected = ref(false);
+// 消息接收列表
 interface MessageType {
   type?: string;
   sender?: string;
   content: string;
 }
-
 const messages = ref<MessageType[]>([]);
+// 广播消息内容
+const topicMessage = ref("亲爱的朋友们，系统已恢复最新状态。");
+// 点对点消息内容（默认示例）
+const queneMessage = ref("Hi, " + userStore.userInfo.username + " 这里是点对点消息示例！");
+const receiver = ref("root");
 
-const topicMessage = ref("亲爱的大冤种们，由于一只史诗级的BUG，系统版本已经被迫回退到了0.0.1。"); // 广播消息
-
-const queneMessage = ref(
-  "hi , " + receiver.value + " , 我是" + userStore.userInfo.username + " , 想和你交个朋友 ! "
-);
-
-let stompClient: Client;
+// 调用 useStomp hook，默认使用 socketEndpoint 和 token（此处用 getAccessToken()）
+const {
+  isConnected: stompConnected,
+  connect,
+  subscribe,
+  disconnect,
+  client,
+} = useStomp({
+  brokerURL: socketEndpoint.value,
+  token: getAccessToken(),
+  reconnectDelay: 5000,
+  debug: true,
+});
 
-function connectWebSocket() {
-  stompClient = new Client({
-    brokerURL: socketEndpoint.value,
-    connectHeaders: {
-      Authorization: getToken(),
-    },
-    debug: (str: any) => {
-      console.log(str);
-    },
-    onConnect: () => {
-      console.log("连接成功");
-      isConnected.value = true;
+// 同步 hook 的连接状态到组件
+watch(stompConnected, (newVal) => {
+  isConnected.value = newVal;
+  if (newVal) {
+    // 连接成功后，订阅广播和点对点消息主题
+    subscribe("/topic/notice", (res) => {
       messages.value.push({
         sender: "Server",
-        content: "Websocket 已连接",
-        type: "tip",
-      });
-
-      stompClient.subscribe("/topic/notice", (res: any) => {
-        messages.value.push({
-          sender: "Server",
-          content: res.body,
-        });
-      });
-
-      stompClient.subscribe("/user/queue/greeting", (res: any) => {
-        const messageData = JSON.parse(res.body) as MessageType;
-        messages.value.push({
-          sender: messageData.sender,
-          content: messageData.content,
-        });
+        content: res.body,
       });
-    },
-    onStompError: (frame: any) => {
-      console.error("Broker reported error: " + frame.headers["message"]);
-      console.error("Additional details: " + frame.body);
-    },
-    onDisconnect: () => {
-      isConnected.value = false;
+    });
+    subscribe("/user/queue/greeting", (res) => {
+      const messageData = JSON.parse(res.body) as MessageType;
       messages.value.push({
-        sender: "Server",
-        content: "Websocket 已断开",
-        type: "tip",
+        sender: messageData.sender,
+        content: messageData.content,
       });
-    },
-  });
-
-  stompClient.activate();
-}
-
-function disconnectWebSocket() {
-  if (stompClient && stompClient.connected) {
-    stompClient.deactivate();
-    isConnected.value = false;
+    });
+    messages.value.push({
+      sender: "Server",
+      content: "Websocket 已连接",
+      type: "tip",
+    });
+  } else {
     messages.value.push({
       sender: "Server",
       content: "Websocket 已断开",
       type: "tip",
     });
   }
+});
+
+// 连接 WebSocket
+function connectWebSocket() {
+  connect();
 }
 
+// 断开 WebSocket
+function disconnectWebSocket() {
+  disconnect();
+}
+
+// 发送广播消息
 function sendToAll() {
-  if (stompClient.connected) {
-    stompClient.publish({
+  if (client && client.connected) {
+    client.publish({
       destination: "/topic/notice",
       body: topicMessage.value,
     });
@@ -196,9 +187,10 @@ function sendToAll() {
   }
 }
 
+// 发送点对点消息
 function sendToUser() {
-  if (stompClient.connected) {
-    stompClient.publish({
+  if (client && client.connected) {
+    client.publish({
       destination: "/app/sendToUser/" + receiver.value,
       body: queneMessage.value,
     });
@@ -212,6 +204,10 @@ function sendToUser() {
 onMounted(() => {
   connectWebSocket();
 });
+
+onBeforeUnmount(() => {
+  disconnectWebSocket();
+});
 </script>
 
 <style scoped>
@@ -219,40 +215,33 @@ onMounted(() => {
   display: flex;
   flex-direction: column;
 }
-
 .message {
   padding: 10px;
   margin: 10px;
   border-radius: 5px;
 }
-
 .message--sent {
   align-self: flex-end;
   background-color: #dcf8c6;
 }
-
 .message--received {
   align-self: flex-start;
   background-color: #e8e8e8;
 }
-
 .message-content {
   display: flex;
   flex-direction: column;
 }
-
 .message-sender {
   margin-bottom: 5px;
   font-weight: bold;
   text-align: right;
 }
-
 .message-receiver {
   margin-bottom: 5px;
   font-weight: bold;
   text-align: left;
 }
-
 .tip-message {
   align-self: center;
   padding: 5px 10px;

From 79ea96ab8a9f95db02afcca13599e5f4f99fe9af Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Feb 2025 01:01:02 +0800
Subject: [PATCH 187/497] =?UTF-8?q?refactor:=20:recycle:=20websocket=20?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 src/hooks/useStomp.ts                         | 85 +++++++++----------
 .../NavBar/components/Notification.vue        | 37 +++++---
 src/views/demo/websocket.vue                  | 16 ++--
 4 files changed, 74 insertions(+), 66 deletions(-)

diff --git a/.env.development b/.env.development
index 10bd8d14..55b854a1 100644
--- a/.env.development
+++ b/.env.development
@@ -9,7 +9,7 @@ VITE_APP_API_URL=https://api.youlai.tech # 线上
 # VITE_APP_API_URL=http://localhost:8989    # 本地
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws
-VITE_APP_WS_ENDPOINT=ws://localhost:8989/ws
+VITE_APP_WS_ENDPOINT=
 
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/src/hooks/useStomp.ts b/src/hooks/useStomp.ts
index b13d394a..af88f57a 100644
--- a/src/hooks/useStomp.ts
+++ b/src/hooks/useStomp.ts
@@ -1,4 +1,3 @@
-import { ref, watch, onMounted } from "vue";
 import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
 import { getAccessToken } from "@/utils/auth";
 
@@ -14,26 +13,18 @@ export interface UseStompOptions {
 }
 
 export function useStomp(options: UseStompOptions = {}) {
-  // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
   const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
   const defaultToken = getAccessToken();
 
-  // 将 brokerURL 定义为响应式 ref，便于动态修改
   const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
   const token = options.token ?? defaultToken;
 
-  // 连接状态标记
   const isConnected = ref(false);
-  // 存储所有订阅
   const subscriptions = new Map<string, StompSubscription>();
 
-  // 用于保存 STOMP 客户端的实例
-  let client: Client | null = null;
+  const client = ref<Client | null>(null);
 
-  /**
-   * 初始化 STOMP 客户端
-   * 只有在 brokerURL 非空时才会初始化客户端
-   */
+  // 初始化 STOMP 客户端
   const initializeClient = () => {
     if (!brokerURL.value) {
       console.warn(
@@ -42,8 +33,8 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
-    if (!client) {
-      client = new Client({
+    if (!client.value) {
+      client.value = new Client({
         brokerURL: brokerURL.value,
         reconnectDelay: options.reconnectDelay ?? 5000,
         debug: options.debug ? (msg) => console.log("[STOMP]", msg) : () => {},
@@ -54,17 +45,17 @@ export function useStomp(options: UseStompOptions = {}) {
         heartbeatOutgoing: 4000,
       });
 
-      client.onConnect = (frame) => {
+      client.value.onConnect = (frame) => {
         isConnected.value = true;
         console.log("STOMP connected", frame);
       };
 
-      client.onStompError = (frame) => {
+      client.value.onStompError = (frame) => {
         console.error("Broker reported error: " + frame.headers["message"]);
         console.error("Additional details: " + frame.body);
       };
 
-      client.onWebSocketClose = (evt) => {
+      client.value.onWebSocketClose = (evt) => {
         isConnected.value = false;
         console.warn("WebSocket closed", evt);
       };
@@ -75,9 +66,8 @@ export function useStomp(options: UseStompOptions = {}) {
   watch(brokerURL, (newURL, oldURL) => {
     if (newURL !== oldURL) {
       console.log(`brokerURL changed from ${oldURL} to ${newURL}`);
-      // 断开当前连接，重新激活客户端
-      if (client && client.connected) {
-        client.deactivate();
+      if (client.value && client.value.connected) {
+        client.value.deactivate();
       }
       brokerURL.value = newURL;
       initializeClient(); // 重新初始化客户端
@@ -89,36 +79,39 @@ export function useStomp(options: UseStompOptions = {}) {
     initializeClient();
   });
 
-  /**
-   * 激活连接（如果已经连接或正在激活则直接返回）
-   */
+  // 激活连接（如果已经连接或正在激活则直接返回）
   const connect = () => {
-    if (client && (client.connected || client.active)) {
+    if (client.value && (client.value.connected || client.value.active)) {
       console.log("Already connected or connecting, skipping connect() call.");
       return;
     }
-    client?.activate();
+    if (client.value) {
+      client.value.activate();
+    } else {
+      console.warn("Client is not initialized.");
+    }
   };
 
-  /**
-   * 订阅指定主题
-   * @param destination 目标主题地址
-   * @param callback 接收到消息时的回调函数
-   * @returns 返回订阅 id，用于后续取消订阅
-   */
+  // 订阅指定主题，连接成功后自动订阅
   const subscribe = (destination: string, callback: (message: IMessage) => void): string => {
-    if (client) {
-      const subscription = client.subscribe(destination, callback);
-      subscriptions.set(subscription.id, subscription);
-      return subscription.id;
+    if (!client.value) {
+      console.error("STOMP client is not initialized.");
+      return "";
+    }
+
+    // 如果还没有连接，就先激活连接
+    if (!isConnected.value) {
+      console.log("Not connected yet. Connecting...");
+      connect();
     }
-    return "";
+
+    // 连接成功后订阅主题
+    const subscription = client.value.subscribe(destination, callback);
+    subscriptions.set(subscription.id, subscription);
+    return subscription.id;
   };
 
-  /**
-   * 取消指定订阅
-   * @param subscriptionId 要取消的订阅 id
-   */
+  // 取消指定订阅
   const unsubscribe = (subscriptionId: string) => {
     const subscription = subscriptions.get(subscriptionId);
     if (subscription) {
@@ -127,15 +120,17 @@ export function useStomp(options: UseStompOptions = {}) {
     }
   };
 
-  /**
-   * 主动断开连接（如果未连接则不执行）
-   */
+  // 主动断开连接（如果未连接则不执行）
   const disconnect = () => {
-    if (client && !(client.connected || client.active)) {
+    if (client.value && !(client.value.connected || client.value.active)) {
       console.log("Already disconnected, skipping disconnect() call.");
       return;
     }
-    client?.deactivate();
+    if (client.value) {
+      client.value.deactivate();
+    } else {
+      console.warn("Client is not initialized.");
+    }
     isConnected.value = false;
   };
 
@@ -143,7 +138,7 @@ export function useStomp(options: UseStompOptions = {}) {
     client,
     isConnected,
     connect,
-    subscribe,
+    subscribe, // 订阅函数放到这里
     unsubscribe,
     disconnect,
     brokerURL, // 暴露 brokerURL 以便组件中动态修改
diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index 06d55b2c..d29c0a3f 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -168,7 +168,6 @@
 <script setup lang="ts">
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 import router from "@/router";
-import { useStomp } from "@/hooks/useStomp";
 
 const activeTab = ref("notice");
 const notices = ref<NoticePageVO[]>([]);
@@ -176,20 +175,16 @@ const messages = ref<any[]>([]);
 const tasks = ref<any[]>([]);
 const noticeDetailRef = ref();
 
-// 初始化 useStomp hook（这里仅用于订阅通知消息），同时调用 connect 建立连接
-const { connect, subscribe, disconnect } = useStomp({
+import { useStomp } from "@/hooks/useStomp";
+
+const { subscribe, disconnect } = useStomp({
   debug: true,
 });
 
-// 获取未读消息列表并连接 WebSocket
-onMounted(() => {
-  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
-    notices.value = data.list;
-  });
-
-  // 建立连接
-  connect();
-
+/**
+ * 订阅通知消息
+ */
+function subscribeNotice() {
   subscribe("/user/queue/message", (message) => {
     console.log("收到消息：", message);
     const data = JSON.parse(message.body);
@@ -210,7 +205,16 @@ onMounted(() => {
       });
     }
   });
-});
+}
+
+/**
+ * 获取我的通知公告
+ */
+function featchMyNotice() {
+  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
+    notices.value = data.list;
+  });
+}
 
 // 阅读通知公告
 function handleReadNotice(id: string) {
@@ -233,8 +237,13 @@ function markAllAsRead() {
   });
 }
 
+// 获取未读消息列表并连接 WebSocket
+onMounted(() => {
+  featchMyNotice();
+  subscribeNotice();
+});
+
 onBeforeUnmount(() => {
-  // 如果需要取消订阅，可以在这里调用 disconnect 或 unsubscribe（本示例直接断开连接）
   disconnect();
 });
 </script>
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 873c77ac..932294a7 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -34,6 +34,7 @@
             </el-col>
           </el-row>
         </el-card>
+
         <!-- 广播消息发送部分 -->
         <el-card class="mt-5">
           <el-form label-width="90px">
@@ -45,6 +46,7 @@
             </el-form-item>
           </el-form>
         </el-card>
+
         <!-- 点对点消息发送部分 -->
         <el-card class="mt-5">
           <el-form label-width="90px">
@@ -60,6 +62,7 @@
           </el-form>
         </el-card>
       </el-col>
+
       <!-- 消息接收显示部分 -->
       <el-col :span="12">
         <el-card>
@@ -96,10 +99,11 @@
 
 <script setup lang="ts">
 import { useStomp } from "@/hooks/useStomp";
-import { getAccessToken } from "@/utils/auth"; // 此处可与 hook 内 getToken 保持一致
-import { useUserStoreHook } from "@/store/modules/user";
+import { getAccessToken } from "@/utils/auth"; // 用于获取token
+import { useUserStoreHook } from "@/store/modules/user"; // 获取用户信息
 
 const userStore = useUserStoreHook();
+
 // 用于手动调整 WebSocket 地址
 const socketEndpoint = ref(import.meta.env.VITE_APP_WS_ENDPOINT);
 // 同步连接状态
@@ -175,8 +179,8 @@ function disconnectWebSocket() {
 
 // 发送广播消息
 function sendToAll() {
-  if (client && client.connected) {
-    client.publish({
+  if (client.value && isConnected.value) {
+    client.value.publish({
       destination: "/topic/notice",
       body: topicMessage.value,
     });
@@ -189,8 +193,8 @@ function sendToAll() {
 
 // 发送点对点消息
 function sendToUser() {
-  if (client && client.connected) {
-    client.publish({
+  if (client.value && isConnected.value) {
+    client.value.publish({
       destination: "/app/sendToUser/" + receiver.value,
       body: queneMessage.value,
     });

From 8e31b8356bab916601aa9363e886ce1f5111ef57 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Feb 2025 01:01:53 +0800
Subject: [PATCH 188/497] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0echar?=
 =?UTF-8?q?t=E4=BE=9D=E8=B5=96=E8=87=B3=E9=A2=84=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/vite.config.ts b/vite.config.ts
index 02dfbd4f..4997c4df 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -99,7 +99,10 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "sortablejs",
         "exceljs",
         "path-to-regexp",
-        "echarts",
+        "echarts/core",
+        "echarts/renderers",
+        "echarts/charts",
+        "echarts/components",
         "vue-i18n",
         "nprogress",
         "qs",

From cfdc8e0cc745d84efac553b8fb8fbd116cde61ab Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 20:30:11 +0800
Subject: [PATCH 189/497] =?UTF-8?q?feat:=20:sparkles:=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=20animate.css=20=E5=8A=A8=E7=94=BB=EF=BC=8Celement-plus=20?=
 =?UTF-8?q?=E5=86=85=E7=BD=AE=E5=8A=A8=E7=94=BB=E8=BF=87=E4=BA=8E=E5=8D=95?=
 =?UTF-8?q?=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                             | 1 +
 src/layout/components/AppMain/index.vue                  | 2 +-
 src/layout/components/Sidebar/components/SidebarLogo.vue | 4 ++--
 src/main.ts                                              | 4 ++++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index dd30df77..5aa47071 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "@vueuse/core": "^12.5.0",
     "@wangeditor-next/editor": "^5.6.31",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
+    "animate.css": "^4.1.1",
     "axios": "^1.7.9",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
diff --git a/src/layout/components/AppMain/index.vue b/src/layout/components/AppMain/index.vue
index 8f33f3c4..398ee216 100644
--- a/src/layout/components/AppMain/index.vue
+++ b/src/layout/components/AppMain/index.vue
@@ -2,7 +2,7 @@
   <section class="app-main" :style="{ height: appMainHeight }">
     <router-view>
       <template #default="{ Component, route }">
-        <transition name="el-fade-in-linear" mode="out-in">
+        <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
           <keep-alive :include="cachedViews">
             <component :is="Component" :key="route.path" />
           </keep-alive>
diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layout/components/Sidebar/components/SidebarLogo.vue
index 2c72e50d..ab04b52e 100644
--- a/src/layout/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layout/components/Sidebar/components/SidebarLogo.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="logo">
-    <transition name="el-fade-in-linear" mode="out-in">
+    <transition enter-active-class="animate__animated animate__fadeInLeft">
       <router-link :key="+collapse" class="wh-full flex-center" to="/">
         <img :src="http://github.com/logo" class="w20px h20px" />
         <span v-if="!collapse" class="title">
@@ -34,7 +34,7 @@ defineProps({
     margin-left: 10px;
     font-size: 14px;
     font-weight: bold;
-    color: white;
+    color: #ffffff;
   }
 }
 
diff --git a/src/main.ts b/src/main.ts
index 5485bacf..0167bf8c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,6 +8,10 @@ import "element-plus/theme-chalk/dark/css-vars.css";
 import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
+
+// 全局引入 animate.css
+import "animate.css";
+
 // 自动为某些默认事件（如 touchstart、wheel 等）添加 { passive: true },提升滚动性能并消除控制台的非被动事件监听警告
 import "default-passive-events";
 

From fe44986a8ff9344a635a7cd3e5edaeb5e1d821e3 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 21:14:13 +0800
Subject: [PATCH 190/497] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ECharts/index.vue                       |  7 ++++++-
 src/components/LangSelect/index.vue                    | 10 ++++++----
 .../Sidebar/components/SidebarMenuItemTitle.vue        |  1 +
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/components/ECharts/index.vue b/src/components/ECharts/index.vue
index f4afa719..03b8b983 100644
--- a/src/components/ECharts/index.vue
+++ b/src/components/ECharts/index.vue
@@ -4,6 +4,7 @@
  *
  * 开源协议：https://opensource.org/licenses/MIT
  * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
+ * 参考：https://echarts.apache.org/handbook/zh/basics/import/#%E6%8C%89%E9%9C%80%E5%BC%95%E5%85%A5-echarts-%E5%9B%BE%E8%A1%A8%E5%92%8C%E7%BB%84%E4%BB%B6
  *
  * 在使用时，请保留此注释，感谢您对开源的支持！
  -->
@@ -13,10 +14,14 @@
 </template>
 
 <script setup lang="ts">
+// 引入 echarts 核心模块，核心模块提供了 echarts 使用必须要的接口。
 import * as echarts from "echarts/core";
-import { CanvasRenderer } from "echarts/renderers";
+// 引入柱状、折线和饼图常用图表
 import { BarChart, LineChart, PieChart } from "echarts/charts";
+// 引入标题，提示框，直角坐标系，数据集，内置数据转换器组件，
 import { GridComponent, TooltipComponent, LegendComponent } from "echarts/components";
+// 引入 Canvas 渲染器，注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
+import { CanvasRenderer } from "echarts/renderers";
 
 import { useResizeObserver } from "@vueuse/core";
 
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 2dbf7381..ef7f0cb5 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -1,8 +1,6 @@
 <template>
   <el-dropdown trigger="click" @command="handleLanguageChange">
-    <div>
-      <div class="i-svg:language" />
-    </div>
+    <div class="i-svg:language" />
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item
@@ -19,7 +17,6 @@
 </template>
 
 <script setup lang="ts">
-import { useI18n } from "vue-i18n";
 import { useAppStore } from "@/store/modules/app";
 import { LanguageEnum } from "@/enums/LanguageEnum";
 
@@ -38,6 +35,11 @@ const langOptions = [
 const appStore = useAppStore();
 const { locale, t } = useI18n();
 
+/**
+ * 处理语言切换
+ *
+ * @param lang  语言（zh-cn、en）
+ */
 function handleLanguageChange(lang: string) {
   locale.value = lang;
   appStore.changeLanguage(lang);
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
index aa7cbcc9..67bf325c 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
@@ -1,4 +1,5 @@
 <template>
+  <!-- 菜单图标 -->
   <template v-if="icon">
     <el-icon v-if="isElIcon" class="el-icon">
       <component :is="iconComponent" />

From 1f409a142056b3b8179ab3979382e2ba9ac69e89 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 21:18:56 +0800
Subject: [PATCH 191/497] =?UTF-8?q?refactor:=20:recycle:=20websocket=20?=
 =?UTF-8?q?=E7=A4=BA=E4=BE=8B=E5=92=8C=20hooks=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/useStomp.ts        |  70 +++++++------
 src/views/demo/websocket.vue | 188 ++++++++++++++++-------------------
 2 files changed, 125 insertions(+), 133 deletions(-)

diff --git a/src/hooks/useStomp.ts b/src/hooks/useStomp.ts
index af88f57a..302482dc 100644
--- a/src/hooks/useStomp.ts
+++ b/src/hooks/useStomp.ts
@@ -4,7 +4,7 @@ import { getAccessToken } from "@/utils/auth";
 export interface UseStompOptions {
   /** WebSocket 地址，不传时使用 VITE_APP_WS_ENDPOINT 环境变量 */
   brokerURL?: string;
-  /** 用于鉴权的 token，不传时使用 getToken() 的返回值 */
+  /** 用于鉴权的 token，不传时使用 getAccessToken() 的返回值 */
   token?: string;
   /** 重连延迟，单位毫秒，默认为 5000 */
   reconnectDelay?: number;
@@ -13,18 +13,25 @@ export interface UseStompOptions {
 }
 
 export function useStomp(options: UseStompOptions = {}) {
+  // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
   const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
   const defaultToken = getAccessToken();
 
   const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
   const token = options.token ?? defaultToken;
 
+  // 连接状态标记
   const isConnected = ref(false);
+  // 存储所有订阅
   const subscriptions = new Map<string, StompSubscription>();
 
-  const client = ref<Client | null>(null);
+  // 用于保存 STOMP 客户端的实例
+  let client = ref<Client | null>(null);
 
-  // 初始化 STOMP 客户端
+  /**
+   * 初始化 STOMP 客户端
+   * 只有在 brokerURL 非空时才会初始化客户端
+   */
   const initializeClient = () => {
     if (!brokerURL.value) {
       console.warn(
@@ -66,6 +73,7 @@ export function useStomp(options: UseStompOptions = {}) {
   watch(brokerURL, (newURL, oldURL) => {
     if (newURL !== oldURL) {
       console.log(`brokerURL changed from ${oldURL} to ${newURL}`);
+      // 断开当前连接，重新激活客户端
       if (client.value && client.value.connected) {
         client.value.deactivate();
       }
@@ -76,42 +84,40 @@ export function useStomp(options: UseStompOptions = {}) {
 
   // 在组件挂载时检查并初始化客户端
   onMounted(() => {
+    console.log("useStomp onMounted initializeClient");
     initializeClient();
   });
 
-  // 激活连接（如果已经连接或正在激活则直接返回）
+  /**
+   * 激活连接（如果已经连接或正在激活则直接返回）
+   */
   const connect = () => {
     if (client.value && (client.value.connected || client.value.active)) {
       console.log("Already connected or connecting, skipping connect() call.");
       return;
     }
-    if (client.value) {
-      client.value.activate();
-    } else {
-      console.warn("Client is not initialized.");
-    }
+    client.value?.activate();
   };
 
-  // 订阅指定主题，连接成功后自动订阅
+  /**
+   * 订阅指定主题
+   * @param destination 目标主题地址
+   * @param callback 接收到消息时的回调函数
+   * @returns 返回订阅 id，用于后续取消订阅
+   */
   const subscribe = (destination: string, callback: (message: IMessage) => void): string => {
-    if (!client.value) {
-      console.error("STOMP client is not initialized.");
-      return "";
-    }
-
-    // 如果还没有连接，就先激活连接
-    if (!isConnected.value) {
-      console.log("Not connected yet. Connecting...");
-      connect();
+    if (client.value) {
+      const subscription = client.value.subscribe(destination, callback);
+      subscriptions.set(subscription.id, subscription);
+      return subscription.id;
     }
-
-    // 连接成功后订阅主题
-    const subscription = client.value.subscribe(destination, callback);
-    subscriptions.set(subscription.id, subscription);
-    return subscription.id;
+    return "";
   };
 
-  // 取消指定订阅
+  /**
+   * 取消指定订阅
+   * @param subscriptionId 要取消的订阅 id
+   */
   const unsubscribe = (subscriptionId: string) => {
     const subscription = subscriptions.get(subscriptionId);
     if (subscription) {
@@ -120,17 +126,15 @@ export function useStomp(options: UseStompOptions = {}) {
     }
   };
 
-  // 主动断开连接（如果未连接则不执行）
+  /**
+   * 主动断开连接（如果未连接则不执行）
+   */
   const disconnect = () => {
     if (client.value && !(client.value.connected || client.value.active)) {
       console.log("Already disconnected, skipping disconnect() call.");
       return;
     }
-    if (client.value) {
-      client.value.deactivate();
-    } else {
-      console.warn("Client is not initialized.");
-    }
+    client.value?.deactivate();
     isConnected.value = false;
   };
 
@@ -138,9 +142,9 @@ export function useStomp(options: UseStompOptions = {}) {
     client,
     isConnected,
     connect,
-    subscribe, // 订阅函数放到这里
+    subscribe,
     unsubscribe,
     disconnect,
-    brokerURL, // 暴露 brokerURL 以便组件中动态修改
+    brokerURL,
   };
 }
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 932294a7..7ca89b1b 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -12,9 +12,8 @@
       <el-col :span="12">
         <el-card>
           <el-row>
-            <el-col :span="16">
-              <!-- 输入框允许修改 websocket 地址（注意：修改后不会自动更新已创建的 hook 实例） -->
-              <el-input v-model="socketEndpoint" class="w-220px" />
+            <el-col :span="18">
+              <el-input v-model="socketEndpoint" style="width: 200px" />
               <el-button
                 type="primary"
                 class="ml-5"
@@ -27,14 +26,13 @@
                 断开
               </el-button>
             </el-col>
-            <el-col :span="8" class="text-right">
+            <el-col :span="6" class="text-right">
               连接状态：
-              <el-tag v-if="isConnected" class="ml-2" type="success">已连接</el-tag>
-              <el-tag v-else class="ml-2" type="info">已断开</el-tag>
+              <el-tag v-if="isConnected" type="success">已连接</el-tag>
+              <el-tag v-else type="info">已断开</el-tag>
             </el-col>
           </el-row>
         </el-card>
-
         <!-- 广播消息发送部分 -->
         <el-card class="mt-5">
           <el-form label-width="90px">
@@ -46,7 +44,6 @@
             </el-form-item>
           </el-form>
         </el-card>
-
         <!-- 点对点消息发送部分 -->
         <el-card class="mt-5">
           <el-form label-width="90px">
@@ -62,32 +59,34 @@
           </el-form>
         </el-card>
       </el-col>
-
       <!-- 消息接收显示部分 -->
       <el-col :span="12">
         <el-card>
-          <div class="message-container">
+          <div class="chat-messages-wrapper">
             <div
               v-for="(message, index) in messages"
               :key="index"
-              :class="{
-                'tip-message': message.type === 'tip',
-                message: message.type !== 'tip',
-                'message--sent': message.sender === userStore.userInfo.username,
-                'message--received': message.sender !== userStore.userInfo.username,
-              }"
+              :class="[
+                message.type === 'tip' ? 'system-notice' : 'chat-message',
+                {
+                  'chat-message--sent': message.sender === userStore.userInfo.username,
+                  'chat-message--received': message.sender !== userStore.userInfo.username,
+                },
+              ]"
             >
-              <div v-if="message.type != 'tip'" class="message-content">
-                <div
-                  :class="{
-                    'message-sender': message.sender === userStore.userInfo.username,
-                    'message-receiver': message.sender !== userStore.userInfo.username,
-                  }"
-                >
-                  {{ message.sender }}
+              <template v-if="message.type != 'tip'">
+                <div class="chat-message__content">
+                  <div
+                    :class="{
+                      'chat-message__sender': message.sender === userStore.userInfo.username,
+                      'chat-message__receiver': message.sender !== userStore.userInfo.username,
+                    }"
+                  >
+                    {{ message.sender }}
+                  </div>
+                  <div class="text-gray-600">{{ message.content }}</div>
                 </div>
-                <div class="color-#333">{{ message.content }}</div>
-              </div>
+              </template>
               <div v-else>{{ message.content }}</div>
             </div>
           </div>
@@ -99,16 +98,12 @@
 
 <script setup lang="ts">
 import { useStomp } from "@/hooks/useStomp";
-import { getAccessToken } from "@/utils/auth"; // 用于获取token
-import { useUserStoreHook } from "@/store/modules/user"; // 获取用户信息
+import { useUserStoreHook } from "@/store/modules/user";
 
 const userStore = useUserStoreHook();
-
 // 用于手动调整 WebSocket 地址
 const socketEndpoint = ref(import.meta.env.VITE_APP_WS_ENDPOINT);
 // 同步连接状态
-const isConnected = ref(false);
-// 消息接收列表
 interface MessageType {
   type?: string;
   sender?: string;
@@ -122,50 +117,42 @@ const queneMessage = ref("Hi, " + userStore.userInfo.username + " 这里是点
 const receiver = ref("root");
 
 // 调用 useStomp hook，默认使用 socketEndpoint 和 token（此处用 getAccessToken()）
-const {
-  isConnected: stompConnected,
-  connect,
-  subscribe,
-  disconnect,
-  client,
-} = useStomp({
-  brokerURL: socketEndpoint.value,
-  token: getAccessToken(),
-  reconnectDelay: 5000,
+const { isConnected, connect, subscribe, disconnect, client } = useStomp({
   debug: true,
 });
 
-// 同步 hook 的连接状态到组件
-watch(stompConnected, (newVal) => {
-  isConnected.value = newVal;
-  if (newVal) {
-    // 连接成功后，订阅广播和点对点消息主题
-    subscribe("/topic/notice", (res) => {
+watch(
+  () => isConnected.value,
+  (connected) => {
+    if (connected) {
+      // 连接成功后，订阅广播和点对点消息主题
+      subscribe("/topic/notice", (res) => {
+        messages.value.push({
+          sender: "Server",
+          content: res.body,
+        });
+      });
+      subscribe("/user/queue/greeting", (res) => {
+        const messageData = JSON.parse(res.body) as MessageType;
+        messages.value.push({
+          sender: messageData.sender,
+          content: messageData.content,
+        });
+      });
       messages.value.push({
         sender: "Server",
-        content: res.body,
+        content: "Websocket 已连接",
+        type: "tip",
       });
-    });
-    subscribe("/user/queue/greeting", (res) => {
-      const messageData = JSON.parse(res.body) as MessageType;
+    } else {
       messages.value.push({
-        sender: messageData.sender,
-        content: messageData.content,
+        sender: "Server",
+        content: "Websocket 已断开",
+        type: "tip",
       });
-    });
-    messages.value.push({
-      sender: "Server",
-      content: "Websocket 已连接",
-      type: "tip",
-    });
-  } else {
-    messages.value.push({
-      sender: "Server",
-      content: "Websocket 已断开",
-      type: "tip",
-    });
+    }
   }
-});
+);
 
 // 连接 WebSocket
 function connectWebSocket() {
@@ -179,7 +166,7 @@ function disconnectWebSocket() {
 
 // 发送广播消息
 function sendToAll() {
-  if (client.value && isConnected.value) {
+  if (client.value && client.value.connected) {
     client.value.publish({
       destination: "/topic/notice",
       body: topicMessage.value,
@@ -193,7 +180,7 @@ function sendToAll() {
 
 // 发送点对点消息
 function sendToUser() {
-  if (client.value && isConnected.value) {
+  if (client.value && client.value.connected) {
     client.value.publish({
       destination: "/app/sendToUser/" + receiver.value,
       body: queneMessage.value,
@@ -214,45 +201,46 @@ onBeforeUnmount(() => {
 });
 </script>
 
-<style scoped>
-.message-container {
+<style scoped lang="scss">
+.chat-messages-wrapper {
   display: flex;
   flex-direction: column;
+  gap: 10px;
 }
-.message {
+.chat-message {
+  max-width: 80%;
   padding: 10px;
-  margin: 10px;
   border-radius: 5px;
+  &--sent {
+    align-self: flex-end;
+    background-color: #dcf8c6;
+  }
+  &--received {
+    align-self: flex-start;
+    background-color: #e8e8e8;
+  }
+  &__content {
+    display: flex;
+    flex-direction: column;
+    color: var(--el-text-color-primary); // 使用主题文本颜色
+  }
+  &__sender {
+    margin-bottom: 5px;
+    font-weight: bold;
+    text-align: right;
+  }
+  &__receiver {
+    margin-bottom: 5px;
+    font-weight: bold;
+    text-align: left;
+  }
 }
-.message--sent {
-  align-self: flex-end;
-  background-color: #dcf8c6;
-}
-.message--received {
-  align-self: flex-start;
-  background-color: #e8e8e8;
-}
-.message-content {
-  display: flex;
-  flex-direction: column;
-}
-.message-sender {
-  margin-bottom: 5px;
-  font-weight: bold;
-  text-align: right;
-}
-.message-receiver {
-  margin-bottom: 5px;
-  font-weight: bold;
-  text-align: left;
-}
-.tip-message {
+.system-notice {
   align-self: center;
   padding: 5px 10px;
-  margin-bottom: 5px;
-  font-style: italic;
-  text-align: center;
-  background-color: #f0f0f0;
-  border-radius: 5px;
+  font-size: 0.9em;
+  color: var(--el-text-color-secondary);
+  background-color: var(--el-fill-color-lighter);
+  border-radius: 15px;
 }
 </style>

From 4b042f2a0bc71bf93fdb02a408d9404596cc3001 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 21:28:46 +0800
Subject: [PATCH 192/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/NavbarRight.vue         | 75 ++++++++++++++++---
 .../NavBar/components/UserProfile.vue         | 62 ---------------
 src/layout/components/Sidebar/index.vue       |  2 +-
 src/layout/index.vue                          |  4 +-
 4 files changed, 68 insertions(+), 75 deletions(-)
 delete mode 100644 src/layout/components/NavBar/components/UserProfile.vue

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index b5693a96..a1489693 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="navbar__right">
-    <!-- 非手机设备（窄屏）才显示 -->
-    <template v-if="!isMobile">
+    <!-- 桌面端显示 -->
+    <template v-if="isDesktop">
       <!-- 搜索 -->
       <MenuSearch />
 
@@ -19,7 +19,22 @@
     </template>
 
     <!-- 用户头像（个人中心、注销登录等） -->
-    <UserProfile />
+    <el-dropdown trigger="click">
+      <div class="user-profile">
+        <img class="user-profile__avatar" :src="http://github.com/userStore.userInfo.avatar" />
+        <span class="user-profile__name">{{ userStore.userInfo.username }}</span>
+      </div>
+      <template #dropdown>
+        <el-dropdown-menu>
+          <el-dropdown-item @click="handleProfileClick">
+            {{ $t("navbar.profile") }}
+          </el-dropdown-item>
+          <el-dropdown-item divided @click="logout">
+            {{ $t("navbar.logout") }}
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </template>
+    </el-dropdown>
 
     <!-- 设置面板 -->
     <div v-if="defaultSettings.showSettings" @click="settingStore.settingsVisible = true">
@@ -30,16 +45,43 @@
 <script setup lang="ts">
 import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
+import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
 
-import { useAppStore, useSettingsStore } from "@/store";
-
-import UserProfile from "./UserProfile.vue";
 import Notification from "./Notification.vue";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
+const userStore = useUserStore();
+
+const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);
 
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+/**
+ * 打开个人中心页面
+ */
+function handleProfileClick() {
+  useRouter().push({ name: "Profile" });
+}
+
+/**
+ * 注销登出
+ */
+function logout() {
+  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    lockScroll: false,
+  }).then(() => {
+    userStore
+      .logout()
+      .then(() => {
+        useTagsViewStore().delAllViews();
+      })
+      .then(() => {
+        useRouter().push(`/login?redirect=${useRoute().fullPath}`);
+      });
+  });
+}
 </script>
 
 <style lang="scss" scoped>
@@ -61,10 +103,23 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
       background: rgb(0 0 0 / 10%);
     }
   }
-}
+  .user-profile {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    padding: 0 13px;
+
+    &__avatar {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+    }
 
-:deep(.el-divider--horizontal) {
-  margin: 10px 0;
+    &__name {
+      margin-left: 10px;
+    }
+  }
 }
 
 .layout-top .navbar__right > *,
diff --git a/src/layout/components/NavBar/components/UserProfile.vue b/src/layout/components/NavBar/components/UserProfile.vue
deleted file mode 100644
index 670a386d..00000000
--- a/src/layout/components/NavBar/components/UserProfile.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <el-dropdown trigger="click">
-    <div class="flex-center h100% p13px">
-      <img :src="http://github.com/userStore.userInfo.avatar" class="rounded-full mr10px w24px h24px" />
-      <span>{{ userStore.userInfo.username }}</span>
-    </div>
-    <template #dropdown>
-      <el-dropdown-menu>
-        <el-dropdown-item @click="handleOpenUserProfile">
-          {{ $t("navbar.profile") }}
-        </el-dropdown-item>
-        <el-dropdown-item divided @click="logout">
-          {{ $t("navbar.logout") }}
-        </el-dropdown-item>
-      </el-dropdown-menu>
-    </template>
-  </el-dropdown>
-</template>
-
-<script setup lang="ts">
-defineOptions({
-  name: "UserProfile",
-});
-
-import { useTagsViewStore, useUserStore } from "@/store";
-
-const tagsViewStore = useTagsViewStore();
-const userStore = useUserStore();
-
-const route = useRoute();
-const router = useRouter();
-
-/**
- * 打开个人中心页面
- */
-function handleOpenUserProfile() {
-  router.push({ name: "Profile" });
-}
-
-/**
- * 注销登出
- */
-function logout() {
-  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-    lockScroll: false,
-  }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login?redirect=${route.fullPath}`);
-      });
-  });
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 0d0108ac..c1dd1144 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,7 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-import NavbarRight from "../NavBar/components/NavbarRight.vue";
+import NavbarRight from "../Navbar/components/NavbarRight.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1f709c5a..3476e2f4 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -34,7 +34,7 @@
 
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: isShowTagsView }" class="main-container">
-      <NavBar v-if="layout === LayoutEnum.LEFT" />
+      <Navbar v-if="layout === LayoutEnum.LEFT" />
       <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
@@ -52,7 +52,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import NavBar from "./components/NavBar/index.vue";
+import Navbar from "./components/Navbar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From 52157082f59c6fedb1d5663850e02b195abf5ef3 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 13 Feb 2025 21:38:32 +0800
Subject: [PATCH 193/497] =?UTF-8?q?fix:=20:bug:=20=E5=AF=BC=E8=88=AA?=
 =?UTF-8?q?=E6=A0=8F=E9=80=9A=E7=9F=A5=E4=BC=98=E5=8C=96=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/Notification.vue        | 69 +++++++++----------
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index d29c0a3f..9940ea5e 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -24,7 +24,7 @@
                       size="small"
                       class="w200px cursor-pointer !ml-2 !flex-1"
                       truncated
-                      @click="handleReadNotice(item.id)"
+                      @click="readNotice(item.id)"
                     >
                       {{ item.title }}
                     </el-text>
@@ -42,7 +42,7 @@
               </template>
               <el-divider />
               <div class="flex-x-between">
-                <el-link type="primary" :underline="false" @click="handleViewMore">
+                <el-link type="primary" :underline="false" @click="viewMoreNotice">
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
                     <ArrowRight />
@@ -70,7 +70,7 @@
                     <el-link
                       type="primary"
                       class="w200px cursor-pointer !ml-2 !flex-1"
-                      @click="handleReadNotice(item.id)"
+                      @click="readNotice(item.id)"
                     >
                       {{ item.title }}
                     </el-link>
@@ -92,7 +92,7 @@
                   v-if="tasks.length > 5"
                   type="primary"
                   :underline="false"
-                  @click="handleViewMore"
+                  @click="viewMoreNotice"
                 >
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
@@ -118,7 +118,7 @@
                     <el-link
                       type="primary"
                       class="w200px cursor-pointer !ml-2 !flex-1"
-                      @click="handleReadNotice(item.id)"
+                      @click="readNotice(item.id)"
                     >
                       {{ item.title }}
                     </el-link>
@@ -139,7 +139,7 @@
                   v-if="tasks.length > 5"
                   type="primary"
                   :underline="false"
-                  @click="handleViewMore"
+                  @click="viewMoreNotice"
                 >
                   <span class="text-xs">查看更多</span>
                   <el-icon class="text-xs">
@@ -176,36 +176,37 @@ const tasks = ref<any[]>([]);
 const noticeDetailRef = ref();
 
 import { useStomp } from "@/hooks/useStomp";
-
-const { subscribe, disconnect } = useStomp({
+const { subscribe, unsubscribe, isConnected } = useStomp({
   debug: true,
 });
 
-/**
- * 订阅通知消息
- */
-function subscribeNotice() {
-  subscribe("/user/queue/message", (message) => {
-    console.log("收到消息：", message);
-    const data = JSON.parse(message.body);
-    const id = data.id;
-    if (!notices.value.some((notice) => notice.id == id)) {
-      notices.value.unshift({
-        id,
-        title: data.title,
-        type: data.type,
-        publishTime: data.publishTime,
-      });
+watch(
+  () => isConnected.value,
+  (connected) => {
+    if (connected) {
+      subscribe("/user/queue/message", (message) => {
+        console.log("收到通知消息：", message);
+        const data = JSON.parse(message.body);
+        const id = data.id;
+        if (!notices.value.some((notice) => notice.id == id)) {
+          notices.value.unshift({
+            id,
+            title: data.title,
+            type: data.type,
+            publishTime: data.publishTime,
+          });
 
-      ElNotification({
-        title: "您收到一条新的通知消息！",
-        message: data.title,
-        type: "success",
-        position: "bottom-right",
+          ElNotification({
+            title: "您收到一条新的通知消息！",
+            message: data.title,
+            type: "success",
+            position: "bottom-right",
+          });
+        }
       });
     }
-  });
-}
+  }
+);
 
 /**
  * 获取我的通知公告
@@ -217,7 +218,7 @@ function featchMyNotice() {
 }
 
 // 阅读通知公告
-function handleReadNotice(id: string) {
+function readNotice(id: string) {
   noticeDetailRef.value.openNotice(id);
   const index = notices.value.findIndex((notice) => notice.id === id);
   if (index >= 0) {
@@ -226,7 +227,7 @@ function handleReadNotice(id: string) {
 }
 
 // 查看更多
-function handleViewMore() {
+function viewMoreNotice() {
   router.push({ path: "/myNotice" });
 }
 
@@ -237,14 +238,12 @@ function markAllAsRead() {
   });
 }
 
-// 获取未读消息列表并连接 WebSocket
 onMounted(() => {
   featchMyNotice();
-  subscribeNotice();
 });
 
 onBeforeUnmount(() => {
-  disconnect();
+  unsubscribe("/user/queue/message");
 });
 </script>
 

From d3e4144f2cc38f6de3aa1014538750e830f0545d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Feb 2025 23:44:29 +0800
Subject: [PATCH 194/497] =?UTF-8?q?fix:=20:bug:=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue | 2 +-
 src/layout/index.vue                    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index c1dd1144..0d0108ac 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -24,7 +24,7 @@
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-import NavbarRight from "../Navbar/components/NavbarRight.vue";
+import NavbarRight from "../NavBar/components/NavbarRight.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 3476e2f4..56a7c4f9 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -34,7 +34,7 @@
 
     <!-- 左侧和顶部布局 -->
     <div v-else :class="{ hasTagsView: isShowTagsView }" class="main-container">
-      <Navbar v-if="layout === LayoutEnum.LEFT" />
+      <NavBar v-if="layout === LayoutEnum.LEFT" />
       <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
@@ -52,7 +52,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import Navbar from "./components/Navbar/index.vue";
+import NavBar from "@/components/NavBar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From 445a69aeba67d33bc748cb7406e6b2dcc0a54d90 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Feb 2025 23:50:05 +0800
Subject: [PATCH 195/497] =?UTF-8?q?fix:=20:bug:=20=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=B7=AF=E5=BE=84=E9=94=99=E8=AF=AF=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 56a7c4f9..1f709c5a 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -52,7 +52,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-import NavBar from "@/components/NavBar/index.vue";
+import NavBar from "./components/NavBar/index.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();

From 031cb74da882fcf0cec95508dc2ca5fb299bd59c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 15 Feb 2025 09:11:27 +0800
Subject: [PATCH 196/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20pinia=203=20=E5=92=8C=E5=85=B6=E4=BB=96=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 5aa47071..3235a1fd 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.0.0",
-    "@vueuse/core": "^12.5.0",
+    "@vueuse/core": "^12.6.1",
     "@wangeditor-next/editor": "^5.6.31",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
@@ -55,49 +55,49 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.3",
+    "element-plus": "^2.9.4",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^8.2.0",
-    "pinia": "^2.3.1",
+    "pinia": "^3.0.1",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.0",
+    "vue-i18n": "^11.1.1",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
-    "@eslint/js": "^9.19.0",
+    "@eslint/js": "^9.20.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.1",
+    "@types/node": "^22.13.4",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.23.0",
-    "@typescript-eslint/parser": "^8.23.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.0",
+    "@typescript-eslint/parser": "^8.24.0",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.0",
-    "eslint": "^9.19.0",
+    "eslint": "^9.20.1",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-vue": "^9.32.0",
-    "globals": "^15.14.0",
+    "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.4.3",
-    "postcss": "^8.5.1",
+    "postcss": "^8.5.2",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.4.2",
-    "sass": "^1.84.0",
+    "prettier": "^3.5.1",
+    "sass": "^1.85.0",
     "stylelint": "^16.14.1",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
@@ -105,14 +105,14 @@
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-prettier": "^5.0.3",
-    "terser": "^5.38.0",
+    "terser": "^5.39.0",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.23.0",
+    "typescript-eslint": "^8.24.0",
     "unocss": "65.4.3",
     "unplugin-auto-import": "^19.0.0",
     "unplugin-vue-components": "^28.0.0",
     "vite": "^6.1.0",
-    "vite-plugin-mock-dev-server": "^1.8.3",
+    "vite-plugin-mock-dev-server": "^1.8.4",
     "vue-eslint-parser": "^9.4.3",
     "vue-tsc": "^2.2.0"
   },

From b450539e1019151c399c7aeb7202a09de1a7709d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 15 Feb 2025 16:34:36 +0800
Subject: [PATCH 197/497] =?UTF-8?q?fix:=20:bug:=20=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=9C=AA=E8=83=BD=E9=87=8D=E5=AE=9A=E5=90=91?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavBar/components/NavbarRight.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index a1489693..4e841c6c 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -52,14 +52,17 @@ import Notification from "./Notification.vue";
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
 const userStore = useUserStore();
+const tagsViewStore = useTagsViewStore();
 
+const route = useRoute();
+const router = useRouter();
 const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);
 
 /**
  * 打开个人中心页面
  */
 function handleProfileClick() {
-  useRouter().push({ name: "Profile" });
+  router.push({ name: "Profile" });
 }
 
 /**
@@ -75,10 +78,10 @@ function logout() {
     userStore
       .logout()
       .then(() => {
-        useTagsViewStore().delAllViews();
+        tagsViewStore.delAllViews();
       })
       .then(() => {
-        useRouter().push(`/login?redirect=${useRoute().fullPath}`);
+        router.push(`/login?redirect=${route.fullPath}`);
       });
   });
 }

From ccf2f900daf1c274fb7010d734966b6ffa8b348e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 17 Feb 2025 23:56:48 +0800
Subject: [PATCH 198/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E9=80=9A=E7=9F=A5=E6=A0=B7=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/Notification.vue        | 190 ++++--------------
 1 file changed, 42 insertions(+), 148 deletions(-)

diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index 9940ea5e..e8429551 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -1,162 +1,61 @@
 <template>
   <div>
-    <el-dropdown class="wh-full">
+    <el-dropdown class="wh-full flex-center" trigger="click">
       <el-badge v-if="notices.length > 0" :offset="[-10, 15]" :value="notices.length" :max="99">
         <el-icon>
           <Bell />
         </el-icon>
       </el-badge>
-      <el-badge v-else>
+
+      <div v-else>
         <el-icon>
           <Bell />
         </el-icon>
-      </el-badge>
+      </div>
 
       <template #dropdown>
         <div class="p-2">
-          <el-tabs v-model="activeTab">
-            <el-tab-pane label="通知" name="notice">
-              <template v-if="notices.length > 0">
-                <div v-for="(item, index) in notices" :key="index" class="w500px py-3">
-                  <div class="flex-y-center">
-                    <DictLabel v-model="item.type" code="notice_type" size="small" />
-                    <el-text
-                      size="small"
-                      class="w200px cursor-pointer !ml-2 !flex-1"
-                      truncated
-                      @click="readNotice(item.id)"
-                    >
-                      {{ item.title }}
-                    </el-text>
-
-                    <div class="text-xs text-gray">
-                      {{ item.publishTime }}
-                    </div>
-                  </div>
-                </div>
-              </template>
-              <template v-else>
-                <div class="flex-center h150px w350px">
-                  <el-empty :image-size="50" description="暂无通知" />
-                </div>
-              </template>
-              <el-divider />
-              <div class="flex-x-between">
-                <el-link type="primary" :underline="false" @click="viewMoreNotice">
-                  <span class="text-xs">查看更多</span>
-                  <el-icon class="text-xs">
-                    <ArrowRight />
-                  </el-icon>
-                </el-link>
-                <el-link
-                  v-if="notices.length > 0"
-                  type="primary"
-                  :underline="false"
-                  @click="markAllAsRead"
+          <template v-if="notices.length > 0">
+            <div v-for="(item, index) in notices" :key="index" class="w500px py-3">
+              <div class="flex-y-center">
+                <DictLabel v-model="item.type" code="notice_type" size="small" />
+                <el-text
+                  size="small"
+                  class="w200px cursor-pointer !ml-2 !flex-1"
+                  truncated
+                  @click="readNotice(item.id)"
                 >
-                  <span class="text-xs">全部已读</span>
-                </el-link>
-              </div>
-            </el-tab-pane>
-            <el-tab-pane label="消息" name="message">
-              <template v-if="messages.length > 0">
-                <div
-                  v-for="(item, index) in messages"
-                  :key="index"
-                  class="w400px flex-x-between p-1"
-                >
-                  <div class="flex-y-center">
-                    <DictLabel v-model="item.type" code="notice_type" size="small" />
-                    <el-link
-                      type="primary"
-                      class="w200px cursor-pointer !ml-2 !flex-1"
-                      @click="readNotice(item.id)"
-                    >
-                      {{ item.title }}
-                    </el-link>
+                  {{ item.title }}
+                </el-text>
 
-                    <div class="text-xs text-gray-400">
-                      {{ item.publishTime }}
-                    </div>
-                  </div>
+                <div class="text-xs text-gray">
+                  {{ item.publishTime }}
                 </div>
-              </template>
-              <template v-else>
-                <div class="flex-center h150px w350px">
-                  <el-empty :image-size="50" description="暂无消息" />
-                </div>
-              </template>
-              <el-divider />
-              <div class="flex-x-between">
-                <el-link
-                  v-if="tasks.length > 5"
-                  type="primary"
-                  :underline="false"
-                  @click="viewMoreNotice"
-                >
-                  <span class="text-xs">查看更多</span>
-                  <el-icon class="text-xs">
-                    <ArrowRight />
-                  </el-icon>
-                </el-link>
-                <el-link
-                  v-if="messages.length > 0"
-                  type="primary"
-                  :underline="false"
-                  @click="markAllAsRead"
-                >
-                  <span class="text-xs">全部已读</span>
-                </el-link>
-              </div>
-            </el-tab-pane>
-
-            <el-tab-pane label="待办" name="task">
-              <template v-if="tasks.length > 0">
-                <div v-for="(item, index) in tasks" :key="index" class="w500px py-3">
-                  <div class="flex-y-center">
-                    <DictLabel v-model="item.type" code="notice_type" size="small" />
-                    <el-link
-                      type="primary"
-                      class="w200px cursor-pointer !ml-2 !flex-1"
-                      @click="readNotice(item.id)"
-                    >
-                      {{ item.title }}
-                    </el-link>
-                    <div class="text-xs text-gray-400">
-                      {{ item.publishTime }}
-                    </div>
-                  </div>
-                </div>
-              </template>
-              <template v-else>
-                <div class="flex-center h150px w350px">
-                  <el-empty :image-size="50" description="暂无待办" />
-                </div>
-              </template>
-              <el-divider />
-              <div class="flex-x-between">
-                <el-link
-                  v-if="tasks.length > 5"
-                  type="primary"
-                  :underline="false"
-                  @click="viewMoreNotice"
-                >
-                  <span class="text-xs">查看更多</span>
-                  <el-icon class="text-xs">
-                    <ArrowRight />
-                  </el-icon>
-                </el-link>
-                <el-link
-                  v-if="tasks.length > 0"
-                  type="primary"
-                  :underline="false"
-                  @click="markAllAsRead"
-                >
-                  <span class="text-xs">全部已读</span>
-                </el-link>
               </div>
-            </el-tab-pane>
-          </el-tabs>
+            </div>
+            <el-divider />
+            <div class="flex-x-between">
+              <el-link type="primary" :underline="false" @click="viewMoreNotice">
+                <span class="text-xs">查看更多</span>
+                <el-icon class="text-xs">
+                  <ArrowRight />
+                </el-icon>
+              </el-link>
+              <el-link
+                v-if="notices.length > 0"
+                type="primary"
+                :underline="false"
+                @click="markAllAsRead"
+              >
+                <span class="text-xs">全部已读</span>
+              </el-link>
+            </div>
+          </template>
+          <template v-else>
+            <div class="flex-center h150px w350px">
+              <el-empty :image-size="50" description="暂无通知" />
+            </div>
+          </template>
         </div>
       </template>
     </el-dropdown>
@@ -169,16 +68,11 @@
 import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 import router from "@/router";
 
-const activeTab = ref("notice");
 const notices = ref<NoticePageVO[]>([]);
-const messages = ref<any[]>([]);
-const tasks = ref<any[]>([]);
 const noticeDetailRef = ref();
 
 import { useStomp } from "@/hooks/useStomp";
-const { subscribe, unsubscribe, isConnected } = useStomp({
-  debug: true,
-});
+const { subscribe, unsubscribe, isConnected } = useStomp();
 
 watch(
   () => isConnected.value,

From 62879b293d4502d98598474cef8be3b3f704090d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 00:34:38 +0800
Subject: [PATCH 199/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E5=8F=B3=E4=BE=A7=E6=93=8D=E4=BD=9C=E6=A0=8F?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavBar/components/Notification.vue     | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/layout/components/NavBar/components/Notification.vue
index e8429551..70bc8308 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/layout/components/NavBar/components/Notification.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-dropdown class="wh-full flex-center" trigger="click">
-      <el-badge v-if="notices.length > 0" :offset="[-10, 15]" :value="notices.length" :max="99">
+    <el-dropdown class="h-full items-center justify-center" trigger="click">
+      <el-badge v-if="notices.length > 0" :offset="[0, 15]" :value="notices.length" :max="99">
         <el-icon>
           <Bell />
         </el-icon>
@@ -14,7 +14,7 @@
       </div>
 
       <template #dropdown>
-        <div class="p-2">
+        <div class="p-5">
           <template v-if="notices.length > 0">
             <div v-for="(item, index) in notices" :key="index" class="w500px py-3">
               <div class="flex-y-center">
@@ -53,7 +53,7 @@
           </template>
           <template v-else>
             <div class="flex-center h150px w350px">
-              <el-empty :image-size="50" description="暂无通知" />
+              <el-empty :image-size="50" description="暂无消息" />
             </div>
           </template>
         </div>
@@ -149,4 +149,7 @@ onBeforeUnmount(() => {
   width: 100%;
   height: 100%;
 }
+:deep(.el-dropdown) {
+  color: currentColor;
+}
 </style>

From a60c48ae60f1f54a45637543d22574ffe814f331 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 00:43:59 +0800
Subject: [PATCH 200/497] =?UTF-8?q?refactor:=20:recycle:=20hamburger=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Hamburger/index.vue | 32 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 6bc47abc..4b624c96 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,9 +1,5 @@
-<!-- 汉堡按钮组件：展开/收缩菜单  -->
 <template>
-  <div
-    class="px-[15px] flex items-center justify-center color-[var(--el-text-color-regular)]"
-    @click="toggleClick"
-  >
+  <div class="hamburger-wrapper" @click="toggleClick">
     <div :class="['i-svg:collapse', { hamburger: true, 'is-active': isActive }]" />
   </div>
 </template>
@@ -25,13 +21,25 @@ function toggleClick() {
 </script>
 
 <style scoped lang="scss">
-.hamburger {
-  vertical-align: middle;
-  cursor: pointer;
-  transform: scaleX(-1);
-}
+.hamburger-wrapper {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 15px;
+
+  .hamburger {
+    vertical-align: middle;
+    cursor: pointer;
+    transform: scaleX(-1);
+  }
 
-.hamburger.is-active {
-  transform: scaleX(1);
+  .hamburger.is-active {
+    transform: scaleX(1);
+  }
+}
+.layout-mix {
+  .hamburger-wrapper {
+    color: #fff;
+  }
 }
 </style>

From 056aca0a8e8470ba708a67efb39b2fa95fceeb05 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 00:50:27 +0800
Subject: [PATCH 201/497] =?UTF-8?q?docs:=20:memo:=20=E4=BE=9D=E8=B5=96?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index a97ac1ae..46a68ac1 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
   <h1>vue3-element-admin</h1>
 
   <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.0.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.1-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.1.0-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.4-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
@@ -12,7 +12,7 @@
 
   <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
      <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
-   </a>     
+   </a>
   <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
     <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
   </a>
@@ -118,7 +118,7 @@ server {
 	# 反向代理配置
 	location /prod-api/ {
       # api.youlai.tech 替换后端API地址，注意保留后面的斜杠 /
-      proxy_pass http://api.youlai.tech/; 
+      proxy_pass http://api.youlai.tech/;
 	}
 }
 ```

From 583bdd631bef6539bf22e0c2bd8618add5d79050 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 00:51:12 +0800
Subject: [PATCH 202/497] chore: :hammer: bump version to 2.23.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 3235a1fd..6fead508 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.22.1",
+  "version": "2.23.0",
   "private": true,
   "type": "module",
   "scripts": {

From a1b4efe9d7063e08d46f14d3626edd7dbe27aeaa Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Tue, 18 Feb 2025 13:23:44 +0800
Subject: [PATCH 203/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Settings/components/LayoutSelect.vue      | 175 ++++++++++--------
 1 file changed, 101 insertions(+), 74 deletions(-)

diff --git a/src/layout/components/Settings/components/LayoutSelect.vue b/src/layout/components/Settings/components/LayoutSelect.vue
index 565dc41d..f259baeb 100644
--- a/src/layout/components/Settings/components/LayoutSelect.vue
+++ b/src/layout/components/Settings/components/LayoutSelect.vue
@@ -1,35 +1,20 @@
 <template>
-  <div class="flex flex-wrap justify-around w-full h-12">
-    <el-tooltip content="左侧模式" placement="bottom">
+  <div class="layout-select">
+    <el-tooltip
+      v-for="item in layoutOptions"
+      :key="item.value"
+      :content="item.label"
+      placement="bottom"
+    >
       <div
-        class="layout-item left"
-        :class="{ 'is-active': modelValue === LayoutEnum.LEFT }"
-        @click="handleLayoutChange(LayoutEnum.LEFT)"
+        role="button"
+        tabindex="0"
+        :class="['layout-item', item.className, { 'is-active': modelValue === item.value }]"
+        @click="handleLayoutChange(item.value)"
+        @keydown.enter.space="handleLayoutChange(item.value)"
       >
-        <div />
-        <div />
-      </div>
-    </el-tooltip>
-
-    <el-tooltip content="顶部模式" placement="bottom">
-      <div
-        class="layout-item top"
-        :class="{ 'is-active': modelValue === LayoutEnum.TOP }"
-        @click="handleLayoutChange(LayoutEnum.TOP)"
-      >
-        <div />
-        <div />
-      </div>
-    </el-tooltip>
-
-    <el-tooltip content="混合模式" placement="bottom">
-      <div
-        class="layout-item mix"
-        :class="{ 'is-active': modelValue === LayoutEnum.MIX }"
-        @click="handleLayoutChange(LayoutEnum.MIX)"
-      >
-        <div />
-        <div />
+        <div class="layout-item-part" />
+        <div class="layout-item-part" />
       </div>
     </el-tooltip>
   </div>
@@ -38,76 +23,118 @@
 <script lang="ts" setup>
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
-const modelValue = defineModel("modelValue", {
-  type: String,
+interface LayoutOption {
+  value: LayoutEnum;
+  label: string;
+  className: string;
+}
+
+const layoutOptions: LayoutOption[] = [
+  { value: LayoutEnum.LEFT, label: "左侧模式", className: "left" },
+  { value: LayoutEnum.TOP, label: "顶部模式", className: "top" },
+  { value: LayoutEnum.MIX, label: "混合模式", className: "mix" },
+];
+
+const modelValue = defineModel<LayoutEnum>("modelValue", {
   required: true,
-  default: () => "",
+  default: () => LayoutEnum.LEFT,
 });
 
-/**
- * 变换布局
- *
- * @param layout
- */
-function handleLayoutChange(layout: string) {
+function handleLayoutChange(layout: LayoutEnum) {
   modelValue.value = layout;
 }
 </script>
 
-<style scoped>
-.layout-selector {
+<style scoped lang="scss">
+.layout-select {
   display: flex;
-  flex-wrap: wrap;
-  justify-content: space-around;
-  width: 100%;
-  height: 50px;
+  gap: 10px;
+  justify-content: space-evenly;
+  padding: 10px 0;
+  --layout-primary: #1b2a47;
+  --layout-background: #f0f2f5;
+  --layout-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+  --layout-hover: #e3f1f9;
 }
 
 .layout-item {
   position: relative;
   width: 18%;
-  height: 45px;
-  overflow: hidden;
+  height: 50px;
   cursor: pointer;
-  background: #f0f2f5;
-  border-radius: 4px;
+  background: var(--layout-background);
+  border-radius: 8px;
+  box-shadow: var(--layout-shadow);
+
+  transition:
+    transform 0.2s ease,
+    border-color 0.2s ease,
+    box-shadow 0.2s ease;
 
-  &.mix div:nth-child(1),
-  &.top div:nth-child(1) {
-    width: 100%;
-    height: 30%;
-    background: #1b2a47;
-    box-shadow: 0 0 1px #888;
+  &:hover {
+    background-color: var(--layout-hover);
+    transform: scale(1.02); /* 稍微放大，避免过于夸张 */
   }
 
-  &.mix div:nth-child(2) {
+  &:focus-visible {
+    outline: 2px solid var(--el-color-primary);
+  }
+
+  &-part {
     position: absolute;
-    bottom: 0;
-    left: 0;
-    width: 30%;
-    height: 70%;
-    background: #1b2a47;
-    box-shadow: 0 0 1px #888;
+    background: var(--layout-primary);
+    border-radius: 4px; /* 保持和父容器一致的圆角 */
+    box-shadow: var(--layout-shadow);
+    transition: all 0.3s ease;
   }
 
-  &.left div:nth-child(1) {
-    width: 30%;
-    height: 100%;
-    background: #1b2a47;
+  &.left {
+    .layout-item-part {
+      &:first-child {
+        width: 30%;
+        height: 100%;
+        border-radius: 4px 0 0 4px; /* 左边部分圆角 */
+      }
+      &:last-child {
+        top: 0;
+        right: 0;
+        width: 70%;
+        height: 30%;
+        background: #fff;
+        border-radius: 0 4px 4px 0; /* 右边部分圆角 */
+      }
+    }
   }
 
-  &.left div:nth-child(2) {
-    position: absolute;
-    top: 0;
-    right: 0;
-    width: 70%;
-    height: 30%;
-    background: #fff;
-    box-shadow: 0 0 1px #888;
+  &.top {
+    .layout-item-part:first-child {
+      width: 100%;
+      height: 30%;
+      border-radius: 4px 4px 0 0; /* 顶部部分圆角 */
+    }
+  }
+
+  &.mix {
+    .layout-item-part {
+      &:first-child {
+        width: 100%;
+        height: 30%;
+        border-radius: 4px 4px 0 0; /* 顶部部分圆角 */
+      }
+      &:last-child {
+        bottom: 0;
+        left: 0;
+        width: 30%;
+        height: 70%;
+        border-radius: 0 0 4px 4px; /* 底部部分圆角 */
+      }
+    }
   }
 }
 
-.layout-item.is-active {
+.is-active {
+  background-color: var(--layout-hover);
   border: 2px solid var(--el-color-primary);
+  transform: scale(1.05); /* 轻微放大 */
 }
 </style>

From c0b5b5fb971c83d2074cf745df41fee2f56a7751 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 23:24:48 +0800
Subject: [PATCH 204/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 46a68ac1..326118da 100644
--- a/README.md
+++ b/README.md
@@ -26,37 +26,35 @@
 
 
 <div align="center">
-  <a target="_blank" href="http://vue3.youlai.tech/">🔍 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 阅读文档</a> | <a href="http://github.com/README.en-US.md">🌐English
+  <a target="_blank" href="http://vue3.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a> | <a href="http://github.com/README.en-US.md">💬 English
 </div>
 
 
-
 ## 项目简介
 
-[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 是基于 Vue3 + Vite5+ TypeScript5 + Element-Plus + Pinia 等主流技术栈构建的免费开源的中后台管理的前端模板（配套[Java 后端源码](https://gitee.com/youlaiorg/youlai-boot)）。
+[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 基于 Vue3、Vite、TypeScript 和 Element-Plus 搭建的极简开箱即用企业级后台管理前端模板。 （配套 Java 后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) 和 Node 后端 [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)）。
 
 
 ## 项目特色
 
 - **简洁易用**：基于 [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) 升级的 Vue3 版本，无过渡封装 ，易上手。
-
 - **数据交互**：同时支持本地 `Mock` 和线上接口，配套 [Java 后端源码](https://gitee.com/youlaiorg/youlai-boot)和[在线接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)。
-
-- **权限管理**：用户、角色、菜单、字典、部门等完善的权限系统功能。
-
-- **基础设施**：动态路由、按钮权限、国际化、代码规范、Git 提交规范、常用组件封装。
-
+- **系统功能：** 提供用户管理、角色管理、菜单管理、部门管理、字典管理等功能模块。
+- **权限管理：** 支持动态路由、按钮权限、角色权限和数据权限等多种权限管理方式。
+- **数据交互：** 支持 Mock 数据和线上接口数据，并提供配套的 Java 和 Node 后端源码。
+- **基础设施：** 提供国际化、多布局、暗黑模式、全屏、水印、接口文档和代码生成器等功能。
 - **持续更新**：项目持续开源更新，实时更新工具和依赖。
 
 
+## 项目截图
 
-## 项目预览
+![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183316.png)
 
-![明亮模式](https://foruda.gitee.com/images/1709651876583793739/0ba1ee1c_716974.png)
+![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183410.png)
 
-![暗黑模式](https://foruda.gitee.com/images/1709651875494206224/2a2b0b53_716974.png)
+![](https://www.youlai.tech/storage/blog/2025/01/18/20250118160647.png)
 
-![接口文档](https://foruda.gitee.com/images/1687755822857820115/96054330_716974.png)
+![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183539.png)
 
 ## 项目源码
 

From baf94fa7b2dbde7518ed48faf6a6b68bfe67e217 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 18 Feb 2025 23:47:36 +0800
Subject: [PATCH 205/497] =?UTF-8?q?docs:=20:memo:=20=E6=96=87=E6=A1=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 326118da..093359d9 100644
--- a/README.md
+++ b/README.md
@@ -38,10 +38,11 @@
 ## 项目特色
 
 - **简洁易用**：基于 [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) 升级的 Vue3 版本，无过渡封装 ，易上手。
-- **数据交互**：同时支持本地 `Mock` 和线上接口，配套 [Java 后端源码](https://gitee.com/youlaiorg/youlai-boot)和[在线接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)。
+- **数据交互**： 支持 `Mock` 数据和[线上接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)，并提供配套的 [Java](https://gitee.com/youlaiorg/youlai-boot) 和 [Node](https://gitee.com/youlaiorg/youlai-nest) 后端源码。
+
 - **系统功能：** 提供用户管理、角色管理、菜单管理、部门管理、字典管理等功能模块。
 - **权限管理：** 支持动态路由、按钮权限、角色权限和数据权限等多种权限管理方式。
-- **数据交互：** 支持 Mock 数据和线上接口数据，并提供配套的 Java 和 Node 后端源码。
+
 - **基础设施：** 提供国际化、多布局、暗黑模式、全屏、水印、接口文档和代码生成器等功能。
 - **持续更新**：项目持续开源更新，实时更新工具和依赖。
 
@@ -188,15 +189,13 @@ Thanks to all the contributors!
 
 ![](https://foruda.gitee.com/images/1728577513089814203/95f2a70d_716974.jpeg)
 
-## 交流群🚀
+## 加群交流
 
-> **关注「有来技术」公众号，获取交流群二维码。**
+> **关注「有来技术」公众号，点击菜单“交流群”获取加群二维码。**
 >
-> 如果交流群的二维码过期，请加微信(haoxianrui)并备注「前端」、「后端」或「全栈」以获取最新二维码。
+> 如果二维码过期，请加微信(haoxianrui)备注「前端」、「后端」或「全栈」拉你进群。
 >
-> 为确保交流群质量，防止营销广告人群混入，我们采取了此措施。望各位理解！
+> 交流群仅限技术交流，为过滤广告营销暂设此门槛，感谢理解与配合
 
-| 公众号 | 交流群 |
-|:----:|:----:|
-| ![有来技术公众号二维码](https://foruda.gitee.com/images/1687689212187063809/3c69eaee_716974.png) | ![交流群二维码](https://foruda.gitee.com/images/1687689212139273561/6a65ef69_716974.png) |
+![有来技术公众号二维码](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
 

From dd3e4b69f3c32a2f0c5e7d6213f6e5612c7518d2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 19 Feb 2025 00:55:25 +0800
Subject: [PATCH 206/497] =?UTF-8?q?docs:=20:memo:=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=83=A8=E7=BD=B2=E8=AF=B4=E6=98=8E=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 093359d9..41040beb 100644
--- a/README.md
+++ b/README.md
@@ -49,10 +49,6 @@
 
 ## 项目截图
 
-![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183316.png)
-
-![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183410.png)
-
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118160647.png)
 
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183539.png)
@@ -99,26 +95,33 @@ pnpm run dev
 
 ## 项目部署
 
+[Nginx 安装和配置](https://blog.csdn.net/u013737132/article/details/145667694)
+
+**项目打包**
 ```bash
-# 项目打包
 pnpm run build
+# 生成文件将输出至 /dist 目录
+```
+
+**部署静态资源**
 
-# 上传文件至远程服务器
 将本地打包生成的 dist 目录下的所有文件拷贝至服务器的 /usr/share/nginx/html 目录。
 
+**Nginx 配置**
+```shell
 # nginx.cofig 配置
 server {
-	listen     80;
-	server_name  localhost;
-	location / {
-			root /usr/share/nginx/html;
-			index index.html index.htm;
-	}
-	# 反向代理配置
-	location /prod-api/ {
-      # api.youlai.tech 替换后端API地址，注意保留后面的斜杠 /
-      proxy_pass http://api.youlai.tech/;
-	}
+    listen      80;
+    server_name localhost;
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+    # 反向代理配置
+    location /prod-api/ {
+        # api.youlai.tech 替换后端API地址，注意保留后面的斜杠 /
+        proxy_pass http://api.youlai.tech/;
+    }
 }
 ```
 
@@ -165,8 +168,8 @@ server {
 
 - [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)
 
-- [ESLint+Prettier+Stylelint+EditorConfig 约束和统一前端代码规范](https://blog.csdn.net/u013737132/article/details/130190788)
-- [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://blog.csdn.net/u013737132/article/details/130191363)
+- [ESLint+Prettier+Stylelint+EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723)
+- [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236)
 
 
 ## 提交规范

From 2304b49ac436c19f81b60d6df4ce316ac7f26bd8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 19 Feb 2025 08:15:54 +0800
Subject: [PATCH 207/497] =?UTF-8?q?docs:=20:memo:=20=E9=83=A8=E7=BD=B2?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 41040beb..37815efd 100644
--- a/README.md
+++ b/README.md
@@ -95,36 +95,34 @@ pnpm run dev
 
 ## 项目部署
 
-[Nginx 安装和配置](https://blog.csdn.net/u013737132/article/details/145667694)
+执行 `pnpm run build` 命令后，项目将被打包并生成 `dist` 目录。接下来，将 `dist` 目录下的文件上传到服务器 `/usr/share/nginx/html` 目录下，并配置 Nginx 进行反向代理。
 
-**项目打包**
 ```bash
 pnpm run build
-# 生成文件将输出至 /dist 目录
 ```
 
-**部署静态资源**
+以下是 Nginx 的配置示例：
 
-将本地打包生成的 dist 目录下的所有文件拷贝至服务器的 /usr/share/nginx/html 目录。
-
-**Nginx 配置**
-```shell
-# nginx.cofig 配置
+```nginx
 server {
     listen      80;
     server_name localhost;
+
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
     }
+
     # 反向代理配置
     location /prod-api/ {
-        # api.youlai.tech 替换后端API地址，注意保留后面的斜杠 /
+        # 请将 api.youlai.tech 替换为您的后端 API 地址，并注意保留后面的斜杠 /
         proxy_pass http://api.youlai.tech/;
     }
 }
 ```
 
+更多详细信息，请参考这篇文章：[Nginx 安装和配置](https://blog.csdn.net/u013737132/article/details/145667694)。
+
 ## 本地Mock
 
 项目同时支持在线和本地 Mock 接口，默认使用线上接口，如需替换为 Mock 接口，修改文件 `.env.development` 的 `VITE_MOCK_DEV_SERVER` 为  `true` **即可**。

From f62e02ef0b60ac48396721e6ad0080f6f8b12746 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 19 Feb 2025 08:19:30 +0800
Subject: [PATCH 208/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=A2=84=E8=A7=88=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 37815efd..5b0e94ee 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 
 
 <div align="center">
-  <a target="_blank" href="http://vue3.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a> | <a href="http://github.com/README.en-US.md">💬 English
+  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a> | <a href="http://github.com/README.en-US.md">💬 English
 </div>
 
 

From d6de05a4b7c5636a46307cca8130e95e7962d8c8 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Wed, 19 Feb 2025 12:45:29 +0800
Subject: [PATCH 209/497] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B5=85=E8=89=B2=E6=A8=A1=E5=BC=8F=E4=B8=8B=E7=9A=84=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E9=85=8D=E8=89=B2=E5=88=87=E6=8D=A2=EF=BC=9A?=
 =?UTF-8?q?=E6=B7=B1=E8=93=9D=E8=89=B2=E3=80=81=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/ThemeEnum.ts                        | 14 +++++++++
 src/lang/package/en.ts                        |  3 ++
 src/lang/package/zh-cn.ts                     |  3 ++
 .../NavBar/components/NavbarRight.vue         | 20 ++++++++++++-
 src/layout/components/Settings/index.vue      | 19 +++++++++++-
 .../Sidebar/components/SidebarMenu.vue        | 22 ++++++++++++--
 .../Sidebar/components/SidebarMenuItem.vue    |  6 ++++
 .../Sidebar/components/SidebarMixTopMenu.vue  | 22 ++++++++++++--
 src/settings.ts                               |  2 ++
 src/store/modules/settings.ts                 | 30 +++++++++++++++++--
 src/styles/variables.scss                     | 23 +++++++++-----
 src/types/global.d.ts                         |  2 ++
 src/utils/theme.ts                            | 20 +++++++++++++
 13 files changed, 169 insertions(+), 17 deletions(-)

diff --git a/src/enums/ThemeEnum.ts b/src/enums/ThemeEnum.ts
index 91458e16..6d2ad192 100644
--- a/src/enums/ThemeEnum.ts
+++ b/src/enums/ThemeEnum.ts
@@ -16,3 +16,17 @@ export const enum ThemeEnum {
    */
   AUTO = "auto",
 }
+
+/**
+ * 浅色主题下的侧边栏配色方案枚举
+ */
+export const enum SidebarLightThemeEnum {
+  /**
+   * 深蓝色
+   */
+  DARKBLUE = "light-darkBlue",
+  /**
+   * 白色
+   */
+  WHITE = "light-white",
+}
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 3b062127..446e4c75 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -57,6 +57,9 @@ export default {
     themeColor: "Theme Color",
     tagsView: "Tags View",
     sidebarLogo: "Sidebar Logo",
+    sidebarColorScheme: "Sidebar Color Scheme",
     watermark: "Watermark",
+    white: "white",
+    darkBlue: "darkBlue",
   },
 };
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 0b48e4a3..4ad0f150 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -57,6 +57,9 @@ export default {
     themeColor: "主题颜色",
     tagsView: "开启 Tags-View",
     sidebarLogo: "侧边栏 Logo",
+    sidebarColorScheme: "侧边栏配色方案",
     watermark: "开启水印",
+    white: "白色",
+    darkBlue: "深蓝色",
   },
 };
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index b53bd0d7..959573f4 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="navbar__right">
+  <div class="navbar__right" :class="navbarRightClass">
     <!-- 非手机设备（窄屏）才显示 -->
     <template v-if="!isMobile">
       <!-- 搜索 -->
@@ -35,11 +35,19 @@ import { useAppStore, useSettingsStore } from "@/store";
 
 import UserProfile from "./UserProfile.vue";
 import Notification from "./Notification.vue";
+import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
 
 const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+
+// 根据浅色模式-侧边栏颜色配置选择navbar右侧的样式类
+const navbarRightClass = computed(() => {
+  return settingStore.sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+    ? "navbar__right--darkBlue"
+    : "navbar__right--white";
+});
 </script>
 
 <style lang="scss" scoped>
@@ -70,4 +78,14 @@ const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
 .dark .navbar__right > *:hover {
   background: rgb(255 255 255 / 20%);
 }
+
+.layout-top .navbar__right--darkBlue > *,
+.layout-mix .navbar__right--darkBlue > * {
+  color: #fff;
+}
+
+.layout-top .navbar__right--white > *,
+.layout-mix .navbar__right--white > * {
+  color: #000;
+}
 </style>
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index edc7a0da..5409656f 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -27,6 +27,13 @@
       <span class="text-xs">{{ $t("settings.watermark") }}</span>
       <el-switch v-model="settingsStore.watermarkEnabled" />
     </div>
+    <div v-if="!isDark" class="py-1 flex-x-between">
+      <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
+      <el-radio-group v-model="settingsStore.sidebarColorScheme" @change="changeSidebarColorScheme">
+        <el-radio :value="SidebarLightThemeEnum.WHITE">{{ $t("settings.white") }}</el-radio>
+        <el-radio :value="SidebarLightThemeEnum.DARKBLUE">{{ $t("settings.darkBlue") }}</el-radio>
+      </el-radio-group>
+    </div>
 
     <el-divider>{{ $t("settings.navigation") }}</el-divider>
 
@@ -37,7 +44,7 @@
 <script setup lang="ts">
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { ThemeEnum } from "@/enums/ThemeEnum";
-
+import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
 const route = useRoute();
@@ -74,6 +81,16 @@ const changeTheme = (val: any) => {
   settingsStore.changeTheme(isDark.value ? ThemeEnum.DARK : ThemeEnum.LIGHT);
 };
 
+/**
+ * 更改侧边栏颜色方案
+ *
+ * @param val 颜色方案名称
+ */
+const changeSidebarColorScheme = (val: any) => {
+  console.log(val);
+  settingsStore.changeSidebarColorScheme(val);
+};
+
 /**
  * 切换布局
  *
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 0701ef65..2f52d063 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -4,9 +4,21 @@
     ref="menuRef"
     :default-active="currentRoute.path"
     :collapse="!appStore.sidebar.opened"
-    :background-color="theme === 'dark' ? variables['menu-background'] : undefined"
-    :text-color="theme === 'dark' ? variables['menu-text'] : undefined"
-    :active-text-color="theme === 'dark' ? variables['menu-active-text'] : undefined"
+    :background-color="
+      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        ? variables['menu-background']
+        : undefined
+    "
+    :text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        ? variables['menu-text']
+        : undefined
+    "
+    :active-text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        ? variables['menu-active-text']
+        : undefined
+    "
     :popper-effect="theme"
     :unique-opened="false"
     :collapse-transition="false"
@@ -29,6 +41,7 @@ import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
 
 import { LayoutEnum } from "@/enums/LayoutEnum";
+import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 
@@ -63,6 +76,9 @@ const menuMode = computed(() => {
 // 获取主题
 const theme = computed(() => settingsStore.theme);
 
+// 获取浅色主题下的侧边栏配色方案
+const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
+
 /**
  * 获取完整路径
  *
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 35579937..c89142b6 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -192,4 +192,10 @@ html.dark {
     background-color: $menu-hover;
   }
 }
+
+html.light-darkBlue {
+  .el-menu-item:hover {
+    background-color: $menu-hover;
+  }
+}
 </style>
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 613ed94a..36d81158 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -4,9 +4,21 @@
     <el-menu
       mode="horizontal"
       :default-active="activePath"
-      :background-color="theme === 'dark' ? variables['menu-background'] : undefined"
-      :text-color="theme === 'dark' ? variables['menu-text'] : undefined"
-      :active-text-color="theme === 'dark' ? variables['menu-active-text'] : undefined"
+      :background-color="
+        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+          ? variables['menu-background']
+          : undefined
+      "
+      :text-color="
+        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+          ? variables['menu-text']
+          : undefined
+      "
+      :active-text-color="
+        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+          ? variables['menu-active-text']
+          : undefined
+      "
       @select="handleMenuSelect"
     >
       <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
@@ -35,6 +47,7 @@ import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
+import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
 
 /**
  * 定义状态：先定义 reactive、ref 或 computed 状态
@@ -50,6 +63,9 @@ const activePath = computed(() => appStore.activeTopMenuPath);
 // 获取主题
 const theme = computed(() => settingsStore.theme);
 
+// 获取浅色主题下的侧边栏配色方案
+const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
+
 // 顶部菜单列表
 const topMenus = ref<RouteRecordRaw[]>([]);
 
diff --git a/src/settings.ts b/src/settings.ts
index 60244795..f155263d 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -33,6 +33,8 @@ const defaultSettings: AppSettings = {
   watermarkEnabled: false,
   // 水印内容
   watermarkContent: pkg.name,
+  // 侧边栏配色方案
+  sidebarColorScheme: "light-white",
 };
 
 export default defaultSettings;
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 025d2df8..368805c4 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,6 +1,11 @@
 import defaultSettings from "@/settings";
-import { ThemeEnum } from "@/enums/ThemeEnum";
-import { generateThemeColors, applyTheme, toggleDarkMode } from "@/utils/theme";
+import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum";
+import {
+  generateThemeColors,
+  applyTheme,
+  toggleDarkMode,
+  toggleLightModeSidebarColorScheme,
+} from "@/utils/theme";
 
 type SettingsValue = boolean | string;
 
@@ -11,6 +16,11 @@ export const useSettingsStore = defineStore("setting", () => {
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
   const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
+  // 浅色主题下的侧边栏配色方案 (白色/深蓝色)
+  const sidebarColorScheme = useStorage<string>(
+    "sidebarColorScheme",
+    defaultSettings.sidebarColorScheme
+  );
   // 布局
   const layout = useStorage<string>("layout", defaultSettings.layout);
   // 水印
@@ -34,10 +44,20 @@ export const useSettingsStore = defineStore("setting", () => {
     { immediate: true }
   );
 
+  //  监听浅色侧边栏配色方案变化
+  watch(
+    [sidebarColorScheme],
+    ([newSidebarColorScheme]) => {
+      toggleLightModeSidebarColorScheme(newSidebarColorScheme === SidebarLightThemeEnum.DARKBLUE);
+    },
+    { immediate: true }
+  );
+
   // 设置映射
   const settingsMap: Record<string, Ref<SettingsValue>> = {
     tagsView,
     sidebarLogo,
+    sidebarColorScheme,
     layout,
     watermarkEnabled,
   };
@@ -51,6 +71,10 @@ export const useSettingsStore = defineStore("setting", () => {
     theme.value = val;
   }
 
+  function changeSidebarColorScheme(val: string) {
+    sidebarColorScheme.value = val;
+  }
+
   function changeThemeColor(color: string) {
     themeColor.value = color;
   }
@@ -63,6 +87,7 @@ export const useSettingsStore = defineStore("setting", () => {
     settingsVisible,
     tagsView,
     sidebarLogo,
+    sidebarColorScheme,
     layout,
     themeColor,
     theme,
@@ -71,5 +96,6 @@ export const useSettingsStore = defineStore("setting", () => {
     changeTheme,
     changeThemeColor,
     changeLayout,
+    changeSidebarColorScheme,
   };
 });
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 96c09235..8edef2c4 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -25,22 +25,31 @@
 /** 全局SCSS变量 */
 
 :root {
-  --menu-background: #fff;
-  --menu-text: #212121; // 菜单文字颜色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
+  --menu-background: #fff; // 菜单背景色
+  --menu-text: #212121; // 菜单文字颜色 浅色主题-白色侧边栏配色下仅占位，实际颜色由 el-menu-item 组件决定
   --menu-active-text: var(
     --el-menu-active-color
-  ); // 菜单激活文字颜色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
-
-  --menu-hover: #e6f4ff; // 菜单悬停背景色 浅色模式下仅占位，实际颜色由 el-menu-item 组件决定
-  --sidebar-logo-background: #f5f5f5;
-  --sidebar-logo-text-color: #333;
+  ); // 菜单激活文字颜色 浅色主题-白色侧边栏配色下仅占位，实际颜色由 el-menu-item 组件决定
 
+  --menu-hover: #e6f4ff; // 菜单悬停背景色 浅色主题-白色侧边栏配色下仅占位，实际颜色由 el-menu-item 组件决定
+  --sidebar-logo-background: #f5f5f5; // 侧边栏 Logo 背景色
+  --sidebar-logo-text-color: #333; // 侧边栏 Logo 文字颜色
   // 修复表格 fixed 列被选中后由于透明色导致叠字的 bug
   .el-table {
     --el-table-current-row-bg-color: rgb(235 243 250);
   }
 }
 
+/** 浅色主题-深蓝色侧边栏配色 */
+html.light-darkBlue {
+  --menu-background: #304156; // 菜单背景色
+  --menu-text: #bfcbd9; // 菜单文字颜色
+  --menu-active-text: var(--el-menu-active-color); // 菜单激活文字颜色
+  --menu-hover: #263445; // 菜单悬停背景色
+  --sidebar-logo-background: #2d3748; // 侧边栏 Logo 背景色
+  --sidebar-logo-text-color: #fff; // 侧边栏 Logo 文字颜色
+}
+
 /** 暗黑主题 */
 html.dark {
   --menu-background: var(--el-bg-color-overlay);
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index efc4ba45..2a285ab1 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -76,6 +76,8 @@ declare global {
     watermarkEnabled: boolean;
     /** 水印内容 */
     watermarkContent: string;
+    /** 侧边栏配色方案(light-white | light-darkBlue) */
+    sidebarColorScheme: "light-white" | "light-darkBlue";
   }
 
   /**
diff --git a/src/utils/theme.ts b/src/utils/theme.ts
index a62d01d1..560e8c21 100644
--- a/src/utils/theme.ts
+++ b/src/utils/theme.ts
@@ -1,3 +1,5 @@
+import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
+
 // 辅助函数：将十六进制颜色转换为 RGB
 function hexToRgb(hex: string): [number, number, number] {
   const bigint = parseInt(hex.slice(1), 16);
@@ -43,6 +45,11 @@ export function applyTheme(colors: Record<string, string>) {
   });
 }
 
+/**
+ * 切换暗黑模式
+ *
+ * @param isDark 是否启用暗黑模式
+ */
 export function toggleDarkMode(isDark: boolean) {
   if (isDark) {
     document.documentElement.classList.add("dark");
@@ -50,3 +57,16 @@ export function toggleDarkMode(isDark: boolean) {
     document.documentElement.classList.remove("dark");
   }
 }
+
+/**
+ * 切换浅色主题下的侧边栏颜色方案
+ *
+ * @param isBlue 布尔值，表示是否开启深蓝色侧边栏颜色方案
+ */
+export function toggleLightModeSidebarColorScheme(isDarkBlueDark: boolean) {
+  if (isDarkBlueDark) {
+    document.documentElement.classList.add(SidebarLightThemeEnum.DARKBLUE);
+  } else {
+    document.documentElement.classList.remove(SidebarLightThemeEnum.DARKBLUE);
+  }
+}

From 549c47119910ed5b05de82e77f472630424480d9 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Wed, 19 Feb 2025 13:56:50 +0800
Subject: [PATCH 210/497] =?UTF-8?q?fix:=20:bug:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E4=B8=BB=E9=A2=98=E5=92=8C=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E9=85=8D=E8=89=B2=E6=96=B9=E6=A1=88=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=20navbar=20=E5=8F=B3=E4=BE=A7=E7=9A=84=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavBar/components/NavbarRight.vue   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 959573f4..2d8425fc 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="navbar__right" :class="navbarRightClass">
+  <div :class="['navbar__right', navbarRightClass]">
     <!-- 非手机设备（窄屏）才显示 -->
     <template v-if="!isMobile">
       <!-- 搜索 -->
@@ -35,18 +35,20 @@ import { useAppStore, useSettingsStore } from "@/store";
 
 import UserProfile from "./UserProfile.vue";
 import Notification from "./Notification.vue";
-import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
 
 const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
 
-// 根据浅色模式-侧边栏颜色配置选择navbar右侧的样式类
+// 根据主题和侧边栏配色方案选择 navbar 右侧的样式类
 const navbarRightClass = computed(() => {
-  return settingStore.sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
-    ? "navbar__right--darkBlue"
-    : "navbar__right--white";
+  const isDarkTheme = settingStore.theme === ThemeEnum.DARK;
+  const isDarkBlueSidebar = settingStore.sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE;
+
+  // 如果是暗黑主题，或者是浅色主题中的深蓝色侧边栏配色
+  return isDarkTheme || isDarkBlueSidebar ? "navbar__right--darkBlue" : "navbar__right--white";
 });
 </script>
 

From 9084de48436293774a9812eb8efbf59e10e7a4de Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 20 Feb 2025 08:22:42 +0800
Subject: [PATCH 211/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20Lay?=
 =?UTF-8?q?outSelect=20=E5=80=BC=E7=B1=BB=E5=9E=8B=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 2 +-
 src/store/modules/settings.ts            | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 5409656f..341d5181 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -96,7 +96,7 @@ const changeSidebarColorScheme = (val: any) => {
  *
  * @param layout 布局  LayoutEnum
  */
-function changeLayout(layout: string) {
+function changeLayout(layout: LayoutEnum) {
   settingsStore.changeLayout(layout);
   if (layout === LayoutEnum.MIX) {
     route.name && againActiveTop(route.name as string);
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 368805c4..bba15cff 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,5 +1,6 @@
 import defaultSettings from "@/settings";
 import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum";
+import { LayoutEnum } from "@/enums/LayoutEnum";
 import {
   generateThemeColors,
   applyTheme,
@@ -12,7 +13,7 @@ type SettingsValue = boolean | string;
 export const useSettingsStore = defineStore("setting", () => {
   // 基本设置
   const settingsVisible = ref(false);
-  // 标签
+  // 标签视图
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
   const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
@@ -22,7 +23,7 @@ export const useSettingsStore = defineStore("setting", () => {
     defaultSettings.sidebarColorScheme
   );
   // 布局
-  const layout = useStorage<string>("layout", defaultSettings.layout);
+  const layout = useStorage<LayoutEnum>("layout", defaultSettings.layout as LayoutEnum);
   // 水印
   const watermarkEnabled = useStorage<boolean>(
     "watermarkEnabled",
@@ -79,7 +80,7 @@ export const useSettingsStore = defineStore("setting", () => {
     themeColor.value = color;
   }
 
-  function changeLayout(val: string) {
+  function changeLayout(val: LayoutEnum) {
     layout.value = val;
   }
 

From 3a0e4cb8df376e9264408567e919524cd286b4bb Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 20 Feb 2025 08:23:31 +0800
Subject: [PATCH 212/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/components/ThemeColorPicker.vue | 2 +-
 src/types/global.d.ts                                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Settings/components/ThemeColorPicker.vue b/src/layout/components/Settings/components/ThemeColorPicker.vue
index 587c1ac5..bfa82d33 100644
--- a/src/layout/components/Settings/components/ThemeColorPicker.vue
+++ b/src/layout/components/Settings/components/ThemeColorPicker.vue
@@ -13,7 +13,7 @@ const props = defineProps({
 
 const emit = defineEmits(["update:modelValue"]);
 
-// 定义颜色预设
+// 主题颜色预设
 const colorPresets = [
   "#4080FF",
   "#ff4500",
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 2a285ab1..eb560d0c 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -63,7 +63,7 @@ declare global {
     /** 是否显示侧边栏Logo */
     sidebarLogo: boolean;
     /** 导航栏布局(left|top|mix) */
-    layout: string;
+    layout: "left" | "top" | "mix";
     /** 主题颜色 */
     themeColor: string;
     /** 主题模式(dark|light) */

From 058001059dc1bdc39412f09ca464d5a6a3362547 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 20 Feb 2025 08:24:48 +0800
Subject: [PATCH 213/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E9=85=8D=E8=89=B2=E4=BD=BF=E7=94=A8=E6=9E=9A?=
 =?UTF-8?q?=E4=B8=BE=E4=BD=9C=E4=B8=BA=E5=88=9D=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/settings.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/settings.ts b/src/settings.ts
index f155263d..02c25e20 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,6 +1,6 @@
 import { SizeEnum } from "./enums/SizeEnum";
 import { LayoutEnum } from "./enums/LayoutEnum";
-import { ThemeEnum } from "./enums/ThemeEnum";
+import { ThemeEnum, SidebarLightThemeEnum } from "./enums/ThemeEnum";
 import { LanguageEnum } from "./enums/LanguageEnum";
 
 const { pkg } = __APP_INFO__;
@@ -34,7 +34,7 @@ const defaultSettings: AppSettings = {
   // 水印内容
   watermarkContent: pkg.name,
   // 侧边栏配色方案
-  sidebarColorScheme: "light-white",
+  sidebarColorScheme: SidebarLightThemeEnum.WHITE,
 };
 
 export default defaultSettings;

From e50d969758ec88cf50cfc10ef8cbef0ac726f7dd Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 20 Feb 2025 18:18:28 +0800
Subject: [PATCH 214/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=20.stylelintcache=20=E5=92=8C=20.eslintcache=20=E5=88=B0=20.gi?=
 =?UTF-8?q?tignore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index dccd5ce8..a6d77ca9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ dist-ssr
 stats.html
 pnpm-lock.yaml
 package-lock.json
+.stylelintcache
+.eslintcache

From 400d147b2f5a6a355c1fb5295b633b408909fd58 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 20 Feb 2025 18:21:38 +0800
Subject: [PATCH 215/497] =?UTF-8?q?style:=20:lipstick:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/reset.scss | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index b3b43c7a..56689def 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -25,9 +25,8 @@ body {
   width: 100%;
   height: 100%;
   margin: 0;
-  font-family:
-    "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
-    Arial, sans-serif;
+  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei",
+    "微软雅黑", Arial, sans-serif;
   line-height: inherit;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;

From 6f159a0eed4a9f21f4b41985b998f278ef4a82a8 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 20 Feb 2025 18:32:06 +0800
Subject: [PATCH 216/497] =?UTF-8?q?chore:=20:hammer:=20stylelint=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9C=AA=E7=9F=A5=E4=BC=AA=E5=85=83=E7=B4=A0?=
 =?UTF-8?q?=20extend?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .stylelintrc.cjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index 215713f3..62bd59cf 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -35,7 +35,7 @@ module.exports = {
     "at-rule-no-unknown": [
       true,
       {
-        ignoreAtRules: ["apply", "use", "forward"],
+        ignoreAtRules: ["apply", "use", "forward", "extend"],
       },
     ],
   },

From a076e2eaa5d63b903f520b7d4acf60e29c71bf23 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 20 Feb 2025 18:36:49 +0800
Subject: [PATCH 217/497] =?UTF-8?q?chore:=20:hammer:=20=E7=B2=BE=E7=AE=80?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=E5=BF=AB=E6=8D=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/codegen/index.vue | 2 +-
 uno.config.ts               | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index 66809295..e24e19ff 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -362,7 +362,7 @@
           </el-col>
           <el-col :span="18">
             <el-scrollbar max-height="72vh">
-              <div class="absolute-rt z-36 right-5 top-2">
+              <div class="absolute z-36 right-5 top-2">
                 <el-link type="primary" @click="handleCopyCode">
                   <el-icon>
                     <CopyDocument />
diff --git a/uno.config.ts b/uno.config.ts
index 4ea11316..e08e746f 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -30,17 +30,15 @@ const generateSafeList = () => {
 };
 
 export default defineConfig({
+  // 自定义快捷类
   shortcuts: {
+    "wh-full": "w-full h-full",
     "flex-center": "flex justify-center items-center",
     "flex-x-center": "flex justify-center",
     "flex-y-center": "flex items-center",
-    "wh-full": "w-full h-full",
     "flex-x-start": "flex items-center justify-start",
     "flex-x-between": "flex items-center justify-between",
     "flex-x-end": "flex items-center justify-end",
-    "absolute-lt": "absolute left-0 top-0",
-    "absolute-rt": "absolute right-0 top-0 ",
-    "fixed-lt": "fixed left-0 top-0",
   },
   theme: {
     colors: {

From 60a4d28162a5e34b8fe8a18ac8a1894df14ba3f8 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Thu, 20 Feb 2025 18:41:47 +0800
Subject: [PATCH 218/497] =?UTF-8?q?refactor:=20:recycle:=20layout=20?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=EF=BC=8C=E7=B2=BE=E7=AE=80=E9=87=8D=E5=A4=8D=E7=9A=84?=
 =?UTF-8?q?css=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 267 ++++++++++++++++++++++---------------------
 1 file changed, 134 insertions(+), 133 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 1f709c5a..36371649 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -1,44 +1,41 @@
 <template>
-  <div class="wh-full" :class="classObj">
-    <!-- 遮罩层 -->
-    <div
-      v-if="isMobile && isOpenSidebar"
-      class="wh-full fixed-lt z-999 bg-black bg-opacity-30"
-      @click="handleOutsideClick"
-    />
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="handleCloseSidebar" />
 
-    <!-- 公用侧边栏 -->
-    <Sidebar class="sidebar-container" />
+    <!-- 侧边栏 -->
+    <Sidebar class="layout__sidebar" />
 
     <!-- 混合布局 -->
-    <div v-if="layout === LayoutEnum.MIX" class="mix-container">
-      <div class="mix-container-sidebar">
+    <div v-if="layout === LayoutEnum.MIX" class="layout__container">
+      <!-- 左侧菜单栏 -->
+      <div class="layout__sidebar--left">
         <el-scrollbar>
           <SidebarMenu :data="mixedLayoutLeftRoutes" :base-path="activeTopMenuPath" />
         </el-scrollbar>
-        <div class="sidebar-toggle">
-          <hamburger :is-active="appStore.sidebar.opened" @toggle-click="toggleSidebar" />
+        <div class="layout__sidebar-toggle">
+          <hamburger :is-active="appStore.sidebar.opened" @toggle-click="handleToggleSidebar" />
         </div>
       </div>
-
-      <div :class="{ hasTagsView: isShowTagsView }" class="main-container">
+      <!-- 主内容区域 -->
+      <div :class="{ hasTagsView: isShowTagsView }" class="layout__main">
         <TagsView v-if="isShowTagsView" />
         <AppMain />
         <Settings v-if="defaultSettings.showSettings" />
-        <!-- 返回顶部 -->
+        <!-- 返回顶部按钮 -->
         <el-backtop target=".app-main">
           <div class="i-svg:backtop w-6 h-6" />
         </el-backtop>
       </div>
     </div>
 
-    <!-- 左侧和顶部布局 -->
-    <div v-else :class="{ hasTagsView: isShowTagsView }" class="main-container">
+    <!-- 左侧或顶部布局的主内容区 -->
+    <div v-else :class="{ hasTagsView: isShowTagsView }" class="layout__main">
       <NavBar v-if="layout === LayoutEnum.LEFT" />
       <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
-      <!-- 返回顶部 -->
+      <!-- 返回顶部按钮 -->
       <el-backtop target=".app-main">
         <div class="i-svg:backtop w-6 h-6" />
       </el-backtop>
@@ -47,11 +44,17 @@
 </template>
 
 <script setup lang="ts">
+// 状态管理
 import { useAppStore, useSettingsStore, usePermissionStore } from "@/store";
+
+// 配置
 import defaultSettings from "@/settings";
+
+// 枚举
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
 
+// 组件
 import NavBar from "./components/NavBar/index.vue";
 
 const appStore = useAppStore();
@@ -59,154 +62,161 @@ const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
 const width = useWindowSize().width;
 
-const WIDTH_DESKTOP = 992; // 响应式布局容器固定宽度  大屏（>=1200px） 中屏（>=992px） 小屏（>=768px）
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
-const isOpenSidebar = computed(() => appStore.sidebar.opened);
-const isShowTagsView = computed(() => settingsStore.tagsView); // 是否显示tagsView
-const layout = computed(() => settingsStore.layout); // 布局模式 left top mix
-const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活path
-const mixedLayoutLeftRoutes = computed(() => permissionStore.mixedLayoutLeftRoutes); // 混合布局左侧菜单
+// 常量
+const WIDTH_DESKTOP = 992; // 响应式布局容器固定宽度（大屏 >=1200px，中屏 >=992px，小屏 >=768px）
 
+// 计算属性
+const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE); // 是否为移动设备
+const isSidebarOpen = computed(() => appStore.sidebar.opened); // 侧边栏是否展开
+const isShowTagsView = computed(() => settingsStore.tagsView); // 是否显示标签视图
+const layout = computed(() => settingsStore.layout); // 当前布局模式（left、top、mix）
+const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活路径
+const mixedLayoutLeftRoutes = computed(() => permissionStore.mixedLayoutLeftRoutes); // 混合布局左侧菜单路由
+
+// 监听顶部菜单激活路径变化，更新混合布局左侧菜单路由
 watch(
   () => activeTopMenuPath.value,
   (newVal: string) => {
     permissionStore.setMixedLayoutLeftRoutes(newVal);
   },
-  {
-    deep: true,
-    immediate: true,
-  }
+  { deep: true, immediate: true }
 );
 
-const classObj = computed(() => ({
-  hideSidebar: !appStore.sidebar.opened,
-  openSidebar: appStore.sidebar.opened,
-  mobile: appStore.device === DeviceEnum.MOBILE,
-  [`layout-${settingsStore.layout}`]: true,
-}));
-
+// 监听窗口宽度变化，调整设备类型和侧边栏状态
 watchEffect(() => {
-  appStore.toggleDevice(width.value < WIDTH_DESKTOP ? DeviceEnum.MOBILE : DeviceEnum.DESKTOP);
-  if (width.value >= WIDTH_DESKTOP) {
+  const isDesktop = width.value >= WIDTH_DESKTOP;
+  appStore.toggleDevice(isDesktop ? DeviceEnum.DESKTOP : DeviceEnum.MOBILE);
+  if (isDesktop) {
     appStore.openSideBar();
   } else {
     appStore.closeSideBar();
   }
 });
 
-function handleOutsideClick() {
-  appStore.closeSideBar();
-}
-
-function toggleSidebar() {
-  appStore.toggleSidebar();
-}
-
+// 监听路由变化，如果是移动设备且侧边栏展开，则关闭侧边栏
 const route = useRoute();
 watch(route, () => {
-  if (isMobile.value && isOpenSidebar.value) {
+  if (isMobile.value && isSidebarOpen.value) {
     appStore.closeSideBar();
   }
 });
-</script>
 
-<style lang="scss" scoped>
-.sidebar-container {
-  position: fixed;
-  top: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 999;
-  width: $sidebar-width;
-  background-color: $menu-background;
-  transition: width 0.28s;
-
-  :deep(.el-menu) {
-    border: none;
-  }
+// 计算属性：布局样式
+const layoutClass = computed(() => ({
+  hideSidebar: !appStore.sidebar.opened,
+  openSidebar: appStore.sidebar.opened,
+  mobile: appStore.device === DeviceEnum.MOBILE,
+  [`layout-${settingsStore.layout}`]: true,
+}));
+
+/**
+ * 处理遮罩层点击事件，关闭侧边栏
+ */
+function handleCloseSidebar() {
+  appStore.closeSideBar();
 }
 
-.main-container {
-  position: relative;
+/**
+ * 处理切换侧边栏的展开/收起状态
+ */
+function handleToggleSidebar() {
+  appStore.toggleSidebar();
+}
+</script>
+<style lang="scss" scoped>
+.layout {
+  width: 100%;
   height: 100%;
-  margin-left: $sidebar-width;
-  overflow-y: auto;
-  transition: margin-left 0.28s;
 
-  .fixed-header {
-    position: sticky;
+  &__overlay {
+    position: fixed;
     top: 0;
-    z-index: 9;
-    transition: width 0.28s;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
   }
-}
 
-.layout-top {
-  .sidebar-container {
-    position: sticky;
+  &__sidebar {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
     z-index: 999;
-    display: flex;
-    width: 100% !important;
-    height: $navbar-height;
+    width: $sidebar-width;
+    background-color: $menu-background;
+    transition: width 0.28s;
 
-    :deep(.el-scrollbar) {
-      flex: 1;
-      height: $navbar-height;
+    :deep(.el-menu) {
+      border: none;
     }
+  }
 
-    :deep(.el-menu-item),
-    :deep(.el-sub-menu__title),
-    :deep(.el-menu--horizontal) {
-      height: $navbar-height;
-      line-height: $navbar-height;
+  &__main {
+    position: relative;
+    height: 100%;
+    margin-left: $sidebar-width;
+    overflow-y: auto;
+    transition: margin-left 0.28s;
+
+    .fixed-header {
+      position: sticky;
+      top: 0;
+      z-index: 9;
+      transition: width 0.28s;
     }
+  }
+}
 
-    :deep(.el-menu--collapse) {
-      width: 100%;
-    }
+// 占位符选择器
+%layout__sidebar--horizontal {
+  width: 100% !important;
+  height: $navbar-height;
+
+  :deep(.el-scrollbar) {
+    flex: 1;
+    height: $navbar-height;
   }
 
-  .main-container {
+  :deep(.el-menu-item),
+  :deep(.el-sub-menu__title),
+  :deep(.el-menu--horizontal) {
+    height: $navbar-height;
+    line-height: $navbar-height;
+  }
+}
+
+.layout-top {
+  .layout__sidebar {
+    position: sticky;
+    display: flex;
+    @extend %layout__sidebar--horizontal;
+  }
+
+  .layout__main {
     height: calc(100vh - $navbar-height);
     margin-left: 0;
   }
 }
 
 .layout-mix {
-  .sidebar-container {
-    width: 100% !important;
-    height: $navbar-height;
-
-    :deep(.el-scrollbar) {
-      flex: 1;
-      height: $navbar-height;
-    }
-
-    :deep(.el-menu-item),
-    :deep(.el-sub-menu__title),
-    :deep(.el-menu--horizontal) {
-      height: $navbar-height;
-      line-height: $navbar-height;
-    }
-
-    :deep(.el-menu--horizontal.el-menu) {
-      border: none;
-    }
+  .layout__sidebar {
+    @extend %layout__sidebar--horizontal;
   }
 
-  .mix-container {
+  .layout__container {
     display: flex;
     height: 100%;
     padding-top: $navbar-height;
 
-    .mix-container-sidebar {
+    .layout__sidebar--left {
       position: relative;
       width: $sidebar-width;
       height: 100%;
       background-color: var(--menu-background);
 
       :deep(.el-scrollbar) {
-        // 50px 是底部收缩按钮的高度
         height: calc(100vh - $navbar-height - 50px);
       }
 
@@ -215,7 +225,7 @@ watch(route, () => {
         border: none;
       }
 
-      .sidebar-toggle {
+      .layout__sidebar-toggle {
         position: absolute;
         bottom: 0;
         display: flex;
@@ -224,19 +234,10 @@ watch(route, () => {
         width: 100%;
         height: 50px;
         line-height: 50px;
-        box-shadow: 0 0 6px -2px var(--el-color-primary);
-
-        div:hover {
-          background-color: var(--menu-background);
-        }
-
-        :deep(svg) {
-          color: var(--el-color-primary) !important;
-        }
       }
     }
 
-    .main-container {
+    .layout__main {
       flex: 1;
       min-width: 0;
       margin-left: 0;
@@ -246,24 +247,24 @@ watch(route, () => {
 
 .hideSidebar {
   &.layout-left {
-    .main-container {
+    .layout__main {
       margin-left: $sidebar-width-collapsed;
     }
   }
 
   &.layout-top {
-    .main-container {
+    .layout__main {
       margin-left: 0;
     }
   }
 
   &.layout-mix {
-    .sidebar-container {
+    .layout__sidebar {
       width: 100% !important;
     }
 
-    .mix-container {
-      &-sidebar {
+    .layout__container {
+      .layout__sidebar--left {
         width: $sidebar-width-collapsed;
       }
     }
@@ -271,22 +272,22 @@ watch(route, () => {
 }
 
 .layout-left.hideSidebar {
-  .sidebar-container {
+  .layout__sidebar {
     width: $sidebar-width-collapsed !important;
   }
 
-  .main-container {
+  .layout__main {
     margin-left: $sidebar-width-collapsed;
   }
 
   &.mobile {
-    .sidebar-container {
+    .layout__sidebar {
       pointer-events: none;
       transform: translate3d(-$sidebar-width, 0, 0);
       transition-duration: 0.3s;
     }
 
-    .main-container {
+    .layout__main {
       margin-left: 0;
     }
   }

From 1787bf36f37b123de165380e8f9caf7e6bbbf4af Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:11:01 +0800
Subject: [PATCH 219/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=B7=B7=E5=90=88=E5=B8=83=E5=B1=80=E4=B8=8B=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E9=85=8D=E8=89=B2=E4=B8=BA=E7=99=BD=E8=89=B2=E6=97=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=20huamburger=20=E6=97=A0=E6=B3=95=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Hamburger/index.vue | 48 ++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 4b624c96..dc79d96d 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -1,20 +1,38 @@
 <template>
   <div class="hamburger-wrapper" @click="toggleClick">
-    <div :class="['i-svg:collapse', { hamburger: true, 'is-active': isActive }]" />
+    <div :class="['i-svg:collapse', { hamburger: true, 'is-active': isActive }, hamburgerClass]" />
   </div>
 </template>
 
 <script setup lang="ts">
+import { useSettingsStore } from "@/store";
+import { ThemeEnum, SidebarColorEnum } from "@/enums/ThemeEnum";
+import { LayoutEnum } from "@/enums/LayoutEnum";
+
 defineProps({
-  isActive: {
-    required: true,
-    type: Boolean,
-    default: false,
-  },
+  isActive: { type: Boolean, required: true },
 });
 
 const emit = defineEmits(["toggleClick"]);
 
+const settingsStore = useSettingsStore();
+const layout = computed(() => settingsStore.layout);
+
+const hamburgerClass = computed(() => {
+  // 如果暗黑主题
+  if (settingsStore.theme === ThemeEnum.DARK) {
+    return "hamburger--white";
+  }
+
+  // 如果是混合布局 && 侧边栏配色方案是经典蓝
+  if (
+    layout.value === LayoutEnum.MIX &&
+    settingsStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+  ) {
+    return "hamburger--white";
+  }
+});
+
 function toggleClick() {
   emit("toggleClick");
 }
@@ -26,20 +44,20 @@ function toggleClick() {
   align-items: center;
   justify-content: center;
   padding: 0 15px;
+  cursor: pointer;
 
   .hamburger {
     vertical-align: middle;
-    cursor: pointer;
     transform: scaleX(-1);
-  }
+    transition: transform 0.3s ease;
 
-  .hamburger.is-active {
-    transform: scaleX(1);
-  }
-}
-.layout-mix {
-  .hamburger-wrapper {
-    color: #fff;
+    &--white {
+      color: #fff;
+    }
+
+    &.is-active {
+      transform: scaleX(1);
+    }
   }
 }
 </style>

From 7b676c46a5f07b11046828ede185124183546de2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:12:26 +0800
Subject: [PATCH 220/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BB=84=E4=BB=B6=E4=BD=BF=E7=94=A8=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavBar/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index 9e8c61a5..5a4a73e1 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -4,7 +4,7 @@
       <!-- 展开/收缩菜单  -->
       <Hamburger :is-active="isSidebarOpened" @toggle-click="toggleSideBar" />
       <!-- 面包屑 -->
-      <breadcrumb />
+      <Breadcrumb />
     </div>
     <!-- 导航栏右侧 -->
     <NavbarRight />

From 624ccff5ca5010cf56453c820c932333b4f287c5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:16:55 +0800
Subject: [PATCH 221/497] =?UTF-8?q?docs:=20:memo:=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 36371649..52c1376e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -13,8 +13,9 @@
         <el-scrollbar>
           <SidebarMenu :data="mixedLayoutLeftRoutes" :base-path="activeTopMenuPath" />
         </el-scrollbar>
+        <!-- 侧边栏切换按钮 -->
         <div class="layout__sidebar-toggle">
-          <hamburger :is-active="appStore.sidebar.opened" @toggle-click="handleToggleSidebar" />
+          <Hamburger :is-active="appStore.sidebar.opened" @toggle-click="handleToggleSidebar" />
         </div>
       </div>
       <!-- 主内容区域 -->

From bd9af1add2e72ff49642f597ed60741f5aeee32b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:19:54 +0800
Subject: [PATCH 222/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BE=A7?=
 =?UTF-8?q?=E8=BE=B9=E6=A0=8F=E9=85=8D=E8=89=B2=E6=96=B9=E6=A1=88=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/ThemeEnum.ts                        | 12 +++++-----
 src/lang/package/en.ts                        |  4 ++--
 src/lang/package/zh-cn.ts                     |  6 ++---
 .../NavBar/components/NavbarRight.vue         | 22 +++++++++----------
 src/layout/components/Settings/index.vue      |  8 ++++---
 .../Sidebar/components/SidebarMenu.vue        |  8 +++----
 .../Sidebar/components/SidebarMenuItem.vue    |  2 +-
 .../Sidebar/components/SidebarMixTopMenu.vue  |  8 +++----
 src/settings.ts                               |  4 ++--
 src/store/modules/settings.ts                 | 13 ++++-------
 src/styles/variables.scss                     |  2 +-
 src/types/global.d.ts                         |  4 ++--
 src/utils/theme.ts                            | 10 ++++-----
 13 files changed, 49 insertions(+), 54 deletions(-)

diff --git a/src/enums/ThemeEnum.ts b/src/enums/ThemeEnum.ts
index 6d2ad192..5ceae645 100644
--- a/src/enums/ThemeEnum.ts
+++ b/src/enums/ThemeEnum.ts
@@ -18,15 +18,15 @@ export const enum ThemeEnum {
 }
 
 /**
- * 浅色主题下的侧边栏配色方案枚举
+ * 侧边栏配色方案枚举
  */
-export const enum SidebarLightThemeEnum {
+export const enum SidebarColorEnum {
   /**
-   * 深蓝色
+   * 经典蓝
    */
-  DARKBLUE = "light-darkBlue",
+  CLASSIC_BLUE = "classic-blue",
   /**
-   * 白色
+   * 极简白
    */
-  WHITE = "light-white",
+  MINIMAL_WHITE = "minimal-white",
 }
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 446e4c75..ef6eae4e 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -59,7 +59,7 @@ export default {
     sidebarLogo: "Sidebar Logo",
     sidebarColorScheme: "Sidebar Color Scheme",
     watermark: "Watermark",
-    white: "white",
-    darkBlue: "darkBlue",
+    classicBlue: "Classic Blue",
+    minimalWhite: "Minimal White",
   },
 };
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 4ad0f150..d3169adf 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -57,9 +57,9 @@ export default {
     themeColor: "主题颜色",
     tagsView: "开启 Tags-View",
     sidebarLogo: "侧边栏 Logo",
-    sidebarColorScheme: "侧边栏配色方案",
+    sidebarColorScheme: "侧边栏配色",
     watermark: "开启水印",
-    white: "白色",
-    darkBlue: "深蓝色",
+    classicBlue: "经典蓝",
+    minimalWhite: "极简白",
   },
 };
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index cf0c4846..f153364e 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -48,7 +48,7 @@ import { DeviceEnum } from "@/enums/DeviceEnum";
 import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
 
 import Notification from "./Notification.vue";
-import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
@@ -68,11 +68,16 @@ function handleProfileClick() {
 
 // 根据主题和侧边栏配色方案选择 navbar 右侧的样式类
 const navbarRightClass = computed(() => {
-  const isDarkTheme = settingStore.theme === ThemeEnum.DARK;
-  const isDarkBlueSidebar = settingStore.sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE;
+  // 如果暗黑主题
+  if (settingStore.theme === ThemeEnum.DARK) {
+    return "navbar__right--white";
+  }
+
+  // 如果侧边栏是经典蓝
 
-  // 如果是暗黑主题，或者是浅色主题中的深蓝色侧边栏配色
-  return isDarkTheme || isDarkBlueSidebar ? "navbar__right--darkBlue" : "navbar__right--white";
+  if (settingStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE) {
+    return "navbar__right--white";
+  }
 });
 
 /**
@@ -135,14 +140,9 @@ function logout() {
   }
 }
 
-.layout-top .navbar__right--darkBlue > *,
-.layout-mix .navbar__right--darkBlue > * {
-  color: #fff;
-}
-
 .layout-top .navbar__right--white > *,
 .layout-mix .navbar__right--white > * {
-  color: #000;
+  color: #fff;
 }
 
 .dark .navbar__right > *:hover {
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 341d5181..eb1d8d96 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -30,8 +30,10 @@
     <div v-if="!isDark" class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
       <el-radio-group v-model="settingsStore.sidebarColorScheme" @change="changeSidebarColorScheme">
-        <el-radio :value="SidebarLightThemeEnum.WHITE">{{ $t("settings.white") }}</el-radio>
-        <el-radio :value="SidebarLightThemeEnum.DARKBLUE">{{ $t("settings.darkBlue") }}</el-radio>
+        <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
+          {{ $t("settings.minimalWhite") }}
+        </el-radio>
+        <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">{{ $t("settings.classicBlue") }}</el-radio>
       </el-radio-group>
     </div>
 
@@ -44,7 +46,7 @@
 <script setup lang="ts">
 import { LayoutEnum } from "@/enums/LayoutEnum";
 import { ThemeEnum } from "@/enums/ThemeEnum";
-import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColorEnum } from "@/enums/ThemeEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
 const route = useRoute();
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index bc8bf94b..b4c39e3b 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -5,17 +5,17 @@
     :default-active="currentRoute.path"
     :collapse="!appStore.sidebar.opened"
     :background-color="
-      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
         ? variables['menu-background']
         : undefined
     "
     :text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
         ? variables['menu-text']
         : undefined
     "
     :active-text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
         ? variables['menu-active-text']
         : undefined
     "
@@ -42,7 +42,7 @@ import type { MenuInstance } from "element-plus";
 import type { RouteRecordRaw } from "vue-router";
 
 import { LayoutEnum } from "@/enums/LayoutEnum";
-import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColorEnum } from "@/enums/ThemeEnum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 2139c07d..01ac79f6 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -193,7 +193,7 @@ html.dark {
   }
 }
 
-html.light-darkBlue {
+html.sidebar-color-blue {
   .el-menu-item:hover {
     background-color: $menu-hover;
   }
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 870abf7b..4144253b 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -5,17 +5,17 @@
       mode="horizontal"
       :default-active="activePath"
       :background-color="
-        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
           ? variables['menu-background']
           : undefined
       "
       :text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
           ? variables['menu-text']
           : undefined
       "
       :active-text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarLightThemeEnum.DARKBLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
           ? variables['menu-active-text']
           : undefined
       "
@@ -44,7 +44,7 @@ import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
-import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColorEnum } from "@/enums/ThemeEnum";
 
 const router = useRouter();
 const appStore = useAppStore();
diff --git a/src/settings.ts b/src/settings.ts
index 02c25e20..5a289af7 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,6 +1,6 @@
 import { SizeEnum } from "./enums/SizeEnum";
 import { LayoutEnum } from "./enums/LayoutEnum";
-import { ThemeEnum, SidebarLightThemeEnum } from "./enums/ThemeEnum";
+import { ThemeEnum, SidebarColorEnum } from "./enums/ThemeEnum";
 import { LanguageEnum } from "./enums/LanguageEnum";
 
 const { pkg } = __APP_INFO__;
@@ -34,7 +34,7 @@ const defaultSettings: AppSettings = {
   // 水印内容
   watermarkContent: pkg.name,
   // 侧边栏配色方案
-  sidebarColorScheme: SidebarLightThemeEnum.WHITE,
+  sidebarColorScheme: SidebarColorEnum.CLASSIC_BLUE,
 };
 
 export default defaultSettings;
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index bba15cff..12a58e50 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -1,12 +1,7 @@
 import defaultSettings from "@/settings";
-import { SidebarLightThemeEnum, ThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum";
 import { LayoutEnum } from "@/enums/LayoutEnum";
-import {
-  generateThemeColors,
-  applyTheme,
-  toggleDarkMode,
-  toggleLightModeSidebarColorScheme,
-} from "@/utils/theme";
+import { generateThemeColors, applyTheme, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 
 type SettingsValue = boolean | string;
 
@@ -17,7 +12,7 @@ export const useSettingsStore = defineStore("setting", () => {
   const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
   // 侧边栏 Logo
   const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
-  // 浅色主题下的侧边栏配色方案 (白色/深蓝色)
+  // 侧边栏配色方案 (经典蓝/极简白)
   const sidebarColorScheme = useStorage<string>(
     "sidebarColorScheme",
     defaultSettings.sidebarColorScheme
@@ -49,7 +44,7 @@ export const useSettingsStore = defineStore("setting", () => {
   watch(
     [sidebarColorScheme],
     ([newSidebarColorScheme]) => {
-      toggleLightModeSidebarColorScheme(newSidebarColorScheme === SidebarLightThemeEnum.DARKBLUE);
+      toggleSidebarColor(newSidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE);
     },
     { immediate: true }
   );
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 8edef2c4..2aae5378 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -41,7 +41,7 @@
 }
 
 /** 浅色主题-深蓝色侧边栏配色 */
-html.light-darkBlue {
+html.sidebar-color-blue {
   --menu-background: #304156; // 菜单背景色
   --menu-text: #bfcbd9; // 菜单文字颜色
   --menu-active-text: var(--el-menu-active-color); // 菜单激活文字颜色
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index eb560d0c..242a7e50 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -76,8 +76,8 @@ declare global {
     watermarkEnabled: boolean;
     /** 水印内容 */
     watermarkContent: string;
-    /** 侧边栏配色方案(light-white | light-darkBlue) */
-    sidebarColorScheme: "light-white" | "light-darkBlue";
+    /** 侧边栏配色方案 */
+    sidebarColorScheme: "classic-blue" | "minimal-white";
   }
 
   /**
diff --git a/src/utils/theme.ts b/src/utils/theme.ts
index 560e8c21..e8b78d88 100644
--- a/src/utils/theme.ts
+++ b/src/utils/theme.ts
@@ -1,5 +1,3 @@
-import { SidebarLightThemeEnum } from "@/enums/ThemeEnum";
-
 // 辅助函数：将十六进制颜色转换为 RGB
 function hexToRgb(hex: string): [number, number, number] {
   const bigint = parseInt(hex.slice(1), 16);
@@ -63,10 +61,10 @@ export function toggleDarkMode(isDark: boolean) {
  *
  * @param isBlue 布尔值，表示是否开启深蓝色侧边栏颜色方案
  */
-export function toggleLightModeSidebarColorScheme(isDarkBlueDark: boolean) {
-  if (isDarkBlueDark) {
-    document.documentElement.classList.add(SidebarLightThemeEnum.DARKBLUE);
+export function toggleSidebarColor(isBuleSidebar: boolean) {
+  if (isBuleSidebar) {
+    document.documentElement.classList.add("sidebar-color-blue");
   } else {
-    document.documentElement.classList.remove(SidebarLightThemeEnum.DARKBLUE);
+    document.documentElement.classList.remove("sidebar-color-blue");
   }
 }

From ea43476d44ede2957230e3a1fa8fa1eac3a0034f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:35:23 +0800
Subject: [PATCH 223/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E9=85=8D=E8=89=B2=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E5=8A=A0=E8=BD=BD=E5=88=9D?=
 =?UTF-8?q?=E5=A7=8B=E9=BB=98=E8=AE=A4=E5=80=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 11 ++++++-----
 src/store/modules/settings.ts            |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index eb1d8d96..d5fe2e23 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -29,7 +29,7 @@
     </div>
     <div v-if="!isDark" class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
-      <el-radio-group v-model="settingsStore.sidebarColorScheme" @change="changeSidebarColorScheme">
+      <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
         <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
           {{ $t("settings.minimalWhite") }}
         </el-radio>
@@ -53,7 +53,9 @@ const route = useRoute();
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
+
 const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
+const sidebarColor = computed(() => settingsStore.sidebarColorScheme);
 
 const settingsVisible = computed({
   get() {
@@ -84,13 +86,12 @@ const changeTheme = (val: any) => {
 };
 
 /**
- * 更改侧边栏颜色方案
+ * 更改侧边栏颜色
  *
  * @param val 颜色方案名称
  */
-const changeSidebarColorScheme = (val: any) => {
-  console.log(val);
-  settingsStore.changeSidebarColorScheme(val);
+const changeSidebarColor = (val: any) => {
+  settingsStore.changeSidebarColor(val);
 };
 
 /**
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.ts
index 12a58e50..41bfa4e7 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.ts
@@ -67,7 +67,7 @@ export const useSettingsStore = defineStore("setting", () => {
     theme.value = val;
   }
 
-  function changeSidebarColorScheme(val: string) {
+  function changeSidebarColor(val: string) {
     sidebarColorScheme.value = val;
   }
 
@@ -92,6 +92,6 @@ export const useSettingsStore = defineStore("setting", () => {
     changeTheme,
     changeThemeColor,
     changeLayout,
-    changeSidebarColorScheme,
+    changeSidebarColor,
   };
 });

From 543abe76c8e1c5526e59f58f9c83951ec4f06f99 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:39:03 +0800
Subject: [PATCH 224/497] =?UTF-8?q?fix:=20:bug:=20=E4=BE=A7=E8=BE=B9?=
 =?UTF-8?q?=E6=A0=8F=E9=85=8D=E7=BD=AE=E5=8A=A0=E8=BD=BD=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index d5fe2e23..2b39f597 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -55,7 +55,7 @@ const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
 
 const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
-const sidebarColor = computed(() => settingsStore.sidebarColorScheme);
+const sidebarColor = ref(settingsStore.sidebarColorScheme);
 
 const settingsVisible = computed({
   get() {

From d18fff710400d9f4caf1a08de55d218187bb1392 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 21 Feb 2025 00:43:20 +0800
Subject: [PATCH 225/497] chore: :hammer: bump version to 2.24.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加可配置的侧边栏配色方案
布局代码优化重构
修复LayoutSelect绑定值类型不匹配警告问题
已知问题修复
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 6fead508..7c9cb72c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.23.0",
+  "version": "2.24.0",
   "private": true,
   "type": "module",
   "scripts": {

From 3b51a9dcccef93185e4f5619c4fdd3aed8f18aaf Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Fri, 21 Feb 2025 13:56:27 +0800
Subject: [PATCH 226/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BE=E5=A4=87=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E4=B8=BB=E5=86=85=E5=AE=B9=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E5=B7=A6=E8=BE=B9=E8=B7=9D=E8=AE=BE=E7=BD=AE=E6=97=A0?=
 =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 45 ++++++++++++++++++++++----------------------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 52c1376e..3d641186 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -261,7 +261,7 @@ function handleToggleSidebar() {
 
   &.layout-mix {
     .layout__sidebar {
-      width: 100% !important;
+      width: 100%;
     }
 
     .layout__container {
@@ -272,33 +272,34 @@ function handleToggleSidebar() {
   }
 }
 
-.layout-left.hideSidebar {
-  .layout__sidebar {
-    width: $sidebar-width-collapsed !important;
-  }
-
-  .layout__main {
-    margin-left: $sidebar-width-collapsed;
-  }
-
-  &.mobile {
+.layout-left {
+  &.hideSidebar {
     .layout__sidebar {
-      pointer-events: none;
-      transform: translate3d(-$sidebar-width, 0, 0);
-      transition-duration: 0.3s;
+      width: $sidebar-width-collapsed;
     }
 
     .layout__main {
-      margin-left: 0;
+      margin-left: $sidebar-width-collapsed;
     }
-  }
-}
 
-.mobile {
-  .layout-mix,
-  .layout-top,
-  .layout-left {
-    margin-left: 0;
+    &.mobile {
+      .layout__sidebar {
+        pointer-events: none;
+        transform: translate3d(-$sidebar-width, 0, 0);
+        transition-duration: 0.3s;
+      }
+
+      .layout__main {
+        margin-left: 0;
+      }
+    }
+  }
+  &.openSidebar {
+    &.mobile {
+      .layout__main {
+        margin-left: 0;
+      }
+    }
   }
 }
 </style>

From 845c91b469ac8438aae97faf957d765aba932321 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Fri, 21 Feb 2025 14:43:34 +0800
Subject: [PATCH 227/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BE=A7=E8=BE=B9=E6=A0=8F=E6=B7=B7=E5=90=88=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E7=9A=84hamburger=E7=BB=84=E4=BB=B6=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E9=98=B4=E5=BD=B1=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/layout/index.vue b/src/layout/index.vue
index 52c1376e..e955f55e 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -235,6 +235,7 @@ function handleToggleSidebar() {
         width: 100%;
         height: 50px;
         line-height: 50px;
+        box-shadow: 0 0 6px -2px var(--el-color-primary);
       }
     }
 

From 9af44cb28cc88b5138e9828cca11ba5e78954885 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 21 Feb 2025 14:56:16 +0800
Subject: [PATCH 228/497] =?UTF-8?q?fix:=20:bug:=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E9=A2=9C=E8=89=B2=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E9=A2=84=E8=AE=BE=E9=A2=9C=E8=89=B2=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

项目配置中颜色选择预设颜色重复
---
 src/layout/components/Settings/components/ThemeColorPicker.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/layout/components/Settings/components/ThemeColorPicker.vue b/src/layout/components/Settings/components/ThemeColorPicker.vue
index bfa82d33..946ef189 100644
--- a/src/layout/components/Settings/components/ThemeColorPicker.vue
+++ b/src/layout/components/Settings/components/ThemeColorPicker.vue
@@ -22,7 +22,6 @@ const colorPresets = [
   "#00ced1",
   "#1e90ff",
   "#c71585",
-  "rgba(255, 69, 0, 0.68)",
   "rgb(255, 120, 0)",
   "hsva(120, 40, 94)",
 ];

From ff70b72633f58d8e79ff367cfbb51af189a34bd5 Mon Sep 17 00:00:00 2001
From: ray <1490493387@qq.com>
Date: Sat, 22 Feb 2025 01:05:54 +0800
Subject: [PATCH 229/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E9=9D=A2=E6=9D=BF=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=92=8C=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 82 +++++++++++++++++------------
 1 file changed, 49 insertions(+), 33 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index f78e0e63..d8c0c302 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -32,7 +32,7 @@
           <li
             v-for="(item, index) in displayResults"
             :key="item.path"
-            :class="{ active: index === activeIndex }"
+            :class="{ 'search-result__item--active': index === activeIndex }"
             @click="navigateToRoute(item)"
           >
             <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
@@ -48,16 +48,22 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <div class="i-svg:enter w-5 h-5" />
-          <span>选择</span>
-
-          <div class="i-svg:down w-5 h-5 ml-5" />
-          <div class="i-svg:up w-5 h-5 ml-5" />
-          <span>切换</span>
-
-          <div class="i-svg:esc w-5 h-5ml-5" />
-
-          <span>退出</span>
+          <div class="dialog-footer__shortcut">
+            <div class="i-svg:enter" />
+          </div>
+          <span class="dialog-footer__text mr-3">选择</span>
+
+          <div class="dialog-footer__shortcut">
+            <div class="i-svg:down" />
+          </div>
+          <div class="dialog-footer__shortcut ml-1">
+            <div class="i-svg:up" />
+          </div>
+          <span class="dialog-footer__text mr-3">切换</span>
+          <div class="dialog-footer__shortcut">
+            <div class="i-svg:esc" />
+          </div>
+          <span class="dialog-footer__text">退出</span>
         </div>
       </template>
     </el-dialog>
@@ -174,25 +180,28 @@ onMounted(() => {
 });
 </script>
 
-<style scoped>
+<style scoped lang="scss">
 .search-result {
   max-height: 400px;
   overflow-y: auto;
-}
 
-.search-result ul li {
-  padding: 10px;
-  line-height: 40px;
-  text-align: left;
-  cursor: pointer;
-}
+  ul {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+  }
 
-.search-result ul li.active {
-  background-color: #e6f7ff;
-}
+  &__item {
+    padding: 10px;
+    line-height: 40px;
+    text-align: left;
+    cursor: pointer;
 
-.search-result ul li:hover {
-  background-color: #f5f5f5;
+    &--active {
+      color: $menu-active-text;
+      background-color: $menu-hover;
+    }
+  }
 }
 
 .dialog-footer {
@@ -200,25 +209,32 @@ onMounted(() => {
   align-items: center;
   justify-content: start;
 
-  svg {
+  &__shortcut {
     display: flex;
     align-items: center;
     justify-content: center;
-    padding: 0 2px;
-    margin-right: 0.4em;
-    color: #909399;
-    background: rgb(125 125 125 / 10%);
+    width: 20px;
+    height: 18px;
+    padding: 0 0 1px;
+    color: var(--el-text-color-secondary);
+    background: rgba(125, 125, 125, 0.1);
     border: 0;
     border-radius: 2px;
     box-shadow:
       inset 0 -2px 0 0 #cdcde6,
       inset 0 0 1px 1px #fff,
-      0 1px 2px 1px rgb(30 35 90 / 40%);
+      0 1px 2px 1px rgba(30, 35, 90, 0.4);
   }
 
-  span {
-    font-size: 12px;
-    color: #909399;
+  &__text {
+    margin-left: 5px;
+    font-size: 14px;
+    color: var(--el-text-color-secondary);
   }
 }
+
+[class^="i-svg:"] {
+  display: inline-block;
+  color: var(--el-text-color-secondary);
+}
 </style>

From f9e4d1b93637db9d1d609bacd42b3f15ef2f8b78 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 22 Feb 2025 12:26:07 +0800
Subject: [PATCH 230/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E5=8F=82=E6=95=B0=E5=8F=98=E5=8C=96=E6=97=B6?=
 =?UTF-8?q?=E8=B7=A8=E9=A1=B5=E9=9D=A2=E8=A7=A6=E5=8F=91=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

使用 onBeforeRouteUpdate 替代普通 watch 监听路由参数
---
 src/views/system/dict/data.vue | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index e8cf6253..591926d6 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -166,15 +166,6 @@ const dialog = reactive({
 
 const formData = reactive<DictDataForm>({});
 
-// 监听路由参数变化，更新字典数据
-watch(
-  () => [route.query.dictCode],
-  ([newDictCode]) => {
-    queryParams.dictCode = newDictCode as string;
-    dictCode.value = newDictCode as string;
-    handleQuery();
-  }
-);
 const computedRules = computed(() => {
   const rules: Partial<Record<string, any>> = {
     value: [{ required: true, message: "请输入字典值", trigger: "blur" }],
@@ -290,4 +281,10 @@ function handleDelete(id?: number) {
 onMounted(() => {
   handleQuery();
 });
+
+// 同一路由参数变化时更新数据
+onBeforeRouteUpdate((to) => {
+  queryParams.dictCode = to.query.dictCode as string;
+  handleQuery();
+});
 </script>

From 7094eedf6dcdb68cb8396134557f944105b1e6ba Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 22 Feb 2025 23:39:42 +0800
Subject: [PATCH 231/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E6=9C=80=E6=96=B0=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 148 +++++++++++++++++++++++-----------
 1 file changed, 101 insertions(+), 47 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index f784e3e2..42279698 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -218,35 +218,63 @@
           <ECharts :options="visitTrendChartOptions" height="400px" />
         </el-card>
       </el-col>
-      <!-- 通知公告 -->
+      <!-- 最新动态 -->
       <el-col :xs="24" :span="8">
         <el-card>
           <template #header>
             <div class="flex-x-between">
-              <div class="flex-y-center">通知公告</div>
-              <el-link type="primary">
-                <span class="text-xs" @click="navigateToNoticePage">查看更多</span>
-                <el-icon class="text-xs"><ArrowRight /></el-icon>
+              <span class="header-title">最新动态</span>
+              <el-link
+                type="primary"
+                :underline="false"
+                href="https://gitee.com/youlaiorg/vue3-element-admin/releases"
+                target="_blank"
+              >
+                完整记录
+                <el-icon class="link-icon"><TopRight /></el-icon>
               </el-link>
             </div>
           </template>
 
           <el-scrollbar height="400px">
-            <div v-for="(item, index) in notices" :key="index" class="flex-y-center py-4">
-              <DictLabel v-model="item.type" code="notice_type" size="small" />
-              <el-text truncated class="!mx-2 flex-1 !text-xs !text-gray">
-                {{ item.title }}
-              </el-text>
-              <el-link @click="openNoticeDetail(item.id)">
-                <el-icon class="text-sm"><View /></el-icon>
-              </el-link>
-            </div>
+            <el-timeline class="p-3">
+              <el-timeline-item
+                v-for="(item, index) in vesionList"
+                :key="index"
+                :timestamp="item.date"
+                placement="top"
+                :color="index === 0 ? '#67C23A' : '#909399'"
+                :hollow="index !== 0"
+                size="large"
+              >
+                <div class="version-item" :class="{ 'latest-item': index === 0 }">
+                  <div>
+                    <el-text tag="strong">{{ item.title }}</el-text>
+                    <el-tag v-if="item.tag" :type="index === 0 ? 'success' : 'info'" size="small">
+                      {{ item.tag }}
+                    </el-tag>
+                  </div>
+
+                  <el-text class="version-content">{{ item.content }}</el-text>
+
+                  <div v-if="item.link">
+                    <el-link
+                      :type="index === 0 ? 'primary' : 'info'"
+                      :href="http://github.com/item.link"
+                      target="_blank"
+                      :underline="false"
+                    >
+                      详情
+                      <el-icon class="link-icon"><TopRight /></el-icon>
+                    </el-link>
+                  </div>
+                </div>
+              </el-timeline-item>
+            </el-timeline>
           </el-scrollbar>
         </el-card>
       </el-col>
     </el-row>
-
-    <NoticeDetail ref="noticeDetailRef" />
   </div>
 </template>
 
@@ -257,18 +285,48 @@ defineOptions({
 });
 
 import { dayjs } from "element-plus";
-import router from "@/router";
 import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log";
-import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
 import { useUserStore } from "@/store/modules/user";
 import { formatGrowthRate } from "@/utils";
 
-const userStore = useUserStore();
+interface VersionItem {
+  id: string;
+  title: string; // 版本标题（如：v2.4.0）
+  date: string; // 发布时间
+  content: string; // 版本描述
+  link: string; // 详情链接
+  tag?: string; // 版本标签（可选）
+}
 
-const noticeDetailRef = ref();
+const userStore = useUserStore();
 
 // 当前通知公告列表
-const notices = ref<NoticePageVO[]>([]);
+const vesionList = ref<VersionItem[]>([
+  {
+    id: "1",
+    title: "v2.4.0",
+    date: "2021-09-01 00:00:00",
+    content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",
+    link: "https://gitee.com/youlaiorg/vue3-element-admin/releases",
+    tag: "里程碑",
+  },
+  {
+    id: "1",
+    title: "v2.4.0",
+    date: "2021-09-01 00:00:00",
+    content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",
+    link: "https://gitee.com/youlaiorg/vue3-element-admin/releases",
+    tag: "里程碑",
+  },
+  {
+    id: "1",
+    title: "v2.4.0",
+    date: "2021-09-01 00:00:00",
+    content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",
+    link: "https://gitee.com/youlaiorg/vue3-element-admin/releases",
+    tag: "里程碑",
+  },
+]);
 
 // 当前时间（用于计算问候语）
 const currentDate = new Date();
@@ -425,31 +483,6 @@ const computeGrowthRateClass = (growthRate?: number): string => {
   }
 };
 
-/**
- * 获取当前用户的通知公告数据
- */
-const fetchMyNotices = () => {
-  NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 10 }).then((data) => {
-    notices.value = data.list;
-  });
-};
-
-/**
- * 跳转至通知公告详情页面（查看更多通知）
- */
-function navigateToNoticePage() {
-  router.push({ path: "/myNotice" });
-}
-
-/**
- * 打开指定通知详情
- *
- * @param id - 通知 ID
- */
-function openNoticeDetail(id: string) {
-  noticeDetailRef.value.openNotice(id);
-}
-
 // 监听访问趋势日期范围的变化，重新获取趋势数据
 watch(
   () => visitTrendDateRange.value,
@@ -463,7 +496,6 @@ watch(
 // 组件挂载后加载访客统计数据和通知公告数据
 onMounted(() => {
   fetchVisitStatsData();
-  fetchMyNotices();
 });
 </script>
 
@@ -479,5 +511,27 @@ onMounted(() => {
     z-index: 1;
     border: 0;
   }
+
+  .version-item {
+    padding: 16px;
+    margin-bottom: 12px;
+    background: var(--el-fill-color-lighter);
+    border-radius: 8px;
+    transition: all 0.2s;
+
+    &.latest-item {
+      background: var(--el-color-primary-light-9);
+      border: 1px solid var(--el-color-primary-light-5);
+    }
+    &:hover {
+      transform: translateX(5px);
+    }
+    .version-content {
+      margin-bottom: 12px;
+      font-size: 13px;
+      line-height: 1.5;
+      color: var(--el-text-color-secondary);
+    }
+  }
 }
 </style>

From 2be92dacd1f7aad6c751ac5f32587335991ba277 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 22 Feb 2025 23:42:57 +0800
Subject: [PATCH 232/497] =?UTF-8?q?fix:=20:bug:=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=9B=BE=E6=A0=87=E9=A2=9C=E8=89=B2=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index d8c0c302..eeac84fe 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -233,7 +233,7 @@ onMounted(() => {
   }
 }
 
-[class^="i-svg:"] {
+.dialog-footer > [class^="i-svg:"] {
   display: inline-block;
   color: var(--el-text-color-secondary);
 }

From b1d3003099333bcfef3cde91b146107a58c5aa74 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 22 Feb 2025 23:51:30 +0800
Subject: [PATCH 233/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5=E5=85=AC=E5=91=8A=E8=A7=A3=E8=80=A6=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NoticeDropdown/index.vue}                 | 126 +++++++++++++-----
 .../NavBar/components/NavbarRight.vue         |   5 +-
 src/layout/components/Settings/index.vue      |   2 +-
 src/types/components.d.ts                     |   1 +
 .../system/notice/components/MyNotice.vue     |  84 ++++++++++--
 .../system/notice/components/NoticeDetail.vue |  90 -------------
 src/views/system/notice/index.vue             |  84 +++++++++---
 7 files changed, 238 insertions(+), 154 deletions(-)
 rename src/{layout/components/NavBar/components/Notification.vue => components/NoticeDropdown/index.vue} (52%)
 delete mode 100644 src/views/system/notice/components/NoticeDetail.vue

diff --git a/src/layout/components/NavBar/components/Notification.vue b/src/components/NoticeDropdown/index.vue
similarity index 52%
rename from src/layout/components/NavBar/components/Notification.vue
rename to src/components/NoticeDropdown/index.vue
index 70bc8308..4010f261 100644
--- a/src/layout/components/NavBar/components/Notification.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div>
+  <div class="notice">
     <el-dropdown class="h-full items-center justify-center" trigger="click">
-      <el-badge v-if="notices.length > 0" :offset="[0, 15]" :value="notices.length" :max="99">
+      <el-badge v-if="noticeList.length > 0" :offset="[0, 15]" :value="noticeList.length" :max="99">
         <el-icon>
           <Bell />
         </el-icon>
@@ -15,15 +15,15 @@
 
       <template #dropdown>
         <div class="p-5">
-          <template v-if="notices.length > 0">
-            <div v-for="(item, index) in notices" :key="index" class="w500px py-3">
+          <template v-if="noticeList.length > 0">
+            <div v-for="(item, index) in noticeList" :key="index" class="w500px py-3">
               <div class="flex-y-center">
                 <DictLabel v-model="item.type" code="notice_type" size="small" />
                 <el-text
                   size="small"
                   class="w200px cursor-pointer !ml-2 !flex-1"
                   truncated
-                  @click="readNotice(item.id)"
+                  @click="handleReadNotice(item.id)"
                 >
                   {{ item.title }}
                 </el-text>
@@ -35,17 +35,17 @@
             </div>
             <el-divider />
             <div class="flex-x-between">
-              <el-link type="primary" :underline="false" @click="viewMoreNotice">
+              <el-link type="primary" :underline="false" @click="handleViewMoreNotice">
                 <span class="text-xs">查看更多</span>
                 <el-icon class="text-xs">
                   <ArrowRight />
                 </el-icon>
               </el-link>
               <el-link
-                v-if="notices.length > 0"
+                v-if="noticeList.length > 0"
                 type="primary"
                 :underline="false"
-                @click="markAllAsRead"
+                @click="handleMarkAllAsRead"
               >
                 <span class="text-xs">全部已读</span>
               </el-link>
@@ -60,16 +60,39 @@
       </template>
     </el-dropdown>
 
-    <NoticeDetail ref="noticeDetailRef" />
+    <el-dialog
+      v-model="noticeDialogVisible"
+      :title="noticeDetail?.title ?? '通知详情'"
+      width="800px"
+      custom-class="notice-detail"
+    >
+      <div v-if="noticeDetail" class="notice-detail__wrapper">
+        <div class="notice-detail__meta">
+          <span>
+            <el-icon><User /></el-icon>
+            {{ noticeDetail.publisherName }}
+          </span>
+          <span class="ml-2">
+            <el-icon><Timer /></el-icon>
+            {{ noticeDetail.publishTime }}
+          </span>
+        </div>
+
+        <div class="notice-detail__content">
+          <div v-html="noticeDetail.content"></div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
 <script setup lang="ts">
-import NoticeAPI, { NoticePageVO } from "@/api/system/notice";
+import NoticeAPI, { NoticePageVO, NoticeDetailVO } from "@/api/system/notice";
 import router from "@/router";
 
-const notices = ref<NoticePageVO[]>([]);
-const noticeDetailRef = ref();
+const noticeList = ref<NoticePageVO[]>([]);
+const noticeDialogVisible = ref(false);
+const noticeDetail = ref<NoticeDetailVO | null>(null);
 
 import { useStomp } from "@/hooks/useStomp";
 const { subscribe, unsubscribe, isConnected } = useStomp();
@@ -82,8 +105,8 @@ watch(
         console.log("收到通知消息：", message);
         const data = JSON.parse(message.body);
         const id = data.id;
-        if (!notices.value.some((notice) => notice.id == id)) {
-          notices.value.unshift({
+        if (!noticeList.value.some((notice) => notice.id == id)) {
+          noticeList.value.unshift({
             id,
             title: data.title,
             type: data.type,
@@ -107,28 +130,32 @@ watch(
  */
 function featchMyNotice() {
   NoticeAPI.getMyNoticePage({ pageNum: 1, pageSize: 5, isRead: 0 }).then((data) => {
-    notices.value = data.list;
+    noticeList.value = data.list;
   });
 }
 
 // 阅读通知公告
-function readNotice(id: string) {
-  noticeDetailRef.value.openNotice(id);
-  const index = notices.value.findIndex((notice) => notice.id === id);
-  if (index >= 0) {
-    notices.value.splice(index, 1); // 从消息列表中移除已读消息
-  }
+function handleReadNotice(id: string) {
+  NoticeAPI.getDetail(id).then((data) => {
+    noticeDialogVisible.value = true;
+    noticeDetail.value = data;
+    // 标记为已读
+    const index = noticeList.value.findIndex((notice) => notice.id === id);
+    if (index >= 0) {
+      noticeList.value.splice(index, 1);
+    }
+  });
 }
 
 // 查看更多
-function viewMoreNotice() {
+function handleViewMoreNotice() {
   router.push({ path: "/myNotice" });
 }
 
 // 全部已读
-function markAllAsRead() {
+function handleMarkAllAsRead() {
   NoticeAPI.readAll().then(() => {
-    notices.value = [];
+    noticeList.value = [];
   });
 }
 
@@ -142,14 +169,47 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss" scoped>
-:deep(.el-badge) {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-}
-:deep(.el-dropdown) {
-  color: currentColor;
+.notice {
+  :deep(.el-badge) {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 100%;
+    height: 100%;
+  }
+
+  .notice-detail {
+    &__wrapper {
+      padding: 0 20px;
+    }
+
+    &__meta {
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
+      font-size: 13px;
+      color: var(--el-text-color-secondary);
+    }
+
+    &__publisher {
+      margin-right: 24px;
+
+      i {
+        margin-right: 4px;
+      }
+    }
+
+    &__content {
+      max-height: 60vh;
+      padding-top: 16px;
+      margin-bottom: 24px;
+      overflow-y: auto;
+      border-top: 1px solid var(--el-border-color);
+
+      &::-webkit-scrollbar {
+        width: 6px;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index f153364e..4002c412 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -14,8 +14,8 @@
       <!-- 语言选择 -->
       <LangSelect />
 
-      <!-- 消息通知 -->
-      <Notification />
+      <!-- 通知下拉 -->
+      <NoticeDropdown />
     </template>
 
     <!-- 用户头像（个人中心、注销登录等） -->
@@ -47,7 +47,6 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/DeviceEnum";
 import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
 
-import Notification from "./Notification.vue";
 import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum";
 
 const appStore = useAppStore();
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 2b39f597..4fe0fe57 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -30,10 +30,10 @@
     <div v-if="!isDark" class="py-1 flex-x-between">
       <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
       <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
+        <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">{{ $t("settings.classicBlue") }}</el-radio>
         <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
           {{ $t("settings.minimalWhite") }}
         </el-radio>
-        <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">{{ $t("settings.classicBlue") }}</el-radio>
       </el-radio-group>
     </div>
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index d9ef9c47..13482415 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -70,6 +70,7 @@ declare module "vue" {
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
     MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
+    NoticeDropdown: (typeof import("./../components/Notice/NoticeDropdown.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"];
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index e8900b30..07a02169 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -59,7 +59,7 @@
         </el-table-column>
         <el-table-column align="center" fixed="right" label="操作" width="80">
           <template #default="scope">
-            <el-button type="primary" size="small" link @click="viewNoticeDetail(scope.row.id)">
+            <el-button type="primary" size="small" link @click="handleReadNotice(scope.row.id)">
               查看
             </el-button>
           </template>
@@ -75,7 +75,29 @@
       />
     </el-card>
 
-    <NoticeDetail ref="noticeDetailRef" />
+    <el-dialog
+      v-model="noticeDialogVisible"
+      :title="noticeDetail?.title ?? '通知详情'"
+      width="800px"
+      custom-class="notice-detail"
+    >
+      <div v-if="noticeDetail" class="notice-detail__wrapper">
+        <div class="notice-detail__meta">
+          <span>
+            <el-icon><User /></el-icon>
+            {{ noticeDetail.publisherName }}
+          </span>
+          <span class="ml-2">
+            <el-icon><Timer /></el-icon>
+            {{ noticeDetail.publishTime }}
+          </span>
+        </div>
+
+        <div class="notice-detail__content">
+          <div v-html="noticeDetail.content"></div>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -85,11 +107,9 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import NoticeAPI, { NoticePageVO, NoticePageQuery } from "@/api/system/notice";
+import NoticeAPI, { NoticePageVO, NoticePageQuery, NoticeDetailVO } from "@/api/system/notice";
 
 const queryFormRef = ref();
-const noticeDetailRef = ref();
-
 const pageData = ref<NoticePageVO[]>([]);
 
 const loading = ref(false);
@@ -100,7 +120,10 @@ const queryParams = reactive<NoticePageQuery>({
   pageSize: 10,
 });
 
-/** 查询通知公告 */
+const noticeDialogVisible = ref(false);
+const noticeDetail = ref<NoticeDetailVO | null>(null);
+
+// 查询通知公告
 function handleQuery() {
   loading.value = true;
   NoticeAPI.getMyNoticePage(queryParams)
@@ -113,18 +136,61 @@ function handleQuery() {
     });
 }
 
-/** 重置通知公告查询 */
+// 重置通知公告查询
 function handleResetQuery() {
   queryFormRef.value!.resetFields();
   queryParams.pageNum = 1;
   handleQuery();
 }
 
-function viewNoticeDetail(id: string) {
-  noticeDetailRef.value.openNotice(id);
+// 阅读通知公告
+function handleReadNotice(id: string) {
+  NoticeAPI.getDetail(id).then((data) => {
+    noticeDialogVisible.value = true;
+    noticeDetail.value = data;
+  });
 }
 
 onMounted(() => {
   handleQuery();
 });
 </script>
+
+<style lang="scss" scoped>
+:deep(.el-dialog__header) {
+  text-align: center;
+}
+.notice-detail {
+  &__wrapper {
+    padding: 0 20px;
+  }
+
+  &__meta {
+    display: flex;
+    align-items: center;
+    margin-bottom: 16px;
+    font-size: 13px;
+    color: var(--el-text-color-secondary);
+  }
+
+  &__publisher {
+    margin-right: 24px;
+
+    i {
+      margin-right: 4px;
+    }
+  }
+
+  &__content {
+    max-height: 60vh;
+    padding-top: 16px;
+    margin-bottom: 24px;
+    overflow-y: auto;
+    border-top: 1px solid var(--el-border-color);
+
+    &::-webkit-scrollbar {
+      width: 6px;
+    }
+  }
+}
+</style>
diff --git a/src/views/system/notice/components/NoticeDetail.vue b/src/views/system/notice/components/NoticeDetail.vue
deleted file mode 100644
index d573c3e9..00000000
--- a/src/views/system/notice/components/NoticeDetail.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <el-dialog
-    v-model="visible"
-    :show-close="false"
-    :fullscreen="isFullscreen"
-    width="50%"
-    append-to-body
-    @close="handleClose"
-  >
-    <template #header>
-      <div class="flex-x-between">
-        <span>通知公告详情</span>
-        <div class="dialog-toolbar">
-          <!-- 全屏/退出全屏按钮 -->
-          <el-button circle @click="toggleFullscreen">
-            <div :class="`i-svg:${isFullscreen ? 'fullscreen-exit' : 'fullscreen'}`" />
-          </el-button>
-          <!-- 关闭按钮 -->
-          <el-button circle @click="handleClose">
-            <template #icon>
-              <Close />
-            </template>
-          </el-button>
-        </div>
-      </div>
-    </template>
-
-    <el-descriptions :column="1">
-      <el-descriptions-item label="标题：">
-        {{ notice.title }}
-      </el-descriptions-item>
-      <el-descriptions-item label="发布状态：">
-        <el-tag v-if="notice.publishStatus == 0" type="info">未发布</el-tag>
-        <el-tag v-else-if="notice.publishStatus == 1" type="success">已发布</el-tag>
-        <el-tag v-else-if="notice.publishStatus == -1" type="warning">已撤回</el-tag>
-      </el-descriptions-item>
-      <el-descriptions-item label="发布人：">
-        {{ notice.publisherName }}
-      </el-descriptions-item>
-      <el-descriptions-item label="发布时间：">
-        {{ notice.publishTime }}
-      </el-descriptions-item>
-      <el-descriptions-item label="公告内容：">
-        <div class="notice-content" v-html="notice.content" />
-      </el-descriptions-item>
-    </el-descriptions>
-  </el-dialog>
-</template>
-
-<script setup lang="ts">
-import NoticeAPI, { NoticeDetailVO } from "@/api/system/notice";
-
-const visible = ref(false);
-const notice = ref<NoticeDetailVO>({});
-const isFullscreen = ref(false); // 控制全屏状态
-
-// 切换全屏
-const toggleFullscreen = () => {
-  isFullscreen.value = !isFullscreen.value;
-};
-
-// 关闭弹窗
-const handleClose = () => {
-  visible.value = false;
-};
-
-// 接收公告详情
-const openNotice = async (id: string) => {
-  visible.value = true;
-  const noticeDetail = await NoticeAPI.getDetail(id);
-  notice.value = noticeDetail;
-};
-
-defineExpose({
-  openNotice,
-});
-</script>
-
-<style scoped>
-.notice-content {
-  width: 100%;
-  overflow-x: hidden;
-}
-
-/* 由于 v-html 内容不受 scoped 样式影响，需要使用 :deep() */
-:deep(.notice-content img) {
-  max-width: 100%;
-  height: auto;
-}
-</style>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index b6980f00..bc19cf14 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -103,12 +103,7 @@
         </el-table-column>
         <el-table-column align="center" fixed="right" label="操作" width="150">
           <template #default="scope">
-            <el-button
-              type="primary"
-              size="small"
-              link
-              @click="handleOpenNoticeDetailDialog(scope.row.id)"
-            >
+            <el-button type="primary" size="small" link @click="openDetailDialog(scope.row.id)">
               查看
             </el-button>
             <el-button
@@ -168,17 +163,15 @@
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
-      top="4vh"
-      width="1250"
+      top="3vh"
+      width="80%"
       @close="handleCloseDialog"
     >
       <el-form ref="dataFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="通知标题" prop="title">
           <el-input v-model="formData.title" placeholder="通知标题" clearable />
         </el-form-item>
-        <el-form-item label="通知内容" prop="content">
-          <WangEditor v-model="formData.content" />
-        </el-form-item>
+
         <el-form-item label="通知类型" prop="type">
           <Dict v-model="formData.type" code="notice_type" />
         </el-form-item>
@@ -201,6 +194,9 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="通知内容" prop="content">
+          <WangEditor v-model="formData.content" />
+        </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -210,7 +206,45 @@
       </template>
     </el-dialog>
     <!-- 通知公告详情 -->
-    <NoticeDetail ref="noticeDetailRef" />
+    <el-dialog
+      v-model="detailDialog.visible"
+      :show-close="false"
+      width="50%"
+      append-to-body
+      @close="closeDetailDialog"
+    >
+      <template #header>
+        <div class="flex-x-between">
+          <span>通知公告详情</span>
+          <div class="dialog-toolbar">
+            <el-button circle @click="closeDetailDialog">
+              <template #icon>
+                <Close />
+              </template>
+            </el-button>
+          </div>
+        </div>
+      </template>
+      <el-descriptions :column="1">
+        <el-descriptions-item label="标题：">
+          {{ currentNotice.title }}
+        </el-descriptions-item>
+        <el-descriptions-item label="发布状态：">
+          <el-tag v-if="currentNotice.publishStatus == 0" type="info">未发布</el-tag>
+          <el-tag v-else-if="currentNotice.publishStatus == 1" type="success">已发布</el-tag>
+          <el-tag v-else-if="currentNotice.publishStatus == -1" type="warning">已撤回</el-tag>
+        </el-descriptions-item>
+        <el-descriptions-item label="发布人：">
+          {{ currentNotice.publisherName }}
+        </el-descriptions-item>
+        <el-descriptions-item label="发布时间：">
+          {{ currentNotice.publishTime }}
+        </el-descriptions-item>
+        <el-descriptions-item label="公告内容：">
+          <div class="notice-content" v-html="currentNotice.content" />
+        </el-descriptions-item>
+      </el-descriptions>
+    </el-dialog>
   </div>
 </template>
 
@@ -220,12 +254,16 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import NoticeAPI, { NoticePageVO, NoticeForm, NoticePageQuery } from "@/api/system/notice";
+import NoticeAPI, {
+  NoticePageVO,
+  NoticeForm,
+  NoticePageQuery,
+  NoticeDetailVO,
+} from "@/api/system/notice";
 import UserAPI from "@/api/system/user";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
-const noticeDetailRef = ref();
 
 const loading = ref(false);
 const selectIds = ref<number[]>([]);
@@ -272,6 +310,11 @@ const rules = reactive({
   type: [{ required: true, message: "请选择通知类型", trigger: "change" }],
 });
 
+const detailDialog = reactive({
+  visible: false,
+});
+const currentNotice = ref<NoticeDetailVO>({});
+
 // 查询通知公告
 function handleQuery() {
   loading.value = true;
@@ -400,10 +443,15 @@ function handleDelete(id?: number) {
   );
 }
 
-// 打开通知公告详情弹窗
-function handleOpenNoticeDetailDialog(id: number) {
-  noticeDetailRef.value.openNotice(id);
-}
+const closeDetailDialog = () => {
+  detailDialog.visible = false;
+};
+
+const openDetailDialog = async (id: string) => {
+  const noticeDetail = await NoticeAPI.getDetail(id);
+  currentNotice.value = noticeDetail;
+  detailDialog.visible = true;
+};
 
 onMounted(() => {
   handleQuery();

From a6654ba17b9f8ef5f4c459d5a02cef45413b16cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=B6=85?= <chao.yu@chinaxpp.com>
Date: Mon, 24 Feb 2025 17:15:05 +0800
Subject: [PATCH 234/497] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E8=AD=A6=E5=91=8A=EF=BC=9A[el-radio]=20[API]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/launch.json             | 10 ++++++++++
 src/views/system/role/index.vue |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..a5088194
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,10 @@
+{
+  "configurations": [
+    {
+      "type": "msedge",
+      "name": " http://localhost:3000/",
+      "request": "launch",
+      "url": " http://localhost:3000/"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 4730579c..eab71721 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -116,8 +116,8 @@
 
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
+            <el-radio :value="1">正常</el-radio>
+            <el-radio :value="0">停用</el-radio>
           </el-radio-group>
         </el-form-item>
 

From 9b08bbfd9d402806e4749dd8419f33fe78b6f5dd Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Feb 2025 22:25:18 +0800
Subject: [PATCH 235/497] =?UTF-8?q?chore:=20:hammer:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 7c9cb72c..05a9bbd7 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.0.0",
-    "@vueuse/core": "^12.6.1",
+    "@vueuse/core": "^12.7.0",
     "@wangeditor-next/editor": "^5.6.31",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
@@ -55,7 +55,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.4",
+    "element-plus": "^2.9.5",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -71,32 +71,32 @@
   "devDependencies": {
     "@commitlint/cli": "^19.7.1",
     "@commitlint/config-conventional": "^19.7.1",
-    "@eslint/js": "^9.20.0",
+    "@eslint/js": "^9.21.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.4",
+    "@types/node": "^22.13.5",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.24.0",
-    "@typescript-eslint/parser": "^8.24.0",
+    "@typescript-eslint/eslint-plugin": "^8.24.1",
+    "@typescript-eslint/parser": "^8.24.1",
     "@vitejs/plugin-vue": "^5.2.1",
     "autoprefixer": "^10.4.20",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.0",
-    "eslint": "^9.20.1",
+    "eslint": "^9.21.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-vue": "^9.32.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.4.3",
-    "postcss": "^8.5.2",
+    "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.1",
+    "prettier": "^3.5.2",
     "sass": "^1.85.0",
     "stylelint": "^16.14.1",
     "stylelint-config-html": "^1.1.0",
@@ -107,14 +107,14 @@
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.39.0",
     "typescript": "^5.7.3",
-    "typescript-eslint": "^8.24.0",
+    "typescript-eslint": "^8.24.1",
     "unocss": "65.4.3",
-    "unplugin-auto-import": "^19.0.0",
-    "unplugin-vue-components": "^28.0.0",
-    "vite": "^6.1.0",
+    "unplugin-auto-import": "^19.1.0",
+    "unplugin-vue-components": "^28.4.0",
+    "vite": "^6.1.1",
     "vite-plugin-mock-dev-server": "^1.8.4",
     "vue-eslint-parser": "^9.4.3",
-    "vue-tsc": "^2.2.0"
+    "vue-tsc": "^2.2.4"
   },
   "engines": {
     "node": ">=18.0.0"

From eaff7161760ffb2df271b579163a60d0552d43eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BA=8E=E8=B6=85?= <chao.yu@chinaxpp.com>
Date: Tue, 25 Feb 2025 09:45:29 +0800
Subject: [PATCH 236/497] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E8=B0=83?=
 =?UTF-8?q?=E8=AF=95=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=20launch.json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/launch.json | 10 ----------
 1 file changed, 10 deletions(-)
 delete mode 100644 .vscode/launch.json

diff --git a/.vscode/launch.json b/.vscode/launch.json
deleted file mode 100644
index a5088194..00000000
--- a/.vscode/launch.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "configurations": [
-    {
-      "type": "msedge",
-      "name": " http://localhost:3000/",
-      "request": "launch",
-      "url": " http://localhost:3000/"
-    }
-  ]
-}
\ No newline at end of file

From b9ac5b35bab1a819a1793ff9d4f96291756f1432 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 27 Feb 2025 16:49:05 +0800
Subject: [PATCH 237/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E5=BF=85=E5=A1=AB=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/MultiImageUpload.vue  | 1 -
 src/components/Upload/SingleImageUpload.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index a66b94c0..451310c1 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -87,7 +87,6 @@ const previewImageIndex = ref(0); // 预览图片的索引
 
 const modelValue = defineModel("modelValue", {
   type: [Array] as PropType<string[]>,
-  required: true,
   default: () => [],
 });
 
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index 3ce77c7f..bcda04cc 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -77,7 +77,6 @@ const props = defineProps({
 
 const modelValue = defineModel("modelValue", {
   type: String,
-  required: true,
   default: () => "",
 });
 

From a0efc16352c47d1f99253649d963a36403aaad0e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 27 Feb 2025 16:51:56 +0800
Subject: [PATCH 238/497] =?UTF-8?q?fix:=20:bug:=20=E8=A1=A5=E5=85=85mock?=
 =?UTF-8?q?=E7=9A=84refreshToken=E7=9A=84=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/auth.mock.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mock/auth.mock.ts b/mock/auth.mock.ts
index 59803e5c..153142cc 100644
--- a/mock/auth.mock.ts
+++ b/mock/auth.mock.ts
@@ -24,7 +24,8 @@ export default defineMock([
         accessToken:
           "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImRlcHRJZCI6MSwiZGF0YVNjb3BlIjoxLCJ1c2VySWQiOjIsImlhdCI6MTcyODE5MzA1MiwiYXV0aG9yaXRpZXMiOlsiUk9MRV9BRE1JTiJdLCJqdGkiOiJhZDg3NzlhZDZlYWY0OWY3OTE4M2ZmYmI5OWM4MjExMSJ9.58YHwL3sNNC22jyAmOZeSm-7MITzfHb_epBIz7LvWeA",
         tokenType: "Bearer",
-        refreshToken: null,
+        refreshToken:
+          "eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJhZG1pbiIsImRlcHRJZCI6MSwiZGF0YVNjb3BlIjoxLCJ1c2VySWQiOjIsImlhdCI6MTcyODE5MzA1MiwiYXV0aG9yaXRpZXMiOlsiUk9MRV9BRE1JTiJdLCJqdGkiOiJhZDg3NzlhZDZlYWY0OWY3OTE4M2ZmYmI5OWM4MjExMSJ9.58YHwL3sNNC22jyAmOZeSm-7MITzfHb_epBIz7LvWeA",
         expires: null,
       },
       msg: "一切ok",

From 7b6ea62996c1875cedaacf2adb4d472d92b3dd9c Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Fri, 28 Feb 2025 11:29:13 +0800
Subject: [PATCH 239/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E6=97=B6=E5=87=BA=E7=8E=B0=E6=96=B0=E7=9A=84tagview?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复字典数据页面刷新时出现新的tagview的问题
---
 src/store/modules/tags-view.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/store/modules/tags-view.ts b/src/store/modules/tags-view.ts
index 82fb50be..7a39ffb8 100644
--- a/src/store/modules/tags-view.ts
+++ b/src/store/modules/tags-view.ts
@@ -8,8 +8,11 @@ export const useTagsViewStore = defineStore("tagsView", () => {
    * 添加已访问视图到已访问视图列表中
    */
   function addVisitedView(view: TagView) {
-    // 如果已经存在于已访问的视图列表中，则不再添加
-    if (visitedViews.value.some((v) => v.path === view.path)) {
+    // 如果已经存在于已访问的视图列表中或者是重定向地址，则不再添加
+    if (view.path.startsWith("/redirect")) {
+      return;
+    }
+    if (visitedViews.value.some((v) => v.name === view.name)) {
       return;
     }
     // 如果视图是固定的（affix），则在已访问的视图列表的开头添加

From b6ba68b655551fc5c64a232205c2406b3826ef18 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 28 Feb 2025 23:57:29 +0800
Subject: [PATCH 240/497] =?UTF-8?q?style:=20:lipstick:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/global.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 242a7e50..cf16798f 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -91,6 +91,7 @@ declare global {
     /** 子列表  */
     children?: OptionType[];
   }
+
   /**
    * 导入结果
    */

From 70b53cf306def00e85d9356a1491bde9fc8046df Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 1 Mar 2025 00:50:09 +0800
Subject: [PATCH 241/497] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0=20ti?=
 =?UTF-8?q?meline=20=E7=BB=84=E4=BB=B6=E8=87=B3=E9=A2=84=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vite.config.ts b/vite.config.ts
index 4997c4df..afaae229 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -178,6 +178,8 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es/components/image-viewer/style/css",
         "element-plus/es/components/empty/style/css",
         "element-plus/es/components/message/style/css",
+        "element-plus/es/components/timeline/style/css",
+        "element-plus/es/components/timeline-item/style/css",
       ],
     },
     // 构建配置

From d278a3e53dfc104feda785b29a4bfb799f534934 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Mar 2025 22:47:43 +0800
Subject: [PATCH 242/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=BB=93=E6=9E=9C=E9=A1=B9=E6=A0=B7=E5=BC=8F=E6=9C=AA?=
 =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index eeac84fe..8905f110 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -32,7 +32,12 @@
           <li
             v-for="(item, index) in displayResults"
             :key="item.path"
-            :class="{ 'search-result__item--active': index === activeIndex }"
+            :class="[
+              'search-result__item',
+              {
+                'search-result__item--active': index === activeIndex,
+              },
+            ]"
             @click="navigateToRoute(item)"
           >
             <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
@@ -40,7 +45,7 @@
             </el-icon>
             <div v-else-if="item.icon" :class="`i-svg:${item.icon}`" />
             <div v-else class="i-svg:menu" />
-            {{ item.title }}
+            <span class="ml-2">{{ item.title }}</span>
           </li>
         </ul>
         <el-empty v-else description="暂无数据" />
@@ -192,14 +197,15 @@ onMounted(() => {
   }
 
   &__item {
+    display: flex;
+    align-items: center;
     padding: 10px;
-    line-height: 40px;
     text-align: left;
     cursor: pointer;
 
     &--active {
-      color: $menu-active-text;
-      background-color: $menu-hover;
+      color: var(--el-color-primary);
+      background-color: var(--el-menu-hover-bg-color);
     }
   }
 }

From 0464737638984813b616613cbff781e1be13cacc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 2 Mar 2025 22:51:05 +0800
Subject: [PATCH 243/497] chore: :hammer: bump version to 2.24.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 05a9bbd7..1fd1ebc6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.24.0",
+  "version": "2.24.1",
   "private": true,
   "type": "module",
   "scripts": {

From 1830f8f9f6b4e9e3a9b72ae2e5bcd1760882b172 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Mon, 3 Mar 2025 16:20:13 +0800
Subject: [PATCH 244/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构文件上传
---
 src/components/Upload/FileUpload.vue | 24 +++++++++++++++---------
 src/views/demo/upload.vue            |  6 +++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 55b34b60..ada73735 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -24,7 +24,7 @@
           <a class="el-upload-list__item-name" @click="handleDownload(file)">
             <el-icon><Document /></el-icon>
             <span class="el-upload-list__item-file-name">{{ file.name }}</span>
-            <span class="el-icon--close" @click="handleRemove(file.url!)">
+            <span class="el-icon--close" @click.stop="handleRemove(file.url!)">
               <el-icon><Close /></el-icon>
             </span>
           </a>
@@ -45,6 +45,7 @@
 import {
   UploadRawFile,
   UploadUserFile,
+  UploadFile,
   UploadProgressEvent,
   UploadRequestOptions,
 } from "element-plus";
@@ -111,12 +112,12 @@ const props = defineProps({
 });
 
 const modelValue = defineModel("modelValue", {
-  type: [Array] as PropType<string[]>,
+  type: [Array] as PropType<UploadFile[]>,
   required: true,
   default: () => [],
 });
 
-const fileList = ref([] as UploadUserFile[]);
+const fileList = ref([] as UploadFile[]);
 
 const showProgress = ref(false);
 const progressPercent = ref(0);
@@ -125,12 +126,12 @@ const progressPercent = ref(0);
 watch(
   modelValue,
   (value) => {
-    fileList.value = value.map((url) => {
-      const name = url.substring(url.lastIndexOf("/") + 1);
+    fileList.value = value.map((item) => {
+      const name = item.name ? item.name : item.url?.substring(item.url.lastIndexOf("/") + 1);
       return {
         name: name,
-        url: url,
-      } as UploadUserFile;
+        url: item.url,
+      } as UploadFile;
     });
   },
   {
@@ -189,7 +190,11 @@ const handleProgress = (event: UploadProgressEvent) => {
  */
 const handleSuccess = (fileInfo: FileInfo) => {
   ElMessage.success("上传成功");
-  modelValue.value = [...modelValue.value, fileInfo.url];
+
+  modelValue.value = [
+    ...modelValue.value,
+    { name: fileInfo.name, url: fileInfo.url } as UploadFile,
+  ];
 };
 
 /**
@@ -204,8 +209,9 @@ const handleError = (_error: any) => {
  * 删除文件
  */
 function handleRemove(fileUrl: string) {
+  console.log(fileUrl);
   FileAPI.delete(fileUrl).then(() => {
-    modelValue.value = modelValue.value.filter((url) => url !== fileUrl);
+    modelValue.value = modelValue.value.filter((file) => file.url !== fileUrl);
   });
 }
 
diff --git a/src/views/demo/upload.vue b/src/views/demo/upload.vue
index c590dc58..0b281412 100644
--- a/src/views/demo/upload.vue
+++ b/src/views/demo/upload.vue
@@ -16,7 +16,7 @@
       </el-form-item>
 
       <el-form-item label="多图上传">
-        <MultiImageUpload v-model="picUrls" />
+        <MultiImageUpload v-model="picUrls" :limit="2" />
       </el-form-item>
 
       <el-form-item label="文件上传">
@@ -34,7 +34,7 @@ const picUrl = ref("https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg");
 const picUrls = ref(["https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg"]);
 
 const fileUrls = ref([
-  "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg",
-  "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg",
+  { name: "照片1.jpg", url: "https://s2.loli.net/2023/05/24/yNsxFC8rLHMZQcK.jpg" },
+  { name: "照片2.jpg", url: "https://s2.loli.net/2023/05/24/RuHFMwW4rG5lIqs.jpg" },
 ]);
 </script>

From 6c10e3067ea5d1cc5820cffe1604b9bad35f6f31 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Mar 2025 10:08:30 +0800
Subject: [PATCH 245/497] =?UTF-8?q?fix(tags-view):=20:bug:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E9=98=BB=E6=AD=A2=E6=BB=9A=E8=BD=AE=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=BB=A5=E4=BC=98=E5=8C=96=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=E5=8F=B0=E5=85=B3=E4=BA=8E=E8=A2=AB=E5=8A=A8=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8=E7=9A=84=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

移除 @wheel 事件 prevent 修饰符，默认 passive 为 true 避免阻塞滚动，移除多余的默认行为阻止
tags-view 容器高度使用CSS变量增强灵活性

#IBQTF1 #IBQTF1
---
 src/layout/components/TagsView/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 38947e3c..4c8f6122 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="tags-container">
-    <el-scrollbar class="scroll-container" :vertical="false" @wheel.prevent="handleScroll">
+    <el-scrollbar class="scroll-container" :vertical="false" @wheel="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tagRef"
@@ -341,7 +341,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .tags-container {
   width: 100%;
-  height: 34px;
+  height: $tags-view-height;
   background-color: var(--el-bg-color);
   border: 1px solid var(--el-border-color-light);
   box-shadow: 0 1px 1px var(--el-box-shadow-light);

From 4941d400565496e4be290d4d9a94ff2a56564804 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 6 Mar 2025 10:11:28 +0800
Subject: [PATCH 246/497] chore: :hammer: bump version to 2.24.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1fd1ebc6..f516b9c0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.24.1",
+  "version": "2.24.2",
   "private": true,
   "type": "module",
   "scripts": {

From 12981c5e6eb75238ecd5bb12e797c905d9c65792 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Thu, 6 Mar 2025 11:40:01 +0800
Subject: [PATCH 247/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=89=93=E5=8C=85=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复文件上传打包报错的问题
---
 src/components/Upload/FileUpload.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index ada73735..8b61aa32 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -112,7 +112,7 @@ const props = defineProps({
 });
 
 const modelValue = defineModel("modelValue", {
-  type: [Array] as PropType<UploadFile[]>,
+  type: [Array] as PropType<FileInfo[]>,
   required: true,
   default: () => [],
 });
@@ -131,6 +131,8 @@ watch(
       return {
         name: name,
         url: item.url,
+        status: "success",
+        uid: getUid(),
       } as UploadFile;
     });
   },
@@ -191,10 +193,7 @@ const handleProgress = (event: UploadProgressEvent) => {
 const handleSuccess = (fileInfo: FileInfo) => {
   ElMessage.success("上传成功");
 
-  modelValue.value = [
-    ...modelValue.value,
-    { name: fileInfo.name, url: fileInfo.url } as UploadFile,
-  ];
+  modelValue.value = [...modelValue.value, { name: fileInfo.name, url: fileInfo.url } as FileInfo];
 };
 
 /**
@@ -224,6 +223,12 @@ function handleDownload(file: UploadUserFile) {
     FileAPI.download(url, name);
   }
 }
+
+/** 获取一个不重复的id */
+function getUid(): number {
+  // 时间戳左移13位（相当于乘以8192） + 4位随机数
+  return (Date.now() << 13) | Math.floor(Math.random() * 8192);
+}
 </script>
 <style lang="scss" scoped>
 .el-upload-list__item .el-icon--close {

From f7d402217ebd69368eaa7fe4f678e3db150dc4ca Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Thu, 6 Mar 2025 11:43:36 +0800
Subject: [PATCH 248/497] =?UTF-8?q?docs:=20:memo:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除日志打印
---
 src/components/Upload/FileUpload.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 8b61aa32..65b436a2 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -208,7 +208,6 @@ const handleError = (_error: any) => {
  * 删除文件
  */
 function handleRemove(fileUrl: string) {
-  console.log(fileUrl);
   FileAPI.delete(fileUrl).then(() => {
     modelValue.value = modelValue.value.filter((file) => file.url !== fileUrl);
   });

From 4c79e057b5e561f3512cb04c828248517bac4392 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 11 Mar 2025 17:58:16 +0800
Subject: [PATCH 249/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 54 ++++++++++++++++++++++++++--------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/package.json b/package.json
index f516b9c0..e0590ef3 100644
--- a/package.json
+++ b/package.json
@@ -45,17 +45,17 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@stomp/stompjs": "^7.0.0",
-    "@vueuse/core": "^12.7.0",
-    "@wangeditor-next/editor": "^5.6.31",
+    "@stomp/stompjs": "^7.0.1",
+    "@vueuse/core": "^12.8.2",
+    "@wangeditor-next/editor": "^5.6.34",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.7.9",
+    "axios": "^1.8.2",
     "codemirror": "^5.65.18",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.5",
+    "element-plus": "^2.9.6",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -65,40 +65,40 @@
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
-    "vue-i18n": "^11.1.1",
+    "vue-i18n": "^11.1.2",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.7.1",
-    "@commitlint/config-conventional": "^19.7.1",
-    "@eslint/js": "^9.21.0",
+    "@commitlint/cli": "^19.8.0",
+    "@commitlint/config-conventional": "^19.8.0",
+    "@eslint/js": "^9.22.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.5",
+    "@types/node": "^22.13.10",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.24.1",
-    "@typescript-eslint/parser": "^8.24.1",
+    "@typescript-eslint/eslint-plugin": "^8.26.1",
+    "@typescript-eslint/parser": "^8.26.1",
     "@vitejs/plugin-vue": "^5.2.1",
-    "autoprefixer": "^10.4.20",
+    "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
-    "cz-git": "^1.11.0",
-    "eslint": "^9.21.0",
-    "eslint-config-prettier": "^10.0.1",
+    "cz-git": "^1.11.1",
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-prettier": "^5.2.3",
-    "eslint-plugin-vue": "^9.32.0",
+    "eslint-plugin-vue": "^10.0.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.4.3",
     "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.2",
-    "sass": "^1.85.0",
-    "stylelint": "^16.14.1",
+    "prettier": "^3.5.3",
+    "sass": "^1.85.1",
+    "stylelint": "^16.15.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -106,15 +106,15 @@
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.39.0",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.24.1",
+    "typescript": "^5.8.2",
+    "typescript-eslint": "^8.26.1",
     "unocss": "65.4.3",
-    "unplugin-auto-import": "^19.1.0",
-    "unplugin-vue-components": "^28.4.0",
-    "vite": "^6.1.1",
+    "unplugin-auto-import": "^19.1.1",
+    "unplugin-vue-components": "^28.4.1",
+    "vite": "^6.2.1",
     "vite-plugin-mock-dev-server": "^1.8.4",
-    "vue-eslint-parser": "^9.4.3",
-    "vue-tsc": "^2.2.4"
+    "vue-eslint-parser": "^10.1.1",
+    "vue-tsc": "^2.2.8"
   },
   "engines": {
     "node": ">=18.0.0"

From 5123465fc0ecb4cfa9b0e0294cc2e004d8654899 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 11 Mar 2025 18:09:46 +0800
Subject: [PATCH 250/497] =?UTF-8?q?chore:=20:hammer:=20eslint=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E9=80=82=E9=85=8D=20eslint-plugin-vue=20=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20v9=20=E5=8D=87=E7=BA=A7=20v10=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eslint.config.js b/eslint.config.js
index d952d1e7..28ccc1b5 100644
--- a/eslint.config.js
+++ b/eslint.config.js
@@ -91,7 +91,7 @@ export default [
     plugins: { vue: pluginVue, "@typescript-eslint": pluginTypeScript },
     processor: pluginVue.processors[".vue"],
     rules: {
-      ...pluginVue.configs["vue3-recommended"].rules, // Vue 3 推荐规则
+      ...pluginVue.configs.recommended.rules, // Vue 推荐规则
       "vue/no-v-html": "off", // 允许 v-html
       "vue/multi-word-component-names": "off", // 允许单个单词组件名
     },

From b0bbf3e59dc7ecb86bde39ecddefe018af78b2ea Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 11 Mar 2025 18:14:58 +0800
Subject: [PATCH 251/497] =?UTF-8?q?fix:=20:bug:=20eslint=20=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=20no-required-prop-with-default=20=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Pagination/index.vue                      | 1 -
 src/layout/components/Sidebar/components/SidebarMenu.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 3a7e53dc..7017d95b 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -18,7 +18,6 @@
 <script setup lang="ts">
 const props = defineProps({
   total: {
-    required: true,
     type: Number as PropType<number>,
     default: 0,
   },
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index b4c39e3b..0d0d086b 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -51,7 +51,6 @@ import variables from "@/styles/variables.module.scss";
 const props = defineProps({
   data: {
     type: Array<RouteRecordRaw>,
-    required: true,
     default: () => [],
   },
   basePath: {

From a99076a01d2ba418487acab57f9dd40c21fb2985 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Mar 2025 21:26:38 +0800
Subject: [PATCH 252/497] =?UTF-8?q?fix:=20:bug:=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=20mock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/menu.mock.ts | 347 +++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 346 insertions(+), 1 deletion(-)

diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 9d3840dd..06a4096c 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -491,7 +491,7 @@ export default defineMock([
     },
   },
 
-  // 获取菜单树形列表
+  // 获取菜单树形表格列表
   {
     url: "menus",
     method: ["GET"],
@@ -1556,6 +1556,351 @@ export default defineMock([
     },
   },
 
+  // 获取菜单树形下拉列表
+  {
+    url: "menus/options",
+    method: ["GET"],
+    body: {
+      code: "00000",
+      data: [
+        {
+          value: "1",
+          label: "系统管理",
+          children: [
+            {
+              value: "2",
+              label: "用户管理",
+              children: [
+                {
+                  value: "105",
+                  label: "用户查询",
+                },
+                {
+                  value: "31",
+                  label: "用户新增",
+                },
+                {
+                  value: "32",
+                  label: "用户编辑",
+                },
+                {
+                  value: "33",
+                  label: "用户删除",
+                },
+                {
+                  value: "88",
+                  label: "重置密码",
+                },
+                {
+                  value: "106",
+                  label: "用户导入",
+                },
+                {
+                  value: "107",
+                  label: "用户导出",
+                },
+              ],
+            },
+            {
+              value: "3",
+              label: "角色管理",
+              children: [
+                {
+                  value: "139",
+                  label: "角色查询",
+                },
+                {
+                  value: "70",
+                  label: "角色新增",
+                },
+                {
+                  value: "71",
+                  label: "角色编辑",
+                },
+                {
+                  value: "72",
+                  label: "角色删除",
+                },
+              ],
+            },
+            {
+              value: "4",
+              label: "菜单管理",
+              children: [
+                {
+                  value: "73",
+                  label: "菜单新增",
+                },
+                {
+                  value: "140",
+                  label: "菜单查询",
+                },
+                {
+                  value: "75",
+                  label: "菜单删除",
+                },
+                {
+                  value: "74",
+                  label: "菜单编辑",
+                },
+              ],
+            },
+            {
+              value: "5",
+              label: "部门管理",
+              children: [
+                {
+                  value: "76",
+                  label: "部门新增",
+                },
+                {
+                  value: "141",
+                  label: "部门查询",
+                },
+                {
+                  value: "77",
+                  label: "部门编辑",
+                },
+                {
+                  value: "78",
+                  label: "部门删除",
+                },
+              ],
+            },
+            {
+              value: "6",
+              label: "字典管理",
+              children: [
+                {
+                  value: "79",
+                  label: "字典新增",
+                },
+                {
+                  value: "142",
+                  label: "字典查询",
+                },
+                {
+                  value: "81",
+                  label: "字典编辑",
+                },
+                {
+                  value: "84",
+                  label: "字典删除",
+                },
+              ],
+            },
+            {
+              value: "117",
+              label: "系统日志",
+            },
+            {
+              value: "135",
+              label: "字典数据",
+              children: [
+                {
+                  value: "143",
+                  label: "字典数据查询",
+                },
+                {
+                  value: "136",
+                  label: "字典数据新增",
+                },
+                {
+                  value: "137",
+                  label: "字典数据编辑",
+                },
+                {
+                  value: "138",
+                  label: "字典数据删除",
+                },
+              ],
+            },
+            {
+              value: "120",
+              label: "系统配置",
+              children: [
+                {
+                  value: "121",
+                  label: "系统配置查询",
+                },
+                {
+                  value: "122",
+                  label: "系统配置新增",
+                },
+                {
+                  value: "123",
+                  label: "系统配置修改",
+                },
+                {
+                  value: "124",
+                  label: "系统配置删除",
+                },
+                {
+                  value: "125",
+                  label: "系统配置刷新",
+                },
+              ],
+            },
+            {
+              value: "126",
+              label: "通知公告",
+              children: [
+                {
+                  value: "127",
+                  label: "通知查询",
+                },
+                {
+                  value: "128",
+                  label: "通知新增",
+                },
+                {
+                  value: "129",
+                  label: "通知编辑",
+                },
+                {
+                  value: "130",
+                  label: "通知删除",
+                },
+                {
+                  value: "133",
+                  label: "通知发布",
+                },
+                {
+                  value: "134",
+                  label: "通知撤回",
+                },
+              ],
+            },
+          ],
+        },
+        {
+          value: "118",
+          label: "系统工具",
+          children: [
+            {
+              value: "119",
+              label: "代码生成",
+            },
+          ],
+        },
+        {
+          value: "40",
+          label: "接口文档",
+          children: [
+            {
+              value: "41",
+              label: "Apifox",
+            },
+          ],
+        },
+        {
+          value: "26",
+          label: "平台文档",
+          children: [
+            {
+              value: "102",
+              label: "document",
+            },
+            {
+              value: "30",
+              label: "平台文档(外链)",
+            },
+          ],
+        },
+        {
+          value: "20",
+          label: "多级菜单",
+          children: [
+            {
+              value: "21",
+              label: "菜单一级",
+              children: [
+                {
+                  value: "22",
+                  label: "菜单二级",
+                  children: [
+                    {
+                      value: "23",
+                      label: "菜单三级-1",
+                    },
+                    {
+                      value: "24",
+                      label: "菜单三级-2",
+                    },
+                  ],
+                },
+              ],
+            },
+          ],
+        },
+        {
+          value: "36",
+          label: "组件封装",
+          children: [
+            {
+              value: "108",
+              label: "增删改查",
+            },
+            {
+              value: "109",
+              label: "列表选择器",
+            },
+            {
+              value: "37",
+              label: "富文本编辑器",
+            },
+            {
+              value: "38",
+              label: "图片上传",
+            },
+            {
+              value: "39",
+              label: "图标选择器",
+            },
+            {
+              value: "95",
+              label: "字典组件",
+            },
+          ],
+        },
+        {
+          value: "110",
+          label: "路由参数",
+          children: [
+            {
+              value: "111",
+              label: "参数(type=1)",
+            },
+            {
+              value: "112",
+              label: "参数(type=2)",
+            },
+          ],
+        },
+        {
+          value: "89",
+          label: "功能演示",
+          children: [
+            {
+              value: "97",
+              label: "Icons",
+            },
+            {
+              value: "90",
+              label: "Websocket",
+            },
+            {
+              value: "91",
+              label: "敬请期待...",
+            },
+          ],
+        },
+      ],
+
+      msg: "一切ok",
+    },
+  },
+
   // 新增菜单
   {
     url: "menus",

From ad3381157f0a6be71249f921953152e6af49c197 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Mar 2025 21:28:51 +0800
Subject: [PATCH 253/497] =?UTF-8?q?docs:=20:memo:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/NavBar/components/NavbarRight.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 4002c412..7ac5179f 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -73,14 +73,13 @@ const navbarRightClass = computed(() => {
   }
 
   // 如果侧边栏是经典蓝
-
   if (settingStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE) {
     return "navbar__right--white";
   }
 });
 
 /**
- * 注销登出
+ * 注销登录
  */
 function logout() {
   ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {

From 2fa92e93dbf2483f4a1fbdfcbb0d8da0bc8fcf4e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Mar 2025 21:30:13 +0800
Subject: [PATCH 254/497] =?UTF-8?q?docs:=20:memo:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 6a8e532b..3273c00a 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -77,11 +77,6 @@ export const usePermissionStore = defineStore("permission", () => {
 /**
  * 解析后端返回的路由数据并转换为 Vue Router 兼容的路由配置
  *
- * 1. 遍历 `rawRoutes` 并转换为 `RouteRecordRaw` 格式。
- * 2. 若 `component` 为 `"Layout"`，则替换为 `Layout` 组件。
- * 3. 若 `component` 为字符串路径，则动态加载对应的 Vue 组件，找不到则默认 `404.vue`。
- * 4. 递归解析 `children`，确保子路由也被正确转换。
- *
  * @param rawRoutes 后端返回的原始路由数据
  * @returns 解析后的路由配置数组
  */

From 3ffd534710e763d85c5d15262be1479f45b0f42a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 13 Mar 2025 21:31:35 +0800
Subject: [PATCH 255/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5b0e94ee..e55d8101 100644
--- a/README.md
+++ b/README.md
@@ -165,7 +165,6 @@ server {
 ## 项目文档
 
 - [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)
-
 - [ESLint+Prettier+Stylelint+EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723)
 - [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236)
 
@@ -179,7 +178,7 @@ server {
 
 ## 项目统计
 
-![Alt](https://repobeats.axiom.co/api/embed/aa7cca3d6fa9c308fc659fa6e09af9a1910506c3.svg "Repobeats analytics image")
+![](https://repobeats.axiom.co/api/embed/aa7cca3d6fa9c308fc659fa6e09af9a1910506c3.svg "Repobeats analytics image")
 
 
 Thanks to all the contributors!

From 00e686e7a7352e695f9f810f0bcdfcfd73287c87 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 16 Mar 2025 22:43:03 +0800
Subject: [PATCH 256/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=9D=A2=E6=9D=BF=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Settings/index.vue | 200 +++++++++++++----------
 1 file changed, 118 insertions(+), 82 deletions(-)

diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 4fe0fe57..8a5a4d98 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -1,45 +1,68 @@
 <template>
-  <el-drawer v-model="settingsVisible" size="300" :title="$t('settings.project')">
-    <el-divider>{{ $t("settings.theme") }}</el-divider>
-
-    <div class="flex-center">
-      <el-switch v-model="isDark" active-icon="Moon" inactive-icon="Sunny" @change="changeTheme" />
-    </div>
-
-    <el-divider>{{ $t("settings.interface") }}</el-divider>
-
-    <div class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.themeColor") }}</span>
-      <ThemeColorPicker v-model="settingsStore.themeColor" @update:model-value="changeThemeColor" />
-    </div>
-
-    <div class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.tagsView") }}</span>
-      <el-switch v-model="settingsStore.tagsView" />
-    </div>
-
-    <div class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.sidebarLogo") }}</span>
-      <el-switch v-model="settingsStore.sidebarLogo" />
-    </div>
-
-    <div class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.watermark") }}</span>
-      <el-switch v-model="settingsStore.watermarkEnabled" />
-    </div>
-    <div v-if="!isDark" class="py-1 flex-x-between">
-      <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
-      <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
-        <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">{{ $t("settings.classicBlue") }}</el-radio>
-        <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
-          {{ $t("settings.minimalWhite") }}
-        </el-radio>
-      </el-radio-group>
-    </div>
-
-    <el-divider>{{ $t("settings.navigation") }}</el-divider>
-
-    <LayoutSelect v-model="settingsStore.layout" @update:model-value="changeLayout" />
+  <el-drawer
+    v-model="drawerVisible"
+    size="300"
+    :title="$t('settings.project')"
+    :before-close="handleCloseDrawer"
+  >
+    <section class="config-section">
+      <el-divider>{{ $t("settings.theme") }}</el-divider>
+
+      <div class="flex-center">
+        <el-switch
+          v-model="isDark"
+          active-icon="Moon"
+          inactive-icon="Sunny"
+          @change="handleThemeChange"
+        />
+      </div>
+    </section>
+
+    <!-- 界面设置 -->
+    <section class="config-section">
+      <el-divider>{{ $t("settings.interface") }}</el-divider>
+
+      <div class="config-item flex-x-between">
+        <span class="text-xs">{{ $t("settings.themeColor") }}</span>
+        <el-color-picker
+          v-model="selectedThemeColor"
+          :predefine="colorPresets"
+          popper-class="theme-picker-dropdown"
+        />
+      </div>
+
+      <div class="config-item flex-x-between">
+        <span class="text-xs">{{ $t("settings.tagsView") }}</span>
+        <el-switch v-model="settingsStore.tagsView" />
+      </div>
+
+      <div class="config-item flex-x-between">
+        <span class="text-xs">{{ $t("settings.sidebarLogo") }}</span>
+        <el-switch v-model="settingsStore.sidebarLogo" />
+      </div>
+
+      <div class="config-item flex-x-between">
+        <span class="text-xs">{{ $t("settings.watermark") }}</span>
+        <el-switch v-model="settingsStore.watermarkEnabled" />
+      </div>
+      <div v-if="!isDark" class="config-item flex-x-between">
+        <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
+        <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
+          <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">
+            {{ $t("settings.classicBlue") }}
+          </el-radio>
+          <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
+            {{ $t("settings.minimalWhite") }}
+          </el-radio>
+        </el-radio-group>
+      </div>
+    </section>
+
+    <!-- 布局设置 -->
+    <section class="config-section">
+      <el-divider>{{ $t("settings.navigation") }}</el-divider>
+      <LayoutSelect v-model="settingsStore.layout" @update:model-value="handleLayoutChange" />
+    </section>
   </el-drawer>
 </template>
 
@@ -48,6 +71,18 @@ import { LayoutEnum } from "@/enums/LayoutEnum";
 import { ThemeEnum } from "@/enums/ThemeEnum";
 import { SidebarColorEnum } from "@/enums/ThemeEnum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
+// 颜色预设
+const colorPresets = [
+  "#4080FF",
+  "#ff4500",
+  "#ff8c00",
+  "#90ee90",
+  "#00ced1",
+  "#1e90ff",
+  "#c71585",
+  "rgb(255, 120, 0)",
+  "hsva(120, 40, 94)",
+];
 
 const route = useRoute();
 const appStore = useAppStore();
@@ -57,32 +92,23 @@ const permissionStore = usePermissionStore();
 const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
 const sidebarColor = ref(settingsStore.sidebarColorScheme);
 
-const settingsVisible = computed({
-  get() {
-    return settingsStore.settingsVisible;
-  },
-  set() {
-    settingsStore.settingsVisible = false;
-  },
+const selectedThemeColor = computed({
+  get: () => settingsStore.themeColor,
+  set: (value) => settingsStore.changeThemeColor(value),
 });
 
-/**
- *  切换主题颜色
- *
- * @param color 颜色
- */
-function changeThemeColor(color: string) {
-  settingsStore.changeThemeColor(color);
-}
+const drawerVisible = computed({
+  get: () => settingsStore.settingsVisible,
+  set: (value) => (settingsStore.settingsVisible = value),
+});
 
 /**
- * 切换主题
+ * 处理主题切换
  *
- * @param val 是否为暗黑模式
+ * @param isDark 是否启用暗黑模式
  */
-const changeTheme = (val: any) => {
-  isDark.value = val;
-  settingsStore.changeTheme(isDark.value ? ThemeEnum.DARK : ThemeEnum.LIGHT);
+const handleThemeChange = (isDark: string | number | boolean) => {
+  settingsStore.changeTheme(isDark ? ThemeEnum.DARK : ThemeEnum.LIGHT);
 };
 
 /**
@@ -97,34 +123,25 @@ const changeSidebarColor = (val: any) => {
 /**
  * 切换布局
  *
- * @param layout 布局  LayoutEnum
+ * @param layout - 布局模式
  */
-function changeLayout(layout: LayoutEnum) {
+const handleLayoutChange = (layout: LayoutEnum) => {
   settingsStore.changeLayout(layout);
-  if (layout === LayoutEnum.MIX) {
-    route.name && againActiveTop(route.name as string);
-  }
-}
-
-/**
- * 重新激活顶部菜单
- *
- * @param routeName 路由名称
- */
-function againActiveTop(routeName: string) {
-  const parent = findOutermostParent(permissionStore.routes, routeName);
-  if (appStore.activeTopMenuPath !== parent.path) {
-    appStore.activeTopMenu(parent.path);
+  if (layout === LayoutEnum.MIX && route.name) {
+    const topLevelRoute = findTopLevelRoute(permissionStore.routes, route.name as string);
+    if (appStore.activeTopMenuPath !== topLevelRoute.path) {
+      appStore.activeTopMenu(topLevelRoute.path);
+    }
   }
-}
+};
 
 /**
- * 查找最外层父级
+ * 查找路由的顶层父路由
  *
  * @param tree 树形数据
  * @param findName 查找的名称
  */
-function findOutermostParent(tree: any[], findName: string) {
+function findTopLevelRoute(tree: any[], findName: string) {
   let parentMap: any = {};
 
   function buildParentMap(node: any, parent: any) {
@@ -148,9 +165,28 @@ function findOutermostParent(tree: any[], findName: string) {
     }
     currentNode = parentMap[currentNode.name];
   }
-
   return null;
 }
+
+/**
+ * 关闭抽屉前的回调
+ */
+const handleCloseDrawer = () => {
+  settingsStore.settingsVisible = false;
+};
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.config-section {
+  margin-bottom: 24px;
+
+  .config-item {
+    padding: 12px 0;
+    border-bottom: 1px solid var(--el-border-color-light);
+
+    &:last-child {
+      border-bottom: none;
+    }
+  }
+}
+</style>

From 6204deb7cb4dfdf7ff8a2a91117a226de5676971 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 16 Mar 2025 22:49:24 +0800
Subject: [PATCH 257/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E7=9A=84=20ThemeColorPicker=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Settings/components/ThemeColorPicker.vue  | 40 -------------------
 src/types/components.d.ts                     |  1 -
 2 files changed, 41 deletions(-)
 delete mode 100644 src/layout/components/Settings/components/ThemeColorPicker.vue

diff --git a/src/layout/components/Settings/components/ThemeColorPicker.vue b/src/layout/components/Settings/components/ThemeColorPicker.vue
deleted file mode 100644
index 946ef189..00000000
--- a/src/layout/components/Settings/components/ThemeColorPicker.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-<template>
-  <el-color-picker
-    v-model="currentColor"
-    :predefine="colorPresets"
-    popper-class="theme-picker-dropdown"
-  />
-</template>
-
-<script lang="ts" setup>
-const props = defineProps({
-  modelValue: String,
-});
-
-const emit = defineEmits(["update:modelValue"]);
-
-// 主题颜色预设
-const colorPresets = [
-  "#4080FF",
-  "#ff4500",
-  "#ff8c00",
-  "#90ee90",
-  "#00ced1",
-  "#1e90ff",
-  "#c71585",
-  "rgb(255, 120, 0)",
-  "hsva(120, 40, 94)",
-];
-
-const currentColor = ref(props.modelValue);
-
-watch(currentColor, (newValue) => {
-  emit("update:modelValue", newValue);
-});
-</script>
-
-<style scoped>
-:deep(.theme-picker-dropdown) {
-  z-index: 99999 !important;
-}
-</style>
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 13482415..ca45a035 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -90,7 +90,6 @@ declare module "vue" {
     SizeSelect: (typeof import("./../components/SizeSelect/index.vue"))["default"];
     TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"];
     TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"];
-    ThemeColorPicker: (typeof import("./../layout/components/Settings/components/ThemeColorPicker.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
   }
   export interface ComponentCustomProperties {

From 98e73fef4045b158b4838b654047ac4434ec611a Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 19 Mar 2025 18:07:23 +0800
Subject: [PATCH 258/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=A4=9A=E9=80=89=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=EF=BC=8C=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复上传文件多选文件时，上传失败的问题
---
 src/components/Upload/FileUpload.vue        | 33 ++++++++++++++++++---
 src/components/Upload/SingleImageUpload.vue |  1 -
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 65b436a2..bb8f11bb 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -46,6 +46,7 @@ import {
   UploadRawFile,
   UploadUserFile,
   UploadFile,
+  UploadFiles,
   UploadProgressEvent,
   UploadRequestOptions,
 } from "element-plus";
@@ -147,7 +148,7 @@ watch(
 function handleBeforeUpload(file: UploadRawFile) {
   // 限制文件大小
   if (file.size > props.maxFileSize * 1024 * 1024) {
-    ElMessage.warning("上传图片不能大于" + props.maxFileSize + "M");
+    ElMessage.warning("上传文件不能大于" + props.maxFileSize + "M");
     return false;
   }
   return true;
@@ -190,10 +191,34 @@ const handleProgress = (event: UploadProgressEvent) => {
 /**
  * 上传成功
  */
-const handleSuccess = (fileInfo: FileInfo) => {
+const handleSuccess = (response: any, uploadFile: UploadFile, files: UploadFiles) => {
   ElMessage.success("上传成功");
-
-  modelValue.value = [...modelValue.value, { name: fileInfo.name, url: fileInfo.url } as FileInfo];
+  //只有当状态为success或者fail，代表文件上传全部完成了，失败也算完成
+  if (
+    files.every((file: UploadFile) => {
+      return file.status === "success" || file.status === "fail";
+    })
+  ) {
+    let fileInfos = [] as FileInfo[];
+    files.map((file: UploadFile) => {
+      if (file.status === "success") {
+        //只取携带response的才是刚上传的
+        let res = file.response as FileInfo;
+        if (res) {
+          fileInfos.push({ name: res.name, url: res.url } as FileInfo);
+        }
+      } else {
+        //失败上传 从fileList删掉，不展示
+        fileList.value.splice(
+          fileList.value.findIndex((e) => e.uid === file.uid),
+          1
+        );
+      }
+    });
+    if (fileInfos.length > 0) {
+      modelValue.value = [...modelValue.value, ...fileInfos];
+    }
+  }
 };
 
 /**
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index bcda04cc..73836975 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -10,7 +10,6 @@
     :http-request="handleUpload"
     :on-success="onSuccess"
     :on-error="onError"
-    multiple
   >
     <template #default>
       <el-image v-if="modelValue" :src="http://github.com/modelValue" />

From ddf7577eca1e905d4e67ab487ad507db687dad0c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 00:09:26 +0800
Subject: [PATCH 259/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md    |  4 ++--
 package.json | 30 +++++++++++++++---------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/README.md b/README.md
index e55d8101..7a8f16be 100644
--- a/README.md
+++ b/README.md
@@ -3,8 +3,8 @@
   <h1>vue3-element-admin</h1>
 
   <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.1.0-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.4-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.7-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/package.json b/package.json
index e0590ef3..bd7ae9ba 100644
--- a/package.json
+++ b/package.json
@@ -45,17 +45,17 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@stomp/stompjs": "^7.0.1",
+    "@stomp/stompjs": "^7.1.0",
     "@vueuse/core": "^12.8.2",
     "@wangeditor-next/editor": "^5.6.34",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.8.2",
-    "codemirror": "^5.65.18",
+    "axios": "^1.8.4",
+    "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.6",
+    "element-plus": "^2.9.7",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -71,34 +71,34 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
-    "@eslint/js": "^9.22.0",
+    "@eslint/js": "^9.23.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.10",
+    "@types/node": "^22.13.11",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.26.1",
-    "@typescript-eslint/parser": "^8.26.1",
-    "@vitejs/plugin-vue": "^5.2.1",
+    "@typescript-eslint/eslint-plugin": "^8.27.0",
+    "@typescript-eslint/parser": "^8.27.0",
+    "@vitejs/plugin-vue": "^5.2.3",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.1",
-    "eslint": "^9.22.0",
+    "eslint": "^9.23.0",
     "eslint-config-prettier": "^10.1.1",
     "eslint-plugin-prettier": "^5.2.3",
     "eslint-plugin-vue": "^10.0.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.4.3",
+    "lint-staged": "^15.5.0",
     "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.5.3",
-    "sass": "^1.85.1",
-    "stylelint": "^16.15.0",
+    "sass": "^1.86.0",
+    "stylelint": "^16.16.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -107,11 +107,11 @@
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.39.0",
     "typescript": "^5.8.2",
-    "typescript-eslint": "^8.26.1",
+    "typescript-eslint": "^8.27.0",
     "unocss": "65.4.3",
     "unplugin-auto-import": "^19.1.1",
     "unplugin-vue-components": "^28.4.1",
-    "vite": "^6.2.1",
+    "vite": "^6.2.2",
     "vite-plugin-mock-dev-server": "^1.8.4",
     "vue-eslint-parser": "^10.1.1",
     "vue-tsc": "^2.2.8"

From 3c9cf679615cff9381d75f50ba7085becfe19194 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 08:17:31 +0800
Subject: [PATCH 260/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E8=B0=83=E6=95=B4=E6=8C=89=E9=9C=80=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=EF=BC=8Capi=E3=80=81store=E5=92=8C=E6=9E=9A=E4=B8=BE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=91=BD=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/dict-data.mock.ts                        | 216 -------------
 mock/dict.mock.ts                             | 298 ++++++++++++-----
 mock/menu.mock.ts                             |  36 +--
 mock/user.mock.ts                             |  64 ++--
 src/App.vue                                   |   8 +-
 src/api/{auth/index.ts => auth.api.ts}        |   0
 src/api/{codegen/index.ts => codegen.api.ts}  |   0
 src/api/{file/index.ts => file.api.ts}        |   0
 src/api/system/{config.ts => config.api.ts}   |  21 +-
 src/api/system/{dept.ts => dept.api.ts}       |   2 +-
 src/api/system/dict-data.ts                   | 162 ----------
 src/api/system/dict.api.ts                    | 302 ++++++++++++++++++
 src/api/system/dict.ts                        | 180 -----------
 src/api/system/{log.ts => log.api.ts}         |   0
 src/api/system/{menu.ts => menu.api.ts}       |   4 +-
 src/api/system/{notice.ts => notice.api.ts}   |   2 +-
 src/api/system/{role.ts => role.api.ts}       |   2 +-
 src/api/system/{user.ts => user.api.ts}       |   2 +-
 src/components/Dict/DictLabel.vue             |  58 ++--
 src/components/Dict/index.vue                 |  39 +--
 src/components/Hamburger/index.vue            |  10 +-
 src/components/LangSelect/index.vue           |   4 +-
 src/components/NoticeDropdown/index.vue       |   2 +-
 src/components/SizeSelect/index.vue           |  10 +-
 src/components/Upload/FileUpload.vue          |   2 +-
 src/components/Upload/MultiImageUpload.vue    |   2 +-
 src/components/Upload/SingleImageUpload.vue   |   2 +-
 src/components/WangEditor/index.vue           |   2 +-
 src/enums/LayoutEnum.ts                       |  18 --
 src/enums/SidebarStatusEnum.ts                |  14 -
 src/enums/SizeEnum.ts                         |  19 --
 .../{ResultEnum.ts => api/result.enum.ts}     |   0
 .../{FormTypeEnum.ts => codegen/form.enum.ts} |   0
 .../query.enum.ts}                            |   0
 src/enums/index.ts                            |  11 +
 .../device.enum.ts}                           |   0
 src/enums/settings/layout.enum.ts             |  53 +++
 .../locale.enum.ts}                           |   0
 .../{ThemeEnum.ts => settings/theme.enum.ts}  |   4 +-
 .../{MenuTypeEnum.ts => system/menu.enum.ts}  |   0
 src/lang/index.ts                             |   2 +-
 src/lang/package/zh-cn.ts                     |   2 +-
 .../NavBar/components/NavbarRight.vue         |   8 +-
 .../Settings/components/LayoutSelect.vue      |  16 +-
 src/layout/components/Settings/index.vue      |  18 +-
 .../Sidebar/components/SidebarMenu.vue        |  12 +-
 .../Sidebar/components/SidebarMixTopMenu.vue  |   8 +-
 src/layout/components/Sidebar/index.vue       |   6 +-
 src/layout/index.vue                          |   8 +-
 src/plugins/permission.ts                     |   2 +-
 src/settings.ts                               |  13 +-
 src/store/index.ts                            |  12 +-
 src/store/modules/{app.ts => app.store.ts}    |  14 +-
 src/store/modules/dict.store.ts               |  55 ++++
 src/store/modules/dict.ts                     |  41 ---
 .../{permission.ts => permission.store.ts}    |   2 +-
 .../{settings.ts => settings.store.ts}        |  12 +-
 .../{tags-view.ts => tags-view.store.ts}      |   0
 src/store/modules/{user.ts => user.store.ts}  |  20 +-
 src/utils/request.ts                          |  47 ++-
 src/views/codegen/index.vue                   |  10 +-
 src/views/dashboard/index.vue                 |   4 +-
 src/views/demo/curd/config/add.ts             |   4 +-
 src/views/demo/curd/config/content.ts         |   6 +-
 src/views/demo/curd/config/edit.ts            |   4 +-
 src/views/demo/curd/config/search.ts          |   2 +-
 src/views/demo/curd/index.vue                 |   6 +-
 src/views/demo/signature.vue                  |   2 +-
 src/views/demo/table-select/config/select.ts  |   2 +-
 src/views/demo/websocket.vue                  |   2 +-
 src/views/login/index.vue                     |  98 +++---
 src/views/profile/index.vue                   |   4 +-
 src/views/system/config/index.vue             |   4 +-
 src/views/system/dept/index.vue               |   4 +-
 .../system/dict/{data.vue => dict-item.vue}   |  45 ++-
 src/views/system/dict/index.vue               |  13 +-
 src/views/system/log/index.vue                |   2 +-
 src/views/system/menu/index.vue               |   6 +-
 .../system/notice/components/MyNotice.vue     |   2 +-
 src/views/system/notice/index.vue             |   6 +-
 src/views/system/role/index.vue               |   6 +-
 src/views/system/user/components/DeptTree.vue |   2 +-
 .../system/user/components/UserImport.vue     |   4 +-
 src/views/system/user/index.vue               |  10 +-
 84 files changed, 988 insertions(+), 1107 deletions(-)
 delete mode 100644 mock/dict-data.mock.ts
 rename src/api/{auth/index.ts => auth.api.ts} (100%)
 rename src/api/{codegen/index.ts => codegen.api.ts} (100%)
 rename src/api/{file/index.ts => file.api.ts} (100%)
 rename src/api/system/{config.ts => config.api.ts} (85%)
 rename src/api/system/{dept.ts => dept.api.ts} (98%)
 delete mode 100644 src/api/system/dict-data.ts
 create mode 100644 src/api/system/dict.api.ts
 delete mode 100644 src/api/system/dict.ts
 rename src/api/system/{log.ts => log.api.ts} (100%)
 rename src/api/system/{menu.ts => menu.api.ts} (97%)
 rename src/api/system/{notice.ts => notice.api.ts} (99%)
 rename src/api/system/{role.ts => role.api.ts} (99%)
 rename src/api/system/{user.ts => user.api.ts} (99%)
 delete mode 100644 src/enums/LayoutEnum.ts
 delete mode 100644 src/enums/SidebarStatusEnum.ts
 delete mode 100644 src/enums/SizeEnum.ts
 rename src/enums/{ResultEnum.ts => api/result.enum.ts} (100%)
 rename src/enums/{FormTypeEnum.ts => codegen/form.enum.ts} (100%)
 rename src/enums/{QueryTypeEnum.ts => codegen/query.enum.ts} (100%)
 create mode 100644 src/enums/index.ts
 rename src/enums/{DeviceEnum.ts => settings/device.enum.ts} (100%)
 create mode 100644 src/enums/settings/layout.enum.ts
 rename src/enums/{LanguageEnum.ts => settings/locale.enum.ts} (100%)
 rename src/enums/{ThemeEnum.ts => settings/theme.enum.ts} (83%)
 rename src/enums/{MenuTypeEnum.ts => system/menu.enum.ts} (100%)
 rename src/store/modules/{app.ts => app.store.ts} (85%)
 create mode 100644 src/store/modules/dict.store.ts
 delete mode 100644 src/store/modules/dict.ts
 rename src/store/modules/{permission.ts => permission.store.ts} (98%)
 rename src/store/modules/{settings.ts => settings.store.ts} (84%)
 rename src/store/modules/{tags-view.ts => tags-view.store.ts} (100%)
 rename src/store/modules/{user.ts => user.store.ts} (87%)
 rename src/views/system/dict/{data.vue => dict-item.vue} (87%)

diff --git a/mock/dict-data.mock.ts b/mock/dict-data.mock.ts
deleted file mode 100644
index 9f33f2db..00000000
--- a/mock/dict-data.mock.ts
+++ /dev/null
@@ -1,216 +0,0 @@
-import { defineMock } from "./base";
-
-export default defineMock([
-  {
-    url: "dict-data/page",
-    method: ["GET"],
-    body: {
-      code: "00000",
-      data: {
-        list: [
-          {
-            id: 1,
-            dictCode: "gender",
-            label: "男",
-            value: "1",
-            sort: 1,
-            status: 1,
-          },
-          {
-            id: 2,
-            dictCode: "gender",
-            label: "女",
-            value: "2",
-            sort: 2,
-            status: 1,
-          },
-          {
-            id: 3,
-            dictCode: "gender",
-            label: "保密",
-            value: "0",
-            sort: 3,
-            status: 1,
-          },
-        ],
-        total: 3,
-      },
-      msg: "一切ok",
-    },
-  },
-
-  {
-    url: "dict-data/:dictCode/options",
-    method: ["GET"],
-    body: ({ params }) => {
-      const dictCode = params.dictCode;
-
-      let list = null;
-
-      if (dictCode == "gender") {
-        list = [
-          {
-            value: "1",
-            label: "男",
-          },
-          {
-            value: "2",
-            label: "女",
-          },
-          {
-            value: "0",
-            label: "保密",
-          },
-        ];
-      } else if (dictCode == "notice_level") {
-        list = [
-          {
-            value: "L",
-            label: "低",
-            tag: "info",
-          },
-          {
-            value: "M",
-            label: "中",
-            tag: "warning",
-          },
-          {
-            value: "H",
-            label: "高",
-            tag: "danger",
-          },
-        ];
-      } else if (dictCode == "notice_type") {
-        list = [
-          {
-            value: "1",
-            label: "系统升级",
-            tag: "success",
-          },
-          {
-            value: "2",
-            label: "系统维护",
-            tag: "primary",
-          },
-          {
-            value: "3",
-            label: "安全警告",
-            tag: "danger",
-          },
-          {
-            value: "4",
-            label: "假期通知",
-            tag: "success",
-          },
-          {
-            value: "5",
-            label: "公司新闻",
-            tag: "primary",
-          },
-          {
-            value: "99",
-            label: "其他",
-            tag: "info",
-          },
-        ];
-      }
-
-      return {
-        code: "00000",
-        data: list,
-        msg: "一切ok",
-      };
-    },
-  },
-  // 新增字典数据
-  {
-    url: "dict-data",
-    method: ["POST"],
-    body({ body }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "新增字典" + body.name + "成功",
-      };
-    },
-  },
-
-  // 获取字典数据表单
-  {
-    url: "dict-data/:id/form",
-    method: ["GET"],
-    body: ({ params }) => {
-      return {
-        code: "00000",
-        data: dictMap[params.id],
-        msg: "一切ok",
-      };
-    },
-  },
-
-  // 修改字典数据
-  {
-    url: "dict-data/:id",
-    method: ["PUT"],
-    body({ body }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "修改字典数据" + body.name + "成功",
-      };
-    },
-  },
-
-  // 删除字典
-  {
-    url: "dict-data/:id",
-    method: ["DELETE"],
-    body({ params }) {
-      return {
-        code: "00000",
-        data: null,
-        msg: "删除字典" + params.id + "成功",
-      };
-    },
-  },
-]);
-
-// 字典数据映射表数据
-const dictMap: Record<string, any> = {
-  1: {
-    code: "00000",
-    data: {
-      id: 1,
-      value: "1",
-      label: "男",
-      sort: 1,
-      status: 1,
-      tagType: "primary",
-    },
-    msg: "一切ok",
-  },
-  2: {
-    code: "00000",
-    data: {
-      id: 2,
-      value: "2",
-      label: "女",
-      sort: 2,
-      status: 1,
-      tagType: "danger",
-    },
-    msg: "一切ok",
-  },
-  3: {
-    code: "00000",
-    data: {
-      id: 3,
-      value: "0",
-      label: "保密",
-      sort: 3,
-      status: 1,
-      tagType: "info",
-    },
-    msg: "一切ok",
-  },
-};
diff --git a/mock/dict.mock.ts b/mock/dict.mock.ts
index 5f3e5f27..9eff20e7 100644
--- a/mock/dict.mock.ts
+++ b/mock/dict.mock.ts
@@ -2,7 +2,7 @@ import { defineMock } from "./base";
 
 export default defineMock([
   {
-    url: "dict/page",
+    url: "dicts/page",
     method: ["GET"],
     body: {
       code: "00000",
@@ -23,7 +23,7 @@ export default defineMock([
 
   // 新增字典
   {
-    url: "dict",
+    url: "dicts",
     method: ["POST"],
     body({ body }) {
       return {
@@ -36,7 +36,7 @@ export default defineMock([
 
   // 获取字典表单数据
   {
-    url: "dict/:id/form",
+    url: "dicts/:id/form",
     method: ["GET"],
     body: ({ params }) => {
       return {
@@ -49,7 +49,7 @@ export default defineMock([
 
   // 修改字典
   {
-    url: "dict/:id",
+    url: "dicts/:id",
     method: ["PUT"],
     body({ body }) {
       return {
@@ -62,108 +62,194 @@ export default defineMock([
 
   // 删除字典
   {
-    url: "dict/:id",
+    url: "dicts/:ids",
     method: ["DELETE"],
     body({ params }) {
       return {
         code: "00000",
         data: null,
-        msg: "删除字典" + params.id + "成功",
+        msg: "删除字典" + params.ids + "成功",
       };
     },
   },
 
-  // 所有字典列表
+  //---------------------------------------------------
+  // 字典项相关接口
+  //---------------------------------------------------
+
+  // 字典项分页列表
   {
-    url: "dict/list",
+    url: "dicts/:dictCode/items/page",
     method: ["GET"],
-    body() {
-      return {
-        code: "00000",
-        data: [
-          {
-            name: "通知级别",
-            dictCode: "notice_level",
-            dictDataList: [
-              {
-                value: "L",
-                label: "低",
-                tagType: "info",
-              },
-              {
-                value: "M",
-                label: "中",
-                tagType: "warning",
-              },
-              {
-                value: "H",
-                label: "高",
-                tagType: "danger",
-              },
-            ],
-          },
-          {
-            name: "通知类型",
-            dictCode: "notice_type",
-            dictDataList: [
-              {
-                value: "1",
-                label: "系统升级",
-                tagType: "success",
-              },
-              {
-                value: "2",
-                label: "系统维护",
-                tagType: "primary",
-              },
-              {
-                value: "3",
-                label: "安全警告",
-                tagType: "danger",
-              },
-              {
-                value: "4",
-                label: "假期通知",
-                tagType: "success",
-              },
-              {
-                value: "5",
-                label: "公司新闻",
-                tagType: "primary",
-              },
-              {
-                value: "99",
-                label: "其他",
-                tagType: "info",
-              },
-            ],
+    body: {
+      code: "00000",
+      data: {
+        list: [
+          {
+            id: 1,
+            dictCode: "gender",
+            label: "男",
+            value: "1",
+            sort: 1,
+            status: 1,
           },
           {
-            name: "性别",
+            id: 2,
             dictCode: "gender",
-            dictDataList: [
-              {
-                value: "1",
-                label: "男",
-                tagType: "primary",
-              },
-              {
-                value: "2",
-                label: "女",
-                tagType: "danger",
-              },
-              {
-                value: "0",
-                label: "保密",
-                tagType: "info",
-              },
-            ],
+            label: "女",
+            value: "2",
+            sort: 2,
+            status: 1,
+          },
+          {
+            id: 3,
+            dictCode: "gender",
+            label: "保密",
+            value: "0",
+            sort: 3,
+            status: 1,
           },
         ],
+        total: 3,
+      },
+      msg: "一切ok",
+    },
+  },
+  // 字典项列表
+  {
+    url: "dicts/:dictCode/items",
+    method: ["GET"],
+    body: ({ params }) => {
+      const dictCode = params.dictCode;
+
+      let list = null;
+
+      if (dictCode == "gender") {
+        list = [
+          {
+            value: "1",
+            label: "男",
+          },
+          {
+            value: "2",
+            label: "女",
+          },
+          {
+            value: "0",
+            label: "保密",
+          },
+        ];
+      } else if (dictCode == "notice_level") {
+        list = [
+          {
+            value: "L",
+            label: "低",
+            tag: "info",
+          },
+          {
+            value: "M",
+            label: "中",
+            tag: "warning",
+          },
+          {
+            value: "H",
+            label: "高",
+            tag: "danger",
+          },
+        ];
+      } else if (dictCode == "notice_type") {
+        list = [
+          {
+            value: "1",
+            label: "系统升级",
+            tag: "success",
+          },
+          {
+            value: "2",
+            label: "系统维护",
+            tag: "primary",
+          },
+          {
+            value: "3",
+            label: "安全警告",
+            tag: "danger",
+          },
+          {
+            value: "4",
+            label: "假期通知",
+            tag: "success",
+          },
+          {
+            value: "5",
+            label: "公司新闻",
+            tag: "primary",
+          },
+          {
+            value: "99",
+            label: "其他",
+            tag: "info",
+          },
+        ];
+      }
+
+      return {
+        code: "00000",
+        data: list,
+        msg: "一切ok",
+      };
+    },
+  },
+  // 新增字典项
+  {
+    url: "dicts/:dictCode/items",
+    method: ["POST"],
+    body({ body }) {
+      return {
+        code: "00000",
+        data: null,
+        msg: "新增字典" + body.name + "成功",
+      };
+    },
+  },
+
+  // 字典项表单数据
+  {
+    url: "dicts/:dictCode/items/:itemId/form",
+    method: ["GET"],
+    body: ({ params }) => {
+      return {
+        code: "00000",
+        data: dictItemMap[params.itemId],
         msg: "一切ok",
       };
     },
   },
+
+  // 修改字典项
+  {
+    url: "dicts/:dictCode/items/:itemId",
+    method: ["PUT"],
+    body({ body }) {
+      return {
+        code: "00000",
+        data: null,
+        msg: "修改字典项" + body.name + "成功",
+      };
+    },
+  },
+
+  // 删除字典
+  {
+    url: "dicts/:dictCode/items/:itemId",
+    method: ["DELETE"],
+    body({ params }) {
+      return {
+        code: "00000",
+        data: null,
+        msg: "删除字典" + params.itemId + "成功",
+      };
+    },
+  },
 ]);
 
 // 字典映射表数据
@@ -179,3 +265,43 @@ const dictMap: Record<string, any> = {
     msg: "一切ok",
   },
 };
+
+// 字典项映射表数据
+const dictItemMap: Record<string, any> = {
+  1: {
+    code: "00000",
+    data: {
+      id: 1,
+      value: "1",
+      label: "男",
+      sort: 1,
+      status: 1,
+      tagType: "primary",
+    },
+    msg: "一切ok",
+  },
+  2: {
+    code: "00000",
+    data: {
+      id: 2,
+      value: "2",
+      label: "女",
+      sort: 2,
+      status: 1,
+      tagType: "danger",
+    },
+    msg: "一切ok",
+  },
+  3: {
+    code: "00000",
+    data: {
+      id: 3,
+      value: "0",
+      label: "保密",
+      sort: 3,
+      status: 1,
+      tagType: "info",
+    },
+    msg: "一切ok",
+  },
+};
diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 06a4096c..2f2550d1 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -99,11 +99,11 @@ export default defineMock([
               },
             },
             {
-              path: "dict-data",
-              component: "system/dict/data",
-              name: "DictData",
+              path: "dict-item",
+              component: "system/dict/dict-item",
+              name: "DictItem",
               meta: {
-                title: "字典数据",
+                title: "字典项",
                 icon: "",
                 hidden: true,
                 keepAlive: true,
@@ -880,11 +880,11 @@ export default defineMock([
             {
               id: 135,
               parentId: 1,
-              name: "字典数据",
+              name: "字典项",
               type: "MENU",
               routeName: "DictData",
-              routePath: "dict-data",
-              component: "system/dict/data",
+              routePath: "dict-item",
+              component: "system/dict/dict-item",
               sort: 6,
               visible: 0,
               icon: "",
@@ -894,7 +894,7 @@ export default defineMock([
                 {
                   id: 136,
                   parentId: 135,
-                  name: "字典数据新增",
+                  name: "字典项新增",
                   type: "BUTTON",
                   routeName: null,
                   routePath: "",
@@ -903,13 +903,13 @@ export default defineMock([
                   visible: 1,
                   icon: "",
                   redirect: null,
-                  perm: "sys:dict-data:add",
+                  perm: "sys:dict-item:add",
                   children: [],
                 },
                 {
                   id: 137,
                   parentId: 135,
-                  name: "字典数据编辑",
+                  name: "字典项编辑",
                   type: "BUTTON",
                   routeName: null,
                   routePath: "",
@@ -918,13 +918,13 @@ export default defineMock([
                   visible: 1,
                   icon: "",
                   redirect: null,
-                  perm: "sys:dict-data:edit",
+                  perm: "sys:dict-item:edit",
                   children: [],
                 },
                 {
                   id: 138,
                   parentId: 135,
-                  name: "字典数据删除",
+                  name: "字典项删除",
                   type: "BUTTON",
                   routeName: null,
                   routePath: "",
@@ -933,7 +933,7 @@ export default defineMock([
                   visible: 1,
                   icon: "",
                   redirect: null,
-                  perm: "sys:dict-data:delete",
+                  perm: "sys:dict-item:delete",
                   children: [],
                 },
               ],
@@ -1695,23 +1695,23 @@ export default defineMock([
             },
             {
               value: "135",
-              label: "字典数据",
+              label: "字典项",
               children: [
                 {
                   value: "143",
-                  label: "字典数据查询",
+                  label: "字典项查询",
                 },
                 {
                   value: "136",
-                  label: "字典数据新增",
+                  label: "字典项新增",
                 },
                 {
                   value: "137",
-                  label: "字典数据编辑",
+                  label: "字典项编辑",
                 },
                 {
                   value: "138",
-                  label: "字典数据删除",
+                  label: "字典项删除",
                 },
               ],
             },
diff --git a/mock/user.mock.ts b/mock/user.mock.ts
index 57c8482d..bf2fc988 100644
--- a/mock/user.mock.ts
+++ b/mock/user.mock.ts
@@ -13,38 +13,52 @@ export default defineMock([
         avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
         roles: ["ADMIN"],
         perms: [
-          "sys:notice:edit",
-          "sys:menu:delete",
-          "sys:dict:edit",
-          "sys:notice:query",
-          "sys:dict:delete",
-          "sys:config:add",
-          "sys:config:refresh",
-          "sys:menu:add",
+          "sys:user:query",
           "sys:user:add",
+          "sys:user:edit",
+          "sys:user:delete",
+          "sys:user:import",
           "sys:user:export",
+          "sys:user:reset-password",
+
+          "sys:role:query",
+          "sys:role:add",
           "sys:role:edit",
+          "sys:role:delete",
+
+          "sys:dept:query",
+          "sys:dept:add",
+          "sys:dept:edit",
           "sys:dept:delete",
-          "sys:config:update",
-          "sys:user:password:reset",
-          "sys:notice:revoke",
-          "sys:user:import",
-          "sys:user:delete",
-          "sys:dict_type:delete",
+
+          "sys:menu:query",
+          "sys:menu:add",
+          "sys:menu:edit",
+          "sys:menu:delete",
+
+          "sys:dict:query",
           "sys:dict:add",
-          "sys:role:add",
-          "sys:notice:publish",
-          "sys:notice:delete",
-          "sys:dept:edit",
-          "sys:dict_type:edit",
-          "sys:user:query",
-          "sys:user:edit",
-          "sys:config:delete",
-          "sys:dept:add",
+          "sys:dict:edit",
+          "sys:dict:delete",
+          "sys:dict:delete",
+
+          "sys:dict-item:query",
+          "sys:dict-item:add",
+          "sys:dict-item:edit",
+          "sys:dict-item:delete",
+
+          "sys:notice:query",
           "sys:notice:add",
-          "sys:role:delete",
-          "sys:menu:edit",
+          "sys:notice:edit",
+          "sys:notice:delete",
+          "sys:notice:revoke",
+          "sys:notice:publish",
+
           "sys:config:query",
+          "sys:config:add",
+          "sys:config:update",
+          "sys:config:delete",
+          "sys:config:refresh",
         ],
       },
       msg: "一切ok",
diff --git a/src/App.vue b/src/App.vue
index 6bc6d3ce..764bbf26 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,18 +15,18 @@
 <script setup lang="ts">
 import { useAppStore, useSettingsStore } from "@/store";
 import defaultSettings from "@/settings";
-import { ThemeEnum } from "@/enums/ThemeEnum";
-import { SizeEnum } from "@/enums/SizeEnum";
+import { ThemeMode } from "@/enums/settings/theme.enum";
+import { ComponentSize } from "@/enums/settings/layout.enum";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 
 const locale = computed(() => appStore.locale);
-const size = computed(() => appStore.size as SizeEnum);
+const size = computed(() => appStore.size as ComponentSize);
 const watermarkEnabled = computed(() => settingsStore.watermarkEnabled);
 
 // 明亮/暗黑主题水印字体颜色适配
 const fontColor = computed(() => {
-  return settingsStore.theme === ThemeEnum.DARK ? "rgba(255, 255, 255, .15)" : "rgba(0, 0, 0, .15)";
+  return settingsStore.theme === ThemeMode.DARK ? "rgba(255, 255, 255, .15)" : "rgba(0, 0, 0, .15)";
 });
 </script>
diff --git a/src/api/auth/index.ts b/src/api/auth.api.ts
similarity index 100%
rename from src/api/auth/index.ts
rename to src/api/auth.api.ts
diff --git a/src/api/codegen/index.ts b/src/api/codegen.api.ts
similarity index 100%
rename from src/api/codegen/index.ts
rename to src/api/codegen.api.ts
diff --git a/src/api/file/index.ts b/src/api/file.api.ts
similarity index 100%
rename from src/api/file/index.ts
rename to src/api/file.api.ts
diff --git a/src/api/system/config.ts b/src/api/system/config.api.ts
similarity index 85%
rename from src/api/system/config.ts
rename to src/api/system/config.api.ts
index 95c1bb84..d05aa81f 100644
--- a/src/api/system/config.ts
+++ b/src/api/system/config.api.ts
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 const CONFIG_BASE_URL = "/api/v1/config";
 
 const ConfigAPI = {
-  /** 获取系统配置分页数据 */
+  /** 系统配置分页 */
   getPage(queryParams?: ConfigPageQuery) {
     return request<any, PageResult<ConfigPageVO[]>>({
       url: `${CONFIG_BASE_URL}/page`,
@@ -11,12 +11,8 @@ const ConfigAPI = {
       params: queryParams,
     });
   },
-  /**
-   * 获取系统配置表单数据
-   *
-   * @param id ConfigID
-   * @returns Config表单数据
-   */
+
+  /** 系统配置表单数据 */
   getFormData(id: number) {
     return request<any, ConfigForm>({
       url: `${CONFIG_BASE_URL}/${id}/form`,
@@ -24,8 +20,8 @@ const ConfigAPI = {
     });
   },
 
-  /** 添加系统配置*/
-  add(data: ConfigForm) {
+  /** 新增系统配置 */
+  create(data: ConfigForm) {
     return request({
       url: `${CONFIG_BASE_URL}`,
       method: "post",
@@ -33,12 +29,7 @@ const ConfigAPI = {
     });
   },
 
-  /**
-   * 更新系统配置
-   *
-   * @param id ConfigID
-   * @param data Config表单数据
-   */
+  /** 更新系统配置 */
   update(id: number, data: ConfigForm) {
     return request({
       url: `${CONFIG_BASE_URL}/${id}`,
diff --git a/src/api/system/dept.ts b/src/api/system/dept.api.ts
similarity index 98%
rename from src/api/system/dept.ts
rename to src/api/system/dept.api.ts
index e3e7530f..a2124e92 100644
--- a/src/api/system/dept.ts
+++ b/src/api/system/dept.api.ts
@@ -44,7 +44,7 @@ const DeptAPI = {
    * @param data 部门表单数据
    * @returns 请求结果
    */
-  add(data: DeptForm) {
+  create(data: DeptForm) {
     return request({
       url: `${DEPT_BASE_URL}`,
       method: "post",
diff --git a/src/api/system/dict-data.ts b/src/api/system/dict-data.ts
deleted file mode 100644
index 412e1fe6..00000000
--- a/src/api/system/dict-data.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-import request from "@/utils/request";
-
-const DICT_DATA_BASE_URL = "/api/v1/dict-data";
-
-const DictDataAPI = {
-  /**
-   * 获取字典分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典分页结果
-   */
-  getPage(queryParams: DictDataPageQuery) {
-    return request<any, PageResult<DictDataPageVO[]>>({
-      url: `${DICT_DATA_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /**
-   * 获取字典数据表单
-   *
-   * @param id 字典ID
-   * @returns 字典数据表单
-   */
-  getFormData(id: number) {
-    return request<any, ResponseData<DictDataForm>>({
-      url: `${DICT_DATA_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 新增字典数据
-   *
-   * @param data 字典数据
-   */
-  add(data: DictDataForm) {
-    return request({
-      url: `${DICT_DATA_BASE_URL}`,
-      method: "post",
-      data: data,
-    });
-  },
-
-  /**
-   * 修改字典数据
-   *
-   * @param id 字典ID
-   * @param data 字典数据
-   */
-  update(id: number, data: DictDataForm) {
-    return request({
-      url: `${DICT_DATA_BASE_URL}/${id}`,
-      method: "put",
-      data: data,
-    });
-  },
-
-  /**
-   * 删除字典
-   *
-   * @param ids 字典ID，多个以英文逗号(,)分隔
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${DICT_DATA_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-
-  /**
-   * 获取字典的数据项
-   *
-   * @param dictCode 字典编码
-   * @returns 字典数据项
-   */
-  getOptions(dictCode: string) {
-    return request<any, OptionType[]>({
-      url: `${DICT_DATA_BASE_URL}/${dictCode}/options`,
-      method: "get",
-    });
-  },
-};
-
-export default DictDataAPI;
-
-/**
- * 字典查询参数
- */
-export interface DictDataPageQuery extends PageQuery {
-  /** 关键字(字典数据值/标签) */
-  keywords?: string;
-
-  /** 字典编码 */
-  dictCode?: string;
-}
-
-/**
- * 字典分页对象
- */
-export interface DictDataPageVO {
-  /**
-   * 字典ID
-   */
-  id: number;
-  /**
-   * 字典编码
-   */
-  dictCode: string;
-  /**
-   * 字典数据值
-   */
-  value: string;
-  /**
-   * 字典数据标签
-   */
-  label: string;
-  /**
-   * 状态（1:启用，0:禁用)
-   */
-  status: number;
-  /**
-   * 字典排序
-   */
-  sort?: number;
-}
-
-/**
- * 字典
- */
-export interface DictDataForm {
-  /**
-   * 字典ID
-   */
-  id?: number;
-  /**
-   * 字典编码
-   */
-  dictCode?: string;
-  /**
-   * 字典数据值
-   */
-  value?: string;
-  /**
-   * 字典数据标签
-   */
-  label?: string;
-  /**
-   * 状态（1:启用，0:禁用)
-   */
-  status?: number;
-  /**
-   * 字典排序
-   */
-  sort?: number;
-
-  /**
-   * 标签类型
-   */
-  tagType?: "success" | "warning" | "info" | "primary" | "danger" | undefined;
-}
diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
new file mode 100644
index 00000000..e2024297
--- /dev/null
+++ b/src/api/system/dict.api.ts
@@ -0,0 +1,302 @@
+import request from "@/utils/request";
+
+const DICT_BASE_URL = "/api/v1/dicts";
+
+const DictAPI = {
+  //---------------------------------------------------
+  // 字典相关接口
+  //---------------------------------------------------
+
+  /**
+   * 字典分页列表
+   *
+   * @param queryParams 查询参数
+   * @returns 字典分页结果
+   */
+  getPage(queryParams: DictPageQuery) {
+    return request<any, PageResult<DictPageVO[]>>({
+      url: `${DICT_BASE_URL}/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+
+  /**
+   * 字典表单数据
+   *
+   * @param id 字典ID
+   * @returns 字典表单数据
+   */
+  getFormData(id: number) {
+    return request<any, ResponseData<DictForm>>({
+      url: `${DICT_BASE_URL}/${id}/form`,
+      method: "get",
+    });
+  },
+
+  /**
+   * 新增字典
+   *
+   * @param data 字典表单数据
+   */
+  create(data: DictForm) {
+    return request({
+      url: `${DICT_BASE_URL}`,
+      method: "post",
+      data: data,
+    });
+  },
+
+  /**
+   * 修改字典
+   *
+   * @param id 字典ID
+   * @param data 字典表单数据
+   */
+  update(id: number, data: DictForm) {
+    return request({
+      url: `${DICT_BASE_URL}/${id}`,
+      method: "put",
+      data: data,
+    });
+  },
+
+  /**
+   * 删除字典
+   *
+   * @param ids 字典ID，多个以英文逗号(,)分隔
+   */
+  deleteByIds(ids: string) {
+    return request({
+      url: `${DICT_BASE_URL}/${ids}`,
+      method: "delete",
+    });
+  },
+
+  //---------------------------------------------------
+  // 字典项相关接口
+  //---------------------------------------------------
+  /**
+   * 获取字典分页列表
+   *
+   * @param queryParams 查询参数
+   * @returns 字典分页结果
+   */
+  getDictItemPage(dictCode: string, queryParams: DictItemPageQuery) {
+    return request<any, PageResult<DictItemPageVO[]>>({
+      url: `${DICT_BASE_URL}/${dictCode}/items/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+
+  /**
+   * 获取字典项列表
+   */
+  getDictItems(dictCode: string) {
+    return request<any, DictItemOption[]>({
+      url: `${DICT_BASE_URL}/${dictCode}/items`,
+      method: "get",
+    });
+  },
+
+  /**
+   * 新增字典项
+   */
+  createDictItem(dictCode: string, data: DictItemForm) {
+    return request({
+      url: `${DICT_BASE_URL}/${dictCode}/items`,
+      method: "post",
+      data: data,
+    });
+  },
+
+  /**
+   * 获取字典项表单数据
+   *
+   * @param id 字典项ID
+   * @returns 字典项表单数据
+   */
+  getDictItemFormData(dictCode: string, id: number) {
+    return request<any, ResponseData<DictItemForm>>({
+      url: `${DICT_BASE_URL}/${dictCode}/items/${id}/form`,
+      method: "get",
+    });
+  },
+
+  /**
+   * 修改字典项
+   */
+  updateDictItem(dictCode: string, id: number, data: DictItemForm) {
+    return request({
+      url: `${DICT_BASE_URL}/${dictCode}/items/${id}`,
+      method: "put",
+      data: data,
+    });
+  },
+
+  /**
+   * 删除字典项
+   */
+  deleteDictItems(dictCode: string, ids: string) {
+    return request({
+      url: `${DICT_BASE_URL}/${dictCode}/items/${ids}`,
+      method: "delete",
+    });
+  },
+};
+
+export default DictAPI;
+
+/**
+ * 字典查询参数
+ */
+export interface DictPageQuery extends PageQuery {
+  /**
+   * 关键字(字典名称/编码)
+   */
+  keywords?: string;
+
+  /**
+   * 字典状态（1:启用，0:禁用）
+   */
+  status?: number;
+}
+
+/**
+ * 字典分页对象
+ */
+export interface DictPageVO {
+  /**
+   * 字典ID
+   */
+  id: number;
+  /**
+   * 字典名称
+   */
+  name: string;
+  /**
+   * 字典编码
+   */
+  dictCode: string;
+  /**
+   * 字典状态（1:启用，0:禁用）
+   */
+  status: number;
+}
+
+/**
+ * 字典
+ */
+export interface DictForm {
+  /**
+   * 字典ID
+   */
+  id?: number;
+  /**
+   * 字典名称
+   */
+  name?: string;
+  /**
+   * 字典编码
+   */
+  dictCode?: string;
+  /**
+   * 字典状态（1-启用，0-禁用）
+   */
+  status?: number;
+  /**
+   * 备注
+   */
+  remark?: string;
+}
+
+/**
+ * 字典查询参数
+ */
+export interface DictItemPageQuery extends PageQuery {
+  /** 关键字(字典数据值/标签) */
+  keywords?: string;
+
+  /** 字典编码 */
+  dictCode?: string;
+}
+
+/**
+ * 字典分页对象
+ */
+export interface DictItemPageVO {
+  /**
+   * 字典ID
+   */
+  id: number;
+  /**
+   * 字典编码
+   */
+  dictCode: string;
+  /**
+   * 字典数据值
+   */
+  value: string;
+  /**
+   * 字典数据标签
+   */
+  label: string;
+  /**
+   * 状态（1:启用，0:禁用)
+   */
+  status: number;
+  /**
+   * 字典排序
+   */
+  sort?: number;
+}
+
+/**
+ * 字典
+ */
+export interface DictItemForm {
+  /**
+   * 字典ID
+   */
+  id?: number;
+  /**
+   * 字典编码
+   */
+  dictCode?: string;
+  /**
+   * 字典数据值
+   */
+  value?: string;
+  /**
+   * 字典数据标签
+   */
+  label?: string;
+  /**
+   * 状态（1:启用，0:禁用)
+   */
+  status?: number;
+  /**
+   * 字典排序
+   */
+  sort?: number;
+
+  /**
+   * 标签类型
+   */
+  tagType?: "success" | "warning" | "info" | "primary" | "danger" | undefined;
+}
+
+/**
+ * 字典项下拉选项
+ */
+export interface DictItemOption {
+  /** 字典数据值 */
+  value: string;
+
+  /** 字典数据标签 */
+  label: string;
+
+  /** 标签类型 */
+  tagType: string;
+}
diff --git a/src/api/system/dict.ts b/src/api/system/dict.ts
deleted file mode 100644
index ed29b7df..00000000
--- a/src/api/system/dict.ts
+++ /dev/null
@@ -1,180 +0,0 @@
-import request from "@/utils/request";
-
-const DICT_BASE_URL = "/api/v1/dict";
-
-const DictAPI = {
-  /**
-   * 获取字典分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典分页结果
-   */
-  getPage(queryParams: DictPageQuery) {
-    return request<any, PageResult<DictPageVO[]>>({
-      url: `${DICT_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /**
-   * 获取字典表单数据
-   *
-   * @param id 字典ID
-   * @returns 字典表单数据
-   */
-  getFormData(id: number) {
-    return request<any, ResponseData<DictForm>>({
-      url: `${DICT_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 新增字典
-   *
-   * @param data 字典表单数据
-   */
-  add(data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}`,
-      method: "post",
-      data: data,
-    });
-  },
-
-  /**
-   * 修改字典
-   *
-   * @param id 字典ID
-   * @param data 字典表单数据
-   */
-  update(id: number, data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}/${id}`,
-      method: "put",
-      data: data,
-    });
-  },
-
-  /**
-   * 删除字典
-   *
-   * @param ids 字典ID，多个以英文逗号(,)分隔
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${DICT_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-
-  /**
-   * 获取字典列表
-   *
-   * @returns 字典列表
-   */
-  getList() {
-    return request<any, DictVO[]>({
-      url: `${DICT_BASE_URL}/list`,
-      method: "get",
-    });
-  },
-};
-
-export default DictAPI;
-
-/**
- * 字典查询参数
- */
-export interface DictPageQuery extends PageQuery {
-  /**
-   * 关键字(字典名称/编码)
-   */
-  keywords?: string;
-
-  /**
-   * 字典状态（1:启用，0:禁用）
-   */
-  status?: number;
-}
-
-/**
- * 字典分页对象
- */
-export interface DictPageVO {
-  /**
-   * 字典ID
-   */
-  id: number;
-  /**
-   * 字典名称
-   */
-  name: string;
-  /**
-   * 字典编码
-   */
-  dictCode: string;
-  /**
-   * 字典状态（1:启用，0:禁用）
-   */
-  status: number;
-}
-
-/**
- * 字典
- */
-export interface DictForm {
-  /**
-   * 字典ID
-   */
-  id?: number;
-  /**
-   * 字典名称
-   */
-  name?: string;
-  /**
-   * 字典编码
-   */
-  dictCode?: string;
-  /**
-   * 字典状态（1-启用，0-禁用）
-   */
-  status?: number;
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-/**
- * 字典数据项分页VO
- *
- * @description 字典数据分页对象
- */
-export interface DictVO {
-  /** 字典名称 */
-  name: string;
-
-  /** 字典编码 */
-  dictCode: string;
-
-  /** 字典数据集合 */
-  dictDataList: DictData[];
-}
-
-/**
- * 字典数据
- *
- * @description 字典数据
- */
-export interface DictData {
-  /** 字典数据值 */
-  value: string;
-
-  /** 字典数据标签 */
-  label: string;
-
-  /** 标签类型 */
-  tagType: string;
-}
diff --git a/src/api/system/log.ts b/src/api/system/log.api.ts
similarity index 100%
rename from src/api/system/log.ts
rename to src/api/system/log.api.ts
diff --git a/src/api/system/menu.ts b/src/api/system/menu.api.ts
similarity index 97%
rename from src/api/system/menu.ts
rename to src/api/system/menu.api.ts
index a3d9b639..65867ff5 100644
--- a/src/api/system/menu.ts
+++ b/src/api/system/menu.api.ts
@@ -62,7 +62,7 @@ const MenuAPI = {
    * @param data 菜单表单数据
    * @returns 请求结果
    */
-  add(data: MenuForm) {
+  create(data: MenuForm) {
     return request({
       url: `${MENU_BASE_URL}`,
       method: "post",
@@ -101,7 +101,7 @@ const MenuAPI = {
 
 export default MenuAPI;
 
-import type { MenuTypeEnum } from "@/enums/MenuTypeEnum";
+import type { MenuTypeEnum } from "@/enums/system/menu.enum";
 
 /** 菜单查询参数 */
 export interface MenuQuery {
diff --git a/src/api/system/notice.ts b/src/api/system/notice.api.ts
similarity index 99%
rename from src/api/system/notice.ts
rename to src/api/system/notice.api.ts
index 17bb1ef1..0ad16107 100644
--- a/src/api/system/notice.ts
+++ b/src/api/system/notice.api.ts
@@ -31,7 +31,7 @@ const NoticeAPI = {
    * @param data Notice表单数据
    * @returns
    */
-  add(data: NoticeForm) {
+  create(data: NoticeForm) {
     return request({
       url: `${NOTICE_BASE_URL}`,
       method: "post",
diff --git a/src/api/system/role.ts b/src/api/system/role.api.ts
similarity index 99%
rename from src/api/system/role.ts
rename to src/api/system/role.api.ts
index cc21e342..44b4624a 100644
--- a/src/api/system/role.ts
+++ b/src/api/system/role.api.ts
@@ -60,7 +60,7 @@ const RoleAPI = {
   },
 
   /** 添加角色 */
-  add(data: RoleForm) {
+  create(data: RoleForm) {
     return request({
       url: `${ROLE_BASE_URL}`,
       method: "post",
diff --git a/src/api/system/user.ts b/src/api/system/user.api.ts
similarity index 99%
rename from src/api/system/user.ts
rename to src/api/system/user.api.ts
index b58e6f50..e9c69c1f 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.api.ts
@@ -46,7 +46,7 @@ const UserAPI = {
    *
    * @param data 用户表单数据
    */
-  add(data: UserForm) {
+  create(data: UserForm) {
     return request({
       url: `${USER_BASE_URL}`,
       method: "post",
diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index fd051314..b68ee155 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -6,47 +6,55 @@
     <span>{{ label }}</span>
   </template>
 </template>
-
 <script setup lang="ts">
 import { useDictStore } from "@/store";
-const dictStore = useDictStore();
 
 const props = defineProps({
-  code: String,
-  modelValue: [String, Number],
+  code: String, // 字典编码
+  modelValue: [String, Number], // 字典项的值
   size: {
     type: String,
-    default: "default",
+    default: "default", // 标签大小
   },
 });
-
 const label = ref("");
-const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>();
-
-const tagSize = ref(props.size as "default" | "large" | "small");
+const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>(); // 标签类型
+const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "large" | "small"); // 标签大小
 
+const dictStore = useDictStore();
+/**
+ * 根据字典项的值获取对应的 label 和 tagType
+ * @param dictCode 字典编码
+ * @param value 字典项的值
+ * @returns 包含 label 和 tagType 的对象
+ */
 const getLabelAndTagByValue = async (dictCode: string, value: any) => {
-  // 先从本地缓存中获取字典数据
-  const dictData = dictStore.getDictionary(dictCode);
-
+  // 按需加载字典数据
+  await dictStore.loadDictItems(dictCode);
+  // 从缓存中获取字典数据
+  const dictItems = dictStore.getDictItems(dictCode);
   // 查找对应的字典项
-  const dictEntry = dictData.find((item: any) => item.value == value);
+  const dictItem = dictItems.find((item) => item.value == value);
   return {
-    label: dictEntry ? dictEntry.label : "",
-    tag: dictEntry ? dictEntry.tagType : undefined,
+    label: dictItem?.label || "",
+    tagType: dictItem?.tagType,
   };
 };
-
-// 监听 props 的变化，获取并更新 label 和 tag
-const fetchLabelAndTag = async () => {
-  const result = await getLabelAndTagByValue(props.code as string, props.modelValue);
-  label.value = result.label;
-  tagType.value = result.tag as "success" | "warning" | "info" | "primary" | "danger" | undefined;
+/**
+ * 更新 label 和 tagType
+ */
+const updateLabelAndTag = async () => {
+  console.log("updateLabelAndTag", props.code, props.modelValue);
+  if (!props.code || props.modelValue === undefined) return;
+  const { label: newLabel, tagType: newTagType } = await getLabelAndTagByValue(
+    props.code,
+    props.modelValue
+  );
+  label.value = newLabel;
+  tagType.value = newTagType as typeof tagType.value;
 };
 
-// 首次挂载时获取字典数据
-onMounted(fetchLabelAndTag);
+watch([() => props.code, () => props.modelValue], updateLabelAndTag);
 
-// 当 modelValue 发生变化时重新获取
-watch(() => props.modelValue, fetchLabelAndTag);
+onMounted(updateLabelAndTag);
 </script>
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index f17b38a7..14dbc9c7 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -100,41 +100,34 @@ const selectedValue = ref<any>(
       : undefined
 );
 
-// 监听 modelValue 变化
+// 监听 modelValue 和 options 的变化
 watch(
-  () => props.modelValue,
-  (newValue) => {
-    if (props.type === "checkbox") {
-      selectedValue.value = Array.isArray(newValue) ? newValue : [];
+  [() => props.modelValue, () => options.value],
+  ([newValue, newOptions]) => {
+    if (newOptions.length > 0 && newValue !== undefined) {
+      if (props.type === "checkbox") {
+        selectedValue.value = Array.isArray(newValue) ? newValue : [];
+      } else {
+        const matchedOption = newOptions.find(
+          (option) => String(option.value) === String(newValue)
+        );
+        selectedValue.value = matchedOption?.value;
+      }
     } else {
-      selectedValue.value = newValue?.toString() || "";
+      selectedValue.value = undefined;
     }
   },
   { immediate: true }
 );
 
-// 监听 options 变化并重新匹配 selectedValue
-watch(
-  () => options.value,
-  (newOptions) => {
-    // options 加载后，确保 selectedValue 可以正确匹配到 options
-    if (newOptions.length > 0 && selectedValue.value !== undefined) {
-      const matchedOption = newOptions.find((option) => option.value === selectedValue.value);
-      if (!matchedOption && props.type !== "checkbox") {
-        // 如果找不到匹配项，清空选中
-        selectedValue.value = "";
-      }
-    }
-  }
-);
-
 // 监听 selectedValue 的变化并触发 update:modelValue
 function handleChange(val: any) {
   emit("update:modelValue", val);
 }
 
 // 获取字典数据
-onMounted(() => {
-  options.value = dictStore.getDictionary(props.code);
+onMounted(async () => {
+  await dictStore.loadDictItems(props.code);
+  options.value = dictStore.getDictItems(props.code);
 });
 </script>
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index dc79d96d..58d2bd10 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -6,8 +6,8 @@
 
 <script setup lang="ts">
 import { useSettingsStore } from "@/store";
-import { ThemeEnum, SidebarColorEnum } from "@/enums/ThemeEnum";
-import { LayoutEnum } from "@/enums/LayoutEnum";
+import { ThemeMode, SidebarColor } from "@/enums/settings/theme.enum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
 
 defineProps({
   isActive: { type: Boolean, required: true },
@@ -20,14 +20,14 @@ const layout = computed(() => settingsStore.layout);
 
 const hamburgerClass = computed(() => {
   // 如果暗黑主题
-  if (settingsStore.theme === ThemeEnum.DARK) {
+  if (settingsStore.theme === ThemeMode.DARK) {
     return "hamburger--white";
   }
 
   // 如果是混合布局 && 侧边栏配色方案是经典蓝
   if (
-    layout.value === LayoutEnum.MIX &&
-    settingsStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+    layout.value === LayoutMode.MIX &&
+    settingsStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE
   ) {
     return "hamburger--white";
   }
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index ef7f0cb5..f348e918 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -17,8 +17,8 @@
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from "@/store/modules/app";
-import { LanguageEnum } from "@/enums/LanguageEnum";
+import { useAppStore } from "@/store/modules/app.store";
+import { LanguageEnum } from "@/enums/settings/locale.enum";
 
 defineProps({
   size: {
diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index 4010f261..8b172959 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -87,7 +87,7 @@
 </template>
 
 <script setup lang="ts">
-import NoticeAPI, { NoticePageVO, NoticeDetailVO } from "@/api/system/notice";
+import NoticeAPI, { NoticePageVO, NoticeDetailVO } from "@/api/system/notice.api";
 import router from "@/router";
 
 const noticeList = ref<NoticePageVO[]>([]);
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 4cb97b28..e5a78b38 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -22,15 +22,15 @@
 </template>
 
 <script setup lang="ts">
-import { SizeEnum } from "@/enums/SizeEnum";
-import { useAppStore } from "@/store/modules/app";
+import { ComponentSize } from "@/enums/settings/layout.enum";
+import { useAppStore } from "@/store/modules/app.store";
 
 const { t } = useI18n();
 const sizeOptions = computed(() => {
   return [
-    { label: t("sizeSelect.default"), value: SizeEnum.DEFAULT },
-    { label: t("sizeSelect.large"), value: SizeEnum.LARGE },
-    { label: t("sizeSelect.small"), value: SizeEnum.SMALL },
+    { label: t("sizeSelect.default"), value: ComponentSize.DEFAULT },
+    { label: t("sizeSelect.large"), value: ComponentSize.LARGE },
+    { label: t("sizeSelect.small"), value: ComponentSize.SMALL },
   ];
 });
 
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 65b436a2..472f293d 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -50,7 +50,7 @@ import {
   UploadRequestOptions,
 } from "element-plus";
 
-import FileAPI, { FileInfo } from "@/api/file";
+import FileAPI, { FileInfo } from "@/api/file.api";
 
 const props = defineProps({
   /**
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index 451310c1..aeb26671 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -40,7 +40,7 @@
 </template>
 <script setup lang="ts">
 import { UploadRawFile, UploadRequestOptions, UploadUserFile } from "element-plus";
-import FileAPI, { FileInfo } from "@/api/file";
+import FileAPI, { FileInfo } from "@/api/file.api";
 
 const props = defineProps({
   /**
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index bcda04cc..8da4aae4 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -26,7 +26,7 @@
 
 <script setup lang="ts">
 import { UploadRawFile, UploadRequestOptions } from "element-plus";
-import FileAPI, { FileInfo } from "@/api/file";
+import FileAPI, { FileInfo } from "@/api/file.api";
 
 const props = defineProps({
   /**
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index bfb6577b..fe8f8931 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -34,7 +34,7 @@ import { Toolbar, Editor } from "@wangeditor-next/editor-for-vue";
 import { IToolbarConfig, IEditorConfig } from "@wangeditor-next/editor";
 
 // 文件上传 API
-import FileAPI from "@/api/file";
+import FileAPI from "@/api/file.api";
 
 // 上传图片回调函数类型
 type InsertFnType = (_url: string, _alt: string, _href: string) => void;
diff --git a/src/enums/LayoutEnum.ts b/src/enums/LayoutEnum.ts
deleted file mode 100644
index 68be72e7..00000000
--- a/src/enums/LayoutEnum.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/**
- * 菜单布局枚举
- */
-export const enum LayoutEnum {
-  /**
-   * 左侧菜单布局
-   */
-  LEFT = "left",
-  /**
-   * 顶部菜单布局
-   */
-  TOP = "top",
-
-  /**
-   * 混合菜单布局
-   */
-  MIX = "mix",
-}
diff --git a/src/enums/SidebarStatusEnum.ts b/src/enums/SidebarStatusEnum.ts
deleted file mode 100644
index a0d877af..00000000
--- a/src/enums/SidebarStatusEnum.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * 侧边栏状态枚举
- */
-export const enum SidebarStatusEnum {
-  /**
-   * 展开
-   */
-  OPENED = "opened",
-
-  /**
-   * 关闭
-   */
-  CLOSED = "closed",
-}
diff --git a/src/enums/SizeEnum.ts b/src/enums/SizeEnum.ts
deleted file mode 100644
index e91e913a..00000000
--- a/src/enums/SizeEnum.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 布局大小枚举
- */
-export const enum SizeEnum {
-  /**
-   * 默认
-   */
-  DEFAULT = "default",
-
-  /**
-   * 大型
-   */
-  LARGE = "large",
-
-  /**
-   * 小型
-   */
-  SMALL = "small",
-}
diff --git a/src/enums/ResultEnum.ts b/src/enums/api/result.enum.ts
similarity index 100%
rename from src/enums/ResultEnum.ts
rename to src/enums/api/result.enum.ts
diff --git a/src/enums/FormTypeEnum.ts b/src/enums/codegen/form.enum.ts
similarity index 100%
rename from src/enums/FormTypeEnum.ts
rename to src/enums/codegen/form.enum.ts
diff --git a/src/enums/QueryTypeEnum.ts b/src/enums/codegen/query.enum.ts
similarity index 100%
rename from src/enums/QueryTypeEnum.ts
rename to src/enums/codegen/query.enum.ts
diff --git a/src/enums/index.ts b/src/enums/index.ts
new file mode 100644
index 00000000..d56b6ad7
--- /dev/null
+++ b/src/enums/index.ts
@@ -0,0 +1,11 @@
+export * from "./api/result.enum";
+
+export * from "./codegen/form.enum";
+export * from "./codegen/query.enum";
+
+export * from "./settings/layout.enum";
+export * from "./settings/theme.enum";
+export * from "./settings/locale.enum";
+export * from "./settings/device.enum";
+
+export * from "./system/menu.enum";
diff --git a/src/enums/DeviceEnum.ts b/src/enums/settings/device.enum.ts
similarity index 100%
rename from src/enums/DeviceEnum.ts
rename to src/enums/settings/device.enum.ts
diff --git a/src/enums/settings/layout.enum.ts b/src/enums/settings/layout.enum.ts
new file mode 100644
index 00000000..e1e4406b
--- /dev/null
+++ b/src/enums/settings/layout.enum.ts
@@ -0,0 +1,53 @@
+/**
+ * 菜单布局枚举
+ */
+export const enum LayoutMode {
+  /**
+   * 左侧菜单布局
+   */
+  LEFT = "left",
+  /**
+   * 顶部菜单布局
+   */
+  TOP = "top",
+
+  /**
+   * 混合菜单布局
+   */
+  MIX = "mix",
+}
+
+/**
+ * 侧边栏状态枚举
+ */
+export const enum SidebarStatus {
+  /**
+   * 展开
+   */
+  OPENED = "opened",
+
+  /**
+   * 关闭
+   */
+  CLOSED = "closed",
+}
+
+/**
+ * 组件尺寸枚举
+ */
+export const enum ComponentSize {
+  /**
+   * 默认
+   */
+  DEFAULT = "default",
+
+  /**
+   * 大型
+   */
+  LARGE = "large",
+
+  /**
+   * 小型
+   */
+  SMALL = "small",
+}
diff --git a/src/enums/LanguageEnum.ts b/src/enums/settings/locale.enum.ts
similarity index 100%
rename from src/enums/LanguageEnum.ts
rename to src/enums/settings/locale.enum.ts
diff --git a/src/enums/ThemeEnum.ts b/src/enums/settings/theme.enum.ts
similarity index 83%
rename from src/enums/ThemeEnum.ts
rename to src/enums/settings/theme.enum.ts
index 5ceae645..21799c3e 100644
--- a/src/enums/ThemeEnum.ts
+++ b/src/enums/settings/theme.enum.ts
@@ -1,7 +1,7 @@
 /**
  * 主题枚举
  */
-export const enum ThemeEnum {
+export const enum ThemeMode {
   /**
    * 明亮主题
    */
@@ -20,7 +20,7 @@ export const enum ThemeEnum {
 /**
  * 侧边栏配色方案枚举
  */
-export const enum SidebarColorEnum {
+export const enum SidebarColor {
   /**
    * 经典蓝
    */
diff --git a/src/enums/MenuTypeEnum.ts b/src/enums/system/menu.enum.ts
similarity index 100%
rename from src/enums/MenuTypeEnum.ts
rename to src/enums/system/menu.enum.ts
diff --git a/src/lang/index.ts b/src/lang/index.ts
index ec3e6ccc..c94e0186 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -1,6 +1,6 @@
 import type { App } from "vue";
 import { createI18n } from "vue-i18n";
-import { useAppStoreHook } from "@/store/modules/app";
+import { useAppStoreHook } from "@/store/modules/app.store";
 // 本地语言包
 import enLocale from "./package/en";
 import zhCnLocale from "./package/zh-cn";
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index d3169adf..50681516 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -30,7 +30,7 @@ export default {
   // 导航栏国际化
   navbar: {
     dashboard: "首页",
-    logout: "注销登出",
+    logout: "注销登录",
     document: "项目文档",
     gitee: "项目地址",
     profile: "个人中心",
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 7ac5179f..8d15aa01 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -44,10 +44,10 @@
 </template>
 <script setup lang="ts">
 import defaultSettings from "@/settings";
-import { DeviceEnum } from "@/enums/DeviceEnum";
+import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
 
-import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
@@ -68,12 +68,12 @@ function handleProfileClick() {
 // 根据主题和侧边栏配色方案选择 navbar 右侧的样式类
 const navbarRightClass = computed(() => {
   // 如果暗黑主题
-  if (settingStore.theme === ThemeEnum.DARK) {
+  if (settingStore.theme === ThemeMode.DARK) {
     return "navbar__right--white";
   }
 
   // 如果侧边栏是经典蓝
-  if (settingStore.sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE) {
+  if (settingStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
     return "navbar__right--white";
   }
 });
diff --git a/src/layout/components/Settings/components/LayoutSelect.vue b/src/layout/components/Settings/components/LayoutSelect.vue
index f259baeb..488341cc 100644
--- a/src/layout/components/Settings/components/LayoutSelect.vue
+++ b/src/layout/components/Settings/components/LayoutSelect.vue
@@ -21,26 +21,26 @@
 </template>
 
 <script lang="ts" setup>
-import { LayoutEnum } from "@/enums/LayoutEnum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
 
 interface LayoutOption {
-  value: LayoutEnum;
+  value: LayoutMode;
   label: string;
   className: string;
 }
 
 const layoutOptions: LayoutOption[] = [
-  { value: LayoutEnum.LEFT, label: "左侧模式", className: "left" },
-  { value: LayoutEnum.TOP, label: "顶部模式", className: "top" },
-  { value: LayoutEnum.MIX, label: "混合模式", className: "mix" },
+  { value: LayoutMode.LEFT, label: "左侧模式", className: "left" },
+  { value: LayoutMode.TOP, label: "顶部模式", className: "top" },
+  { value: LayoutMode.MIX, label: "混合模式", className: "mix" },
 ];
 
-const modelValue = defineModel<LayoutEnum>("modelValue", {
+const modelValue = defineModel<LayoutMode>("modelValue", {
   required: true,
-  default: () => LayoutEnum.LEFT,
+  default: () => LayoutMode.LEFT,
 });
 
-function handleLayoutChange(layout: LayoutEnum) {
+function handleLayoutChange(layout: LayoutMode) {
   modelValue.value = layout;
 }
 </script>
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index 8a5a4d98..f3fe8436 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -48,10 +48,10 @@
       <div v-if="!isDark" class="config-item flex-x-between">
         <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
         <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
-          <el-radio :value="SidebarColorEnum.CLASSIC_BLUE">
+          <el-radio :value="SidebarColor.CLASSIC_BLUE">
             {{ $t("settings.classicBlue") }}
           </el-radio>
-          <el-radio :value="SidebarColorEnum.MINIMAL_WHITE">
+          <el-radio :value="SidebarColor.MINIMAL_WHITE">
             {{ $t("settings.minimalWhite") }}
           </el-radio>
         </el-radio-group>
@@ -67,9 +67,9 @@
 </template>
 
 <script setup lang="ts">
-import { LayoutEnum } from "@/enums/LayoutEnum";
-import { ThemeEnum } from "@/enums/ThemeEnum";
-import { SidebarColorEnum } from "@/enums/ThemeEnum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+import { ThemeMode } from "@/enums/settings/theme.enum";
+import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 // 颜色预设
 const colorPresets = [
@@ -89,7 +89,7 @@ const appStore = useAppStore();
 const settingsStore = useSettingsStore();
 const permissionStore = usePermissionStore();
 
-const isDark = ref<boolean>(settingsStore.theme === ThemeEnum.DARK);
+const isDark = ref<boolean>(settingsStore.theme === ThemeMode.DARK);
 const sidebarColor = ref(settingsStore.sidebarColorScheme);
 
 const selectedThemeColor = computed({
@@ -108,7 +108,7 @@ const drawerVisible = computed({
  * @param isDark 是否启用暗黑模式
  */
 const handleThemeChange = (isDark: string | number | boolean) => {
-  settingsStore.changeTheme(isDark ? ThemeEnum.DARK : ThemeEnum.LIGHT);
+  settingsStore.changeTheme(isDark ? ThemeMode.DARK : ThemeMode.LIGHT);
 };
 
 /**
@@ -125,9 +125,9 @@ const changeSidebarColor = (val: any) => {
  *
  * @param layout - 布局模式
  */
-const handleLayoutChange = (layout: LayoutEnum) => {
+const handleLayoutChange = (layout: LayoutMode) => {
   settingsStore.changeLayout(layout);
-  if (layout === LayoutEnum.MIX && route.name) {
+  if (layout === LayoutMode.MIX && route.name) {
     const topLevelRoute = findTopLevelRoute(permissionStore.routes, route.name as string);
     if (appStore.activeTopMenuPath !== topLevelRoute.path) {
       appStore.activeTopMenu(topLevelRoute.path);
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layout/components/Sidebar/components/SidebarMenu.vue
index 0d0d086b..4c8b36f5 100644
--- a/src/layout/components/Sidebar/components/SidebarMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenu.vue
@@ -5,17 +5,17 @@
     :default-active="currentRoute.path"
     :collapse="!appStore.sidebar.opened"
     :background-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
         ? variables['menu-background']
         : undefined
     "
     :text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
         ? variables['menu-text']
         : undefined
     "
     :active-text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
         ? variables['menu-active-text']
         : undefined
     "
@@ -41,8 +41,8 @@ import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
 import type { RouteRecordRaw } from "vue-router";
 
-import { LayoutEnum } from "@/enums/LayoutEnum";
-import { SidebarColorEnum } from "@/enums/ThemeEnum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 
@@ -70,7 +70,7 @@ const expandedMenuIndexes = ref<string[]>([]);
 
 // 根据布局模式设置菜单的显示方式：顶部布局使用水平模式，其他使用垂直模式
 const menuMode = computed(() => {
-  return settingsStore.layout === LayoutEnum.TOP ? "horizontal" : "vertical";
+  return settingsStore.layout === LayoutMode.TOP ? "horizontal" : "vertical";
 });
 
 // 获取主题
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 4144253b..7f0f4154 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -5,17 +5,17 @@
       mode="horizontal"
       :default-active="activePath"
       :background-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
           ? variables['menu-background']
           : undefined
       "
       :text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
           ? variables['menu-text']
           : undefined
       "
       :active-text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE
+        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
           ? variables['menu-active-text']
           : undefined
       "
@@ -44,7 +44,7 @@ import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
-import { SidebarColorEnum } from "@/enums/ThemeEnum";
+import { SidebarColor } from "@/enums/settings/theme.enum";
 
 const router = useRouter();
 const appStore = useAppStore();
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 0d0108ac..606a7b74 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div :class="{ 'has-logo': sidebarLogo }">
     <!-- 混合布局 -->
-    <div v-if="layout == LayoutEnum.MIX" class="flex w-full">
+    <div v-if="layout == LayoutMode.MIX" class="flex w-full">
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
       <NavbarRight />
@@ -15,13 +15,13 @@
       </el-scrollbar>
 
       <!-- 顶部导航 -->
-      <NavbarRight v-if="layout == LayoutEnum.TOP" />
+      <NavbarRight v-if="layout == LayoutMode.TOP" />
     </template>
   </div>
 </template>
 
 <script setup lang="ts">
-import { LayoutEnum } from "@/enums/LayoutEnum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
 import NavbarRight from "../NavBar/components/NavbarRight.vue";
diff --git a/src/layout/index.vue b/src/layout/index.vue
index b4a576df..4ac10c6f 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -7,7 +7,7 @@
     <Sidebar class="layout__sidebar" />
 
     <!-- 混合布局 -->
-    <div v-if="layout === LayoutEnum.MIX" class="layout__container">
+    <div v-if="layout === LayoutMode.MIX" class="layout__container">
       <!-- 左侧菜单栏 -->
       <div class="layout__sidebar--left">
         <el-scrollbar>
@@ -32,7 +32,7 @@
 
     <!-- 左侧或顶部布局的主内容区 -->
     <div v-else :class="{ hasTagsView: isShowTagsView }" class="layout__main">
-      <NavBar v-if="layout === LayoutEnum.LEFT" />
+      <NavBar v-if="layout === LayoutMode.LEFT" />
       <TagsView v-if="isShowTagsView" />
       <AppMain />
       <Settings v-if="defaultSettings.showSettings" />
@@ -52,8 +52,8 @@ import { useAppStore, useSettingsStore, usePermissionStore } from "@/store";
 import defaultSettings from "@/settings";
 
 // 枚举
-import { DeviceEnum } from "@/enums/DeviceEnum";
-import { LayoutEnum } from "@/enums/LayoutEnum";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
 
 // 组件
 import NavBar from "./components/NavBar/index.vue";
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 04604e92..8f5a07d1 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -40,7 +40,7 @@ export function setupPermission() {
           } catch (error) {
             console.error(error);
             // 路由加载失败，重置 token 并重定向到登录页
-            await useUserStore().clearUserData();
+            await useUserStore().clearSessionAndCache();
             redirectToLogin(to, next);
             NProgress.done();
           }
diff --git a/src/settings.ts b/src/settings.ts
index 5a289af7..dbd14afc 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -1,7 +1,4 @@
-import { SizeEnum } from "./enums/SizeEnum";
-import { LayoutEnum } from "./enums/LayoutEnum";
-import { ThemeEnum, SidebarColorEnum } from "./enums/ThemeEnum";
-import { LanguageEnum } from "./enums/LanguageEnum";
+import { LayoutMode, ComponentSize, SidebarColor, ThemeMode, LanguageEnum } from "./enums";
 
 const { pkg } = __APP_INFO__;
 
@@ -20,11 +17,11 @@ const defaultSettings: AppSettings = {
   // 是否显示侧边栏Logo
   sidebarLogo: true,
   // 布局方式，默认为左侧布局
-  layout: LayoutEnum.LEFT,
+  layout: LayoutMode.LEFT,
   // 主题，根据操作系统的色彩方案自动选择
-  theme: mediaQueryList.matches ? ThemeEnum.DARK : ThemeEnum.LIGHT,
+  theme: mediaQueryList.matches ? ThemeMode.DARK : ThemeMode.LIGHT,
   // 组件大小 default | medium | small | large
-  size: SizeEnum.DEFAULT,
+  size: ComponentSize.DEFAULT,
   // 语言
   language: LanguageEnum.ZH_CN,
   // 主题颜色
@@ -34,7 +31,7 @@ const defaultSettings: AppSettings = {
   // 水印内容
   watermarkContent: pkg.name,
   // 侧边栏配色方案
-  sidebarColorScheme: SidebarColorEnum.CLASSIC_BLUE,
+  sidebarColorScheme: SidebarColor.CLASSIC_BLUE,
 };
 
 export default defaultSettings;
diff --git a/src/store/index.ts b/src/store/index.ts
index 6c0115a5..92361551 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -8,10 +8,10 @@ export function setupStore(app: App<Element>) {
   app.use(store);
 }
 
-export * from "./modules/app";
-export * from "./modules/permission";
-export * from "./modules/settings";
-export * from "./modules/tags-view";
-export * from "./modules/user";
-export * from "./modules/dict";
+export * from "./modules/app.store";
+export * from "./modules/permission.store";
+export * from "./modules/settings.store";
+export * from "./modules/tags-view.store";
+export * from "./modules/user.store";
+export * from "./modules/dict.store";
 export { store };
diff --git a/src/store/modules/app.ts b/src/store/modules/app.store.ts
similarity index 85%
rename from src/store/modules/app.ts
rename to src/store/modules/app.store.ts
index 6bf9a60d..de20db83 100644
--- a/src/store/modules/app.ts
+++ b/src/store/modules/app.store.ts
@@ -4,8 +4,8 @@ import defaultSettings from "@/settings";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import en from "element-plus/es/locale/lang/en";
 import { store } from "@/store";
-import { DeviceEnum } from "@/enums/DeviceEnum";
-import { SidebarStatusEnum } from "@/enums/SidebarStatusEnum";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+import { SidebarStatus } from "@/enums/settings/layout.enum";
 
 export const useAppStore = defineStore("app", () => {
   // 设备类型
@@ -15,9 +15,9 @@ export const useAppStore = defineStore("app", () => {
   // 语言
   const language = useStorage("language", defaultSettings.language);
   // 侧边栏状态
-  const sidebarStatus = useStorage("sidebarStatus", SidebarStatusEnum.CLOSED);
+  const sidebarStatus = useStorage("sidebarStatus", SidebarStatus.CLOSED);
   const sidebar = reactive({
-    opened: sidebarStatus.value === SidebarStatusEnum.OPENED,
+    opened: sidebarStatus.value === SidebarStatus.OPENED,
     withoutAnimation: false,
   });
 
@@ -38,19 +38,19 @@ export const useAppStore = defineStore("app", () => {
   // 切换侧边栏
   function toggleSidebar() {
     sidebar.opened = !sidebar.opened;
-    sidebarStatus.value = sidebar.opened ? SidebarStatusEnum.OPENED : SidebarStatusEnum.CLOSED;
+    sidebarStatus.value = sidebar.opened ? SidebarStatus.OPENED : SidebarStatus.CLOSED;
   }
 
   // 关闭侧边栏
   function closeSideBar() {
     sidebar.opened = false;
-    sidebarStatus.value = SidebarStatusEnum.CLOSED;
+    sidebarStatus.value = SidebarStatus.CLOSED;
   }
 
   // 打开侧边栏
   function openSideBar() {
     sidebar.opened = true;
-    sidebarStatus.value = SidebarStatusEnum.OPENED;
+    sidebarStatus.value = SidebarStatus.OPENED;
   }
 
   // 切换设备
diff --git a/src/store/modules/dict.store.ts b/src/store/modules/dict.store.ts
new file mode 100644
index 00000000..0e1dea10
--- /dev/null
+++ b/src/store/modules/dict.store.ts
@@ -0,0 +1,55 @@
+import { store } from "@/store";
+import DictAPI, { type DictItemOption } from "@/api/system/dict.api";
+
+export const useDictStore = defineStore("dict", () => {
+  // 字典数据缓存
+  const dictCache = useStorage<Record<string, DictItemOption[]>>("dict_cache", {});
+  // 请求队列（防止重复请求）
+  const requestQueue: Record<string, Promise<void>> = {};
+  /**
+   * 缓存字典数据
+   * @param dictCode 字典编码
+   * @param data 字典项列表
+   */
+  const cacheDictItems = (dictCode: string, data: DictItemOption[]) => {
+    dictCache.value[dictCode] = data;
+  };
+  /**
+   * 加载字典数据（如果缓存中没有则请求）
+   * @param dictCode 字典编码
+   */
+  const loadDictItems = async (dictCode: string) => {
+    if (dictCache.value[dictCode]) return;
+    // 防止重复请求
+    if (!requestQueue[dictCode]) {
+      requestQueue[dictCode] = DictAPI.getDictItems(dictCode).then((data) => {
+        cacheDictItems(dictCode, data);
+        Reflect.deleteProperty(requestQueue, dictCode);
+      });
+    }
+    await requestQueue[dictCode];
+  };
+  /**
+   * 获取字典项列表
+   * @param dictCode 字典编码
+   * @returns 字典项列表
+   */
+  const getDictItems = (dictCode: string): DictItemOption[] => {
+    return dictCache.value[dictCode] || [];
+  };
+  /**
+   * 清空字典缓存
+   */
+  const clearDictCache = () => {
+    dictCache.value = {};
+  };
+  return {
+    loadDictItems,
+    getDictItems,
+    clearDictCache,
+  };
+});
+
+export function useDictStoreHook() {
+  return useDictStore(store);
+}
diff --git a/src/store/modules/dict.ts b/src/store/modules/dict.ts
deleted file mode 100644
index f87ec5b5..00000000
--- a/src/store/modules/dict.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { store } from "@/store";
-import DictionaryAPI, { type DictVO, type DictData } from "@/api/system/dict";
-
-export const useDictStore = defineStore("dict", () => {
-  const dictionary = useStorage<Record<string, DictData[]>>("dictionary", {});
-
-  const setDictionary = (dict: DictVO) => {
-    dictionary.value[dict.dictCode] = dict.dictDataList;
-  };
-
-  const loadDictionaries = async () => {
-    const dictList = await DictionaryAPI.getList();
-    dictList.forEach(setDictionary);
-  };
-
-  const getDictionary = (dictCode: string): DictData[] => {
-    return dictionary.value[dictCode] || [];
-  };
-
-  const clearDictionaryCache = () => {
-    dictionary.value = {};
-  };
-
-  const updateDictionaryCache = async () => {
-    clearDictionaryCache(); // 先清除旧缓存
-    await loadDictionaries(); // 重新加载最新字典数据
-  };
-
-  return {
-    dictionary,
-    setDictionary,
-    loadDictionaries,
-    getDictionary,
-    clearDictionaryCache,
-    updateDictionaryCache,
-  };
-});
-
-export function useDictStoreHook() {
-  return useDictStore(store);
-}
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.store.ts
similarity index 98%
rename from src/store/modules/permission.ts
rename to src/store/modules/permission.store.ts
index 3273c00a..db1ca5f6 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.store.ts
@@ -3,7 +3,7 @@ import { constantRoutes } from "@/router";
 import { store } from "@/store";
 import router from "@/router";
 
-import MenuAPI, { type RouteVO } from "@/api/system/menu";
+import MenuAPI, { type RouteVO } from "@/api/system/menu.api";
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
 
diff --git a/src/store/modules/settings.ts b/src/store/modules/settings.store.ts
similarity index 84%
rename from src/store/modules/settings.ts
rename to src/store/modules/settings.store.ts
index 41bfa4e7..e713201a 100644
--- a/src/store/modules/settings.ts
+++ b/src/store/modules/settings.store.ts
@@ -1,6 +1,6 @@
 import defaultSettings from "@/settings";
-import { SidebarColorEnum, ThemeEnum } from "@/enums/ThemeEnum";
-import { LayoutEnum } from "@/enums/LayoutEnum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
+import { LayoutMode } from "@/enums/settings/layout.enum";
 import { generateThemeColors, applyTheme, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 
 type SettingsValue = boolean | string;
@@ -18,7 +18,7 @@ export const useSettingsStore = defineStore("setting", () => {
     defaultSettings.sidebarColorScheme
   );
   // 布局
-  const layout = useStorage<LayoutEnum>("layout", defaultSettings.layout as LayoutEnum);
+  const layout = useStorage<LayoutMode>("layout", defaultSettings.layout as LayoutMode);
   // 水印
   const watermarkEnabled = useStorage<boolean>(
     "watermarkEnabled",
@@ -33,7 +33,7 @@ export const useSettingsStore = defineStore("setting", () => {
   watch(
     [theme, themeColor],
     ([newTheme, newThemeColor]) => {
-      toggleDarkMode(newTheme === ThemeEnum.DARK);
+      toggleDarkMode(newTheme === ThemeMode.DARK);
       const colors = generateThemeColors(newThemeColor);
       applyTheme(colors);
     },
@@ -44,7 +44,7 @@ export const useSettingsStore = defineStore("setting", () => {
   watch(
     [sidebarColorScheme],
     ([newSidebarColorScheme]) => {
-      toggleSidebarColor(newSidebarColorScheme === SidebarColorEnum.CLASSIC_BLUE);
+      toggleSidebarColor(newSidebarColorScheme === SidebarColor.CLASSIC_BLUE);
     },
     { immediate: true }
   );
@@ -75,7 +75,7 @@ export const useSettingsStore = defineStore("setting", () => {
     themeColor.value = color;
   }
 
-  function changeLayout(val: LayoutEnum) {
+  function changeLayout(val: LayoutMode) {
     layout.value = val;
   }
 
diff --git a/src/store/modules/tags-view.ts b/src/store/modules/tags-view.store.ts
similarity index 100%
rename from src/store/modules/tags-view.ts
rename to src/store/modules/tags-view.store.ts
diff --git a/src/store/modules/user.ts b/src/store/modules/user.store.ts
similarity index 87%
rename from src/store/modules/user.ts
rename to src/store/modules/user.store.ts
index 9bd019fa..eec6decf 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.store.ts
@@ -1,9 +1,9 @@
 import { store } from "@/store";
-import { usePermissionStoreHook } from "@/store/modules/permission";
-import { useDictStoreHook } from "@/store/modules/dict";
+import { usePermissionStoreHook } from "@/store/modules/permission.store";
+import { useDictStoreHook } from "@/store/modules/dict.store";
 
-import AuthAPI, { type LoginFormData } from "@/api/auth";
-import UserAPI, { type UserInfo } from "@/api/system/user";
+import AuthAPI, { type LoginFormData } from "@/api/auth.api";
+import UserAPI, { type UserInfo } from "@/api/system/user.api";
 
 import { setAccessToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
 
@@ -60,7 +60,7 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.logout()
         .then(() => {
-          clearUserData();
+          clearSessionAndCache();
           resolve();
         })
         .catch((error) => {
@@ -90,15 +90,13 @@ export const useUserStore = defineStore("user", () => {
   }
 
   /**
-   * 清理用户数据
-   *
-   * @returns
+   * 清除用户会话和缓存
    */
-  function clearUserData() {
+  function clearSessionAndCache() {
     return new Promise<void>((resolve) => {
       clearToken();
       usePermissionStoreHook().resetRouter();
-      useDictStoreHook().clearDictionaryCache();
+      useDictStoreHook().clearDictCache();
       resolve();
     });
   }
@@ -108,7 +106,7 @@ export const useUserStore = defineStore("user", () => {
     getUserInfo,
     login,
     logout,
-    clearUserData,
+    clearSessionAndCache,
     refreshToken,
   };
 });
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 86959e88..c3bd61f9 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,7 @@
 import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
-import { useUserStoreHook } from "@/store/modules/user";
-import { ResultEnum } from "@/enums/ResultEnum";
+import { useUserStoreHook } from "@/store/modules/user.store";
+import { ResultEnum } from "@/enums/api/result.enum";
 import { getAccessToken } from "@/utils/auth";
 import router from "@/router";
 
@@ -12,12 +12,11 @@ const service = axios.create({
   headers: { "Content-Type": "application/json;charset=utf-8" },
   paramsSerializer: (params) => qs.stringify(params),
 });
-
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
     const accessToken = getAccessToken();
-    // 如果 Authorization 设置为 no-auth，则不携带 Token，用于登录、刷新 Token 等接口
+    // 如果 Authorization 设置为 no-auth，则不携带 Token
     if (config.headers.Authorization !== "no-auth" && accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
     } else {
@@ -27,7 +26,6 @@ service.interceptors.request.use(
   },
   (error) => Promise.reject(error)
 );
-
 // 响应拦截器
 service.interceptors.response.use(
   (response: AxiosResponse) => {
@@ -35,18 +33,15 @@ service.interceptors.response.use(
     if (response.config.responseType === "blob") {
       return response;
     }
-
     const { code, data, msg } = response.data;
     if (code === ResultEnum.SUCCESS) {
       return data;
     }
-
     ElMessage.error(msg || "系统出错");
     return Promise.reject(new Error(msg || "Error"));
   },
   async (error) => {
     console.error("request error", error); // for debug
-    // 非 2xx 状态码处理 401、403、500 等
     const { config, response } = error;
     if (response) {
       const { code, msg } = response.data;
@@ -54,6 +49,8 @@ service.interceptors.response.use(
         // Token 过期，刷新 Token
         return handleTokenRefresh(config);
       } else if (code === ResultEnum.REFRESH_TOKEN_INVALID) {
+        // 刷新 Token 过期，跳转登录页
+        await handleSessionExpired();
         return Promise.reject(new Error(msg || "Error"));
       } else {
         ElMessage.error(msg || "系统出错");
@@ -62,29 +59,22 @@ service.interceptors.response.use(
     return Promise.reject(error.message);
   }
 );
-
 export default service;
-
 // 是否正在刷新标识，避免重复刷新
 let isRefreshing = false;
 // 因 Token 过期导致的请求等待队列
 const waitingQueue: Array<() => void> = [];
-
 // 刷新 Token 处理
 async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
   return new Promise((resolve) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      config.headers.Authorization = getAccessToken();
+      config.headers.Authorization = `Bearer ${getAccessToken()}`;
       resolve(service(config));
     };
-
     waitingQueue.push(retryRequest);
-
     if (!isRefreshing) {
       isRefreshing = true;
-
-      // 刷新 Token
       useUserStoreHook()
         .refreshToken()
         .then(() => {
@@ -92,19 +82,10 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
           waitingQueue.forEach((callback) => callback());
           waitingQueue.length = 0;
         })
-        .catch((error: any) => {
-          console.log("handleTokenRefresh error", error);
+        .catch(async (error) => {
+          console.error("handleTokenRefresh error", error);
           // 刷新 Token 失败，跳转登录页
-          ElNotification({
-            title: "提示",
-            message: "您的会话已过期，请重新登录",
-            type: "info",
-          });
-          useUserStoreHook()
-            .clearUserData()
-            .then(() => {
-              router.push("/login");
-            });
+          await handleSessionExpired();
         })
         .finally(() => {
           isRefreshing = false;
@@ -112,3 +93,13 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
     }
   });
 }
+// 处理会话过期
+async function handleSessionExpired() {
+  ElNotification({
+    title: "提示",
+    message: "您的会话已过期，请重新登录",
+    type: "info",
+  });
+  await useUserStoreHook().clearSessionAndCache();
+  router.push("/login");
+}
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index e24e19ff..3a6ef2fc 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -417,18 +417,18 @@ import Codemirror from "codemirror-editor-vue3";
 import type { CmComponentRef } from "codemirror-editor-vue3";
 import type { EditorConfiguration } from "codemirror";
 
-import { FormTypeEnum } from "@/enums/FormTypeEnum";
-import { QueryTypeEnum } from "@/enums/QueryTypeEnum";
+import { FormTypeEnum } from "@/enums/codegen/form.enum";
+import { QueryTypeEnum } from "@/enums/codegen/query.enum";
 
 import GeneratorAPI, {
   TablePageVO,
   GenConfigForm,
   TablePageQuery,
   FieldConfig,
-} from "@/api/codegen";
+} from "@/api/codegen.api";
 
-import DictAPI from "@/api/system/dict";
-import MenuAPI from "@/api/system/menu";
+import DictAPI from "@/api/system/dict.api";
+import MenuAPI from "@/api/system/menu.api";
 
 interface TreeNode {
   label: string;
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 42279698..28b0c31b 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -285,8 +285,8 @@ defineOptions({
 });
 
 import { dayjs } from "element-plus";
-import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log";
-import { useUserStore } from "@/store/modules/user";
+import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log.api";
+import { useUserStore } from "@/store/modules/user.store";
 import { formatGrowthRate } from "@/utils";
 
 interface VersionItem {
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 4cf1e5fe..0d753fb0 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,4 +1,4 @@
-import UserAPI, { type UserForm } from "@/api/system/user";
+import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
 
 const modalConfig: IModalConfig<UserForm> = {
@@ -11,7 +11,7 @@ const modalConfig: IModalConfig<UserForm> = {
   form: {
     labelWidth: 100,
   },
-  formAction: UserAPI.add,
+  formAction: UserAPI.create,
   beforeSubmit(data) {
     console.log("提交之前处理", data);
   },
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index c1c2f908..3be52d3a 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -1,6 +1,6 @@
-import UserAPI from "@/api/system/user";
-import RoleAPI from "@/api/system/role";
-import type { UserPageQuery } from "@/api/system/user";
+import UserAPI from "@/api/system/user.api";
+import RoleAPI from "@/api/system/role.api";
+import type { UserPageQuery } from "@/api/system/user.api";
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig<UserPageQuery> = {
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index bbc0f616..cef72cf8 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,6 +1,6 @@
-import UserAPI, { type UserForm } from "@/api/system/user";
+import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/DeviceEnum";
+import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore } from "@/store";
 
 const modalConfig: IModalConfig<UserForm> = {
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index d46ae31c..a765bcee 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,4 +1,4 @@
-import DeptAPI from "@/api/system/dept";
+import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
 
 const searchConfig: ISearchConfig = {
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index d1499d9d..6c21fc69 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -90,9 +90,9 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI from "@/api/system/user";
-import DeptAPI from "@/api/system/dept";
-import RoleAPI from "@/api/system/role";
+import UserAPI from "@/api/system/user.api";
+import DeptAPI from "@/api/system/dept.api";
+import RoleAPI from "@/api/system/role.api";
 import type { IObject, IOperatData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue
index dd00ad92..2905ed68 100644
--- a/src/views/demo/signature.vue
+++ b/src/views/demo/signature.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import FileAPI from "@/api/file";
+import FileAPI from "@/api/file.api";
 
 const imgUrl = ref("");
 const canvas = ref();
diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index 8e77944a..874df7ad 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -1,4 +1,4 @@
-import UserAPI from "@/api/system/user";
+import UserAPI from "@/api/system/user.api";
 import type { ISelectConfig } from "@/components/TableSelect/index.vue";
 
 const selectConfig: ISelectConfig = {
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 7ca89b1b..946fb464 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -98,7 +98,7 @@
 
 <script setup lang="ts">
 import { useStomp } from "@/hooks/useStomp";
-import { useUserStoreHook } from "@/store/modules/user";
+import { useUserStoreHook } from "@/store/modules/user.store";
 
 const userStore = useUserStoreHook();
 // 用于手动调整 WebSocket 地址
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index edf30fde..5b7c90d9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -146,28 +146,27 @@
 </template>
 
 <script setup lang="ts">
-import { LocationQuery, useRoute } from "vue-router";
+import { LocationQuery, RouteLocationRaw, useRoute } from "vue-router";
 import { useI18n } from "vue-i18n";
 
-import AuthAPI, { type LoginFormData } from "@/api/auth";
+import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import router from "@/router";
 
 import type { FormInstance } from "element-plus";
 
 import defaultSettings from "@/settings";
-import { ThemeEnum } from "@/enums/ThemeEnum";
+import { ThemeMode } from "@/enums/settings/theme.enum";
 
-import { useSettingsStore, useUserStore, useDictStore } from "@/store";
+import { useSettingsStore, useUserStore } from "@/store";
 
 const userStore = useUserStore();
 const settingsStore = useSettingsStore();
-const dictStore = useDictStore();
 
 const route = useRoute();
 const { t } = useI18n();
 const loginFormRef = ref<FormInstance>();
 
-const isDark = ref(settingsStore.theme === ThemeEnum.DARK); // 是否暗黑模式
+const isDark = ref(settingsStore.theme === ThemeMode.DARK); // 是否暗黑模式
 const loading = ref(false); // 按钮 loading 状态
 const isCapslock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
@@ -218,57 +217,60 @@ function getCaptcha() {
   });
 }
 
-// 登录
+// 登录提交处理
 async function handleLoginSubmit() {
-  loginFormRef.value?.validate((valid: boolean) => {
-    if (valid) {
-      loading.value = true;
-      userStore
-        .login(loginFormData.value)
-        .then(async () => {
-          await userStore.getUserInfo();
-          // 需要在路由跳转前加载字典数据，否则会出现字典数据未加载完成导致页面渲染异常
-          await dictStore.loadDictionaries();
-          // 跳转到登录前的页面
-          const { path, queryParams } = parseRedirect();
-          router.push({ path: path, query: queryParams });
-        })
-        .catch(() => {
-          getCaptcha();
-        })
-        .finally(() => {
-          loading.value = false;
-        });
-    }
-  });
+  // 1. 表单验证
+  const valid = await loginFormRef.value?.validate();
+  if (!valid) return;
+
+  loading.value = true;
+  try {
+    // 2. 执行登录
+    await userStore.login(loginFormData.value);
+
+    // 3. 获取用户信息
+    await userStore.getUserInfo();
+
+    // 4. 解析并跳转目标地址
+    const redirect = resolveRedirectTarget(route.query);
+    await router.push(redirect);
+  } catch (error) {
+    // 5. 统一错误处理
+    getCaptcha(); // 刷新验证码
+    console.error("登录失败:", error);
+  } finally {
+    loading.value = false;
+  }
 }
 
 /**
- * 解析 redirect 字符串 为 path 和  queryParams
- *
- * @returns { path: string, queryParams: Record<string, string> } 解析后的 path 和 queryParams
+ * 解析重定向目标
+ * @param query 路由查询参数
+ * @returns 标准化后的路由地址对象
  */
-function parseRedirect(): {
-  path: string;
-  queryParams: Record<string, string>;
-} {
-  const query: LocationQuery = route.query;
-  const redirect = (query.redirect as string) ?? "/";
-
-  const url = new URL(redirect, window.location.origin);
-  const path = url.pathname;
-  const queryParams: Record<string, string> = {};
-
-  url.searchParams.forEach((value, key) => {
-    queryParams[key] = value;
-  });
-
-  return { path, queryParams };
+function resolveRedirectTarget(query: LocationQuery): RouteLocationRaw {
+  // 默认跳转路径
+  const defaultPath = "/";
+
+  // 获取原始重定向路径
+  const rawRedirect = (query.redirect as string) || defaultPath;
+
+  try {
+    // 6. 使用Vue Router解析路径
+    const resolved = router.resolve(rawRedirect);
+    return {
+      path: resolved.path,
+      query: resolved.query,
+    };
+  } catch {
+    // 7. 异常处理：返回安全路径
+    return { path: defaultPath };
+  }
 }
 
 // 主题切换
 const toggleTheme = () => {
-  const newTheme = settingsStore.theme === ThemeEnum.DARK ? ThemeEnum.LIGHT : ThemeEnum.DARK;
+  const newTheme = settingsStore.theme === ThemeMode.DARK ? ThemeMode.LIGHT : ThemeMode.DARK;
   settingsStore.changeTheme(newTheme);
 };
 
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 68b4e7c5..5c85942f 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -260,9 +260,9 @@ import UserAPI, {
   MobileUpdateForm,
   EmailUpdateForm,
   UserProfileForm,
-} from "@/api/system/user";
+} from "@/api/system/user.api";
 
-import FileAPI from "@/api/file";
+import FileAPI from "@/api/file.api";
 
 import { Camera } from "@element-plus/icons-vue";
 
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 034efa23..ba7991b1 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -135,7 +135,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config";
+import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config.api";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
@@ -233,7 +233,7 @@ function handleSubmit() {
           })
           .finally(() => (loading.value = false));
       } else {
-        ConfigAPI.add(formData)
+        ConfigAPI.create(formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 45a39a2d..7c7f4f13 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -158,7 +158,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/system/dept";
+import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/system/dept.api";
 
 const queryFormRef = ref();
 const deptFormRef = ref();
@@ -251,7 +251,7 @@ function handleSubmit() {
           })
           .finally(() => (loading.value = false));
       } else {
-        DeptAPI.add(formData)
+        DeptAPI.create(formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/dict-item.vue
similarity index 87%
rename from src/views/system/dict/data.vue
rename to src/views/system/dict/dict-item.vue
index 591926d6..9f84912e 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -1,4 +1,4 @@
-<!-- 字典数据 -->
+<!-- 字典项 -->
 <template>
   <div class="app-container">
     <div class="search-bar mt-5">
@@ -34,8 +34,8 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="字典标签" prop="label" />
-        <el-table-column label="字典值" prop="value" />
+        <el-table-column label="字典项标签" prop="label" />
+        <el-table-column label="字典项值" prop="value" />
         <el-table-column label="排序" prop="sort" />
         <el-table-column label="状态">
           <template #default="scope">
@@ -78,7 +78,7 @@
       />
     </el-card>
 
-    <!--字典弹窗-->
+    <!--字典项弹窗-->
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
@@ -87,10 +87,10 @@
     >
       <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="100px">
         <el-card shadow="never">
-          <el-form-item label="字典标签" prop="label">
+          <el-form-item label="字典项标签" prop="label">
             <el-input v-model="formData.label" placeholder="请输入字典标签" />
           </el-form-item>
-          <el-form-item label="字典值" prop="value">
+          <el-form-item label="字典项值" prop="value">
             <el-input v-model="formData.value" placeholder="请输入字典值" />
           </el-form-item>
           <el-form-item label="状态">
@@ -130,15 +130,11 @@
 
 <script setup lang="ts">
 defineOptions({
-  name: "DictData",
+  name: "DictItem",
   inherititems: false,
 });
 
-import DictDataAPI, {
-  DictDataPageQuery,
-  DictDataPageVO,
-  DictDataForm,
-} from "@/api/system/dict-data";
+import DictAPI, { DictItemPageQuery, DictItemPageVO, DictItemForm } from "@/api/system/dict.api";
 
 const route = useRoute();
 
@@ -151,20 +147,19 @@ const loading = ref(false);
 const ids = ref<number[]>([]);
 const total = ref(0);
 
-const queryParams = reactive<DictDataPageQuery>({
+const queryParams = reactive<DictItemPageQuery>({
   pageNum: 1,
   pageSize: 10,
-  dictCode: dictCode.value,
 });
 
-const tableData = ref<DictDataPageVO[]>();
+const tableData = ref<DictItemPageVO[]>();
 
 const dialog = reactive({
   title: "",
   visible: false,
 });
 
-const formData = reactive<DictDataForm>({});
+const formData = reactive<DictItemForm>({});
 
 const computedRules = computed(() => {
   const rules: Partial<Record<string, any>> = {
@@ -177,7 +172,7 @@ const computedRules = computed(() => {
 // 查询
 function handleQuery() {
   loading.value = true;
-  DictDataAPI.getPage(queryParams)
+  DictAPI.getDictItemPage(dictCode.value, queryParams)
     .then((data) => {
       tableData.value = data.list;
       total.value = data.total;
@@ -200,12 +195,12 @@ function handleSelectionChange(selection: any) {
 }
 
 // 打开弹窗
-function handleOpenDialog(row?: DictDataPageVO) {
+function handleOpenDialog(row?: DictItemPageVO) {
   dialog.visible = true;
-  dialog.title = row ? "编辑字典数据" : "新增字典数据";
+  dialog.title = row ? "编辑字典项" : "新增字典项";
 
   if (row?.id) {
-    DictDataAPI.getFormData(row.id).then((data) => {
+    DictAPI.getDictItemFormData(dictCode.value, row.id).then((data) => {
       Object.assign(formData, data);
     });
   }
@@ -219,7 +214,7 @@ function handleSubmitClick() {
       const id = formData.id;
       formData.dictCode = dictCode.value;
       if (id) {
-        DictDataAPI.update(id, formData)
+        DictAPI.updateDictItem(dictCode.value, id, formData)
           .then(() => {
             ElMessage.success("修改成功");
             handleCloseDialog();
@@ -227,7 +222,7 @@ function handleSubmitClick() {
           })
           .finally(() => (loading.value = false));
       } else {
-        DictDataAPI.add(formData)
+        DictAPI.createDictItem(dictCode.value, formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
@@ -256,8 +251,8 @@ function handleCloseDialog() {
  * @param id 字典ID
  */
 function handleDelete(id?: number) {
-  const attrGroupIds = [id || ids.value].join(",");
-  if (!attrGroupIds) {
+  const itemIds = [id || ids.value].join(",");
+  if (!itemIds) {
     ElMessage.warning("请勾选删除项");
     return;
   }
@@ -267,7 +262,7 @@ function handleDelete(id?: number) {
     type: "warning",
   }).then(
     () => {
-      DictDataAPI.deleteByIds(attrGroupIds).then(() => {
+      DictAPI.deleteDictItems(dictCode.value, itemIds).then(() => {
         ElMessage.success("删除成功");
         handleResetQuery();
       });
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 39260418..71f5132a 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -129,7 +129,7 @@ defineOptions({
   inherititems: false,
 });
 
-import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict";
+import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict.api";
 
 import router from "@/router";
 
@@ -221,7 +221,7 @@ function handleSubmitClick() {
           })
           .finally(() => (loading.value = false));
       } else {
-        DictAPI.add(formData)
+        DictAPI.create(formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
@@ -270,17 +270,12 @@ function handleDelete(id?: number) {
   );
 }
 
-// 打开字典数据
+// 打开字典项
 function handleOpenDictData(row: DictPageVO) {
   router.push({
-    path: "/system/dict-data",
+    path: "/system/dict-item",
     query: { dictCode: row.dictCode, title: "【" + row.name + "】字典数据" },
   });
-
-  /*  router.push({
-    name: "DictData",
-    params: { dictCode: row.dictCode, title: "【" + row.name + "】字典数据" },
-  }); */
 }
 
 onMounted(() => {
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index f0b8367c..582018c4 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -60,7 +60,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import LogAPI, { LogPageVO, LogPageQuery } from "@/api/system/log";
+import LogAPI, { LogPageVO, LogPageQuery } from "@/api/system/log.api";
 
 const queryFormRef = ref();
 
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 23bab330..8a6c2e2a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -335,8 +335,8 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu";
-import { MenuTypeEnum } from "@/enums/MenuTypeEnum";
+import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu.api";
+import { MenuTypeEnum } from "@/enums/system/menu.enum";
 
 const queryFormRef = ref();
 const menuFormRef = ref();
@@ -465,7 +465,7 @@ function handleSubmit() {
           handleQuery();
         });
       } else {
-        MenuAPI.add(formData.value).then(() => {
+        MenuAPI.create(formData.value).then(() => {
           ElMessage.success("新增成功");
           handleCloseDialog();
           handleQuery();
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index 07a02169..75e5e4b1 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -107,7 +107,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import NoticeAPI, { NoticePageVO, NoticePageQuery, NoticeDetailVO } from "@/api/system/notice";
+import NoticeAPI, { NoticePageVO, NoticePageQuery, NoticeDetailVO } from "@/api/system/notice.api";
 
 const queryFormRef = ref();
 const pageData = ref<NoticePageVO[]>([]);
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index bc19cf14..f96ed715 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -259,8 +259,8 @@ import NoticeAPI, {
   NoticeForm,
   NoticePageQuery,
   NoticeDetailVO,
-} from "@/api/system/notice";
-import UserAPI from "@/api/system/user";
+} from "@/api/system/notice.api";
+import UserAPI from "@/api/system/user.api";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
@@ -389,7 +389,7 @@ function handleSubmit() {
           })
           .finally(() => (loading.value = false));
       } else {
-        NoticeAPI.add(formData)
+        NoticeAPI.create(formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index eab71721..b7c6a791 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -208,8 +208,8 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role";
-import MenuAPI from "@/api/system/menu";
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role.api";
+import MenuAPI from "@/api/system/menu.api";
 
 const queryFormRef = ref();
 const roleFormRef = ref();
@@ -313,7 +313,7 @@ function handleSubmit() {
           })
           .finally(() => (loading.value = false));
       } else {
-        RoleAPI.add(formData)
+        RoleAPI.create(formData)
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
diff --git a/src/views/system/user/components/DeptTree.vue b/src/views/system/user/components/DeptTree.vue
index 5fcfe452..8ae944a8 100644
--- a/src/views/system/user/components/DeptTree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import DeptAPI from "@/api/system/dept";
+import DeptAPI from "@/api/system/dept.api";
 const props = defineProps({
   modelValue: {
     type: [Number],
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 923bc384..4bc57bab 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -90,8 +90,8 @@
 
 <script lang="ts" setup>
 import { ElMessage, type UploadUserFile } from "element-plus";
-import UserAPI from "@/api/system/user";
-import { ResultEnum } from "@/enums/ResultEnum";
+import UserAPI from "@/api/system/user.api";
+import { ResultEnum } from "@/enums/api/result.enum";
 
 const emit = defineEmits(["import-success"]);
 const visible = defineModel("modelValue", {
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 7e651331..e54baced 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -237,10 +237,10 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user";
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user.api";
 
-import DeptAPI from "@/api/system/dept";
-import RoleAPI from "@/api/system/role";
+import DeptAPI from "@/api/system/dept.api";
+import RoleAPI from "@/api/system/role.api";
 
 import DeptTree from "./components/DeptTree.vue";
 import UserImport from "./components/UserImport.vue";
@@ -301,7 +301,7 @@ const roleOptions = ref<OptionType[]>();
 const importDialogVisible = ref(false);
 
 // 查询
-function handleQuery() {
+async function handleQuery() {
   loading.value = true;
   UserAPI.getPage(queryParams)
     .then((data) => {
@@ -395,7 +395,7 @@ const handleSubmit = useDebounceFn(() => {
           })
           .finally(() => (loading.value = false));
       } else {
-        UserAPI.add(formData)
+        UserAPI.create(formData)
           .then(() => {
             ElMessage.success("新增用户成功");
             handleCloseDialog();

From 1cc6cf0d81888e8a18260087b226ff597ac85a41 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 10:08:12 +0800
Subject: [PATCH 261/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E8=8F=9C=E5=8D=95=E6=9E=9A=E4=B8=BE=E7=BC=96=E7=A0=81?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E9=80=BB=E8=BE=91=EF=BC=8C=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E4=BC=A0=E8=BE=93=E8=8F=9C=E5=8D=95=E5=8E=9F=E5=A7=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/system/menu.enum.ts   | 27 ++++++---------------------
 src/views/system/menu/index.vue | 14 +++++++-------
 2 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/src/enums/system/menu.enum.ts b/src/enums/system/menu.enum.ts
index b69942fd..3ed2f378 100644
--- a/src/enums/system/menu.enum.ts
+++ b/src/enums/system/menu.enum.ts
@@ -1,22 +1,7 @@
-/**
- * 菜单类型枚举
- */
-export const enum MenuTypeEnum {
-  /**
-   * 目录
-   */
-  CATALOG = "CATALOG",
-  /**
-   * 菜单
-   */
-  MENU = "MENU",
-
-  /**
-   * 按钮
-   */
-  BUTTON = "BUTTON",
-  /**
-   * 外链
-   */
-  EXTLINK = "EXTLINK",
+// 核心枚举定义
+export enum MenuTypeEnum {
+  CATALOG = 2, // 目录
+  MENU = 1, // 菜单
+  BUTTON = 4, // 按钮
+  EXTLINK = 3, // 外链
 }
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 8a6c2e2a..bcff6cf1 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -76,7 +76,7 @@
         <el-table-column fixed="right" align="center" label="操作" width="220">
           <template #default="scope">
             <el-button
-              v-if="scope.row.type == 'CATALOG' || scope.row.type == 'MENU'"
+              v-if="scope.row.type == MenuTypeEnum.CATALOG || scope.row.type == MenuTypeEnum.MENU"
               v-hasPerm="['sys:menu:add']"
               type="primary"
               link
@@ -131,14 +131,14 @@
 
         <el-form-item label="菜单类型" prop="type">
           <el-radio-group v-model="formData.type" @change="handleMenuTypeChange">
-            <el-radio value="CATALOG">目录</el-radio>
-            <el-radio value="MENU">菜单</el-radio>
-            <el-radio value="BUTTON">按钮</el-radio>
-            <el-radio value="EXTLINK">外链</el-radio>
+            <el-radio :value="MenuTypeEnum.CATALOG">目录</el-radio>
+            <el-radio :value="MenuTypeEnum.MENU">菜单</el-radio>
+            <el-radio :value="MenuTypeEnum.BUTTON">按钮</el-radio>
+            <el-radio :value="MenuTypeEnum.EXTLINK">外链</el-radio>
           </el-radio-group>
         </el-form-item>
 
-        <el-form-item v-if="formData.type == 'EXTLINK'" label="外链地址" prop="path">
+        <el-form-item v-if="formData.type == MenuTypeEnum.EXTLINK" label="外链地址" prop="path">
           <el-input v-model="formData.routePath" placeholder="请输入外链完整路径" />
         </el-form-item>
 
@@ -465,7 +465,7 @@ function handleSubmit() {
           handleQuery();
         });
       } else {
-        MenuAPI.create(formData.value).then(() => {
+        MenuAPI.add(formData.value).then(() => {
           ElMessage.success("新增成功");
           handleCloseDialog();
           handleQuery();

From 96519a69c26f1079d4828e083450cde8cf104ea9 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 10:09:59 +0800
Subject: [PATCH 262/497] chore: :hammer: bump version to 2.25.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e0590ef3..36ae8bc3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.24.2",
+  "version": "2.25.0",
   "private": true,
   "type": "module",
   "scripts": {

From c82ef63c62dee53e7e17b34fc1acdd3a72d2b4f7 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 10:36:52 +0800
Subject: [PATCH 263/497] =?UTF-8?q?fix:=20:bug:=20=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=92=8C=E8=8F=9C=E5=8D=95=E6=89=93=E5=8C=85=E8=AD=A6=E5=91=8A?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict.api.ts            | 7 +++++++
 src/views/codegen/index.vue           | 5 +----
 src/views/demo/table-select/index.vue | 2 +-
 src/views/system/menu/index.vue       | 2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index e2024297..f558a987 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -21,6 +21,13 @@ const DictAPI = {
     });
   },
 
+  getList() {
+    return request<any, OptionType[]>({
+      url: `${DICT_BASE_URL}`,
+      method: "get",
+    });
+  },
+
   /**
    * 字典表单数据
    *
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index 3a6ef2fc..60ea6d63 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -656,10 +656,7 @@ async function handleOpenDialog(tableName: string) {
   currentTableName.value = tableName;
   // 获取字典数据
   DictAPI.getList().then((data) => {
-    dictOptions.value = data.map((item) => ({
-      label: item.name,
-      value: item.dictCode,
-    }));
+    dictOptions.value = data;
     loading.value = true;
     GeneratorAPI.getGenConfig(tableName)
       .then((data) => {
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index 3456b451..6fd82c9d 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -22,7 +22,7 @@ function handleConfirm(data: IUser[]) {
 }
 const text = computed(() => {
   // 获取字典数据
-  const dictData = dictStore.getDictionary("gender");
+  const dictData = dictStore.getDictItems("gender");
   const genderLabel = dictData.find((item: any) => item.value == selectedUser.value?.gender)?.label;
   return selectedUser.value
     ? `${selectedUser.value.username} - ${genderLabel} - ${selectedUser.value.deptName}`
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index bcff6cf1..23c497aa 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -465,7 +465,7 @@ function handleSubmit() {
           handleQuery();
         });
       } else {
-        MenuAPI.add(formData.value).then(() => {
+        MenuAPI.create(formData.value).then(() => {
           ElMessage.success("新增成功");
           handleCloseDialog();
           handleQuery();

From 822ed91e2bc13ddd06a327c7c43281ebbaa05a4c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 10:39:39 +0800
Subject: [PATCH 264/497] =?UTF-8?q?fix:=20:bug:=20=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=92=8C?=
 =?UTF-8?q?mock?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/dict.mock.ts          | 21 +++++++++++++++++++++
 src/api/system/dict.api.ts |  5 +++++
 2 files changed, 26 insertions(+)

diff --git a/mock/dict.mock.ts b/mock/dict.mock.ts
index 9eff20e7..b04a3689 100644
--- a/mock/dict.mock.ts
+++ b/mock/dict.mock.ts
@@ -21,6 +21,27 @@ export default defineMock([
     },
   },
 
+  /**
+   * 字典列表
+   */
+  {
+    url: "dicts",
+    method: ["GET"],
+    body: {
+      code: "00000",
+      data: {
+        list: [
+          {
+            value: "gender",
+            label: "性别",
+          },
+        ],
+        total: 1,
+      },
+      msg: "一切ok",
+    },
+  },
+
   // 新增字典
   {
     url: "dicts",
diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index f558a987..755ff062 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -21,6 +21,11 @@ const DictAPI = {
     });
   },
 
+  /**
+   * 字典列表
+   *
+   * @returns 字典列表
+   */
   getList() {
     return request<any, OptionType[]>({
       url: `${DICT_BASE_URL}`,

From 2f2c3d6b8453e94031528792ce2a25da9e2a6fdb Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 24 Mar 2025 23:19:35 +0800
Subject: [PATCH 265/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8A=BD?=
 =?UTF-8?q?=E5=B1=89=E9=80=82=E9=85=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=87=AA?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue | 17 ++++++++++++++---
 src/views/system/role/index.vue | 14 +++++++++++---
 src/views/system/user/index.vue |  9 ++++++++-
 3 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 23c497aa..ef25aca3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -112,7 +112,12 @@
       </el-table>
     </el-card>
 
-    <el-drawer v-model="dialog.visible" :title="dialog.title" size="50%" @close="handleCloseDialog">
+    <el-drawer
+      v-model="dialog.visible"
+      :title="dialog.title"
+      :size="drawerSize"
+      @close="handleCloseDialog"
+    >
       <el-form ref="menuFormRef" :model="formData" :rules="rules" label-width="100px">
         <el-form-item label="父级菜单" prop="parentId">
           <el-tree-select
@@ -330,13 +335,18 @@
 </template>
 
 <script setup lang="ts">
+import { useAppStore } from "@/store/modules/app.store";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+
+import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu.api";
+import { MenuTypeEnum } from "@/enums/system/menu.enum";
+
 defineOptions({
   name: "SysMenu",
   inheritAttrs: false,
 });
 
-import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu.api";
-import { MenuTypeEnum } from "@/enums/system/menu.enum";
+const appStore = useAppStore();
 
 const queryFormRef = ref();
 const menuFormRef = ref();
@@ -347,6 +357,7 @@ const dialog = reactive({
   visible: false,
 });
 
+const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "600px" : "90%"));
 // 查询参数
 const queryParams = reactive<MenuQuery>({});
 // 菜单表格数据
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b7c6a791..a070f9cc 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -143,7 +143,7 @@
     <el-drawer
       v-model="assignPermDialogVisible"
       :title="'【' + checkedRole.name + '】权限分配'"
-      size="500"
+      :size="drawerSize"
     >
       <div class="flex-x-between">
         <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单权限名称">
@@ -203,13 +203,18 @@
 </template>
 
 <script setup lang="ts">
+import { useAppStore } from "@/store/modules/app.store";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role.api";
+import MenuAPI from "@/api/system/menu.api";
+
 defineOptions({
   name: "Role",
   inheritAttrs: false,
 });
 
-import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role.api";
-import MenuAPI from "@/api/system/menu.api";
+const appStore = useAppStore();
 
 const queryFormRef = ref();
 const roleFormRef = ref();
@@ -234,6 +239,9 @@ const dialog = reactive({
   title: "",
   visible: false,
 });
+
+const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "600px" : "90%"));
+
 // 角色表单
 const formData = reactive<RoleForm>({
   sort: 1,
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index e54baced..b7be3635 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -162,6 +162,7 @@
       v-model="dialog.visible"
       :title="dialog.title"
       append-to-body
+      :size="drawerSize"
       @close="handleCloseDialog"
     >
       <el-form ref="userFormRef" :model="formData" :rules="rules" label-width="80px">
@@ -237,8 +238,10 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user.api";
+import { useAppStore } from "@/store/modules/app.store";
+import { DeviceEnum } from "@/enums/settings/device.enum";
 
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user.api";
 import DeptAPI from "@/api/system/dept.api";
 import RoleAPI from "@/api/system/role.api";
 
@@ -249,6 +252,9 @@ defineOptions({
   name: "User",
   inheritAttrs: false,
 });
+
+const appStore = useAppStore();
+
 const queryFormRef = ref();
 const userFormRef = ref();
 
@@ -265,6 +271,7 @@ const dialog = reactive({
   visible: false,
   title: "新增用户",
 });
+const drawerSize = computed(() => (appStore.device === DeviceEnum.DESKTOP ? "600px" : "90%"));
 
 const formData = reactive<UserForm>({
   status: 1,

From 9c941018dc0daba69bfda9517d0a1723a9ab64c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Mon, 24 Mar 2025 16:23:15 +0000
Subject: [PATCH 266/497] =?UTF-8?q?update=20vite.config.ts.=20fix:=20?=
 =?UTF-8?q?=F0=9F=90=9BElementPlus=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8Fvariables.scss=E6=9C=AA=E7=94=9F=E6=95=88=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 超凡 <2508779859@qq.com>
---
 vite.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index afaae229..19e1dc53 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -63,7 +63,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
         resolvers: [
           // 导入 Element Plus函数，如：ElMessage, ElMessageBox 等
-          ElementPlusResolver(),
+          ElementPlusResolver({ importStyle: "sass" }),
         ],
         eslintrc: {
           enabled: false,
@@ -78,7 +78,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       Components({
         resolvers: [
           // 导入 Element Plus 组件
-          ElementPlusResolver(),
+          ElementPlusResolver({ importStyle: "sass" }),
         ],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],

From 4e434aa93a9524f31a3ba49fc3bb2df9857ee810 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 25 Mar 2025 13:00:19 +0800
Subject: [PATCH 267/497] =?UTF-8?q?fix:=20:bug:=20=E5=90=AF=E7=94=A8=20sas?=
 =?UTF-8?q?s=20=E6=A8=A1=E5=BC=8F=E5=AF=BC=E8=87=B4=E9=A2=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 19e1dc53..afaae229 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -63,7 +63,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
         resolvers: [
           // 导入 Element Plus函数，如：ElMessage, ElMessageBox 等
-          ElementPlusResolver({ importStyle: "sass" }),
+          ElementPlusResolver(),
         ],
         eslintrc: {
           enabled: false,
@@ -78,7 +78,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       Components({
         resolvers: [
           // 导入 Element Plus 组件
-          ElementPlusResolver({ importStyle: "sass" }),
+          ElementPlusResolver(),
         ],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],

From bdaf392635b8694104b608b7ccf8050927c412e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Tue, 25 Mar 2025 06:05:37 +0000
Subject: [PATCH 268/497] =?UTF-8?q?fix:=20=F0=9F=90=9B=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=20sass=20=E6=A8=A1=E5=BC=8F=E5=AF=BC=E8=87=B4=E9=A2=84?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=B1=E6=95=88=20=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83elementplus=E7=96=AF=E7=8B=82=E9=87=8D?=
 =?UTF-8?q?=E8=BD=BD=EF=BC=8C=E5=B0=86=E9=A2=84=E5=8A=A0=E8=BD=BDcss?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9B=B4=E6=94=B9=E4=B8=BAscss=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 超凡 <2508779859@qq.com>
---
 vite.config.ts | 149 ++++++++++++++++++++++++-------------------------
 1 file changed, 73 insertions(+), 76 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index afaae229..a44f96d3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -33,9 +33,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         // 定义全局 SCSS 变量
         scss: {
           api: "modern-compiler",
-          additionalData: `
-            @use "@/styles/variables.scss" as *;
-          `,
+          additionalData: `@use "@/styles/variables.scss" as *;`,
         },
       },
     },
@@ -63,7 +61,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
         resolvers: [
           // 导入 Element Plus函数，如：ElMessage, ElMessageBox 等
-          ElementPlusResolver(),
+          ElementPlusResolver({ importStyle: "sass" }),
         ],
         eslintrc: {
           enabled: false,
@@ -78,7 +76,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       Components({
         resolvers: [
           // 导入 Element Plus 组件
-          ElementPlusResolver(),
+          ElementPlusResolver({ importStyle: "sass" }),
         ],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],
@@ -108,78 +106,77 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "qs",
         "path-browserify",
         "@element-plus/icons-vue",
-        "element-plus/es/locale/lang/zh-cn",
+        "element-plus/es",
         "element-plus/es/locale/lang/en",
-        "element-plus/es/components/form/style/css",
-        "element-plus/es/components/form-item/style/css",
-        "element-plus/es/components/button/style/css",
-        "element-plus/es/components/input/style/css",
-        "element-plus/es/components/input-number/style/css",
-        "element-plus/es/components/switch/style/css",
-        "element-plus/es/components/upload/style/css",
-        "element-plus/es/components/menu/style/css",
-        "element-plus/es/components/col/style/css",
-        "element-plus/es/components/icon/style/css",
-        "element-plus/es/components/row/style/css",
-        "element-plus/es/components/tag/style/css",
-        "element-plus/es/components/dialog/style/css",
-        "element-plus/es/components/loading/style/css",
-        "element-plus/es/components/radio/style/css",
-        "element-plus/es/components/radio-group/style/css",
-        "element-plus/es/components/popover/style/css",
-        "element-plus/es/components/scrollbar/style/css",
-        "element-plus/es/components/tooltip/style/css",
-        "element-plus/es/components/dropdown/style/css",
-        "element-plus/es/components/dropdown-menu/style/css",
-        "element-plus/es/components/dropdown-item/style/css",
-        "element-plus/es/components/sub-menu/style/css",
-        "element-plus/es/components/menu-item/style/css",
-        "element-plus/es/components/divider/style/css",
-        "element-plus/es/components/card/style/css",
-        "element-plus/es/components/link/style/css",
-        "element-plus/es/components/breadcrumb/style/css",
-        "element-plus/es/components/breadcrumb-item/style/css",
-        "element-plus/es/components/table/style/css",
-        "element-plus/es/components/tree-select/style/css",
-        "element-plus/es/components/table-column/style/css",
-        "element-plus/es/components/select/style/css",
-        "element-plus/es/components/option/style/css",
-        "element-plus/es/components/pagination/style/css",
-        "element-plus/es/components/tree/style/css",
-        "element-plus/es/components/alert/style/css",
-        "element-plus/es/components/radio-button/style/css",
-        "element-plus/es/components/checkbox-group/style/css",
-        "element-plus/es/components/checkbox/style/css",
-        "element-plus/es/components/tabs/style/css",
-        "element-plus/es/components/tab-pane/style/css",
-        "element-plus/es/components/rate/style/css",
-        "element-plus/es/components/date-picker/style/css",
-        "element-plus/es/components/notification/style/css",
-        "element-plus/es/components/image/style/css",
-        "element-plus/es/components/statistic/style/css",
-        "element-plus/es/components/watermark/style/css",
-        "element-plus/es/components/config-provider/style/css",
-        "element-plus/es/components/text/style/css",
-        "element-plus/es/components/drawer/style/css",
-        "element-plus/es/components/color-picker/style/css",
-        "element-plus/es/components/backtop/style/css",
-        "element-plus/es/components/message-box/style/css",
-        "element-plus/es/components/skeleton/style/css",
-        "element-plus/es/components/skeleton/style/css",
-        "element-plus/es/components/skeleton-item/style/css",
-        "element-plus/es/components/badge/style/css",
-        "element-plus/es/components/steps/style/css",
-        "element-plus/es/components/step/style/css",
-        "element-plus/es/components/avatar/style/css",
-        "element-plus/es/components/descriptions/style/css",
-        "element-plus/es/components/descriptions-item/style/css",
-        "element-plus/es/components/checkbox-group/style/css",
-        "element-plus/es/components/progress/style/css",
-        "element-plus/es/components/image-viewer/style/css",
-        "element-plus/es/components/empty/style/css",
-        "element-plus/es/components/message/style/css",
-        "element-plus/es/components/timeline/style/css",
-        "element-plus/es/components/timeline-item/style/css",
+        "element-plus/es/locale/lang/zh-cn",
+        "element-plus/es/components/alert/style/index",
+        "element-plus/es/components/avatar/style/index",
+        "element-plus/es/components/backtop/style/index",
+        "element-plus/es/components/badge/style/index",
+        "element-plus/es/components/base/style/index",
+        "element-plus/es/components/breadcrumb-item/style/index",
+        "element-plus/es/components/breadcrumb/style/index",
+        "element-plus/es/components/button/style/index",
+        "element-plus/es/components/card/style/index",
+        "element-plus/es/components/checkbox-group/style/index",
+        "element-plus/es/components/checkbox/style/index",
+        "element-plus/es/components/col/style/index",
+        "element-plus/es/components/color-picker/style/index",
+        "element-plus/es/components/config-provider/style/index",
+        "element-plus/es/components/date-picker/style/index",
+        "element-plus/es/components/descriptions-item/style/index",
+        "element-plus/es/components/descriptions/style/index",
+        "element-plus/es/components/dialog/style/index",
+        "element-plus/es/components/divider/style/index",
+        "element-plus/es/components/drawer/style/index",
+        "element-plus/es/components/dropdown-item/style/index",
+        "element-plus/es/components/dropdown-menu/style/index",
+        "element-plus/es/components/dropdown/style/index",
+        "element-plus/es/components/empty/style/index",
+        "element-plus/es/components/form-item/style/index",
+        "element-plus/es/components/form/style/index",
+        "element-plus/es/components/icon/style/index",
+        "element-plus/es/components/image-viewer/style/index",
+        "element-plus/es/components/image/style/index",
+        "element-plus/es/components/input-number/style/index",
+        "element-plus/es/components/input/style/index",
+        "element-plus/es/components/link/style/index",
+        "element-plus/es/components/loading/style/index",
+        "element-plus/es/components/menu-item/style/index",
+        "element-plus/es/components/menu/style/index",
+        "element-plus/es/components/message-box/style/index",
+        "element-plus/es/components/message/style/index",
+        "element-plus/es/components/notification/style/index",
+        "element-plus/es/components/option/style/index",
+        "element-plus/es/components/pagination/style/index",
+        "element-plus/es/components/popover/style/index",
+        "element-plus/es/components/progress/style/index",
+        "element-plus/es/components/radio-button/style/index",
+        "element-plus/es/components/radio-group/style/index",
+        "element-plus/es/components/radio/style/index",
+        "element-plus/es/components/row/style/index",
+        "element-plus/es/components/scrollbar/style/index",
+        "element-plus/es/components/select/style/index",
+        "element-plus/es/components/skeleton-item/style/index",
+        "element-plus/es/components/skeleton/style/index",
+        "element-plus/es/components/step/style/index",
+        "element-plus/es/components/steps/style/index",
+        "element-plus/es/components/sub-menu/style/index",
+        "element-plus/es/components/switch/style/index",
+        "element-plus/es/components/tab-pane/style/index",
+        "element-plus/es/components/table-column/style/index",
+        "element-plus/es/components/table/style/index",
+        "element-plus/es/components/tabs/style/index",
+        "element-plus/es/components/tag/style/index",
+        "element-plus/es/components/text/style/index",
+        "element-plus/es/components/time-picker/style/index",
+        "element-plus/es/components/timeline-item/style/index",
+        "element-plus/es/components/timeline/style/index",
+        "element-plus/es/components/tooltip/style/index",
+        "element-plus/es/components/tree-select/style/index",
+        "element-plus/es/components/tree/style/index",
+        "element-plus/es/components/upload/style/index",
+        "element-plus/es/components/watermark/style/index",
       ],
     },
     // 构建配置

From 35cae9cc3e5387610cdc4eddc97891616cfdbfba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Wed, 26 Mar 2025 01:45:53 +0800
Subject: [PATCH 269/497] =?UTF-8?q?perf:=20=F0=9F=9A=80PageSearch=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BC=98=E5=8C=96=EF=BC=8C=E6=89=A9=E5=B1=95=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A7=E4=BB=B6=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue   | 260 +++++++++------------------
 src/components/CURD/types.ts         |  22 ++-
 src/components/InputTag/index.vue    |  70 ++++++++
 src/main.ts                          |   2 +
 src/views/demo/curd/config/search.ts |  82 +++++++--
 5 files changed, 249 insertions(+), 187 deletions(-)
 create mode 100644 src/components/InputTag/index.vue

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 3b218dec..19553d2d 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -3,7 +3,7 @@
     v-show="visible"
     v-hasPerm="[`${searchConfig.pageName}:query`]"
     shadow="never"
-    class="mb-[10px]"
+    class="mb-2.5"
   >
     <el-form ref="queryFormRef" :model="queryParams" :inline="true">
       <template v-for="(item, index) in formItems" :key="item.prop">
@@ -14,101 +14,46 @@
         >
           <!-- Label -->
           <template v-if="item.tips" #label>
-            <span>
+            <span class="flex-y-center">
               {{ item.label }}
-              <el-tooltip
-                placement="bottom"
-                effect="light"
-                :content="item.tips"
-                :raw-content="true"
-              >
-                <el-icon style="vertical-align: -0.15em" size="16">
-                  <QuestionFilled />
-                </el-icon>
+              <el-tooltip v-bind="getTooltipProps(item.tips)">
+                <QuestionFilled class="w-4 h-4 mx-1" />
               </el-tooltip>
+              {{ searchConfig.colon === false ? "" : ":" }}
             </span>
           </template>
-          <!-- Input 输入框 -->
-          <template v-if="item.type === 'input' || item.type === undefined">
-            <el-input
-              v-model="queryParams[item.prop]"
-              v-bind="item.attrs"
-              @keyup.enter="handleQuery"
-            />
+          <template v-else #label>
+            {{ item.label }} {{ searchConfig.colon === false ? "" : ":" }}
           </template>
-          <!-- InputTag 标签输入框 -->
-          <template v-if="item.type === 'input-tag'">
-            <div class="flex-center">
-              <el-tag
-                v-for="tag in inputTagMap[item.prop].data"
-                :key="tag"
-                class="mr-2"
-                :closable="true"
-                v-bind="inputTagMap[item.prop].tagAttrs"
-                @close="handleCloseTag(item.prop, tag)"
-              >
-                {{ tag }}
-              </el-tag>
-              <template v-if="inputTagMap[item.prop].inputVisible">
-                <el-input
-                  :ref="(el: HTMLElement) => (inputTagMap[item.prop].inputRef = el)"
-                  v-model="inputTagMap[item.prop].inputValue"
-                  v-bind="inputTagMap[item.prop].inputAttrs"
-                  @keyup.enter="handleInputConfirm(item.prop)"
-                  @blur="handleInputConfirm(item.prop)"
-                />
-              </template>
-              <template v-else>
-                <el-button
-                  v-bind="inputTagMap[item.prop].buttonAttrs"
-                  @click="handleShowInput(item.prop)"
-                >
-                  {{ inputTagMap[item.prop].buttonAttrs.btnText }}
-                </el-button>
-              </template>
-            </div>
-          </template>
-          <!-- Select 选择器 -->
-          <template v-else-if="item.type === 'select'">
-            <el-select v-model="queryParams[item.prop]" v-bind="item.attrs">
-              <template v-for="option in item.options" :key="option.value">
-                <el-option :label="option.label" :value="option.value" />
+
+          <component
+            :is="componentMap[item?.type ? item?.type : 'input']"
+            v-model.trim="queryParams[item.prop]"
+            v-bind="item.attrs"
+            :config="item.attrs"
+            v-on="item.events || {}"
+          >
+            <template v-if="item.type === 'select'">
+              <template v-for="opt in item.options">
+                <el-option :label="opt.label" :value="opt.value" />
               </template>
-            </el-select>
-          </template>
-          <!-- TreeSelect 树形选择 -->
-          <template v-else-if="item.type === 'tree-select'">
-            <el-tree-select v-model="queryParams[item.prop]" v-bind="item.attrs" />
-          </template>
-          <!-- DatePicker 日期选择器 -->
-          <template v-else-if="item.type === 'date-picker'">
-            <el-date-picker v-model="queryParams[item.prop]" v-bind="item.attrs" />
-          </template>
+            </template>
+          </component>
         </el-form-item>
       </template>
       <el-form-item>
-        <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="refresh" @click="handleReset">重置</el-button>
         <!-- 展开/收起 -->
         <el-link
           v-if="isExpandable && formItems.length > showNumber"
-          class="ml-2"
+          class="ml-3"
           type="primary"
           :underline="false"
           @click="isExpand = !isExpand"
         >
-          <template v-if="isExpand">
-            收起
-            <el-icon>
-              <ArrowUp />
-            </el-icon>
-          </template>
-          <template v-else>
-            展开
-            <el-icon>
-              <ArrowDown />
-            </el-icon>
-          </template>
+          {{ isExpand ? "收起" : "展开" }}
+          <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
         </el-link>
       </el-form-item>
     </el-form>
@@ -116,19 +61,33 @@
 </template>
 
 <script setup lang="ts">
-import type { FormInstance } from "element-plus";
-import { reactive, ref } from "vue";
-import type { IObject, ISearchConfig } from "./types";
+import type { IObject, ISearchConfig, ComponentType } from "./types";
+import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
+import { ElInput, ElInputNumber, ElInputTag, ElSelect, ElCascader } from "element-plus";
+import { ElTimePicker, ElTimeSelect, ElOption, ElDatePicker, ElTreeSelect } from "element-plus";
+import { type FormInstance } from "element-plus";
+import InputTag from "@/components/InputTag/index.vue";
 
 // 定义接收的属性
-const props = defineProps<{
-  searchConfig: ISearchConfig;
-}>();
+const props = defineProps<{ searchConfig: ISearchConfig }>();
 // 自定义事件
 const emit = defineEmits<{
   queryClick: [queryParams: IObject];
   resetClick: [queryParams: IObject];
 }>();
+// 组件映射表
+const componentMap: Record<ComponentType, Component> = {
+  input: markRaw(ElInput),
+  select: markRaw(ElSelect),
+  cascader: markRaw(ElCascader),
+  "input-number": markRaw(ElInputNumber),
+  "date-picker": markRaw(ElDatePicker),
+  "time-picker": markRaw(ElTimePicker),
+  "time-select": markRaw(ElTimeSelect),
+  "tree-select": markRaw(ElTreeSelect),
+  "input-tag": markRaw(ElInputTag),
+  "custom-tag": markRaw(InputTag),
+};
 
 const queryFormRef = ref<FormInstance>();
 // 是否显示
@@ -140,100 +99,57 @@ const isExpandable = ref(props.searchConfig.isExpandable ?? true);
 // 是否已展开
 const isExpand = ref(false);
 // 表单项展示数量，若可展开，超出展示数量的表单项隐藏
-const showNumber = computed(() => {
-  if (isExpandable.value === true) {
-    return props.searchConfig.showNumber ?? 3;
-  } else {
-    return formItems.length;
-  }
-});
+const showNumber = computed(() =>
+  isExpandable.value ? (props.searchConfig.showNumber ?? 3) : formItems.length
+);
 // 搜索表单数据
 const queryParams = reactive<IObject>({});
-const inputTagMap = reactive<IObject>({});
-for (const item of formItems) {
-  item.initFn && item.initFn(item);
-  if (item.type === "input-tag") {
-    inputTagMap[item.prop] = {
-      data: Array.isArray(item.initialValue) ? item.initialValue : [],
-      inputVisible: false,
-      inputValue: "",
-      inputRef: null,
-      buttonAttrs: {
-        size: item.attrs?.size ?? "default",
-        btnText: item.attrs?.btnText ?? "+ New Tag",
-        style: "color: #b0b2b7",
-      },
-      inputAttrs: {
-        size: item.attrs?.size ?? "default",
-        clearable: item.attrs?.clearable ?? false,
-        style: "width: 150px",
-      },
-      tagAttrs: {
-        size: item.attrs?.size ?? "default",
-      },
-    };
-    queryParams[item.prop] = computed({
-      get() {
-        return typeof item.attrs?.join === "string"
-          ? inputTagMap[item.prop].data.join(item.attrs.join)
-          : inputTagMap[item.prop].data;
-      },
-      set(value) {
-        // resetFields时会被调用
-        inputTagMap[item.prop].data =
-          typeof item.attrs?.join === "string"
-            ? value.split(item.attrs.join).filter((item: any) => item !== "")
-            : value;
-      },
-    });
-  } else {
-    queryParams[item.prop] = item.initialValue ?? "";
-  }
-}
+// 获取tooltip的属性
+const getTooltipProps = (tips: any) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+
+onMounted(() => {
+  formItems.map((item) => {
+    item.initFn && item.initFn(item);
+    if (item.type === "input-tag" || item.type === "custom-tag") {
+      queryParams[item.prop] = item.initialValue ?? [];
+    } else if (item.type === "input-number") {
+      queryParams[item.prop] = item.initialValue ?? null;
+    } else {
+      queryParams[item.prop] = item.initialValue ?? "";
+    }
+  });
+});
 
-// 重置操作
-function handleReset() {
+// 查询/重置操作
+const handleQuery = () => emit("queryClick", queryParams);
+const handleReset = () => {
   queryFormRef.value?.resetFields();
   emit("resetClick", queryParams);
-}
-
-// 查询操作
-function handleQuery() {
-  emit("queryClick", queryParams);
-}
+};
 
-// 获取分页数据
-function getQueryParams() {
-  return queryParams;
-}
-
-// 显示/隐藏 SearchForm
-function toggleVisible() {
-  visible.value = !visible.value;
-}
+// 暴露的属性和方法
+defineExpose({
+  // 获取分页数据
+  getQueryParams: () => queryParams,
+  // 显示/隐藏 SearchForm
+  toggleVisible: () => (visible.value = !visible.value),
+});
+</script>
 
-// 关闭标签
-function handleCloseTag(prop: string, tag: string) {
-  inputTagMap[prop].data.splice(inputTagMap[prop].data.indexOf(tag), 1);
+<style lang="scss" scoped>
+:deep(.el-input-number .el-input__inner) {
+  text-align: left;
 }
-// 添加标签
-function handleInputConfirm(prop: string) {
-  if (inputTagMap[prop].inputValue) {
-    inputTagMap[prop].data.push(inputTagMap[prop].inputValue);
-  }
-  inputTagMap[prop].inputVisible = false;
-  inputTagMap[prop].inputValue = "";
+.el-form {
+  display: flex;
+  flex-wrap: wrap;
+  row-gap: 1rem;
+  column-gap: 2rem;
 }
-// 显示标签输入框
-function handleShowInput(prop: string) {
-  inputTagMap[prop].inputVisible = true;
-  nextTick(() => {
-    inputTagMap[prop].inputRef.focus();
-  });
+.el-form-item {
+  margin-right: 0;
+  margin-bottom: 0;
 }
-
-// 暴露的属性和方法
-defineExpose({ getQueryParams, toggleVisible });
-</script>
-
-<style lang="scss" scoped></style>
+</style>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 7ed66edb..75eb82f3 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -26,17 +26,31 @@ export interface IOperatData {
   $index: number;
 }
 
+export type ComponentType =
+  | "input"
+  | "select"
+  | "input-number"
+  | "date-picker"
+  | "time-picker"
+  | "time-select"
+  | "tree-select"
+  | "input-tag"
+  | "custom-tag"
+  | "cascader";
+
 export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
   pageName: string;
+  // 标签冒号
+  colon?: boolean;
   // 表单项
   formItems: Array<{
     // 组件类型(如input,select等)
-    type?: "input" | "select" | "tree-select" | "date-picker" | "input-tag";
+    type?: ComponentType;
     // 标签文本
     label: string;
     // 标签提示
-    tips?: string;
+    tips?: string | IObject;
     // 键名
     prop: string;
     // 组件属性(input-tag组件支持join,btnText,size属性)
@@ -44,7 +58,9 @@ export interface ISearchConfig {
     // 初始值
     initialValue?: any;
     // 可选项(适用于select组件)
-    options?: { label: string; value: any }[];
+    options?: Array<{ label: string; value: any }>;
+    // 组件事件
+    events?: Record<string, (...args: any[]) => void>;
     // 初始化数据函数扩展
     initFn?: (formItem: IObject) => void;
   }>;
diff --git a/src/components/InputTag/index.vue b/src/components/InputTag/index.vue
new file mode 100644
index 00000000..885cd938
--- /dev/null
+++ b/src/components/InputTag/index.vue
@@ -0,0 +1,70 @@
+<template>
+  <div class="flex-y-center gap-2">
+    <el-tag
+      v-for="tag in tags"
+      :key="tag"
+      closable
+      :disable-transitions="false"
+      v-bind="config.tagAttrs"
+      @close="handleClose(tag)"
+    >
+      {{ tag }}
+    </el-tag>
+    <el-input
+      v-if="inputVisible"
+      ref="inputRef"
+      v-model.trim="inputValue"
+      @keyup.enter.stop.prevent="handleInputConfirm"
+      @blur.stop.prevent="handleInputConfirm"
+    />
+    <el-button v-else v-bind="config.buttonAttrs" @click="showInput">
+      {{ config.buttonAttrs.btnText ? config.buttonAttrs.btnText : "+ New Tag" }}
+    </el-button>
+  </div>
+</template>
+<script setup lang="ts">
+import type { InputInstance } from "element-plus";
+
+const inputValue = ref("");
+const inputVisible = ref(false);
+const inputRef = ref<InputInstance>();
+
+// 定义 model，用于与父组件的 v-model绑定
+const tags = defineModel<string[]>();
+
+defineProps({
+  config: {
+    type: Object as () => {
+      buttonAttrs: Record<string, any>;
+      inputAttrs: Record<string, any>;
+      tagAttrs: Record<string, any>;
+    },
+    default: () => ({
+      buttonAttrs: {},
+      inputAttrs: {},
+      tagAttrs: {},
+    }),
+  },
+});
+
+const handleClose = (tag: string) => {
+  if (tags.value) {
+    const newTags = tags.value.filter((t) => t !== tag);
+    tags.value = [...newTags];
+  }
+};
+
+const showInput = () => {
+  inputVisible.value = true;
+  nextTick(() => inputRef.value?.focus());
+};
+
+const handleInputConfirm = () => {
+  if (inputValue.value) {
+    const newTags = [...(tags.value || []), inputValue.value];
+    tags.value = newTags;
+  }
+  inputVisible.value = false;
+  inputValue.value = "";
+};
+</script>
diff --git a/src/main.ts b/src/main.ts
index 0167bf8c..370f1ef5 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,4 +1,6 @@
 import { createApp } from "vue";
+// TODO::不引入el-input-tag样式会丢失
+import "element-plus/es/components/input-tag/style/css";
 import App from "./App.vue";
 import setupPlugins from "@/plugins";
 
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index a765bcee..9c863a73 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -3,17 +3,22 @@ import type { ISearchConfig } from "@/components/CURD/types";
 
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
+  colon: false,
   formItems: [
     {
+      tips: "支持模糊搜索",
       type: "input",
       label: "关键字",
       prop: "keywords",
       attrs: {
         placeholder: "用户名/昵称/手机号",
         clearable: true,
-        style: {
-          width: "200px",
-        },
+        style: { width: "200px" },
+      },
+      events: {
+        // 监听输入框输入事件
+        blur: (e) => console.log("失去焦点: ", e),
+        focus: (e) => console.log("获得焦点: ", e),
       },
     },
     {
@@ -27,9 +32,7 @@ const searchConfig: ISearchConfig = {
         "check-strictly": true,
         "render-after-expand": false,
         clearable: true,
-        style: {
-          width: "150px",
-        },
+        style: { width: "200px" },
       },
       async initFn(formItem) {
         formItem.attrs.data = await DeptAPI.getOptions();
@@ -38,20 +41,22 @@ const searchConfig: ISearchConfig = {
       },
     },
     {
+      tips: { effect: "light", placement: "top", content: "自定义文字提示" },
       type: "select",
       label: "状态",
       prop: "status",
       attrs: {
         placeholder: "全部",
         clearable: true,
-        style: {
-          width: "100px",
-        },
+        style: { width: "200px" },
       },
       options: [
         { label: "启用", value: 1 },
         { label: "禁用", value: 0 },
       ],
+      events: {
+        change: (e) => console.log("发生变化: ", e),
+      },
     },
     {
       type: "date-picker",
@@ -63,9 +68,62 @@ const searchConfig: ISearchConfig = {
         "start-placeholder": "开始时间",
         "end-placeholder": "截止时间",
         "value-format": "YYYY-MM-DD",
-        style: {
-          width: "240px",
-        },
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "date-picker",
+      label: "日期选择器",
+      prop: "testDataPicker",
+      attrs: {
+        type: "date",
+        placeholder: "选择日期",
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "input-number",
+      label: "数字输入框",
+      prop: "testInputNumber",
+      attrs: {
+        controls: false,
+        placeholder: "请输入数字",
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "input-tag",
+      label: "标签选择器",
+      prop: "testInputTags",
+      attrs: {
+        clearable: true,
+        placeholder: "请输入",
+      },
+    },
+    {
+      type: "custom-tag",
+      label: "标签选择器",
+      prop: "testCustomTags",
+      attrs: {
+        buttonAttrs: { btnText: "+ New Tag" },
+        inputAttrs: {},
+        tagAttrs: {},
+      },
+    },
+    {
+      type: "time-picker",
+      label: "时间选择器",
+      prop: "testTimePicker",
+      attrs: {
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "time-select",
+      label: "时间选择",
+      prop: "testTimeSelect",
+      attrs: {
+        style: { width: "200px" },
       },
     },
   ],

From 03968a6cc13092bfeacd5aa452dd896f9f238e7b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 26 Mar 2025 08:58:56 +0800
Subject: [PATCH 270/497] =?UTF-8?q?fix:=20:bug:=20=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E9=A1=B9=E5=9C=A8=20Mock=20=E6=A8=A1=E5=BC=8F=E4=B8=8B?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=9E=E6=98=BE=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/dict.mock.ts | 60 +++++++++++++++++------------------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/mock/dict.mock.ts b/mock/dict.mock.ts
index b04a3689..c108bb55 100644
--- a/mock/dict.mock.ts
+++ b/mock/dict.mock.ts
@@ -276,53 +276,37 @@ export default defineMock([
 // 字典映射表数据
 const dictMap: Record<string, any> = {
   1: {
-    code: "00000",
-    data: {
-      id: 1,
-      name: "性别",
-      dictCode: "gender",
-      status: 1,
-    },
-    msg: "一切ok",
+    id: 1,
+    name: "性别",
+    dictCode: "gender",
+    status: 1,
   },
 };
 
 // 字典项映射表数据
 const dictItemMap: Record<string, any> = {
   1: {
-    code: "00000",
-    data: {
-      id: 1,
-      value: "1",
-      label: "男",
-      sort: 1,
-      status: 1,
-      tagType: "primary",
-    },
-    msg: "一切ok",
+    id: 1,
+    value: "1",
+    label: "男",
+    sort: 1,
+    status: 1,
+    tagType: "primary",
   },
   2: {
-    code: "00000",
-    data: {
-      id: 2,
-      value: "2",
-      label: "女",
-      sort: 2,
-      status: 1,
-      tagType: "danger",
-    },
-    msg: "一切ok",
+    id: 2,
+    value: "2",
+    label: "女",
+    sort: 2,
+    status: 1,
+    tagType: "danger",
   },
   3: {
-    code: "00000",
-    data: {
-      id: 3,
-      value: "0",
-      label: "保密",
-      sort: 3,
-      status: 1,
-      tagType: "info",
-    },
-    msg: "一切ok",
+    id: 3,
+    value: "0",
+    label: "保密",
+    sort: 3,
+    status: 1,
+    tagType: "info",
   },
 };

From 61ae8ba350beef81b49c4cd415783001398cfcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Thu, 27 Mar 2025 00:01:44 +0800
Subject: [PATCH 271/497] =?UTF-8?q?style:=20=F0=9F=8C=88=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E9=80=82=E9=85=8D=EF=BC=8C=E8=BF=9B=E5=BA=A6=E6=9D=A1?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=B7=9F=E9=9A=8F=E4=B8=BB=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .stylelintrc.cjs                         |   8 +-
 src/layout/components/Settings/index.vue |   2 +-
 src/styles/index.scss                    |  11 +-
 src/views/error/401.vue                  |  84 ++-----------
 src/views/error/404.vue                  | 143 +++++++----------------
 5 files changed, 60 insertions(+), 188 deletions(-)

diff --git a/.stylelintrc.cjs b/.stylelintrc.cjs
index 62bd59cf..5eb86831 100644
--- a/.stylelintrc.cjs
+++ b/.stylelintrc.cjs
@@ -32,11 +32,7 @@ module.exports = {
       },
     ],
     // 允许使用未知伪元素
-    "at-rule-no-unknown": [
-      true,
-      {
-        ignoreAtRules: ["apply", "use", "forward", "extend"],
-      },
-    ],
+    "at-rule-no-unknown": null, // 禁用默认的未知 at-rule 检查
+    "scss/at-rule-no-unknown": true, // 启用 SCSS 特定的 at-rule 检查
   },
 };
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index f3fe8436..b86b8994 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -74,9 +74,9 @@ import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 // 颜色预设
 const colorPresets = [
   "#4080FF",
+  "#626AEF",
   "#ff4500",
   "#ff8c00",
-  "#90ee90",
   "#00ced1",
   "#1e90ff",
   "#c71585",
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 349c84fd..654335ac 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -17,12 +17,7 @@
   padding: calc(var(--el-card-padding) - 8px) var(--el-card-padding);
 }
 
-.link-type,
-.link-type:focus {
-  color: #337ab7;
-  cursor: pointer;
-
-  &:hover {
-    color: rgb(32 160 255);
-  }
+// 进度条颜色
+#nprogress .bar {
+  background-color: var(--el-color-primary);
 }
diff --git a/src/views/error/401.vue b/src/views/error/401.vue
index cb7231d9..e91f37bb 100644
--- a/src/views/error/401.vue
+++ b/src/views/error/401.vue
@@ -1,85 +1,25 @@
 <template>
-  <div class="page-container">
-    <el-button icon="arrow-left" @click="back">返回</el-button>
+  <div class="p-5 pb-0 sm:p-10 lg:p-20 w-full">
+    <el-button icon="arrow-left" @click="router.back()">返回</el-button>
     <el-row>
-      <el-col :span="12">
-        <h1 class="text-jumbo text-ginormous">Oops!</h1>
+      <el-col :xs="24" :span="12">
+        <h1 class="text-6xl font-bold text-[#484848]">Oops!</h1>
         <h2>你没有权限去该页面</h2>
         <h6>如有不满请联系你领导</h6>
-        <ul class="list-unstyled">
-          <li>或者你可以去:</li>
-          <li class="link-type">
-            <router-link to="/dashboard">回首页</router-link>
-          </li>
-          <li class="link-type">
-            <a href="https://www.youlai.tech/">随便看看</a>
-          </li>
-        </ul>
+        <div class="flex flex-col items-start gap-1.5 text-sm">
+          <span>或者你可以去:</span>
+          <el-link type="primary" @click="router.push('/dashboard')">回首页</el-link>
+          <el-link type="primary" href="https://www.youlai.tech/">随便看看</el-link>
+        </div>
       </el-col>
-      <el-col :span="12">
-        <img src="http://github.com/@/assets/images/401.svg" width="400" height="500" />
+      <el-col :xs="24" :span="12">
+        <img src="http://github.com/@/assets/images/401.svg" class="w-full" />
       </el-col>
     </el-row>
   </div>
 </template>
 
 <script setup lang="ts">
-import { useRouter } from "vue-router";
-
-defineOptions({
-  name: "Page401",
-});
-
+defineOptions({ name: "Page401" });
 const router = useRouter();
-
-function back() {
-  router.back();
-}
 </script>
-
-<style lang="scss" scoped>
-.page-container {
-  width: 100%;
-  padding: 100px;
-
-  .pan-back-btn {
-    color: #fff;
-    background: #008489;
-    border: none !important;
-  }
-
-  .pan-gif {
-    display: block;
-    margin: 0 auto;
-  }
-
-  .pan-img {
-    display: block;
-    width: 100%;
-    margin: 0 auto;
-  }
-
-  .text-jumbo {
-    font-size: 60px;
-    font-weight: 700;
-    color: #484848;
-  }
-
-  .list-unstyled {
-    font-size: 14px;
-
-    li {
-      padding-bottom: 5px;
-    }
-
-    a {
-      color: #008489;
-      text-decoration: none;
-
-      &:hover {
-        text-decoration: underline;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/views/error/404.vue b/src/views/error/404.vue
index efd7e393..28138d5e 100644
--- a/src/views/error/404.vue
+++ b/src/views/error/404.vue
@@ -1,123 +1,64 @@
 <template>
-  <div class="page-container">
-    <div class="pic-404">
-      <img class="pic-404__parent" src="http://github.com/@/assets/images/404.svg" alt="404" />
-    </div>
-    <div class="bullshit">
-      <div class="bullshit__oops">OOPS！</div>
-      <div class="bullshit__info">
+  <div class="wh-full mx-auto flex-center flex-col lg:flex-row">
+    <img class="min-w-[23.4375rem] sm:w-150" src="http://github.com/@/assets/images/404.svg" alt="404" />
+    <div class="w-75">
+      <div class="oops mb-5 text-[2rem] font-bold">OOPS！</div>
+      <div class="info text-gray mb-7 text-[0.8125rem]">
         该页面无法访问。
-        <a style="color: #20a0ff" href="https://www.youlai.tech.com/" target="_blank">
+        <el-link type="primary" href="https://www.youlai.tech.com/" target="_blank">
           有来开源官网
-        </a>
+        </el-link>
+      </div>
+      <div class="headline mb-2.5 text-xl font-bold text-[#222]">抱歉，您访问的页面不存在。</div>
+      <div class="info text-gray mb-7 text-[0.8125rem]">
+        请确认您输入的网址是否正确，或者点击下方按钮返回首页。
       </div>
-      <div class="bullshit__headline">抱歉，您访问的页面不存在。</div>
-      <div class="bullshit__info">请确认您输入的网址是否正确，或者点击下方按钮返回首页。</div>
-      <a href="#" class="bullshit__return-home" @click.prevent="back">返回首页</a>
+      <el-button round type="primary" class="btn h-9 w-28 mb-10" @click="back">返回首页</el-button>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { useRouter } from "vue-router";
-
-defineOptions({
-  name: "Page404",
-});
-
+defineOptions({ name: "Page404" });
 const router = useRouter();
-
-function back() {
-  router.back();
-}
+const back = () => router.push("/");
 </script>
 
 <style lang="scss" scoped>
-.page-container {
-  display: flex;
-  padding: 100px;
-
-  .pic-404 {
-    width: 600px;
-    overflow: hidden;
+@mixin slide-up-animation($delay: 0s) {
+  opacity: 0;
+  animation-name: slideUp;
+  animation-duration: 0.5s;
+  animation-delay: $delay;
+  animation-fill-mode: forwards;
+}
 
-    &__parent {
-      width: 100%;
-    }
+@keyframes slideUp {
+  0% {
+    opacity: 0;
+    transform: translateY(60px);
   }
 
-  .bullshit {
-    width: 300px;
-    padding: 50px 0;
-    overflow: hidden;
-
-    &__oops {
-      margin-bottom: 20px;
-      font-size: 32px;
-      font-weight: bold;
-      line-height: 40px;
-      color: #1482f0;
-      opacity: 0;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-fill-mode: forwards;
-    }
-
-    &__headline {
-      margin-bottom: 10px;
-      font-size: 20px;
-      font-weight: bold;
-      line-height: 24px;
-      color: #222;
-      opacity: 0;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.1s;
-      animation-fill-mode: forwards;
-    }
+  100% {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
 
-    &__info {
-      margin-bottom: 30px;
-      font-size: 13px;
-      line-height: 21px;
-      color: grey;
-      opacity: 0;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.2s;
-      animation-fill-mode: forwards;
-    }
+.oops {
+  color: var(--el-color-primary);
+  @include slide-up-animation(0s);
+}
 
-    &__return-home {
-      float: left;
-      display: block;
-      width: 110px;
-      height: 36px;
-      font-size: 14px;
-      line-height: 36px;
-      color: #fff;
-      text-align: center;
-      cursor: pointer;
-      background: #1482f0;
-      border-radius: 100px;
-      opacity: 0;
-      animation-name: slideUp;
-      animation-duration: 0.5s;
-      animation-delay: 0.3s;
-      animation-fill-mode: forwards;
-    }
+.headline {
+  @include slide-up-animation(0.1s);
+}
 
-    @keyframes slideUp {
-      0% {
-        opacity: 0;
-        transform: translateY(60px);
-      }
+.info {
+  @include slide-up-animation(0.2s);
+}
 
-      100% {
-        opacity: 1;
-        transform: translateY(0);
-      }
-    }
-  }
+.btn {
+  @include slide-up-animation(0.3s);
 }
 </style>

From 32110a62e25de9d439903f34e1f02b7026449428 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Thu, 27 Mar 2025 17:24:53 +0800
Subject: [PATCH 272/497] =?UTF-8?q?refactor:=20:recycle:=20cURD=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=A2=9E=E5=8A=A0=E6=9A=B4=E9=9C=B2=E8=A1=8C=E9=80=89?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=95=B0=E6=8D=AE=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CURD组件增加暴露行选中的数据事件，方便自定义按钮可以获取到行选中的数据
---
 src/components/CURD/PageContent.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index f079d934..7c52a8b6 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -547,6 +547,11 @@ function handleSelectionChange(selection: any[]) {
   removeIds.value = selection.map((item) => item[pk]);
 }
 
+// 获取行选中
+function getSelectionData() {
+  return selectionData.value;
+}
+
 // 刷新
 function handleRefresh(isRestart = false) {
   fetchPageData(lastFormData, isRestart);
@@ -969,7 +974,7 @@ function saveXlsx(fileData: any, fileName: string) {
 }
 
 // 暴露的属性和方法
-defineExpose({ fetchPageData, exportPageData, getFilterParams });
+defineExpose({ fetchPageData, exportPageData, getFilterParams, getSelectionData });
 </script>
 
 <style lang="scss" scoped></style>

From 2c5b43af8fe88b55b6a7081f05cc04e7383a0e53 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 27 Mar 2025 22:38:38 +0800
Subject: [PATCH 273/497] chore: :hammer: bump version to 2.25.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 01c79a2b..520b11dc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.25.0",
+  "version": "2.25.1",
   "private": true,
   "type": "module",
   "scripts": {

From 73b80817331952369e79d3ea7fe38b7328ad7b5e Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Fri, 28 Mar 2025 15:21:52 +0800
Subject: [PATCH 274/497] =?UTF-8?q?refactor(index.html):=20:recycle:=20?=
 =?UTF-8?q?=E9=A6=96=E5=B1=8F=E5=8A=A0=E8=BD=BDloading=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html | 73 ++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 54 insertions(+), 19 deletions(-)

diff --git a/index.html b/index.html
index bd224a67..97513ab2 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,13 @@
 
   <body>
     <div id="app">
-      <div class="loader"></div>
+      <div class="loading-container">
+        <div class="loading-spinner">
+          <div class="loading-bar"></div>
+          <div class="loading-bar"></div>
+          <div class="loading-bar"></div>
+        </div>
+      </div>
     </div>
   </body>
   <script type="module" src="http://github.com/src/main.ts"></script>
@@ -34,27 +40,56 @@
       height: 100%;
     }
 
-    .loader {
-      --d: 22px;
+    .loading-container {
+      display: flex;
+      flex-direction: column;
+      gap: 24px;
+      align-items: center;
+      justify-content: center;
+    }
 
+    .loading-spinner {
+      display: flex;
+      gap: 6px;
+      align-items: center;
+      justify-content: center;
+      height: 40px;
+    }
+
+    .loading-bar {
       width: 4px;
-      height: 4px;
-      color: #25b09b;
-      border-radius: 50%;
-      box-shadow:
-        calc(1 * var(--d)) calc(0 * var(--d)) 0 0,
-        calc(0.707 * var(--d)) calc(0.707 * var(--d)) 0 1px,
-        calc(0 * var(--d)) calc(1 * var(--d)) 0 2px,
-        calc(-0.707 * var(--d)) calc(0.707 * var(--d)) 0 3px,
-        calc(-1 * var(--d)) calc(0 * var(--d)) 0 4px,
-        calc(-0.707 * var(--d)) calc(-0.707 * var(--d)) 0 5px,
-        calc(0 * var(--d)) calc(-1 * var(--d)) 0 6px;
-      animation: l27 1s infinite steps(8);
-    }
-
-    @keyframes l27 {
+      height: 24px;
+      background-color: #498cff;
+      border-radius: 2px;
+      animation: loading-animation 1.2s ease-in-out infinite;
+    }
+
+    .loading-bar:nth-child(1) {
+      animation-delay: 0s;
+    }
+
+    .loading-bar:nth-child(2) {
+      animation-delay: 0.2s;
+    }
+
+    .loading-bar:nth-child(3) {
+      animation-delay: 0.4s;
+    }
+
+    @keyframes loading-animation {
+      0% {
+        opacity: 0.3;
+        transform: scaleY(0.5);
+      }
+
+      50% {
+        opacity: 1;
+        transform: scaleY(1.2);
+      }
+
       100% {
-        transform: rotate(1turn);
+        opacity: 0.3;
+        transform: scaleY(0.5);
       }
     }
   </style>

From 723c419efa959ce5d7a49d6132dcce1e5c2c3a68 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Fri, 28 Mar 2025 16:20:16 +0800
Subject: [PATCH 275/497] =?UTF-8?q?feat(demo=E3=80=81components):=20:spark?=
 =?UTF-8?q?les:=20=E6=96=B0=E5=A2=9ETextScroll=20=E7=BB=84=E4=BB=B6=20-=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=BB=9A=E5=8A=A8=E5=85=AC=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TextScroll/index.vue | 412 ++++++++++++++++++++++++++++
 src/views/demo/text-scroll.vue      |  30 ++
 2 files changed, 442 insertions(+)
 create mode 100644 src/components/TextScroll/index.vue
 create mode 100644 src/views/demo/text-scroll.vue

diff --git a/src/components/TextScroll/index.vue b/src/components/TextScroll/index.vue
new file mode 100644
index 00000000..d37e1e79
--- /dev/null
+++ b/src/components/TextScroll/index.vue
@@ -0,0 +1,412 @@
+<!--
+  TextScroll 组件 - 文本滚动公告
+  
+  功能：
+  - 支持水平方向文本滚动
+  - 提供多种预设样式（默认、成功、警告、危险、信息）
+  - 支持自定义滚动速度和方向
+  - 可选的打字机输入效果
+  - 鼠标悬停时暂停滚动
+  - 可选的关闭按钮
+-->
+<template>
+  <div
+    ref="containerRef"
+    class="text-scroll-container"
+    :class="[`text-scroll--${props.type}`]"
+    :typewriter="props.typewriter ? 'true' : undefined"
+  >
+    <!-- 左侧图标 -->
+    <div class="left-icon">
+      <el-icon><Bell /></el-icon>
+    </div>
+    <!-- 滚动内容包装器 -->
+    <div class="scroll-wrapper">
+      <div
+        ref="scrollContent"
+        class="text-scroll-content"
+        :class="{ scrolling: shouldScroll }"
+        :style="scrollStyle"
+      >
+        <!-- 滚动内容，复制两份以实现无缝滚动 -->
+        <div class="scroll-item" v-html="sanitizedContent" />
+        <div class="scroll-item" v-html="sanitizedContent" />
+      </div>
+    </div>
+    <!-- 可选的关闭按钮 -->
+    <div v-if="showClose" class="right-icon" @click="handleRightIconClick">
+      <el-icon><Close /></el-icon>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useElementHover } from "@vueuse/core";
+
+const emit = defineEmits(["close"]);
+
+interface Props {
+  /** 滚动文本内容（必填） */
+  text: string;
+  /** 滚动速度，数值越小滚动越慢 */
+  speed?: number;
+  /** 滚动方向：左侧或右侧 */
+  direction?: "left" | "right";
+  /** 样式类型 */
+  type?: "default" | "success" | "warning" | "danger" | "info";
+  /** 是否显示关闭按钮 */
+  showClose?: boolean;
+  /** 是否启用打字机效果 */
+  typewriter?: boolean;
+  /** 打字机效果的速度，数值越小打字越快 */
+  typewriterSpeed?: number;
+}
+
+// 定义组件属性及默认值
+const props = withDefaults(defineProps<Props>(), {
+  speed: 70,
+  direction: "left",
+  type: "default",
+  showClose: false,
+  typewriter: false,
+  typewriterSpeed: 100,
+});
+
+// 容器元素引用
+const containerRef = ref<HTMLElement | null>(null);
+// 使用 vueuse 的 useElementHover 检测鼠标悬停状态
+const isHovered = useElementHover(containerRef);
+// 滚动内容元素引用
+const scrollContent = ref<HTMLElement | null>(null);
+// 动画持续时间（秒）
+const animationDuration = ref(0);
+
+/**
+ * 打字机效果相关状态
+ */
+// 当前已显示的文本内容
+const currentText = ref("");
+// 打字机定时器引用，用于清理
+let typewriterTimer: ReturnType<typeof setTimeout> | null = null;
+// 打字机效果是否已完成
+const isTypewriterComplete = ref(false);
+
+/**
+ * 计算是否应该滚动
+ * 条件：
+ * 1. 鼠标未悬停在组件上
+ * 2. 如果启用了打字机效果，则需要等待打字效果完成
+ */
+const shouldScroll = computed(() => {
+  if (props.typewriter) {
+    return !isHovered.value && isTypewriterComplete.value;
+  }
+  return !isHovered.value;
+});
+
+/**
+ * 计算最终显示的内容
+ * 如果启用了打字机效果，则显示当前已打出的文本
+ * 否则直接显示完整文本
+ * 注意：内容支持 HTML，使用时需注意 XSS 风险
+ */
+const sanitizedContent = computed(() => (props.typewriter ? currentText.value : props.text));
+
+/**
+ * 计算滚动样式
+ * 包括动画持续时间、播放状态和方向
+ * 这些值通过 CSS 变量传递给样式
+ */
+const scrollStyle = computed(() => ({
+  "--animation-duration": `${animationDuration.value}s`,
+  "--animation-play-state": shouldScroll.value ? "running" : "paused",
+  "--animation-direction": props.direction === "left" ? "normal" : "reverse",
+}));
+
+/**
+ * 计算动画持续时间
+ * 根据内容宽度和设定的速度计算出合适的动画持续时间
+ * 内容越长或速度值越小，动画持续时间越长
+ */
+const calculateDuration = () => {
+  if (scrollContent.value) {
+    const contentWidth = scrollContent.value.scrollWidth / 2;
+    animationDuration.value = contentWidth / props.speed;
+  }
+};
+
+/**
+ * 处理关闭按钮点击事件
+ * 触发 close 事件，并直接销毁当前组件
+ */
+const handleRightIconClick = () => {
+  emit("close");
+  // 获取当前组件的DOM元素
+  if (containerRef.value) {
+    // 从DOM中移除元素
+    containerRef.value.remove();
+  }
+};
+
+/**
+ * 启动打字机效果
+ * 逐字显示文本内容，完成后设置状态以开始滚动
+ */
+const startTypewriter = () => {
+  let index = 0;
+  currentText.value = "";
+  isTypewriterComplete.value = false; // 重置状态
+
+  // 递归函数，逐字添加文本
+  const type = () => {
+    if (index < props.text.length) {
+      // 添加一个字符
+      currentText.value += props.text[index];
+      index++;
+      // 设置下一个字符的延迟
+      typewriterTimer = setTimeout(type, props.typewriterSpeed);
+    } else {
+      // 所有字符都已添加，设置完成状态
+      isTypewriterComplete.value = true;
+    }
+  };
+
+  // 开始打字过程
+  type();
+};
+
+onMounted(() => {
+  // 计算初始动画持续时间
+  calculateDuration();
+  // 监听窗口大小变化，重新计算动画持续时间
+  window.addEventListener("resize", calculateDuration);
+
+  // 如果启用了打字机效果，开始打字
+  if (props.typewriter) {
+    startTypewriter();
+  }
+});
+
+onUnmounted(() => {
+  // 移除事件监听
+  window.removeEventListener("resize", calculateDuration);
+  // 清除打字机定时器
+  if (typewriterTimer) {
+    clearTimeout(typewriterTimer);
+  }
+});
+
+/**
+ * 监听文本内容变化
+ * 当文本内容变化时，如果启用了打字机效果，重新开始打字
+ */
+watch(
+  () => props.text,
+  () => {
+    if (props.typewriter) {
+      // 清除现有定时器
+      if (typewriterTimer) {
+        clearTimeout(typewriterTimer);
+      }
+      // 重新开始打字效果
+      startTypewriter();
+    }
+  }
+);
+</script>
+
+<style scoped lang="scss">
+.text-scroll-container {
+  position: relative;
+  box-sizing: border-box;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  padding-right: 16px;
+  overflow: hidden;
+  background-color: var(--el-color-primary-light-9) !important;
+  border: 1px solid var(--main-color);
+  border-radius: calc(var(--custom-radius) / 2 + 2px) !important;
+
+  .left-icon,
+  .right-icon {
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    z-index: 2;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 40px;
+    height: 100%;
+    text-align: center;
+    background-color: var(--el-color-primary-light-9) !important;
+  }
+
+  .left-icon {
+    left: 0;
+  }
+
+  .right-icon {
+    right: 0;
+    cursor: pointer;
+    background-color: transparent !important;
+  }
+
+  .scroll-wrapper {
+    flex: 1;
+    margin-left: 34px;
+    overflow: hidden;
+  }
+
+  .text-scroll-content {
+    display: flex;
+    height: 34px;
+    line-height: 34px;
+    white-space: nowrap;
+    animation: scroll linear infinite;
+    animation-duration: var(--animation-duration);
+    animation-direction: var(--animation-direction);
+    animation-play-state: var(--animation-play-state);
+
+    .scroll-item {
+      display: inline-block;
+      min-width: 100%;
+      padding: 0 10px;
+      font-size: 14px;
+      color: var(--el-color-primary-light-2) !important;
+      text-align: left;
+      text-align: center;
+
+      :deep(a) {
+        color: #fd4e4e !important;
+        text-decoration: none;
+
+        &:hover {
+          text-decoration: underline;
+        }
+      }
+    }
+  }
+
+  @keyframes scroll {
+    0% {
+      transform: translateX(0);
+    }
+
+    100% {
+      transform: translateX(-100%);
+    }
+  }
+
+  // 添加类型样式
+  &.text-scroll--default {
+    background-color: var(--el-color-primary-light-9) !important;
+    border-color: var(--el-color-primary);
+
+    .right-icon,
+    .left-icon i {
+      color: var(--el-color-primary) !important;
+    }
+
+    .scroll-item {
+      color: var(--el-color-primary) !important;
+    }
+  }
+
+  &.text-scroll--success {
+    background-color: var(--el-color-success-light-9) !important;
+    border-color: var(--el-color-success);
+
+    .left-icon {
+      background-color: var(--el-color-success-light-9) !important;
+
+      i {
+        color: var(--el-color-success);
+      }
+    }
+
+    .scroll-item {
+      color: var(--el-color-success) !important;
+    }
+  }
+
+  &.text-scroll--warning {
+    background-color: var(--el-color-warning-light-9) !important;
+    border-color: var(--el-color-warning);
+
+    .left-icon {
+      background-color: var(--el-color-warning-light-9) !important;
+
+      i {
+        color: var(--el-color-warning);
+      }
+    }
+
+    .scroll-item {
+      color: var(--el-color-warning) !important;
+    }
+  }
+
+  &.text-scroll--danger {
+    background-color: var(--el-color-danger-light-9) !important;
+    border-color: var(--el-color-danger);
+
+    .left-icon {
+      background-color: var(--el-color-danger-light-9) !important;
+
+      i {
+        color: var(--el-color-danger);
+      }
+    }
+
+    .scroll-item {
+      color: var(--el-color-danger) !important;
+    }
+  }
+
+  &.text-scroll--info {
+    background-color: var(--el-color-info-light-9) !important;
+    border-color: var(--el-color-info);
+
+    .left-icon {
+      background-color: var(--el-color-info-light-9) !important;
+
+      i {
+        color: var(--el-color-info);
+      }
+    }
+
+    .scroll-item {
+      color: var(--el-color-info) !important;
+    }
+  }
+}
+
+// 添加打字机效果的光标样式
+.text-scroll-content .scroll-item {
+  &::after {
+    content: "";
+    opacity: 0;
+    animation: none;
+  }
+}
+
+// 仅在启用打字机效果时显示光标
+.text-scroll-container[typewriter] .text-scroll-content .scroll-item::after {
+  content: "|";
+  opacity: 0;
+  animation: cursor 1s infinite;
+}
+
+@keyframes cursor {
+  0%,
+  100% {
+    opacity: 0;
+  }
+
+  50% {
+    opacity: 1;
+  }
+}
+</style>
diff --git a/src/views/demo/text-scroll.vue b/src/views/demo/text-scroll.vue
new file mode 100644
index 00000000..7c638bf4
--- /dev/null
+++ b/src/views/demo/text-scroll.vue
@@ -0,0 +1,30 @@
+<template>
+  <div class="app-container">
+    <!-- 基础用法 -->
+    <TextScroll text="这是一条基础的滚动公告，默认向左滚动。" typewriter />
+
+    <!-- 使用不同的类型 -->
+    <TextScroll type="success" text="这是一条成功类型的滚动公告" typewriter />
+
+    <TextScroll type="warning" text="这是一条警告类型的滚动公告" />
+
+    <TextScroll type="danger" text="这是一条危险类型的滚动公告" />
+
+    <TextScroll type="info" text="这是一条信息类型的滚动公告" />
+
+    <!-- 自定义速度和方向 -->
+    <TextScroll text="这是一条速度较慢、向右滚动的公告" :speed="30" direction="right" showClose />
+  </div>
+</template>
+
+<script setup lang="ts">
+import TextScroll from "@/components/TextScroll/index.vue";
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  :deep(.text-scroll-container) {
+    margin-bottom: 20px;
+  }
+}
+</style>

From 09b3957fa9016390e919daec762a09ca848193d4 Mon Sep 17 00:00:00 2001
From: lostelk <lostelkwork@163.com>
Date: Fri, 28 Mar 2025 16:27:55 +0800
Subject: [PATCH 276/497] =?UTF-8?q?feat(demo=E3=80=81package.json):=20:spa?=
 =?UTF-8?q?rkles:=20=E6=96=B0=E5=A2=9E=E6=8B=96=E5=8A=A8demo=E7=A4=BA?=
 =?UTF-8?q?=E4=BE=8B=EF=BC=8C=E4=BD=BF=E7=94=A8vue-draggable-plus=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json            |   1 +
 src/views/demo/drag.vue | 123 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 src/views/demo/drag.vue

diff --git a/package.json b/package.json
index 520b11dc..1ebe1f89 100644
--- a/package.json
+++ b/package.json
@@ -65,6 +65,7 @@
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
+    "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "^11.1.2",
     "vue-router": "^4.5.0"
   },
diff --git a/src/views/demo/drag.vue b/src/views/demo/drag.vue
new file mode 100644
index 00000000..783dd982
--- /dev/null
+++ b/src/views/demo/drag.vue
@@ -0,0 +1,123 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="24">
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header><span class="card-header">基础示例</span></template>
+          <VueDraggable ref="el" v-model="userList" class="drag-container">
+            <div v-for="item in userList" :key="item.name" class="drag-item">
+              {{ item.name }}
+            </div>
+          </VueDraggable>
+        </el-card>
+      </el-col>
+
+      <el-col :span="12">
+        <el-card shadow="never">
+          <template #header><span class="card-header">过渡动画</span></template>
+          <VueDraggable
+            v-model="userList"
+            target=".sort-target"
+            :scroll="true"
+            class="drag-container"
+          >
+            <TransitionGroup type="transition" tag="ul" name="fade" class="sort-target">
+              <li v-for="item in userList" :key="item.name" class="drag-item">
+                {{ item.name }}
+              </li>
+            </TransitionGroup>
+          </VueDraggable>
+        </el-card>
+      </el-col>
+    </el-row>
+
+    <el-card shadow="never">
+      <template #header><span class="card-header">表格拖拽排序</span></template>
+      <VueDraggable v-model="userList" target="tbody" :animation="150">
+        <el-table :data="userList" row-key="name">
+          <el-table-column label="姓名" prop="name" />
+          <el-table-column label="角色" prop="roles" />
+        </el-table>
+      </VueDraggable>
+    </el-card>
+
+    <el-card shadow="never">
+      <template #header><span class="card-header">指定元素拖拽排序</span></template>
+      <VueDraggable v-model="userList" target="tbody" handle=".handle" :animation="150">
+        <el-table :data="userList" row-key="name">
+          <el-table-column label="姓名" prop="name" />
+          <el-table-column label="角色" prop="roles" />
+          <el-table-column label="操作" width="100">
+            <template #default>
+              <el-button size="default" class="handle">移动</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </VueDraggable>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { VueDraggable } from "vue-draggable-plus";
+
+const userList = ref([
+  { name: "路飞", roles: "船长·格斗家·D之一族" },
+  { name: "索隆", roles: "剑豪·战斗员·三刀流大师" },
+  { name: "娜美", roles: "航海士·气象学家·财务官" },
+  { name: "山治", roles: "厨师·格斗家·黑足" },
+  { name: "罗宾", roles: "考古学家·历史正文解读者" },
+]);
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  padding: 20px;
+
+  .el-card {
+    margin-bottom: 20px;
+    border-radius: 8px;
+  }
+
+  .card-header {
+    font-size: 16px;
+    font-weight: bold;
+  }
+
+  .drag-container {
+    min-height: 200px;
+  }
+
+  .drag-item {
+    padding: 12px;
+    margin-bottom: 8px;
+    font-weight: 500;
+    text-align: center;
+    cursor: grab;
+    border-radius: 6px;
+    transition: transform 0.2s ease-in-out;
+  }
+
+  .drag-item:active {
+    cursor: grabbing;
+    transform: scale(1.05);
+  }
+}
+
+/* 过渡动画 */
+.fade-move,
+.fade-enter-active,
+.fade-leave-active {
+  transition: all 0.5s cubic-bezier(0.55, 0, 0.1, 1);
+}
+
+.fade-enter-from,
+.fade-leave-to {
+  opacity: 0;
+  transform: scaleY(0.01) translate(20px, 0);
+}
+
+.fade-leave-active {
+  position: absolute;
+}
+</style>

From 486e5a038c8f74734f035ecce2e400ff0cf97cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Mon, 31 Mar 2025 03:25:54 +0800
Subject: [PATCH 277/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5=E6=A0=B7=E5=BC=8F=EF=BC=8C?=
 =?UTF-8?q?=E5=87=8F=E5=B0=91=E5=86=97=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

;
---
 src/api/auth.api.ts       |   2 +
 src/views/login/index.vue | 349 ++++++++++++--------------------------
 2 files changed, 111 insertions(+), 240 deletions(-)

diff --git a/src/api/auth.api.ts b/src/api/auth.api.ts
index 64fb97b2..35c28cf9 100644
--- a/src/api/auth.api.ts
+++ b/src/api/auth.api.ts
@@ -61,6 +61,8 @@ export interface LoginFormData {
   captchaKey: string;
   /** 验证码 */
   captchaCode: string;
+  /** 记住我 */
+  rememberMe: boolean;
 }
 
 /** 登录响应 */
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 5b7c90d9..3e5642ed 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,132 +1,106 @@
 <template>
-  <div class="login">
+  <div class="login flex-center wh-full relative overflow-scroll">
     <!-- 登录页头部 -->
-    <div class="login-header">
-      <div class="flex-y-center">
-        <el-switch
-          v-model="isDark"
-          inline-prompt
-          active-icon="Moon"
-          inactive-icon="Sunny"
-          @change="toggleTheme"
-        />
-        <lang-select class="ml-2 cursor-pointer" />
-      </div>
+    <div class="flex-x-end absolute top-0 w-full p-4">
+      <el-switch
+        v-model="isDark"
+        inline-prompt
+        active-icon="Moon"
+        inactive-icon="Sunny"
+        @change="toggleTheme"
+      />
+      <lang-select class="ml-2 cursor-pointer" />
     </div>
 
     <!-- 登录页内容 -->
-    <div class="login-form">
-      <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules">
-        <div class="form-title">
-          <h2>{{ defaultSettings.title }}</h2>
-          <el-dropdown style="position: absolute; right: 0">
-            <div class="cursor-pointer">
-              <el-icon>
-                <arrow-down />
-              </el-icon>
-            </div>
-            <template #dropdown>
-              <el-dropdown-menu>
-                <el-dropdown-item>
-                  <el-tag>{{ defaultSettings.version }}</el-tag>
-                </el-dropdown-item>
-                <el-dropdown-item @click="setLoginCredentials('root', '123456')">
-                  超级管理员：root/123456
-                </el-dropdown-item>
-                <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
-                  系统管理员：admin/123456
-                </el-dropdown-item>
-                <el-dropdown-item @click="setLoginCredentials('test', '123456')">
-                  测试小游客：test/123456
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </template>
-          </el-dropdown>
-        </div>
+    <div
+      class="m-5 w-full min-w-[335px] max-w-[460px] p-5 shadow-[var(--el-box-shadow-light)] sm:p-10"
+      :class="[isDark ? 'bg-transparent' : 'bg-white']"
+    >
+      <div class="flex-center relative pb-5">
+        <h2>{{ defaultSettings.title }}</h2>
+        <el-dropdown class="absolute! right-0">
+          <div class="cursor-pointer">
+            <el-icon><arrow-down /></el-icon>
+          </div>
+          <template #dropdown>
+            <el-dropdown-menu>
+              <el-dropdown-item>
+                <el-tag>{{ defaultSettings.version }}</el-tag>
+              </el-dropdown-item>
+              <el-dropdown-item @click="setLoginCredentials('root', '123456')">
+                超级管理员: root/123456
+              </el-dropdown-item>
+              <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
+                系统管理员: admin/123456
+              </el-dropdown-item>
+              <el-dropdown-item @click="setLoginCredentials('test', '123456')">
+                测试小游客: test/123456
+              </el-dropdown-item>
+            </el-dropdown-menu>
+          </template>
+        </el-dropdown>
+      </div>
 
+      <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules" size="large">
         <!-- 用户名 -->
         <el-form-item prop="username">
-          <div class="input-wrapper">
-            <el-icon class="mx-2">
-              <User />
-            </el-icon>
-            <el-input
-              ref="username"
-              v-model="loginFormData.username"
-              :placeholder="$t('login.username')"
-              name="username"
-              size="large"
-              class="h-[48px]"
-            />
-          </div>
+          <el-input v-model.trim="loginFormData.username" :placeholder="t('login.username')">
+            <template #prefix>
+              <el-icon :color="isDark ? 'white' : 'black'"><User /></el-icon>
+            </template>
+          </el-input>
         </el-form-item>
 
         <!-- 密码 -->
-        <el-tooltip :visible="isCapslock" :content="$t('login.capsLock')" placement="right">
+        <el-tooltip :visible="isCapsLock" :content="t('login.capsLock')" placement="right">
           <el-form-item prop="password">
-            <div class="input-wrapper">
-              <el-icon class="mx-2">
-                <Lock />
-              </el-icon>
-              <el-input
-                v-model="loginFormData.password"
-                :placeholder="$t('login.password')"
-                type="password"
-                name="password"
-                size="large"
-                class="h-[48px] pr-2"
-                show-password
-                @keyup="checkCapslock"
-                @keyup.enter="handleLoginSubmit"
-              />
-            </div>
+            <el-input
+              v-model.trim="loginFormData.password"
+              :placeholder="t('login.password')"
+              type="password"
+              show-password
+              @keyup="checkCapsLock"
+              @keyup.enter="handleLoginSubmit"
+            >
+              <template #prefix>
+                <el-icon :color="isDark ? 'white' : 'black'"><Lock /></el-icon>
+              </template>
+            </el-input>
           </el-form-item>
         </el-tooltip>
 
         <!-- 验证码 -->
         <el-form-item prop="captchaCode">
-          <div class="input-wrapper">
-            <div class="i-svg:captcha mx-2" />
-
-            <el-input
-              v-model="loginFormData.captchaCode"
-              auto-complete="off"
-              size="large"
-              class="flex-1"
-              :placeholder="$t('login.captchaCode')"
-              @keyup.enter="handleLoginSubmit"
-            />
-
-            <el-image :src="http://github.com/captchaBase64" class="captcha-img" @click="getCaptcha" />
-          </div>
+          <el-input
+            v-model.trim="loginFormData.captchaCode"
+            :placeholder="t('login.captchaCode')"
+            @keyup.enter="handleLoginSubmit"
+          >
+            <template #prefix>
+              <div :class="['i-svg:captcha', isDark ? 'text-white' : 'text-black']" />
+            </template>
+            <template #suffix>
+              <el-image :src="http://github.com/captchaBase64" class="w-[138px] cursor-pointer" @click="getCaptcha" />
+            </template>
+          </el-input>
         </el-form-item>
 
-        <div class="flex-x-between w-full py-1">
-          <el-checkbox>
-            {{ $t("login.rememberMe") }}
-          </el-checkbox>
-
-          <el-link type="primary" href="http://github.com/forget-password">
-            {{ $t("login.forgetPassword") }}
-          </el-link>
+        <div class="flex-x-between w-full">
+          <el-checkbox v-model="loginFormData.rememberMe">{{ t("login.rememberMe") }}</el-checkbox>
+          <el-link type="primary" @click="unfinished">{{ t("login.forgetPassword") }}</el-link>
         </div>
 
         <!-- 登录按钮 -->
-        <el-button
-          :loading="loading"
-          type="primary"
-          size="large"
-          class="w-full"
-          @click.prevent="handleLoginSubmit"
-        >
-          {{ $t("login.login") }}
+        <el-button :loading="loading" type="primary" class="w-full" @click="handleLoginSubmit">
+          {{ t("login.login") }}
         </el-button>
 
         <!-- 第三方登录 -->
         <el-divider>
-          <el-text size="small">{{ $t("login.otherLoginMethods") }}</el-text>
+          <el-text size="small">{{ t("login.otherLoginMethods") }}</el-text>
         </el-divider>
-        <div class="third-party-login">
+        <div class="flex-center gap-x-5 text-[var(--el-text-color-secondary)]">
           <div class="i-svg:wechat" />
           <div class="i-svg:qq" />
           <div class="i-svg:github" />
@@ -136,12 +110,10 @@
     </div>
 
     <!-- 登录页底部 -->
-    <div class="login-footer">
-      <el-text size="small">
-        Copyright © 2021 - 2025 youlai.tech All Rights Reserved.
-        <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
-      </el-text>
-    </div>
+    <el-text size="small" class="py-2.5! fixed bottom-0 text-center">
+      Copyright © 2021 - 2025 youlai.tech All Rights Reserved.
+      <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
+    </el-text>
   </div>
 </template>
 
@@ -168,7 +140,7 @@ const loginFormRef = ref<FormInstance>();
 
 const isDark = ref(settingsStore.theme === ThemeMode.DARK); // 是否暗黑模式
 const loading = ref(false); // 按钮 loading 状态
-const isCapslock = ref(false); // 是否大写锁定
+const isCapsLock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
 
 const loginFormData = ref<LoginFormData>({
@@ -176,6 +148,7 @@ const loginFormData = ref<LoginFormData>({
   password: "123456",
   captchaKey: "",
   captchaCode: "",
+  rememberMe: false,
 });
 
 const loginRules = computed(() => {
@@ -183,14 +156,14 @@ const loginRules = computed(() => {
     username: [
       {
         required: true,
-        trigger: "blur",
+        trigger: "change",
         message: t("login.message.username.required"),
       },
     ],
     password: [
       {
         required: true,
-        trigger: "blur",
+        trigger: "change",
         message: t("login.message.password.required"),
       },
       {
@@ -202,7 +175,7 @@ const loginRules = computed(() => {
     captchaCode: [
       {
         required: true,
-        trigger: "blur",
+        trigger: "change",
         message: t("login.message.captchaCode.required"),
       },
     ],
@@ -219,12 +192,13 @@ function getCaptcha() {
 
 // 登录提交处理
 async function handleLoginSubmit() {
-  // 1. 表单验证
-  const valid = await loginFormRef.value?.validate();
-  if (!valid) return;
-
-  loading.value = true;
   try {
+    // 1. 表单验证
+    const valid = await loginFormRef.value?.validate();
+    if (!valid) return;
+
+    loading.value = true;
+
     // 2. 执行登录
     await userStore.login(loginFormData.value);
 
@@ -275,10 +249,10 @@ const toggleTheme = () => {
 };
 
 // 检查输入大小写
-function checkCapslock(event: KeyboardEvent) {
+function checkCapsLock(event: KeyboardEvent) {
   // 防止浏览器密码自动填充时报错
   if (event instanceof KeyboardEvent) {
-    isCapslock.value = event.getModifierState("CapsLock");
+    isCapsLock.value = event.getModifierState("CapsLock");
   }
 }
 
@@ -288,138 +262,33 @@ const setLoginCredentials = (username: string, password: string) => {
   loginFormData.value.password = password;
 };
 
-onMounted(() => {
-  getCaptcha();
-});
+// 未实现功能提示
+const unfinished = () => {
+  ElMessage.warning("该功能尚未完成，敬请期待！");
+};
+
+onMounted(() => getCaptcha());
 </script>
 
 <style lang="scss" scoped>
 .login {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  width: 100%;
-  height: 100%;
-  padding: 20px;
-  overflow-y: auto;
   background: url("http://github.com/@/assets/images/login-bg.jpg") no-repeat center right;
-
-  .login-header {
-    position: absolute;
-    top: 0;
-    display: flex;
-    justify-content: right;
-    width: 100%;
-    padding: 15px;
-
-    .logo {
-      width: 26px;
-      height: 26px;
-    }
-
-    .title {
-      margin: auto 5px;
-      font-size: 24px;
-      font-weight: bold;
-      color: #3b82f6;
-    }
-  }
-
-  .login-form {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    width: 460px;
-    padding: 40px;
-    overflow: hidden;
-    background-color: #fff;
-    border-radius: 5px;
-    box-shadow: var(--el-box-shadow-light);
-
-    @media (width <= 460px) {
-      width: 100%;
-      padding: 20px;
-    }
-
-    .form-title {
-      position: relative;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      padding: 0 0 20px;
-      text-align: center;
-    }
-
-    .input-wrapper {
-      display: flex;
-      align-items: center;
-      width: 100%;
-    }
-
-    .captcha-img {
-      height: 48px;
-      cursor: pointer;
-      border-top-right-radius: 6px;
-      border-bottom-right-radius: 6px;
-    }
-
-    .third-party-login {
-      display: flex;
-      justify-content: center;
-      width: 100%;
-      color: var(--el-text-color-secondary);
-
-      *:not(:first-child) {
-        margin-left: 20px;
-      }
-
-      .icon {
-        cursor: pointer;
-      }
-    }
-  }
-
-  .login-footer {
-    position: fixed;
-    bottom: 0;
-    width: 100%;
-    padding: 10px 0;
-    text-align: center;
-  }
-}
-
-:deep(.el-form-item) {
-  background: var(--el-input-bg-color);
-  border: 1px solid var(--el-border-color);
-  border-radius: 5px;
 }
-
-:deep(.el-input) {
-  .el-input__wrapper {
-    padding: 0;
-    background-color: transparent;
-    box-shadow: none;
-
-    &.is-focus,
-    &:hover {
-      box-shadow: none !important;
-    }
-
-    input:-webkit-autofill {
-      /* 通过延时渲染背景色变相去除背景颜色 */
-      transition: background-color 1000s ease-in-out 0s;
-    }
-  }
-}
-
 html.dark {
   .login {
     background: url("http://github.com/@/assets/images/login-bg-dark.jpg") no-repeat center right;
-
-    .login-form {
+    .el-card {
       background: transparent;
-      box-shadow: var(--el-box-shadow);
     }
   }
 }
+.el-form-item {
+  margin-bottom: 20px;
+}
+:deep(.el-input) {
+  height: 48px;
+  .el-input__wrapper {
+    padding: 1px 10px;
+  }
+}
 </style>

From e08613ce36545c06a55be1bdcd7474b7c676d0bc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 08:19:03 +0800
Subject: [PATCH 278/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9D=83=E9=99=90=E6=9E=9A=E4=B8=BE=E5=80=BC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/role/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a070f9cc..b3704e4d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -107,10 +107,10 @@
 
         <el-form-item label="数据权限" prop="dataScope">
           <el-select v-model="formData.dataScope">
-            <el-option :key="0" label="全部数据" :value="0" />
-            <el-option :key="1" label="部门及子部门数据" :value="1" />
-            <el-option :key="2" label="本部门数据" :value="2" />
-            <el-option :key="3" label="本人数据" :value="3" />
+            <el-option :key="1" label="全部数据" :value="1" />
+            <el-option :key="2" label="部门及子部门数据" :value="2" />
+            <el-option :key="3" label="本部门数据" :value="3" />
+            <el-option :key="4" label="本人数据" :value="4" />
           </el-select>
         </el-form-item>
 

From cdfe1e581e27c7662c13f2f5fccc708f8569db76 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 14:46:16 +0800
Subject: [PATCH 279/497] =?UTF-8?q?style:=20:lipstick:=20=E5=AD=97?=
 =?UTF-8?q?=E5=85=B8=E7=8A=B6=E6=80=81=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/dict.store.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/store/modules/dict.store.ts b/src/store/modules/dict.store.ts
index 0e1dea10..e053ed94 100644
--- a/src/store/modules/dict.store.ts
+++ b/src/store/modules/dict.store.ts
@@ -4,8 +4,10 @@ import DictAPI, { type DictItemOption } from "@/api/system/dict.api";
 export const useDictStore = defineStore("dict", () => {
   // 字典数据缓存
   const dictCache = useStorage<Record<string, DictItemOption[]>>("dict_cache", {});
+
   // 请求队列（防止重复请求）
   const requestQueue: Record<string, Promise<void>> = {};
+
   /**
    * 缓存字典数据
    * @param dictCode 字典编码
@@ -14,6 +16,7 @@ export const useDictStore = defineStore("dict", () => {
   const cacheDictItems = (dictCode: string, data: DictItemOption[]) => {
     dictCache.value[dictCode] = data;
   };
+
   /**
    * 加载字典数据（如果缓存中没有则请求）
    * @param dictCode 字典编码
@@ -29,6 +32,7 @@ export const useDictStore = defineStore("dict", () => {
     }
     await requestQueue[dictCode];
   };
+
   /**
    * 获取字典项列表
    * @param dictCode 字典编码
@@ -37,12 +41,14 @@ export const useDictStore = defineStore("dict", () => {
   const getDictItems = (dictCode: string): DictItemOption[] => {
     return dictCache.value[dictCode] || [];
   };
+
   /**
    * 清空字典缓存
    */
   const clearDictCache = () => {
     dictCache.value = {};
   };
+
   return {
     loadDictItems,
     getDictItems,

From 2bc86b3964a28cad882071ee6425dce80fe1335d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 14:47:47 +0800
Subject: [PATCH 280/497] =?UTF-8?q?fix:=20:bug:=20=E6=B3=A8=E9=94=80?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B8=85=E7=A9=BA=E7=94=A8=E6=88=B7=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.store.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index eec6decf..d4de3587 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -97,6 +97,7 @@ export const useUserStore = defineStore("user", () => {
       clearToken();
       usePermissionStoreHook().resetRouter();
       useDictStoreHook().clearDictCache();
+      userInfo.value = {} as UserInfo;
       resolve();
     });
   }

From d60a2459b28eb21ff45728ba6d88b90742571720 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 14:58:53 +0800
Subject: [PATCH 281/497] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0=20El?=
 =?UTF-8?q?InputTag=20=E8=87=B3=E6=8C=89=E9=9C=80=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E5=A3=B0=E6=98=8E=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/types/components.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index ca45a035..f1a615a6 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -36,6 +36,7 @@ declare module "vue" {
     ElIcon: (typeof import("element-plus/es"))["ElIcon"];
     ElImage: (typeof import("element-plus/es"))["ElImage"];
     ElInput: (typeof import("element-plus/es"))["ElInput"];
+    ElInputTag: (typeof import("element-plus/es"))["ElInputTag"];
     ElInputNumber: (typeof import("element-plus/es"))["ElInputNumber"];
     ElLink: (typeof import("element-plus/es"))["ElLink"];
     ElMenu: (typeof import("element-plus/es"))["ElMenu"];

From 43a8e6bc795ce3254313f74bcfaf6ad25d181e0f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 15:00:38 +0800
Subject: [PATCH 282/497] =?UTF-8?q?perf:=20:zap:=20=E6=B7=BB=E5=8A=A0=20in?=
 =?UTF-8?q?put-tag=20=E7=BB=84=E4=BB=B6=E8=87=B3=E9=A2=84=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/vite.config.ts b/vite.config.ts
index a44f96d3..c40347f3 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -94,7 +94,8 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "pinia",
         "axios",
         "@vueuse/core",
-        "sortablejs",
+        "codemirror-editor-vue3",
+        "default-passive-events",
         "exceljs",
         "path-to-regexp",
         "echarts/core",
@@ -103,8 +104,10 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "echarts/components",
         "vue-i18n",
         "nprogress",
+        "sortablejs",
         "qs",
         "path-browserify",
+        "@stomp/stompjs",
         "@element-plus/icons-vue",
         "element-plus/es",
         "element-plus/es/locale/lang/en",
@@ -139,6 +142,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es/components/image-viewer/style/index",
         "element-plus/es/components/image/style/index",
         "element-plus/es/components/input-number/style/index",
+        "element-plus/es/components/input-tag/style/index",
         "element-plus/es/components/input/style/index",
         "element-plus/es/components/link/style/index",
         "element-plus/es/components/loading/style/index",

From 738e7eed69fe9cc00f4f97944b7cfe9a6fad092b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 31 Mar 2025 17:24:43 +0800
Subject: [PATCH 283/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E7=BB=84=E4=BB=B6=E5=92=8C=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E6=BC=94=E7=A4=BA=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/menu.mock.ts | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 2f2550d1..02d72db0 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -388,6 +388,32 @@ export default defineMock([
                 params: null,
               },
             },
+            {
+              path: "drag",
+              component: "demo/drag",
+              name: "Drag",
+              meta: {
+                title: "拖拽组件",
+                icon: "",
+                hidden: false,
+                keepAlive: true,
+                alwaysShow: false,
+                params: null,
+              },
+            },
+            {
+              path: "text-scroll",
+              component: "demo/text-scroll",
+              name: "TextScroll",
+              meta: {
+                title: "滚动文本",
+                icon: "",
+                hidden: false,
+                keepAlive: true,
+                alwaysShow: false,
+                params: null,
+              },
+            },
           ],
         },
         {

From 5ec909c11315035c13a63b00c36aa75dc978191d Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 2 Apr 2025 15:16:48 +0800
Subject: [PATCH 284/497] =?UTF-8?q?docs:=20:memo:=20readme=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=98=E7=BD=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

readme增加官网
---
 README.en-US.md | 4 ++--
 README.md       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index 9fb64d68..b8cf934e 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -12,7 +12,7 @@
 
   <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
      <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
-   </a>     
+   </a>
   <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
     <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
   </a>
@@ -25,7 +25,7 @@
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")
 
 <div align="center">
- <a target="_blank" href="http://vue3.youlai.tech/">👀 Live Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 Read Documentation</a>  | 🌐 <a href="http://github.com/README.md">中文
+ <a target="_blank" href="http://vue3.youlai.tech/">👀 Live Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 Read Documentation</a> |  <a target="_blank" href="https://www.youlai.tech/youlai-boot">🌐 Official Website</a> | 🌐 <a href="http://github.com/README.md">中文
 </div>
 
 
diff --git a/README.md b/README.md
index 7a8f16be..7996b419 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 
 
 <div align="center">
-  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a> | <a href="http://github.com/README.en-US.md">💬 English
+  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a>|  <a target="_blank" href="https://www.youlai.tech/youlai-boot">🌐 官网</a> | <a href="http://github.com/README.en-US.md">💬 English
 </div>
 
 

From cce1d6d18e160bad496d9a1438f901ec7fbe008f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 2 Apr 2025 15:57:00 +0800
Subject: [PATCH 285/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=9B=A0=E9=A1=B5=E9=9D=A2=E7=BC=93=E5=AD=98=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dict/dict-item.vue | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index 9f84912e..17ef6336 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -129,11 +129,6 @@
 </template>
 
 <script setup lang="ts">
-defineOptions({
-  name: "DictItem",
-  inherititems: false,
-});
-
 import DictAPI, { DictItemPageQuery, DictItemPageVO, DictItemForm } from "@/api/system/dict.api";
 
 const route = useRoute();
@@ -276,10 +271,4 @@ function handleDelete(id?: number) {
 onMounted(() => {
   handleQuery();
 });
-
-// 同一路由参数变化时更新数据
-onBeforeRouteUpdate((to) => {
-  queryParams.dictCode = to.query.dictCode as string;
-  handleQuery();
-});
 </script>

From 198c003059f8f16d3fc1e2b9a9fd31eb3ce59faa Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 2 Apr 2025 16:16:52 +0800
Subject: [PATCH 286/497] =?UTF-8?q?docs:=20:memo:=20=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BC=98=E5=8C=96=E5=92=8C=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md |  4 ++--
 README.md       | 59 +++++++++++++++++++++++++++----------------------
 2 files changed, 35 insertions(+), 28 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index b8cf934e..d07f5550 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -10,7 +10,7 @@
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
 
-  <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
+  <a href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
      <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
    </a>
   <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
@@ -25,7 +25,7 @@
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")
 
 <div align="center">
- <a target="_blank" href="http://vue3.youlai.tech/">👀 Live Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 Read Documentation</a> |  <a target="_blank" href="https://www.youlai.tech/youlai-boot">🌐 Official Website</a> | 🌐 <a href="http://github.com/README.md">中文
+ <a target="_blank" href="http://vue3.youlai.tech/">👀 Live Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 Read Documentation</a> |  <a target="_blank" href="https://www.youlai.tech/vue3-element-admin">🌐 Official Website</a> | 🌐 <a href="http://github.com/README.md">中文
 </div>
 
 
diff --git a/README.md b/README.md
index 7996b419..5f0737c2 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
 
-  <a href="https://gitee.com/youlaiorg/youlai-boot" target="_blank">
-     <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
+  <a href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
+    <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
    </a>
   <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
     <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
@@ -26,7 +26,7 @@
 
 
 <div align="center">
-  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a>|  <a target="_blank" href="https://www.youlai.tech/youlai-boot">🌐 官网</a> | <a href="http://github.com/README.en-US.md">💬 English
+  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a>|  <a target="_blank" href="https://www.youlai.tech//vue3-element-admin">🌐 官网</a> | <a href="http://github.com/README.en-US.md">💬 English
 </div>
 
 
@@ -57,20 +57,39 @@
 
 | 项目 | Gitee   | Github    | GitCode|
 | ---- | ----| ---- | ---- |
-| 前端 | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
-| 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
-| 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
+| vue3-element-admin 标准版| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
+| vue3-element-admin 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
+| Java 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
+| Node 后端 | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)       | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
 
-## 环境准备
 
-| 环境                 | 名称版本                                                     | 下载地址                                                     |
-| -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ |
-| **开发工具**         | VSCode    | [下载](https://code.visualstudio.com/Download)           |
-| **运行环境**         | Node ≥18 (其中 20.6.0 版本不可用)    | [下载](http://nodejs.cn/download)                        |
+
+## 项目文档
+
+| 文档名称          | 访问地址                                                                                   |
+|---------------|-------------------------------------------------------------------------------------------|
+| 项目 0 到 1  | [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)  |
+| 官方文档 | [https://www.youlai.tech/vue3-element-admin/](https://www.youlai.tech/vue3-element-admin/)  |
+| 代码规范     | [ESLint V9 + Prettier + Stylelint + EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723) |
+| Git 规范 | [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236) |
+| 在线接口文档 | [https://www.apifox.cn/apidoc](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
+
 
 
 ## 项目启动
 
+
+- **环境准备**
+
+| 环境类型       | 版本要求                     | 下载链接                     |
+|----------------|-----------------------------|-----------------------------|
+| **开发工具**   | Visual Studio Code (最新版) | [官方下载](https://code.visualstudio.com/Download) |
+| **运行环境**   | Node.js 18.x (推荐18.16.1)  | [中文镜像](https://npmmirror.com/mirrors/node/v18.16.1/) |
+> ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
+
+
+- **快速开始**
+
 ```bash
 # 克隆代码
 git clone https://gitee.com/youlaiorg/vue3-element-admin.git
@@ -92,7 +111,6 @@ pnpm run dev
 ```
 
 
-
 ## 项目部署
 
 执行 `pnpm run build` 命令后，项目将被打包并生成 `dist` 目录。接下来，将 `dist` 目录下的文件上传到服务器 `/usr/share/nginx/html` 目录下，并配置 Nginx 进行反向代理。
@@ -161,14 +179,6 @@ server {
   如果有其他问题或者建议，建议 [ISSUE](https://gitee.com/youlaiorg/vue3-element-admin/issues/new)
 
 
-
-## 项目文档
-
-- [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)
-- [ESLint+Prettier+Stylelint+EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723)
-- [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236)
-
-
 ## 提交规范
 
 执行 `pnpm run commit` 唤起 git commit 交互，根据提示完成信息的输入和选择。
@@ -191,11 +201,8 @@ Thanks to all the contributors!
 
 ## 加群交流
 
-> **关注「有来技术」公众号，点击菜单“交流群”获取加群二维码。**
->
-> 如果二维码过期，请加微信(haoxianrui)备注「前端」、「后端」或「全栈」拉你进群。
->
-> 交流群仅限技术交流，为过滤广告营销暂设此门槛，感谢理解与配合
+① 关注「有来技术」公众号，点击菜单 **交流群** 获取加群二维码（此举防止广告进群，感谢理解和支持）。
 
-![有来技术公众号二维码](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
+② 直接添加微信 **`haoxianrui`** 备注「前端/后端/全栈」。
 
+![有来技术公众号](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
\ No newline at end of file

From 57e6033b804e99c9e66c5824cac2fa5a88945724 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 2 Apr 2025 16:22:32 +0800
Subject: [PATCH 287/497] chore: :hammer: bump version to 2.25.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 1ebe1f89..564430d6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue3-element-admin",
-  "version": "2.25.1",
+  "version": "2.25.2",
   "private": true,
   "type": "module",
   "scripts": {

From ab3584fcf446ed2ccde933e5a037da2a153962c0 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 2 Apr 2025 19:01:00 +0800
Subject: [PATCH 288/497] =?UTF-8?q?fix:=20:bug:=20=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=B8=BB=E9=94=AE=E4=B8=BA=20string=20=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/codegen.api.ts                        |  6 ++---
 src/api/system/config.api.ts                  | 10 ++++----
 src/api/system/dept.api.ts                    |  6 ++---
 src/api/system/dict.api.ts                    | 16 ++++++-------
 src/api/system/log.api.ts                     |  2 +-
 src/api/system/menu.api.ts                    |  2 +-
 src/api/system/notice.api.ts                  | 20 ++++++++--------
 src/api/system/role.api.ts                    | 16 ++++++-------
 src/api/system/user.api.ts                    | 24 +++++++++----------
 src/views/demo/curd/config/content.ts         |  2 +-
 src/views/demo/curd/config/edit.ts            |  2 +-
 src/views/demo/table-select/index.vue         |  2 +-
 src/views/system/config/index.vue             |  4 ++--
 src/views/system/dept/index.vue               |  2 +-
 src/views/system/dict/index.vue               |  2 +-
 src/views/system/menu/index.vue               |  2 +-
 src/views/system/notice/index.vue             |  6 ++---
 src/views/system/role/index.vue               |  4 ++--
 src/views/system/user/components/DeptTree.vue |  2 +-
 .../system/user/components/UserImport.vue     |  2 +-
 src/views/system/user/index.vue               |  2 +-
 21 files changed, 67 insertions(+), 67 deletions(-)

diff --git a/src/api/codegen.api.ts b/src/api/codegen.api.ts
index af592bae..b3b613fc 100644
--- a/src/api/codegen.api.ts
+++ b/src/api/codegen.api.ts
@@ -110,7 +110,7 @@ export interface TablePageVO {
 /** 代码生成配置表单 */
 export interface GenConfigForm {
   /** 主键 */
-  id?: number;
+  id?: string;
 
   /** 表名 */
   tableName?: string;
@@ -131,7 +131,7 @@ export interface GenConfigForm {
   author?: string;
 
   /** 上级菜单 */
-  parentMenuId?: number;
+  parentMenuId?: string;
 
   /** 后端应用名 */
   backendAppName?: string;
@@ -145,7 +145,7 @@ export interface GenConfigForm {
 /** 字段配置 */
 export interface FieldConfig {
   /** 主键 */
-  id?: number;
+  id?: string;
 
   /** 列名 */
   columnName?: string;
diff --git a/src/api/system/config.api.ts b/src/api/system/config.api.ts
index d05aa81f..f280ee1c 100644
--- a/src/api/system/config.api.ts
+++ b/src/api/system/config.api.ts
@@ -13,7 +13,7 @@ const ConfigAPI = {
   },
 
   /** 系统配置表单数据 */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, ConfigForm>({
       url: `${CONFIG_BASE_URL}/${id}/form`,
       method: "get",
@@ -30,7 +30,7 @@ const ConfigAPI = {
   },
 
   /** 更新系统配置 */
-  update(id: number, data: ConfigForm) {
+  update(id: string, data: ConfigForm) {
     return request({
       url: `${CONFIG_BASE_URL}/${id}`,
       method: "put",
@@ -43,7 +43,7 @@ const ConfigAPI = {
    *
    * @param ids 系统配置ID
    */
-  deleteById(id: number) {
+  deleteById(id: string) {
     return request({
       url: `${CONFIG_BASE_URL}/${id}`,
       method: "delete",
@@ -69,7 +69,7 @@ export interface ConfigPageQuery extends PageQuery {
 /** 系统配置表单对象 */
 export interface ConfigForm {
   /** 主键 */
-  id?: number;
+  id?: string;
   /** 配置名称 */
   configName?: string;
   /** 配置键 */
@@ -83,7 +83,7 @@ export interface ConfigForm {
 /** 系统配置分页对象 */
 export interface ConfigPageVO {
   /** 主键 */
-  id?: number;
+  id?: string;
   /** 配置名称 */
   configName?: string;
   /** 配置键 */
diff --git a/src/api/system/dept.api.ts b/src/api/system/dept.api.ts
index a2124e92..200065d3 100644
--- a/src/api/system/dept.api.ts
+++ b/src/api/system/dept.api.ts
@@ -31,7 +31,7 @@ const DeptAPI = {
    * @param id 部门ID
    * @returns 部门表单数据
    */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, DeptForm>({
       url: `${DEPT_BASE_URL}/${id}/form`,
       method: "get",
@@ -98,13 +98,13 @@ export interface DeptVO {
   /** 创建时间 */
   createTime?: Date;
   /** 部门ID */
-  id?: number;
+  id?: string;
   /** 部门名称 */
   name?: string;
   /** 部门编号 */
   code?: string;
   /** 父部门ID */
-  parentId?: number;
+  parentid?: string;
   /** 排序 */
   sort?: number;
   /** 状态(1:启用；0:禁用) */
diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index 755ff062..3a3d4da9 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -39,7 +39,7 @@ const DictAPI = {
    * @param id 字典ID
    * @returns 字典表单数据
    */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, ResponseData<DictForm>>({
       url: `${DICT_BASE_URL}/${id}/form`,
       method: "get",
@@ -65,7 +65,7 @@ const DictAPI = {
    * @param id 字典ID
    * @param data 字典表单数据
    */
-  update(id: number, data: DictForm) {
+  update(id: string, data: DictForm) {
     return request({
       url: `${DICT_BASE_URL}/${id}`,
       method: "put",
@@ -129,7 +129,7 @@ const DictAPI = {
    * @param id 字典项ID
    * @returns 字典项表单数据
    */
-  getDictItemFormData(dictCode: string, id: number) {
+  getDictItemFormData(dictCode: string, id: string) {
     return request<any, ResponseData<DictItemForm>>({
       url: `${DICT_BASE_URL}/${dictCode}/items/${id}/form`,
       method: "get",
@@ -139,7 +139,7 @@ const DictAPI = {
   /**
    * 修改字典项
    */
-  updateDictItem(dictCode: string, id: number, data: DictItemForm) {
+  updateDictItem(dictCode: string, id: string, data: DictItemForm) {
     return request({
       url: `${DICT_BASE_URL}/${dictCode}/items/${id}`,
       method: "put",
@@ -182,7 +182,7 @@ export interface DictPageVO {
   /**
    * 字典ID
    */
-  id: number;
+  id: string;
   /**
    * 字典名称
    */
@@ -204,7 +204,7 @@ export interface DictForm {
   /**
    * 字典ID
    */
-  id?: number;
+  id?: string;
   /**
    * 字典名称
    */
@@ -241,7 +241,7 @@ export interface DictItemPageVO {
   /**
    * 字典ID
    */
-  id: number;
+  id: string;
   /**
    * 字典编码
    */
@@ -271,7 +271,7 @@ export interface DictItemForm {
   /**
    * 字典ID
    */
-  id?: number;
+  id?: string;
   /**
    * 字典编码
    */
diff --git a/src/api/system/log.api.ts b/src/api/system/log.api.ts
index 32dbc881..402478ad 100644
--- a/src/api/system/log.api.ts
+++ b/src/api/system/log.api.ts
@@ -61,7 +61,7 @@ export interface LogPageQuery extends PageQuery {
  */
 export interface LogPageVO {
   /** 主键 */
-  id: number;
+  id: string;
   /** 日志模块 */
   module: string;
   /** 日志内容 */
diff --git a/src/api/system/menu.api.ts b/src/api/system/menu.api.ts
index 65867ff5..06c11ed2 100644
--- a/src/api/system/menu.api.ts
+++ b/src/api/system/menu.api.ts
@@ -91,7 +91,7 @@ const MenuAPI = {
    * @param id 菜单ID
    * @returns 请求结果
    */
-  deleteById(id: number) {
+  deleteById(id: string) {
     return request({
       url: `${MENU_BASE_URL}/${id}`,
       method: "delete",
diff --git a/src/api/system/notice.api.ts b/src/api/system/notice.api.ts
index 0ad16107..b5e65e79 100644
--- a/src/api/system/notice.api.ts
+++ b/src/api/system/notice.api.ts
@@ -15,10 +15,10 @@ const NoticeAPI = {
   /**
    * 获取通知公告表单数据
    *
-   * @param id NoticeID
-   * @returns Notice表单数据
+   * @param id 通知
+   * @returns 通知表单数据
    */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, NoticeForm>({
       url: `${NOTICE_BASE_URL}/${id}/form`,
       method: "get",
@@ -28,7 +28,7 @@ const NoticeAPI = {
   /**
    * 添加通知公告
    *
-   * @param data Notice表单数据
+   * @param data 通知表单数据
    * @returns
    */
   create(data: NoticeForm) {
@@ -42,10 +42,10 @@ const NoticeAPI = {
   /**
    * 更新通知公告
    *
-   * @param id NoticeID
-   * @param data Notice表单数据
+   * @param id 通知ID
+   * @param data 通知表单数据
    */
-  update(id: number, data: NoticeForm) {
+  update(id: string, data: NoticeForm) {
     return request({
       url: `${NOTICE_BASE_URL}/${id}`,
       method: "put",
@@ -71,7 +71,7 @@ const NoticeAPI = {
    * @param id 被发布的通知公告id
    * @returns
    */
-  publish(id: number) {
+  publish(id: string) {
     return request({
       url: `${NOTICE_BASE_URL}/${id}/publish`,
       method: "put",
@@ -84,7 +84,7 @@ const NoticeAPI = {
    * @param id 撤回的通知id
    * @returns
    */
-  revoke(id: number) {
+  revoke(id: string) {
     return request({
       url: `${NOTICE_BASE_URL}/${id}/revoke`,
       method: "put",
@@ -134,7 +134,7 @@ export interface NoticePageQuery extends PageQuery {
 
 /** 通知公告表单对象 */
 export interface NoticeForm {
-  id?: number;
+  id?: string;
   /** 通知标题 */
   title?: string;
   /** 通知内容 */
diff --git a/src/api/system/role.api.ts b/src/api/system/role.api.ts
index 44b4624a..be680229 100644
--- a/src/api/system/role.api.ts
+++ b/src/api/system/role.api.ts
@@ -25,8 +25,8 @@ const RoleAPI = {
    * @param roleId 角色ID
    * @returns 角色的菜单ID集合
    */
-  getRoleMenuIds(roleId: number) {
-    return request<any, number[]>({
+  getRoleMenuIds(roleId: string) {
+    return request<any, string[]>({
       url: `${ROLE_BASE_URL}/${roleId}/menuIds`,
       method: "get",
     });
@@ -38,7 +38,7 @@ const RoleAPI = {
    * @param roleId 角色ID
    * @param data 菜单ID集合
    */
-  updateRoleMenus(roleId: number, data: number[]) {
+  updateRoleMenus(roleId: string, data: number[]) {
     return request({
       url: `${ROLE_BASE_URL}/${roleId}/menus`,
       method: "put",
@@ -52,7 +52,7 @@ const RoleAPI = {
    * @param id 角色ID
    * @returns 角色表单数据
    */
-  getFormData(id: number) {
+  getFormData(id: string) {
     return request<any, RoleForm>({
       url: `${ROLE_BASE_URL}/${id}/form`,
       method: "get",
@@ -74,7 +74,7 @@ const RoleAPI = {
    * @param id 角色ID
    * @param data 角色表单数据
    */
-  update(id: number, data: RoleForm) {
+  update(id: string, data: RoleForm) {
     return request({
       url: `${ROLE_BASE_URL}/${id}`,
       method: "put",
@@ -105,10 +105,10 @@ export interface RolePageQuery extends PageQuery {
 
 /** 角色分页对象 */
 export interface RolePageVO {
+  /** 角色ID */
+  id?: string;
   /** 角色编码 */
   code?: string;
-  /** 角色ID */
-  id?: number;
   /** 角色名称 */
   name?: string;
   /** 排序 */
@@ -124,7 +124,7 @@ export interface RolePageVO {
 /** 角色表单对象 */
 export interface RoleForm {
   /** 角色ID */
-  id?: number;
+  id?: string;
   /** 角色编码 */
   code?: string;
   /** 数据权限 */
diff --git a/src/api/system/user.api.ts b/src/api/system/user.api.ts
index e9c69c1f..1d16fd1c 100644
--- a/src/api/system/user.api.ts
+++ b/src/api/system/user.api.ts
@@ -34,7 +34,7 @@ const UserAPI = {
    * @param userId 用户ID
    * @returns 用户表单详情
    */
-  getFormData(userId: number) {
+  getFormData(userId: string) {
     return request<any, UserForm>({
       url: `${USER_BASE_URL}/${userId}/form`,
       method: "get",
@@ -60,7 +60,7 @@ const UserAPI = {
    * @param id 用户ID
    * @param data 用户表单数据
    */
-  update(id: number, data: UserForm) {
+  update(id: string, data: UserForm) {
     return request({
       url: `${USER_BASE_URL}/${id}`,
       method: "put",
@@ -74,7 +74,7 @@ const UserAPI = {
    * @param id 用户ID
    * @param password 新密码
    */
-  resetPassword(id: number, password: string) {
+  resetPassword(id: string, password: string) {
     return request({
       url: `${USER_BASE_URL}/${id}/password/reset`,
       method: "put",
@@ -123,7 +123,7 @@ const UserAPI = {
    * @param deptId 部门ID
    * @param file 导入文件
    */
-  import(deptId: number, file: File) {
+  import(deptId: string, file: File) {
     const formData = new FormData();
     formData.append("file", file);
     return request<any, ExcelResult>({
@@ -215,7 +215,7 @@ export default UserAPI;
 /** 登录用户信息 */
 export interface UserInfo {
   /** 用户ID */
-  userId?: number;
+  userId?: string;
 
   /** 用户名 */
   username?: string;
@@ -244,7 +244,7 @@ export interface UserPageQuery extends PageQuery {
   status?: number;
 
   /** 部门ID */
-  deptId?: number;
+  deptId?: string;
 
   /** 开始时间 */
   createTime?: [string, string];
@@ -253,7 +253,7 @@ export interface UserPageQuery extends PageQuery {
 /** 用户分页对象 */
 export interface UserPageVO {
   /** 用户ID */
-  id: number;
+  id: string;
   /** 用户头像URL */
   avatar?: string;
   /** 创建时间 */
@@ -278,16 +278,16 @@ export interface UserPageVO {
 
 /** 用户表单类型 */
 export interface UserForm {
+  /** 用户ID */
+  id?: string;
   /** 用户头像 */
   avatar?: string;
   /** 部门ID */
-  deptId?: number;
+  deptId?: string;
   /** 邮箱 */
   email?: string;
   /** 性别 */
   gender?: number;
-  /** 用户ID */
-  id?: number;
   /** 手机号 */
   mobile?: string;
   /** 昵称 */
@@ -303,7 +303,7 @@ export interface UserForm {
 /** 个人中心用户信息 */
 export interface UserProfileVO {
   /** 用户ID */
-  id?: number;
+  id?: string;
 
   /** 用户名 */
   username?: string;
@@ -336,7 +336,7 @@ export interface UserProfileVO {
 /** 个人中心用户信息表单 */
 export interface UserProfileForm {
   /** 用户ID */
-  id?: number;
+  id?: string;
 
   /** 用户名 */
   username?: string;
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 3be52d3a..f4ce364c 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -20,7 +20,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
   },
   deleteAction: UserAPI.deleteByIds,
   importAction(file) {
-    return UserAPI.import(1, file);
+    return UserAPI.import("1", file);
   },
   exportAction: UserAPI.export,
   importTemplate: UserAPI.downloadTemplate,
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index cef72cf8..bcbe1d90 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -12,7 +12,7 @@ const modalConfig: IModalConfig<UserForm> = {
   },
   pk: "id",
   formAction: function (data) {
-    return UserAPI.update(data.id as number, data);
+    return UserAPI.update(data.id as string, data);
   },
   beforeSubmit(data) {
     console.log("提交之前处理", data);
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index 6fd82c9d..0d7202c3 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -4,7 +4,7 @@ import selectConfig from "./config/select";
 import { useDictStore } from "@/store";
 const dictStore = useDictStore();
 interface IUser {
-  id: number;
+  id: string;
   username: string;
   nickname: string;
   mobile: string;
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index ba7991b1..14e9da16 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -198,7 +198,7 @@ function handleSelectionChange(selection: any) {
 }
 
 // 打开系统配置弹窗
-function handleOpenDialog(id?: number) {
+function handleOpenDialog(id?: string) {
   dialog.visible = true;
   if (id) {
     dialog.title = "修改系统配置";
@@ -259,7 +259,7 @@ function handleCloseDialog() {
 }
 
 // 删除系统配置
-function handleDelete(id: number) {
+function handleDelete(id: string) {
   ElMessageBox.confirm("确认删除该项配置?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 7c7f4f13..ed926967 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -213,7 +213,7 @@ function handleSelectionChange(selection: any) {
  * @param parentId 父部门ID
  * @param deptId 部门ID
  */
-async function handleOpenDialog(parentId?: string, deptId?: number) {
+async function handleOpenDialog(parentId?: string, deptId?: string) {
   // 加载部门下拉数据
   const data = await DeptAPI.getOptions();
   deptOptions.value = [
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 71f5132a..7de44c87 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -198,7 +198,7 @@ function handleAddClick() {
  *
  * @param id 字典ID
  */
-function handleEditClick(id: number) {
+function handleEditClick(id: string) {
   dialog.visible = true;
   dialog.title = "修改字典";
   DictAPI.getFormData(id).then((data) => {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ef25aca3..31a7e6d5 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -487,7 +487,7 @@ function handleSubmit() {
 }
 
 // 删除菜单
-function handleDelete(menuId: number) {
+function handleDelete(menuId: string) {
   if (!menuId) {
     ElMessage.warning("请勾选删除项");
     return false;
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index f96ed715..75cabbac 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -341,7 +341,7 @@ function handleSelectionChange(selection: any) {
 }
 
 // 打开通知公告弹窗
-function handleOpenDialog(id?: number) {
+function handleOpenDialog(id?: string) {
   UserAPI.getOptions().then((data) => {
     userOptions.value = data;
   });
@@ -359,7 +359,7 @@ function handleOpenDialog(id?: number) {
 }
 
 // 发布通知公告
-function handlePublish(id: number) {
+function handlePublish(id: string) {
   NoticeAPI.publish(id).then(() => {
     ElMessage.success("发布成功");
     handleQuery();
@@ -367,7 +367,7 @@ function handlePublish(id: number) {
 }
 
 // 撤回通知公告
-function handleRevoke(id: number) {
+function handleRevoke(id: string) {
   NoticeAPI.revoke(id).then(() => {
     ElMessage.success("撤回成功");
     handleQuery();
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index a070f9cc..00b1bed4 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -257,7 +257,7 @@ const rules = reactive({
 
 // 选中的角色
 interface CheckedRole {
-  id?: number;
+  id?: string;
   name?: string;
 }
 const checkedRole = ref<CheckedRole>({});
@@ -294,7 +294,7 @@ function handleSelectionChange(selection: any) {
 }
 
 // 打开角色弹窗
-function handleOpenDialog(roleId?: number) {
+function handleOpenDialog(roleId?: string) {
   dialog.visible = true;
   if (roleId) {
     dialog.title = "修改角色";
diff --git a/src/views/system/user/components/DeptTree.vue b/src/views/system/user/components/DeptTree.vue
index 8ae944a8..fca23070 100644
--- a/src/views/system/user/components/DeptTree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -24,7 +24,7 @@
 import DeptAPI from "@/api/system/dept.api";
 const props = defineProps({
   modelValue: {
-    type: [Number],
+    type: [String, Number],
     default: undefined,
   },
 });
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 4bc57bab..bcfb420e 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -163,7 +163,7 @@ const handleUpload = async () => {
   }
 
   try {
-    const result = await UserAPI.import(1, importFormData.files[0].raw as File);
+    const result = await UserAPI.import("1", importFormData.files[0].raw as File);
     if (result.code === ResultEnum.SUCCESS && result.invalidCount === 0) {
       ElMessage.success("导入成功，导入数据：" + result.validCount + "条");
       emit("import-success");
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index b7be3635..f94ad4c2 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -360,7 +360,7 @@ function hancleResetPassword(row: UserPageVO) {
  *
  * @param id 用户ID
  */
-async function handleOpenDialog(id?: number) {
+async function handleOpenDialog(id?: string) {
   dialog.visible = true;
   // 加载角色下拉数据源
   roleOptions.value = await RoleAPI.getOptions();

From b96b5276505fd3e86f4f834c5ecfd10f4209ac3c Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 3 Apr 2025 09:30:42 +0800
Subject: [PATCH 289/497] =?UTF-8?q?feat:=20:sparkles:=20=E5=9C=A8=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E4=B8=BB=E9=A2=98=E8=89=B2=E6=97=B6=E8=80=83=E8=99=91?=
 =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E5=92=8C=E4=BA=AE=E8=89=B2?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E7=9A=84=E4=B8=8D=E5=90=8C=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

新增 getDarkColor 和 getLightColor 函数分别用于加深和变浅颜色值

BREAKING CHANGE: 优化颜色调整算法，使主题色在不同模式下更加协调
---
 src/store/modules/settings.store.ts |  2 +-
 src/utils/theme.ts                  | 45 +++++++++++++++++++++++++----
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings.store.ts
index e713201a..2cea2b59 100644
--- a/src/store/modules/settings.store.ts
+++ b/src/store/modules/settings.store.ts
@@ -34,7 +34,7 @@ export const useSettingsStore = defineStore("setting", () => {
     [theme, themeColor],
     ([newTheme, newThemeColor]) => {
       toggleDarkMode(newTheme === ThemeMode.DARK);
-      const colors = generateThemeColors(newThemeColor);
+      const colors = generateThemeColors(newThemeColor, newTheme);
       applyTheme(colors);
     },
     { immediate: true }
diff --git a/src/utils/theme.ts b/src/utils/theme.ts
index e8b78d88..fbf41f00 100644
--- a/src/utils/theme.ts
+++ b/src/utils/theme.ts
@@ -10,27 +10,60 @@ function rgbToHex(r: number, g: number, b: number): string {
 }
 
 // 辅助函数：调整颜色亮度
-function adjustBrightness(hex: string, factor: number): string {
+/** function adjustBrightness(hex: string, factor: number, theme: string): string {
   const rgb = hexToRgb(hex);
+  // 是否是暗黑模式
+  const isDarkMode = theme === "dark" ? 0 : 255;
   const newRgb = rgb.map((val) =>
-    Math.max(0, Math.min(255, Math.round(val + (255 - val) * factor)))
+    Math.max(0, Math.min(255, Math.round(val + (isDarkMode - val) * factor)))
   ) as [number, number, number];
   return rgbToHex(...newRgb);
+} */
+
+/**
+ * 加深颜色值
+ * @param {String} color 颜色值字符串
+ * @param {Number} level 加深的程度，限0-1之间
+ * @returns {String} 返回处理后的颜色值
+ */
+export function getDarkColor(color: string, level: number): string {
+  const rgb = hexToRgb(color);
+  for (let i = 0; i < 3; i++) rgb[i] = Math.round(20.5 * level + rgb[i] * (1 - level));
+  return rgbToHex(rgb[0], rgb[1], rgb[2]);
 }
 
-export function generateThemeColors(primary: string) {
+/**
+ * 变浅颜色值
+ * @param {String} color 颜色值字符串
+ * @param {Number} level 加深的程度，限0-1之间
+ * @returns {String} 返回处理后的颜色值
+ */
+export const getLightColor = (color: string, level: number): string => {
+  const rgb = hexToRgb(color);
+  for (let i = 0; i < 3; i++) rgb[i] = Math.round(255 * level + rgb[i] * (1 - level));
+  return rgbToHex(rgb[0], rgb[1], rgb[2]);
+};
+
+/**
+ * 生成主题色
+ * @param primary 主题色
+ * @param theme 主题类型
+ */
+export function generateThemeColors(primary: string, theme: string) {
   const colors: Record<string, string> = {
     primary,
   };
 
   // 生成浅色变体
   for (let i = 1; i <= 9; i++) {
-    const factor = i * 0.1;
-    colors[`primary-light-${i}`] = adjustBrightness(primary, factor);
+    const primaryColor =
+      theme === "light" ? `${getLightColor(primary, i / 10)}` : `${getDarkColor(primary, i / 10)}`;
+    colors[`primary-light-${i}`] = primaryColor;
   }
 
   // 生成深色变体
-  colors["primary-dark-2"] = adjustBrightness(primary, -0.2);
+  colors["primary-dark-2"] =
+    theme === "light" ? `${getLightColor(primary, 0.2)}` : `${getDarkColor(primary, 0.3)}`;
 
   return colors;
 }

From 794df442e2e41425325cd073fd471ee74c8031b9 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 3 Apr 2025 13:57:16 +0800
Subject: [PATCH 290/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E9=80=9A=E7=9F=A5=E8=B7=AF=E7=94=B1=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeDropdown/index.vue | 2 +-
 src/router/index.ts                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index 8b172959..dcf4b93c 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -149,7 +149,7 @@ function handleReadNotice(id: string) {
 
 // 查看更多
 function handleViewMoreNotice() {
-  router.push({ path: "/myNotice" });
+  router.push({ name: "MyNotice" });
 }
 
 // 全部已读
diff --git a/src/router/index.ts b/src/router/index.ts
index 37c39b23..57058ee4 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -59,7 +59,7 @@ export const constantRoutes: RouteRecordRaw[] = [
         meta: { title: "个人中心", icon: "user", hidden: true },
       },
       {
-        path: "myNotice",
+        path: "my-notice",
         name: "MyNotice",
         component: () => import("@/views/system/notice/components/MyNotice.vue"),
         meta: { title: "我的通知", icon: "user", hidden: true },

From 8dcdecfde449e9025c46d13daf580e626e7fa0b7 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 3 Apr 2025 13:58:38 +0800
Subject: [PATCH 291/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E7=95=8C=E9=9D=A2=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/profile/index.vue | 377 +++++++++++++++++++++++-------------
 1 file changed, 245 insertions(+), 132 deletions(-)

diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 5c85942f..543c1445 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -1,16 +1,15 @@
 <template>
-  <div class="app-container">
-    <el-tabs tab-position="left">
-      <!-- 基本设置 Tab Pane -->
-      <el-tab-pane label="账号信息">
-        <div class="w-full">
-          <el-card>
-            <!-- 头像和昵称部分 -->
-            <div class="relative w-100px h-100px flex-center">
+  <div class="profile-container">
+    <el-row :gutter="20">
+      <!-- 左侧个人信息卡片 -->
+      <el-col :span="8">
+        <el-card class="user-card">
+          <div class="user-info">
+            <div class="avatar-wrapper">
               <el-avatar :src="http://github.com/userProfile.avatar" :size="100" />
               <el-button
                 type="info"
-                class="absolute bottom-0 right-0 cursor-pointer"
+                class="avatar-edit-btn"
                 circle
                 :icon="Camera"
                 size="small"
@@ -18,105 +17,56 @@
               />
               <input ref="fileInput" type="file" style="display: none" @change="handleFileChange" />
             </div>
-            <div class="mt-5">
-              {{ userProfile.nickname }}
-              <el-icon
-                class="align-middle cursor-pointer"
-                @click="handleOpenDialog(DialogType.ACCOUNT)"
-              >
+            <div class="user-name">
+              <span class="nickname">{{ userProfile.nickname }}</span>
+              <el-icon class="edit-icon" @click="handleOpenDialog(DialogType.ACCOUNT)">
                 <Edit />
               </el-icon>
             </div>
-            <!-- 用户信息描述 -->
-            <el-descriptions :column="1" class="mt-10">
-              <!-- 用户名 -->
-              <el-descriptions-item>
-                <template #label>
-                  <el-icon class="align-middle"><User /></el-icon>
-                  用户名
-                </template>
-                {{ userProfile.username }}
-                <el-icon v-if="userProfile.gender === 1" class="align-middle color-blue">
-                  <Male />
-                </el-icon>
-                <el-icon v-else class="align-middle color-pink">
-                  <Female />
-                </el-icon>
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template #label>
-                  <el-icon class="align-middle"><Phone /></el-icon>
-                  手机号码
-                </template>
-                {{ userProfile.mobile }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template #label>
-                  <el-icon class="align-middle"><Message /></el-icon>
-                  邮箱
-                </template>
-                {{ userProfile.email }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template #label>
-                  <div class="i-svg:tree" />
-                  部门
-                </template>
-                {{ userProfile.deptName }}
-              </el-descriptions-item>
-              <el-descriptions-item>
-                <template #label>
-                  <div class="i-svg:role" />
-                  角色
-                </template>
-                {{ userProfile.roleNames }}
-              </el-descriptions-item>
-
-              <el-descriptions-item>
-                <template #label>
-                  <el-icon class="align-middle"><Timer /></el-icon>
-                  创建日期
-                </template>
-                {{ userProfile.createTime }}
-              </el-descriptions-item>
-            </el-descriptions>
-          </el-card>
-        </div>
-      </el-tab-pane>
-
-      <!-- 安全设置  -->
-      <el-tab-pane label="安全设置">
-        <el-card>
-          <!-- 账户密码 -->
-          <el-row>
-            <el-col :span="16">
-              <div class="font-bold">账户密码</div>
-              <div class="text-14px mt-2">
-                定期修改密码有助于保护账户安全
-                <el-button
-                  type="primary"
-                  plain
-                  size="small"
-                  class="ml-5"
-                  @click="() => handleOpenDialog(DialogType.PASSWORD)"
-                >
-                  修改
-                </el-button>
-              </div>
-            </el-col>
-          </el-row>
-          <!-- 绑定手机 -->
-          <div class="mt-5">
-            <div class="font-bold">绑定手机</div>
-            <div class="text-14px mt-2">
-              <span v-if="userProfile.mobile">已绑定手机号：{{ userProfile.mobile }}</span>
-              <span v-else>未绑定手机</span>
+            <div class="user-role">{{ userProfile.roleNames }}</div>
+          </div>
+          <el-divider />
+          <div class="user-stats">
+            <div class="stat-item">
+              <div class="stat-value">0</div>
+              <div class="stat-label">待办</div>
+            </div>
+            <div class="stat-item">
+              <div class="stat-value">0</div>
+              <div class="stat-label">消息</div>
+            </div>
+            <div class="stat-item">
+              <div class="stat-value">0</div>
+              <div class="stat-label">通知</div>
+            </div>
+          </div>
+        </el-card>
+      </el-col>
+
+      <!-- 右侧信息卡片 -->
+      <el-col :span="16">
+        <el-card class="info-card">
+          <template #header>
+            <div class="card-header">
+              <span>账号信息</span>
+            </div>
+          </template>
+          <el-descriptions :column="1" border>
+            <el-descriptions-item label="用户名">
+              {{ userProfile.username }}
+              <el-icon v-if="userProfile.gender === 1" class="gender-icon male">
+                <Male />
+              </el-icon>
+              <el-icon v-else class="gender-icon female">
+                <Female />
+              </el-icon>
+            </el-descriptions-item>
+            <el-descriptions-item label="手机号码">
+              {{ userProfile.mobile || "未绑定" }}
               <el-button
                 v-if="userProfile.mobile"
                 type="primary"
-                plain
-                size="small"
-                class="ml-5"
+                link
                 @click="() => handleOpenDialog(DialogType.MOBILE)"
               >
                 更换
@@ -124,27 +74,18 @@
               <el-button
                 v-else
                 type="primary"
-                plain
-                size="small"
-                class="ml-5"
+                link
                 @click="() => handleOpenDialog(DialogType.MOBILE)"
               >
                 绑定
               </el-button>
-            </div>
-          </div>
-          <!-- 绑定邮箱 -->
-          <div class="mt-5">
-            <div class="font-bold">绑定邮箱</div>
-            <div class="text-14px mt-2">
-              <span v-if="userProfile.email">已绑定邮箱：{{ userProfile.email }}</span>
-              <span v-else>未绑定邮箱</span>
+            </el-descriptions-item>
+            <el-descriptions-item label="邮箱">
+              {{ userProfile.email || "未绑定" }}
               <el-button
                 v-if="userProfile.email"
                 type="primary"
-                plain
-                size="small"
-                class="ml-5"
+                link
                 @click="() => handleOpenDialog(DialogType.EMAIL)"
               >
                 更换
@@ -152,18 +93,39 @@
               <el-button
                 v-else
                 type="primary"
-                plain
-                size="small"
-                class="ml-5"
+                link
                 @click="() => handleOpenDialog(DialogType.EMAIL)"
               >
                 绑定
               </el-button>
+            </el-descriptions-item>
+            <el-descriptions-item label="部门">
+              {{ userProfile.deptName }}
+            </el-descriptions-item>
+            <el-descriptions-item label="创建时间">
+              {{ userProfile.createTime }}
+            </el-descriptions-item>
+          </el-descriptions>
+        </el-card>
+
+        <el-card class="security-card">
+          <template #header>
+            <div class="card-header">
+              <span>安全设置</span>
+            </div>
+          </template>
+          <div class="security-item">
+            <div class="security-info">
+              <div class="security-title">账户密码</div>
+              <div class="security-desc">定期修改密码有助于保护账户安全</div>
             </div>
+            <el-button type="primary" link @click="() => handleOpenDialog(DialogType.PASSWORD)">
+              修改
+            </el-button>
           </div>
         </el-card>
-      </el-tab-pane>
-    </el-tabs>
+      </el-col>
+    </el-row>
 
     <!-- 弹窗 -->
     <el-dialog v-model="dialog.visible" :title="dialog.title" :width="500">
@@ -200,6 +162,7 @@
           <el-input v-model="passwordChangeForm.confirmPassword" type="password" show-password />
         </el-form-item>
       </el-form>
+
       <!-- 绑定手机 -->
       <el-form
         v-else-if="dialog.type === DialogType.MOBILE"
@@ -214,7 +177,7 @@
         <el-form-item label="验证码" prop="code">
           <el-input v-model="mobileUpdateForm.code" style="width: 250px">
             <template #append>
-              <el-button class="ml-5" :disabled="mobileCountdown > 0" @click="handleSendMobileCode">
+              <el-button :disabled="mobileCountdown > 0" @click="handleSendMobileCode">
                 {{ mobileCountdown > 0 ? `${mobileCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
@@ -236,13 +199,14 @@
         <el-form-item label="验证码" prop="code">
           <el-input v-model="emailUpdateForm.code" style="width: 250px">
             <template #append>
-              <el-button class="ml-5" :disabled="emailCountdown > 0" @click="handleSendEmailCode">
+              <el-button :disabled="emailCountdown > 0" @click="handleSendEmailCode">
                 {{ emailCountdown > 0 ? `${emailCountdown}s后重新发送` : "发送验证码" }}
               </el-button>
             </template>
           </el-input>
         </el-form-item>
       </el-form>
+
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="dialog.visible = false">取消</el-button>
@@ -490,18 +454,167 @@ onMounted(async () => {
 </script>
 
 <style lang="scss" scoped>
-/** 关闭tag标签  */
-.app-container {
-  /* 50px = navbar = 50px */
-  height: calc(100vh - 50px);
+.profile-container {
+  min-height: calc(100vh - 84px);
+  padding: 20px;
   background: var(--el-fill-color-blank);
 }
 
-/** 开启tag标签  */
-.hasTagsView {
-  .app-container {
-    /* 84px = navbar + tags-view = 50px + 34px */
-    height: calc(100vh - 84px);
+.user-card {
+  .user-info {
+    padding: 20px 0;
+    text-align: center;
+
+    .avatar-wrapper {
+      position: relative;
+      display: inline-block;
+      margin-bottom: 16px;
+
+      .avatar-edit-btn {
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.5);
+        border: none;
+        transition: all 0.3s ease;
+
+        &:hover {
+          background: rgba(0, 0, 0, 0.7);
+        }
+      }
+    }
+
+    .user-name {
+      margin-bottom: 8px;
+
+      .nickname {
+        font-size: 18px;
+        font-weight: 600;
+        color: var(--el-text-color-primary);
+      }
+
+      .edit-icon {
+        margin-left: 8px;
+        color: var(--el-text-color-secondary);
+        cursor: pointer;
+        transition: all 0.3s ease;
+
+        &:hover {
+          color: var(--el-color-primary);
+        }
+      }
+    }
+
+    .user-role {
+      font-size: 14px;
+      color: var(--el-text-color-secondary);
+    }
+  }
+
+  .user-stats {
+    display: flex;
+    justify-content: space-around;
+    padding: 16px 0;
+
+    .stat-item {
+      text-align: center;
+
+      .stat-value {
+        font-size: 20px;
+        font-weight: 600;
+        color: var(--el-text-color-primary);
+      }
+
+      .stat-label {
+        margin-top: 4px;
+        font-size: 12px;
+        color: var(--el-text-color-secondary);
+      }
+    }
+  }
+}
+
+.info-card,
+.security-card {
+  margin-bottom: 20px;
+
+  .card-header {
+    font-size: 16px;
+    font-weight: 600;
+    color: var(--el-text-color-primary);
+  }
+}
+
+.security-item {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 16px 0;
+
+  .security-info {
+    .security-title {
+      margin-bottom: 4px;
+      font-size: 16px;
+      font-weight: 500;
+      color: var(--el-text-color-primary);
+    }
+
+    .security-desc {
+      font-size: 14px;
+      color: var(--el-text-color-secondary);
+    }
+  }
+}
+
+.el-descriptions {
+  .el-descriptions__label {
+    font-weight: 500;
+    color: var(--el-text-color-regular);
+  }
+
+  .el-descriptions__content {
+    color: var(--el-text-color-primary);
+  }
+
+  .gender-icon {
+    margin-left: 8px;
+    font-size: 16px;
+
+    &.male {
+      color: #409eff;
+    }
+
+    &.female {
+      color: #f56c6c;
+    }
+  }
+}
+
+.el-dialog {
+  .el-dialog__header {
+    padding: 20px;
+    margin: 0;
+    border-bottom: 1px solid var(--el-border-color-light);
+  }
+
+  .el-dialog__body {
+    padding: 30px 20px;
+  }
+
+  .el-dialog__footer {
+    padding: 20px;
+    border-top: 1px solid var(--el-border-color-light);
+  }
+}
+
+// 响应式适配
+@media (max-width: 768px) {
+  .profile-container {
+    padding: 10px;
+  }
+
+  .el-col {
+    width: 100%;
   }
 }
 </style>

From 6026e9cac0d8d80a808d62f3a61adafc5990cee1 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 3 Apr 2025 15:00:16 +0800
Subject: [PATCH 292/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E6=9E=9A=E4=B8=BE=E7=B1=BB=E5=9E=8B=E6=9B=BF=E4=BB=A3?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A2=9E?=
 =?UTF-8?q?=E5=BC=BA=E7=B1=BB=E5=9E=8B=E5=AE=89=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新相关函数和变量的类型定义
---
 src/store/modules/settings.store.ts |  6 +++---
 src/types/global.d.ts               |  2 +-
 src/utils/theme.ts                  | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings.store.ts
index 2cea2b59..f4b0afff 100644
--- a/src/store/modules/settings.store.ts
+++ b/src/store/modules/settings.store.ts
@@ -1,7 +1,7 @@
 import defaultSettings from "@/settings";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 import { LayoutMode } from "@/enums/settings/layout.enum";
-import { generateThemeColors, applyTheme, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
+import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 
 type SettingsValue = boolean | string;
 
@@ -27,7 +27,7 @@ export const useSettingsStore = defineStore("setting", () => {
 
   // 主题
   const themeColor = useStorage<string>("themeColor", defaultSettings.themeColor);
-  const theme = useStorage<string>("theme", defaultSettings.theme);
+  const theme = useStorage<ThemeMode>("theme", defaultSettings.theme);
 
   //  监听主题变化
   watch(
@@ -63,7 +63,7 @@ export const useSettingsStore = defineStore("setting", () => {
     if (setting) setting.value = value;
   }
 
-  function changeTheme(val: string) {
+  function changeTheme(val: ThemeMode) {
     theme.value = val;
   }
 
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index cf16798f..54d2a356 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -67,7 +67,7 @@ declare global {
     /** 主题颜色 */
     themeColor: string;
     /** 主题模式(dark|light) */
-    theme: string;
+    theme: import("@/enums/settings/theme.enum").ThemeMode;
     /** 布局大小(default |large |small) */
     size: string;
     /** 语言( zh-cn| en) */
diff --git a/src/utils/theme.ts b/src/utils/theme.ts
index fbf41f00..558503ee 100644
--- a/src/utils/theme.ts
+++ b/src/utils/theme.ts
@@ -1,3 +1,5 @@
+import { ThemeMode } from "@/enums";
+
 // 辅助函数：将十六进制颜色转换为 RGB
 function hexToRgb(hex: string): [number, number, number] {
   const bigint = parseInt(hex.slice(1), 16);
@@ -49,21 +51,22 @@ export const getLightColor = (color: string, level: number): string => {
  * @param primary 主题色
  * @param theme 主题类型
  */
-export function generateThemeColors(primary: string, theme: string) {
+export function generateThemeColors(primary: string, theme: ThemeMode) {
   const colors: Record<string, string> = {
     primary,
   };
 
   // 生成浅色变体
   for (let i = 1; i <= 9; i++) {
-    const primaryColor =
-      theme === "light" ? `${getLightColor(primary, i / 10)}` : `${getDarkColor(primary, i / 10)}`;
-    colors[`primary-light-${i}`] = primaryColor;
+    colors[`primary-light-${i}`] =
+      theme === ThemeMode.LIGHT
+        ? `${getLightColor(primary, i / 10)}`
+        : `${getDarkColor(primary, i / 10)}`;
   }
 
   // 生成深色变体
   colors["primary-dark-2"] =
-    theme === "light" ? `${getLightColor(primary, 0.2)}` : `${getDarkColor(primary, 0.3)}`;
+    theme === ThemeMode.LIGHT ? `${getLightColor(primary, 0.2)}` : `${getDarkColor(primary, 0.3)}`;
 
   return colors;
 }
@@ -83,9 +86,9 @@ export function applyTheme(colors: Record<string, string>) {
  */
 export function toggleDarkMode(isDark: boolean) {
   if (isDark) {
-    document.documentElement.classList.add("dark");
+    document.documentElement.classList.add(ThemeMode.DARK);
   } else {
-    document.documentElement.classList.remove("dark");
+    document.documentElement.classList.remove(ThemeMode.DARK);
   }
 }
 

From c0718a089c71c120bc8653e3aaa0404f8d73dd51 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 3 Apr 2025 15:05:03 +0800
Subject: [PATCH 293/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重新设计了登录页面布局和样式,添加了注册和重置密码功能组件
---
 src/assets/images/login-bg.svg          |  71 +++++
 src/components/CommonWrapper/index.vue  |  21 ++
 src/components/DarkModeSwitch/index.vue |  39 +++
 src/components/LangSelect/index.vue     |   2 +-
 src/lang/package/en.ts                  |  19 +-
 src/lang/package/zh-cn.ts               |  19 +-
 src/views/login/components/Login.vue    | 253 ++++++++++++++++++
 src/views/login/components/Register.vue | 203 ++++++++++++++
 src/views/login/components/ResetPwd.vue |  57 ++++
 src/views/login/index.vue               | 336 +++++-------------------
 10 files changed, 743 insertions(+), 277 deletions(-)
 create mode 100644 src/assets/images/login-bg.svg
 create mode 100644 src/components/CommonWrapper/index.vue
 create mode 100644 src/components/DarkModeSwitch/index.vue
 create mode 100644 src/views/login/components/Login.vue
 create mode 100644 src/views/login/components/Register.vue
 create mode 100644 src/views/login/components/ResetPwd.vue

diff --git a/src/assets/images/login-bg.svg b/src/assets/images/login-bg.svg
new file mode 100644
index 00000000..e22366f9
--- /dev/null
+++ b/src/assets/images/login-bg.svg
@@ -0,0 +1,71 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="100%" height="100%" viewBox="0 0 1400 800">
+
+  <!-- 主波浪 (蓝色系) -->
+  <path d="M-200 450 Q100 400 400 450 T1000 430"
+        fill="none"
+        stroke="#409EFF"
+        stroke-width="8"
+        stroke-opacity="0.4"
+        stroke-linecap="round">
+    <animate attributeName="d"
+             values="M-200 450 Q100 400 400 450 T1000 430;
+                    M-200 460 Q100 420 400 440 T1000 420;
+                    M-200 450 Q100 400 400 450 T1000 430"
+             dur="12s"
+             repeatCount="indefinite"/>
+  </path>
+
+  <!-- 次级波浪 (金色系) -->
+  <path d="M-150 550 Q200 520 500 560 T1300 530"
+        fill="none"
+        stroke="#FF914D"
+        stroke-width="5"
+        stroke-opacity="0.3"
+        stroke-linecap="round">
+    <animate attributeName="d"
+             values="M-150 550 Q200 520 500 560 T1300 530;
+                    M-150 540 Q200 530 500 550 T1300 520;
+                    M-150 550 Q200 520 500 560 T1300 530"
+             dur="9s"
+             repeatCount="indefinite"/>
+  </path>
+
+  <!-- 动态流动线 -->
+  <path d="M-100 600 Q300 620 700 580 T1400 590"
+        fill="none"
+        stroke="#FF6B6B"
+        stroke-width="3"
+        stroke-opacity="0.25"
+        stroke-dasharray="20 10">
+    <animate attributeName="stroke-dashoffset"
+             from="0" to="100"
+             dur="15s"
+             repeatCount="indefinite"/>
+  </path>
+
+  <!-- 主园球 -->
+  <circle cx="220" cy="220" r="160" fill="#37B6FF" stroke="#37B6FF" stroke-width="8">
+    <animateMotion path="M 0 0 L 30 15 Z" dur="6s" repeatCount="indefinite"/>
+  </circle>
+
+  <!-- 半球形 -->
+  <path d="M 100 350 A 150 150 0 1 1 400 350 Q400 370 380 370 L 250 370 L 120 370 Q100 370 100 350" fill="#FF914D">
+    <animateMotion path="M 800 -200 L 800 -300 L 800 -200" dur="20s" begin="0s" repeatCount="indefinite"/>
+    <animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="30s" type="rotate" values="0 210 530 ; -30 210 530 ; 0 210 530" keyTimes="0 ; 0.5 ; 1" repeatCount="indefinite"/>
+  </path>
+
+  <!-- 旋转方块 -->
+  <rect x="1000" y="420" rx="20" ry="20" width="110" height="110" fill="#FABBD8" stroke="#FABBD8" stroke-width="3">
+    <animateTransform attributeType="XML" attributeName="transform"
+                      begin="0s" dur="30s" type="rotate"
+                      from="0 1450 550" to="360 1450 550"
+                      repeatCount="indefinite"/>
+  </rect>
+
+  <!-- 动态光点 -->
+  <circle cx="1050" cy="580" r="24" fill="#FFD93D" opacity="0.9">
+    <animateMotion path="M 0 0 L -25 35 Z" dur="8s" repeatCount="indefinite"/>
+    <animate attributeName="r" values="24;28;24" dur="4s" repeatCount="indefinite"/>
+  </circle>
+
+</svg>
diff --git a/src/components/CommonWrapper/index.vue b/src/components/CommonWrapper/index.vue
new file mode 100644
index 00000000..9898849a
--- /dev/null
+++ b/src/components/CommonWrapper/index.vue
@@ -0,0 +1,21 @@
+<template>
+  <div cursor-pointer flex-center rounded class="el" :class="padding">
+    <slot></slot>
+  </div>
+</template>
+<script setup lang="ts">
+defineProps({
+  padding: {
+    type: String,
+    default: "p-2",
+  },
+});
+</script>
+<style scoped lang="scss">
+.el {
+  transition: 0.3s var(--el-transition-function-ease-in-out-bezier);
+  &:hover {
+    background-color: var(--el-fill-color);
+  }
+}
+</style>
diff --git a/src/components/DarkModeSwitch/index.vue b/src/components/DarkModeSwitch/index.vue
new file mode 100644
index 00000000..c5991b28
--- /dev/null
+++ b/src/components/DarkModeSwitch/index.vue
@@ -0,0 +1,39 @@
+<template>
+  <el-dropdown trigger="click" @command="handleDarkChange">
+    <el-icon :size="20">
+      <component :is="settingsStore.theme === ThemeMode.DARK ? Moon : Sunny" />
+    </el-icon>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item
+          v-for="item in theneList"
+          :key="item.value"
+          :command="item.value"
+          :disabled="settingsStore.theme === item.value"
+        >
+          <el-icon>
+            <component :is="item.component" />
+          </el-icon>
+          {{ item.label }}
+        </el-dropdown-item>
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+</template>
+<script setup lang="ts">
+import { useSettingsStore } from "@/store";
+import { ThemeMode } from "@/enums";
+import { Moon, Sunny } from "@element-plus/icons-vue";
+
+const { t } = useI18n();
+const settingsStore = useSettingsStore();
+
+const theneList = [
+  { label: t("login.light"), value: ThemeMode.LIGHT, component: Sunny },
+  { label: t("login.dark"), value: ThemeMode.DARK, component: Moon },
+];
+
+const handleDarkChange = (theme: ThemeMode) => {
+  settingsStore.changeTheme(theme);
+};
+</script>
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index f348e918..fab9e71c 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown trigger="click" @command="handleLanguageChange">
-    <div class="i-svg:language" />
+    <div class="i-svg:language" :class="size" />
     <template #dropdown>
       <el-dropdown-menu>
         <el-dropdown-item
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index ef6eae4e..edff4d40 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -6,13 +6,17 @@ export default {
   },
   // 登录页面国际化
   login: {
+    theneToggle: "Theme Switch",
+    languageToggle: "Language Switch",
+    dark: "Dark",
+    light: "Light",
     username: "Username",
     password: "Password",
     login: "Login",
     captchaCode: "Verify Code",
     capsLock: "Caps Lock is On",
     rememberMe: "Remember Me",
-    forgetPassword: "Forget Password",
+    forgetPassword: "Forget Password?",
     message: {
       username: {
         required: "Please enter Username",
@@ -20,12 +24,23 @@ export default {
       password: {
         required: "Please enter Password",
         min: "The password can not be less than 6 digits",
+        confirm: "Please confirm the password again",
+        inconformity: "The two password entries are inconsistent",
       },
       captchaCode: {
         required: "Please enter Verify Code",
       },
     },
-    otherLoginMethods: "Other login methods",
+    otherLoginMethods: "Other",
+    resetPassword: "Reset password",
+    thinkOfPasswd: "Remember your password?",
+    register: "Register account",
+    agree: "I have read and agree to the",
+    userAgreement: "User Agreement",
+    haveAccount: "Already have an account?",
+    noAccount: "Don't have an account?",
+    quickFill: "Quick fill",
+    reg: "Register",
   },
   // 导航栏国际化
   navbar: {
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 50681516..f86191b6 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -6,13 +6,17 @@ export default {
   },
   // 登录页面国际化
   login: {
+    theneToggle: "主题切换",
+    languageToggle: "语言切换",
+    dark: "暗黑",
+    light: "明亮",
     username: "用户名",
     password: "密码",
     login: "登 录",
     captchaCode: "验证码",
     capsLock: "大写锁定已打开",
     rememberMe: "记住我",
-    forgetPassword: "忘记密码",
+    forgetPassword: "忘记密码？",
     message: {
       username: {
         required: "请输入用户名",
@@ -20,12 +24,23 @@ export default {
       password: {
         required: "请输入密码",
         min: "密码不能少于6位",
+        confirm: "请再次确认密码",
+        inconformity: "两次密码输入不一致",
       },
       captchaCode: {
         required: "请输入验证码",
       },
     },
-    otherLoginMethods: "其他登录方式",
+    otherLoginMethods: "其他",
+    resetPassword: "重置密码",
+    thinkOfPasswd: "想起密码？",
+    register: "注册账号",
+    agree: "我已同意并阅读",
+    userAgreement: "用户协议",
+    haveAccount: "已有账号？",
+    noAccount: "您没有账号？",
+    quickFill: "快速填写",
+    reg: "注 册",
   },
   // 导航栏国际化
   navbar: {
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
new file mode 100644
index 00000000..e6c6581b
--- /dev/null
+++ b/src/views/login/components/Login.vue
@@ -0,0 +1,253 @@
+<template>
+  <div>
+    <h3 text-center m-0 mb-20px>{{ t("login.login") }}</h3>
+    <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules" size="large">
+      <!-- 用户名 -->
+      <el-form-item prop="username">
+        <el-input v-model.trim="loginFormData.username" :placeholder="t('login.username')">
+          <template #prefix>
+            <el-icon><User /></el-icon>
+          </template>
+        </el-input>
+      </el-form-item>
+
+      <!-- 密码 -->
+      <el-tooltip :visible="isCapsLock" :content="t('login.capsLock')" placement="right">
+        <el-form-item prop="password">
+          <el-input
+            v-model.trim="loginFormData.password"
+            :placeholder="t('login.password')"
+            type="password"
+            show-password
+            @keyup="checkCapsLock"
+            @keyup.enter="handleLoginSubmit"
+          >
+            <template #prefix>
+              <el-icon><Lock /></el-icon>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-tooltip>
+
+      <!-- 验证码 -->
+      <el-form-item prop="captchaCode">
+        <div flex>
+          <el-input
+            v-model.trim="loginFormData.captchaCode"
+            :placeholder="t('login.captchaCode')"
+            @keyup.enter="handleLoginSubmit"
+          >
+            <template #prefix>
+              <div class="i-svg:captcha" />
+            </template>
+          </el-input>
+          <div cursor-pointer h="[40px]" w="[120px]" flex-center ml-10px @click="getCaptcha">
+            <el-icon v-if="codeLoading" class="is-loading"><Loading /></el-icon>
+
+            <img
+              v-else
+              object-cover
+              border-rd-4px
+              p-1px
+              shadow="[0_0_0_1px_var(--el-border-color)_inset]"
+              :src="http://github.com/captchaBase64"
+              alt="code"
+            />
+          </div>
+        </div>
+      </el-form-item>
+
+      <!-- 快捷登录 -->
+      <div flex-y-center gap-10px>
+        <el-text size="default">{{ t("login.quickFill") }}</el-text>
+        <el-link type="danger" @click="setLoginCredentials('root', '123456')">ROOT</el-link>
+        <el-link type="warning" @click="setLoginCredentials('admin', '123456')">ADMIN</el-link>
+        <el-link type="primary" @click="setLoginCredentials('test', '123456')">TEST</el-link>
+      </div>
+
+      <div class="flex-x-between w-full">
+        <el-checkbox v-model="loginFormData.rememberMe">{{ t("login.rememberMe") }}</el-checkbox>
+        <el-link type="primary" :underline="false" @click="toOtherForm('resetPwd')">
+          {{ t("login.forgetPassword") }}
+        </el-link>
+      </div>
+
+      <!-- 登录按钮 -->
+      <el-form-item>
+        <el-button :loading="loading" type="primary" class="w-full" @click="handleLoginSubmit">
+          {{ t("login.login") }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <div flex-center gap-10px>
+      <el-text size="default">{{ t("login.noAccount") }}</el-text>
+      <el-link type="primary" :underline="false" @click="toOtherForm('register')">
+        {{ t("login.reg") }}
+      </el-link>
+    </div>
+
+    <!-- 第三方登录 -->
+    <el-divider>
+      <el-text size="small">{{ t("login.otherLoginMethods") }}</el-text>
+    </el-divider>
+    <div class="flex-center gap-x-5 w-full text-[var(--el-text-color-secondary)]">
+      <CommonWrapper>
+        <div text-20px class="i-svg:wechat" />
+      </CommonWrapper>
+      <CommonWrapper>
+        <div text-20px cursor-pointer class="i-svg:qq" />
+      </CommonWrapper>
+      <CommonWrapper>
+        <div text-20px cursor-pointer class="i-svg:github" />
+      </CommonWrapper>
+      <CommonWrapper>
+        <div text-20px cursor-pointer class="i-svg:gitee" />
+      </CommonWrapper>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import type { FormInstance } from "element-plus";
+import { LocationQuery, RouteLocationRaw, useRoute } from "vue-router";
+import { useI18n } from "vue-i18n";
+import AuthAPI, { type LoginFormData } from "@/api/auth.api";
+import router from "@/router";
+import { useUserStore } from "@/store";
+import CommonWrapper from "@/components/CommonWrapper/index.vue";
+
+const { t } = useI18n();
+const userStore = useUserStore();
+const route = useRoute();
+
+onMounted(() => getCaptcha());
+
+const loginFormRef = ref<FormInstance>();
+const loading = ref(false); // 按钮 loading 状态
+const isCapsLock = ref(false); // 是否大写锁定
+const captchaBase64 = ref(); // 验证码图片Base64字符串
+
+const loginFormData = ref<LoginFormData>({
+  username: "admin",
+  password: "123456",
+  captchaKey: "",
+  captchaCode: "",
+  rememberMe: false,
+});
+
+const loginRules = computed(() => {
+  return {
+    username: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.username.required"),
+      },
+    ],
+    password: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.password.required"),
+      },
+      {
+        min: 6,
+        message: t("login.message.password.min"),
+        trigger: "blur",
+      },
+    ],
+    captchaCode: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.captchaCode.required"),
+      },
+    ],
+  };
+});
+
+// 获取验证码
+const codeLoading = ref(false);
+function getCaptcha() {
+  codeLoading.value = true;
+  AuthAPI.getCaptcha()
+    .then((data) => {
+      loginFormData.value.captchaKey = data.captchaKey;
+      captchaBase64.value = data.captchaBase64;
+    })
+    .finally(() => (codeLoading.value = false));
+}
+
+// 登录提交处理
+async function handleLoginSubmit() {
+  try {
+    // 1. 表单验证
+    const valid = await loginFormRef.value?.validate();
+    if (!valid) return;
+
+    loading.value = true;
+
+    // 2. 执行登录
+    await userStore.login(loginFormData.value);
+
+    // 3. 获取用户信息
+    await userStore.getUserInfo();
+
+    // 4. 解析并跳转目标地址
+    const redirect = resolveRedirectTarget(route.query);
+    await router.push(redirect);
+
+    // TODO 5. 判断用户是否点击了记住我？采用明文保存或使用jsencrypt库？
+  } catch (error) {
+    // 5. 统一错误处理
+    getCaptcha(); // 刷新验证码
+    console.error("登录失败:", error);
+  } finally {
+    loading.value = false;
+  }
+}
+
+/**
+ * 解析重定向目标
+ * @param query 路由查询参数
+ * @returns 标准化后的路由地址对象
+ */
+function resolveRedirectTarget(query: LocationQuery): RouteLocationRaw {
+  // 默认跳转路径
+  const defaultPath = "/";
+
+  // 获取原始重定向路径
+  const rawRedirect = (query.redirect as string) || defaultPath;
+
+  try {
+    // 6. 使用Vue Router解析路径
+    const resolved = router.resolve(rawRedirect);
+    return {
+      path: resolved.path,
+      query: resolved.query,
+    };
+  } catch {
+    // 7. 异常处理：返回安全路径
+    return { path: defaultPath };
+  }
+}
+
+// 检查输入大小写
+function checkCapsLock(event: KeyboardEvent) {
+  // 防止浏览器密码自动填充时报错
+  if (event instanceof KeyboardEvent) {
+    isCapsLock.value = event.getModifierState("CapsLock");
+  }
+}
+
+// 设置登录凭证
+const setLoginCredentials = (username: string, password: string) => {
+  loginFormData.value.username = username;
+  loginFormData.value.password = password;
+};
+
+const emit = defineEmits(["update:modelValue"]);
+function toOtherForm(type: "register" | "resetPwd") {
+  emit("update:modelValue", type);
+}
+</script>
diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue
new file mode 100644
index 00000000..37d21491
--- /dev/null
+++ b/src/views/login/components/Register.vue
@@ -0,0 +1,203 @@
+<template>
+  <div>
+    <h3 text-center m-0 mb-20px>{{ t("login.reg") }}</h3>
+    <el-form ref="formRef" :model="model" :rules="rules" size="large">
+      <!-- 用户名 -->
+      <el-form-item prop="username">
+        <el-input v-model.trim="model.username" :placeholder="t('login.username')">
+          <template #prefix>
+            <el-icon><User /></el-icon>
+          </template>
+        </el-input>
+      </el-form-item>
+
+      <!-- 密码 -->
+      <el-tooltip :visible="isCapsLock" :content="t('login.capsLock')" placement="right">
+        <el-form-item prop="password">
+          <el-input
+            v-model.trim="model.password"
+            :placeholder="t('login.password')"
+            type="password"
+            show-password
+            @keyup="checkCapsLock"
+            @keyup.enter="submit"
+          >
+            <template #prefix>
+              <el-icon><Lock /></el-icon>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-tooltip>
+
+      <el-tooltip :visible="isCapsLock" :content="t('login.capsLock')" placement="right">
+        <el-form-item prop="confirmPassword">
+          <el-input
+            v-model.trim="model.confirmPassword"
+            :placeholder="t('login.message.password.confirm')"
+            type="password"
+            show-password
+            @keyup="checkCapsLock"
+            @keyup.enter="submit"
+          >
+            <template #prefix>
+              <el-icon><Lock /></el-icon>
+            </template>
+          </el-input>
+        </el-form-item>
+      </el-tooltip>
+
+      <!-- 验证码 -->
+      <el-form-item prop="captchaCode">
+        <div flex>
+          <el-input
+            v-model.trim="model.captchaCode"
+            :placeholder="t('login.captchaCode')"
+            @keyup.enter="submit"
+          >
+            <template #prefix>
+              <div class="i-svg:captcha" />
+            </template>
+          </el-input>
+          <div cursor-pointer h="[40px]" w="[120px]" flex-center ml-10px @click="getCaptcha">
+            <el-icon v-if="codeLoading" class="is-loading"><Loading /></el-icon>
+
+            <img
+              v-else
+              object-cover
+              border-rd-4px
+              p-1px
+              shadow="[0_0_0_1px_var(--el-border-color)_inset]"
+              :src="http://github.com/captchaBase64"
+              alt="code"
+            />
+          </div>
+        </div>
+      </el-form-item>
+
+      <el-form-item>
+        <div class="flex-y-center w-full gap-10px">
+          <el-checkbox v-model="isRead">{{ t("login.agree") }}</el-checkbox>
+          <el-link type="primary" :underline="false">{{ t("login.userAgreement") }}</el-link>
+        </div>
+      </el-form-item>
+
+      <!-- 注册按钮 -->
+      <el-form-item>
+        <el-button :loading="loading" type="success" class="w-full" @click="submit">
+          {{ t("login.register") }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+    <div flex-center gap-10px>
+      <el-text size="default">{{ t("login.haveAccount") }}</el-text>
+      <el-link type="primary" :underline="false" @click="toLogin">{{ t("login.login") }}</el-link>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import type { FormInstance } from "element-plus";
+import { Lock } from "@element-plus/icons-vue";
+import { useI18n } from "vue-i18n";
+import AuthAPI, { type LoginFormData } from "@/api/auth.api";
+
+const { t } = useI18n();
+
+const emit = defineEmits(["update:modelValue"]);
+const toLogin = () => emit("update:modelValue", "login");
+
+onMounted(() => getCaptcha());
+
+const formRef = ref<FormInstance>();
+const loading = ref(false); // 按钮 loading 状态
+const isCapsLock = ref(false); // 是否大写锁定
+const captchaBase64 = ref(); // 验证码图片Base64字符串
+const isRead = ref(false);
+
+interface Model extends LoginFormData {
+  confirmPassword: string;
+}
+
+const model = ref<Model>({
+  username: "admin",
+  password: "123456",
+  confirmPassword: "",
+  captchaKey: "",
+  captchaCode: "",
+  rememberMe: false,
+});
+
+const rules = computed(() => {
+  return {
+    username: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.username.required"),
+      },
+    ],
+    password: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.password.required"),
+      },
+      {
+        min: 6,
+        message: t("login.message.password.min"),
+        trigger: "blur",
+      },
+    ],
+    confirmPassword: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.password.required"),
+      },
+      {
+        min: 6,
+        message: t("login.message.password.min"),
+        trigger: "blur",
+      },
+      {
+        validator: (_: any, value: string) => {
+          return value === model.value.password;
+        },
+        trigger: "blur",
+        message: t("login.message.password.inconformity"),
+      },
+    ],
+    captchaCode: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.captchaCode.required"),
+      },
+    ],
+  };
+});
+
+// 获取验证码
+const codeLoading = ref(false);
+function getCaptcha() {
+  codeLoading.value = true;
+  AuthAPI.getCaptcha()
+    .then((data) => {
+      model.value.captchaKey = data.captchaKey;
+      captchaBase64.value = data.captchaBase64;
+    })
+    .finally(() => (codeLoading.value = false));
+}
+
+// 检查输入大小写
+function checkCapsLock(event: KeyboardEvent) {
+  // 防止浏览器密码自动填充时报错
+  if (event instanceof KeyboardEvent) {
+    isCapsLock.value = event.getModifierState("CapsLock");
+  }
+}
+
+const submit = async () => {
+  await formRef.value?.validate();
+  ElMessage.warning("开发中 ...");
+};
+</script>
diff --git a/src/views/login/components/ResetPwd.vue b/src/views/login/components/ResetPwd.vue
new file mode 100644
index 00000000..a504fe47
--- /dev/null
+++ b/src/views/login/components/ResetPwd.vue
@@ -0,0 +1,57 @@
+<template>
+  <div>
+    <h3 text-center m-0 mb-20px>{{ t("login.resetPassword") }}</h3>
+    <el-form ref="formRef" :model="model" :rules="rules" size="large">
+      <!-- 用户名 -->
+      <el-form-item prop="username">
+        <el-input v-model.trim="model.username" :placeholder="t('login.username')">
+          <template #prefix>
+            <el-icon><User /></el-icon>
+          </template>
+        </el-input>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="warning" class="w-full" @click="submit">
+          {{ t("login.resetPassword") }}
+        </el-button>
+      </el-form-item>
+    </el-form>
+
+    <div flex-center gap-10px>
+      <el-text size="default">{{ t("login.thinkOfPasswd") }}</el-text>
+      <el-link type="primary" :underline="false" @click="toLogin">{{ t("login.login") }}</el-link>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { useI18n } from "vue-i18n";
+import type { FormInstance } from "element-plus";
+
+const { t } = useI18n();
+
+const emit = defineEmits(["update:modelValue"]);
+const toLogin = () => emit("update:modelValue", "login");
+
+const model = ref({
+  username: "",
+});
+
+const rules = computed(() => {
+  return {
+    username: [
+      {
+        required: true,
+        trigger: "blur",
+        message: t("login.message.username.required"),
+      },
+    ],
+  };
+});
+
+const formRef = ref<FormInstance>();
+
+const submit = async () => {
+  await formRef.value?.validate();
+  ElMessage.warning("开发中 ...");
+};
+</script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3e5642ed..2800b5d9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,294 +1,86 @@
 <template>
-  <div class="login flex-center wh-full relative overflow-scroll">
-    <!-- 登录页头部 -->
-    <div class="flex-x-end absolute top-0 w-full p-4">
-      <el-switch
-        v-model="isDark"
-        inline-prompt
-        active-icon="Moon"
-        inactive-icon="Sunny"
-        @change="toggleTheme"
-      />
-      <lang-select class="ml-2 cursor-pointer" />
+  <div class="wh-full flex-center flex-col login">
+    <!-- 右侧切换主题、语言按钮 -->
+    <div class="flex flex-col gap-4px fixed top-40px right-40px text-lg">
+      <el-tooltip :content="t('login.theneToggle')" placement="left">
+        <CommonWrapper>
+          <DarkModeSwitch />
+        </CommonWrapper>
+      </el-tooltip>
+      <el-tooltip :content="t('login.languageToggle')" placement="left">
+        <CommonWrapper>
+          <LangSelect size="text-20px" />
+        </CommonWrapper>
+      </el-tooltip>
     </div>
-
-    <!-- 登录页内容 -->
-    <div
-      class="m-5 w-full min-w-[335px] max-w-[460px] p-5 shadow-[var(--el-box-shadow-light)] sm:p-10"
-      :class="[isDark ? 'bg-transparent' : 'bg-white']"
-    >
-      <div class="flex-center relative pb-5">
-        <h2>{{ defaultSettings.title }}</h2>
-        <el-dropdown class="absolute! right-0">
-          <div class="cursor-pointer">
-            <el-icon><arrow-down /></el-icon>
-          </div>
-          <template #dropdown>
-            <el-dropdown-menu>
-              <el-dropdown-item>
-                <el-tag>{{ defaultSettings.version }}</el-tag>
-              </el-dropdown-item>
-              <el-dropdown-item @click="setLoginCredentials('root', '123456')">
-                超级管理员: root/123456
-              </el-dropdown-item>
-              <el-dropdown-item @click="setLoginCredentials('admin', '123456')">
-                系统管理员: admin/123456
-              </el-dropdown-item>
-              <el-dropdown-item @click="setLoginCredentials('test', '123456')">
-                测试小游客: test/123456
-              </el-dropdown-item>
-            </el-dropdown-menu>
-          </template>
-        </el-dropdown>
-      </div>
-
-      <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules" size="large">
-        <!-- 用户名 -->
-        <el-form-item prop="username">
-          <el-input v-model.trim="loginFormData.username" :placeholder="t('login.username')">
-            <template #prefix>
-              <el-icon :color="isDark ? 'white' : 'black'"><User /></el-icon>
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <!-- 密码 -->
-        <el-tooltip :visible="isCapsLock" :content="t('login.capsLock')" placement="right">
-          <el-form-item prop="password">
-            <el-input
-              v-model.trim="loginFormData.password"
-              :placeholder="t('login.password')"
-              type="password"
-              show-password
-              @keyup="checkCapsLock"
-              @keyup.enter="handleLoginSubmit"
-            >
-              <template #prefix>
-                <el-icon :color="isDark ? 'white' : 'black'"><Lock /></el-icon>
-              </template>
-            </el-input>
-          </el-form-item>
-        </el-tooltip>
-
-        <!-- 验证码 -->
-        <el-form-item prop="captchaCode">
-          <el-input
-            v-model.trim="loginFormData.captchaCode"
-            :placeholder="t('login.captchaCode')"
-            @keyup.enter="handleLoginSubmit"
-          >
-            <template #prefix>
-              <div :class="['i-svg:captcha', isDark ? 'text-white' : 'text-black']" />
-            </template>
-            <template #suffix>
-              <el-image :src="http://github.com/captchaBase64" class="w-[138px] cursor-pointer" @click="getCaptcha" />
-            </template>
-          </el-input>
-        </el-form-item>
-
-        <div class="flex-x-between w-full">
-          <el-checkbox v-model="loginFormData.rememberMe">{{ t("login.rememberMe") }}</el-checkbox>
-          <el-link type="primary" @click="unfinished">{{ t("login.forgetPassword") }}</el-link>
+    <!-- 登录页主体 -->
+    <div flex-1 flex-center>
+      <div
+        class="p-4xl h-full w-full sm:w-450px border-rd-10px sm:h-680px shadow-[var(--el-box-shadow-light)] backdrop-blur-3px"
+      >
+        <div w-full flex flex-col items-center>
+          <!-- logo -->
+          <el-image :src="http://github.com/logo" style="width: 84px" />
+
+          <!-- 标题 -->
+          <h2>
+            <el-badge :value="`v ${defaultSettings.version}`" type="success">
+              {{ defaultSettings.title }}
+            </el-badge>
+          </h2>
+
+          <!-- 组件切换 -->
+          <transition name="fade-slide" mode="out-in">
+            <component :is="formComponents[component]" v-model="component" class="w-90%" />
+          </transition>
         </div>
-
-        <!-- 登录按钮 -->
-        <el-button :loading="loading" type="primary" class="w-full" @click="handleLoginSubmit">
-          {{ t("login.login") }}
-        </el-button>
-
-        <!-- 第三方登录 -->
-        <el-divider>
-          <el-text size="small">{{ t("login.otherLoginMethods") }}</el-text>
-        </el-divider>
-        <div class="flex-center gap-x-5 text-[var(--el-text-color-secondary)]">
-          <div class="i-svg:wechat" />
-          <div class="i-svg:qq" />
-          <div class="i-svg:github" />
-          <div class="i-svg:gitee" />
-        </div>
-      </el-form>
+      </div>
+      <!-- 登录页底部版权 -->
+      <el-text size="small" class="py-2.5! fixed bottom-0 text-center">
+        Copyright © 2021 - 2025 youlai.tech All Rights Reserved.
+        <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
+      </el-text>
     </div>
-
-    <!-- 登录页底部 -->
-    <el-text size="small" class="py-2.5! fixed bottom-0 text-center">
-      Copyright © 2021 - 2025 youlai.tech All Rights Reserved.
-      <a href="http://beian.miit.gov.cn/" target="_blank">皖ICP备20006496号-2</a>
-    </el-text>
   </div>
 </template>
 
 <script setup lang="ts">
-import { LocationQuery, RouteLocationRaw, useRoute } from "vue-router";
-import { useI18n } from "vue-i18n";
-
-import AuthAPI, { type LoginFormData } from "@/api/auth.api";
-import router from "@/router";
-
-import type { FormInstance } from "element-plus";
-
+import logo from "@/assets/logo.png";
 import defaultSettings from "@/settings";
-import { ThemeMode } from "@/enums/settings/theme.enum";
-
-import { useSettingsStore, useUserStore } from "@/store";
-
-const userStore = useUserStore();
-const settingsStore = useSettingsStore();
-
-const route = useRoute();
-const { t } = useI18n();
-const loginFormRef = ref<FormInstance>();
-
-const isDark = ref(settingsStore.theme === ThemeMode.DARK); // 是否暗黑模式
-const loading = ref(false); // 按钮 loading 状态
-const isCapsLock = ref(false); // 是否大写锁定
-const captchaBase64 = ref(); // 验证码图片Base64字符串
-
-const loginFormData = ref<LoginFormData>({
-  username: "admin",
-  password: "123456",
-  captchaKey: "",
-  captchaCode: "",
-  rememberMe: false,
-});
-
-const loginRules = computed(() => {
-  return {
-    username: [
-      {
-        required: true,
-        trigger: "change",
-        message: t("login.message.username.required"),
-      },
-    ],
-    password: [
-      {
-        required: true,
-        trigger: "change",
-        message: t("login.message.password.required"),
-      },
-      {
-        min: 6,
-        message: t("login.message.password.min"),
-        trigger: "blur",
-      },
-    ],
-    captchaCode: [
-      {
-        required: true,
-        trigger: "change",
-        message: t("login.message.captchaCode.required"),
-      },
-    ],
-  };
-});
+import CommonWrapper from "@/components/CommonWrapper/index.vue";
+import DarkModeSwitch from "@/components/DarkModeSwitch/index.vue";
 
-// 获取验证码
-function getCaptcha() {
-  AuthAPI.getCaptcha().then((data) => {
-    loginFormData.value.captchaKey = data.captchaKey;
-    captchaBase64.value = data.captchaBase64;
-  });
-}
-
-// 登录提交处理
-async function handleLoginSubmit() {
-  try {
-    // 1. 表单验证
-    const valid = await loginFormRef.value?.validate();
-    if (!valid) return;
-
-    loading.value = true;
-
-    // 2. 执行登录
-    await userStore.login(loginFormData.value);
-
-    // 3. 获取用户信息
-    await userStore.getUserInfo();
-
-    // 4. 解析并跳转目标地址
-    const redirect = resolveRedirectTarget(route.query);
-    await router.push(redirect);
-  } catch (error) {
-    // 5. 统一错误处理
-    getCaptcha(); // 刷新验证码
-    console.error("登录失败:", error);
-  } finally {
-    loading.value = false;
-  }
-}
-
-/**
- * 解析重定向目标
- * @param query 路由查询参数
- * @returns 标准化后的路由地址对象
- */
-function resolveRedirectTarget(query: LocationQuery): RouteLocationRaw {
-  // 默认跳转路径
-  const defaultPath = "/";
-
-  // 获取原始重定向路径
-  const rawRedirect = (query.redirect as string) || defaultPath;
-
-  try {
-    // 6. 使用Vue Router解析路径
-    const resolved = router.resolve(rawRedirect);
-    return {
-      path: resolved.path,
-      query: resolved.query,
-    };
-  } catch {
-    // 7. 异常处理：返回安全路径
-    return { path: defaultPath };
-  }
-}
-
-// 主题切换
-const toggleTheme = () => {
-  const newTheme = settingsStore.theme === ThemeMode.DARK ? ThemeMode.LIGHT : ThemeMode.DARK;
-  settingsStore.changeTheme(newTheme);
-};
-
-// 检查输入大小写
-function checkCapsLock(event: KeyboardEvent) {
-  // 防止浏览器密码自动填充时报错
-  if (event instanceof KeyboardEvent) {
-    isCapsLock.value = event.getModifierState("CapsLock");
-  }
-}
+type LayoutMap = "login" | "register" | "resetPwd";
 
-// 设置登录凭证
-const setLoginCredentials = (username: string, password: string) => {
-  loginFormData.value.username = username;
-  loginFormData.value.password = password;
-};
+const t = useI18n().t;
 
-// 未实现功能提示
-const unfinished = () => {
-  ElMessage.warning("该功能尚未完成，敬请期待！");
+const component = ref<LayoutMap>("login"); // 切换显示的组件
+const formComponents = {
+  login: defineAsyncComponent(() => import("./components/Login.vue")),
+  register: defineAsyncComponent(() => import("./components/Register.vue")),
+  resetPwd: defineAsyncComponent(() => import("./components/ResetPwd.vue")),
 };
-
-onMounted(() => getCaptcha());
 </script>
 
 <style lang="scss" scoped>
 .login {
-  background: url("http://github.com/@/assets/images/login-bg.jpg") no-repeat center right;
+  background: url("http://github.com/@/assets/images/login-bg.svg");
+  background-size: cover;
 }
-html.dark {
-  .login {
-    background: url("http://github.com/@/assets/images/login-bg-dark.jpg") no-repeat center right;
-    .el-card {
-      background: transparent;
-    }
-  }
+
+/* fade-slide */
+.fade-slide-leave-active,
+.fade-slide-enter-active {
+  transition: all 0.3s;
 }
-.el-form-item {
-  margin-bottom: 20px;
+
+.fade-slide-enter-from {
+  opacity: 0;
+  transform: translateX(-30px);
 }
-:deep(.el-input) {
-  height: 48px;
-  .el-input__wrapper {
-    padding: 1px 10px;
-  }
+
+.fade-slide-leave-to {
+  opacity: 0;
+  transform: translateX(30px);
 }
 </style>

From 5b330b770f676ee7dd281a35ced665159f581c58 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 3 Apr 2025 23:46:33 +0800
Subject: [PATCH 294/497] =?UTF-8?q?docs:=20:memo:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 index.html   | 5 +----
 package.json | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/index.html b/index.html
index 97513ab2..1c086a72 100644
--- a/index.html
+++ b/index.html
@@ -4,10 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" href="http://github.com/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <meta
-      name="description"
-      content="Vue3 + Vite5 + TypeScript5 + Element-Plus 的后台管理模板，配套接口文档和后端源码，vue-element-admin 的 Vue3 版本"
-    />
+    <meta name="description" content="Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板 " />
     <meta
       name="keywords"
       content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
diff --git a/package.json b/package.json
index 564430d6..dceb5e11 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,6 @@
 {
   "name": "vue3-element-admin",
+  "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
   "version": "2.25.2",
   "private": true,
   "type": "module",

From 8b1c6aa06019067e11c205b12b6ff25b4909947a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 4 Apr 2025 00:53:05 +0800
Subject: [PATCH 295/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/login-bg-dark.jpg  | Bin 20471 -> 0 bytes
 src/assets/images/login-bg.jpg       | Bin 32872 -> 0 bytes
 src/assets/images/login-bg.svg       |  98 +++++++++++++--------------
 src/views/login/components/Login.vue |  14 ----
 4 files changed, 49 insertions(+), 63 deletions(-)
 delete mode 100644 src/assets/images/login-bg-dark.jpg
 delete mode 100644 src/assets/images/login-bg.jpg

diff --git a/src/assets/images/login-bg-dark.jpg b/src/assets/images/login-bg-dark.jpg
deleted file mode 100644
index 50dc817e8fca2d229f91de8f9ee4a395572ee00a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20471
zcmd6v&x<3;p4cN}GS^wz&)!sRR@q(*4vB6^72O!ThPSs3CDKx(Ic%1YhJI~WdLR4X
zy@5UKU*M3e0*&UdHG_K2S)v8iY8rZmX<zozyX?a9PO}38{&m=c{{tUwJpOzmr7BgI
zdi-E7j;WS1BjOw1-{1Jg56ut%`G<c{Y5xyD{6iH4N(KC<e)w-{suExB{p2V2emnhV
z>2Durzw<lUaqD0FF8{TD&pa^v{obRWK5Rey>7z6I`@e6`{`imjfAq(H{)=Dy`CrWb
z;xGU5e+B>80e<*v)rjMNmHf>IK}+dI@IfQ^;cwJGhfE=Krv&<+{P15@T-W}Ow>vHW
z-#luk^lwNEUDa>cIr2k>SHH=~bzhbK27Lp&>9qa+5t#D2Exdku&%=fS-}?XP>?ueZ
zPd6j|IME5>a%#)jkBgbU{9TJT-XPff1-)Juou_s4k9Mw9EwybYyLZUCGT-#wTJetw
zqpWEF(AB`U{@VAM`EgH%v_0crv~br@`?^;ugTpT>+ESIw=c;G7LfqFqSCNb_L<c7#
zMDruPX|F`mUK<Yt<XYx;$41bl&~n{HtM`i}gA4!!eO&^zmHDP(=Szl_fv?BYKSFb*
zs@pmYuW{@QSwBWFCo)jV`cDNB+ow&%^%sNY^}yGZrdw@ZciKL{TIJc>&|F%iVz#aC
zd^2k0O;qH|Ka05Sdqr2OazloYida(UaqkSdeHHdLzRiFlLl?Z4jtC>oH;~46MjG#<
zLx|pX)*c5M6!P~LNJh@V)5Ox;Uq~Nx2%me4bY|=%Jh^TTm5r}oZa+k|Uh*Byx%X0%
zs|3pVy9q{+VQ-JPeG?<iz2~}ZRjAwz<hIg(YZq7qT!})q#l6E~bS=$VF`{+5?F<>W
zSVUmkwp^9Gi6Y&$H-wn&Gv6}O_8t2dsxys@x5b&=vBfmE@7NP#SCL}GZEtf+e$sn8
zQlc_pl-PHTPQ|wb$Y6Egl5bCV1m${X@NmaWYE!n-S7Lge2;s14d<7p+Vz<wtH_Ar7
z+C^|(A{Dcx4m9>g`gQMZTNQMyDj7StA;qTQ_1GH^bae$X$yFwt-*`Z}L-?k*t$Slr
zM5r9Q-U*PqgXg~AmT$O3Fco!XTcvgf7e!Mxv@tkRml4uyQRp41Y<h1-LfFGnRTbUs
z_2BUh<-*bx|29KGI9Betao62<D3?i2EM?QCU5QvSl^BRIG7M#h^c=>#c&%?ymGq6U
z8ER!1DbV8lgO~^U5CxgKB8L*#jWABLr3Ownt#q&GXRoa>3oLe9!jio)L7Q$7(M)&j
zVKbC=6%kyNO29NUNl8P&FNN;<)53SQzJdUUqMpOC7=f$npk_0^=)7Y1&vp@%SQ#Dw
zf-My$+~|@1v;-=AT#JbDsyxGhkI^7LWHtz#fn+I}9$Nu`z)ejl^6^%A<DqyKy(nIl
zVl`l{YZxEz7Mq9PEt~O{;lvM5f3p#gu5#$f5otv48wR!l6=hOH@ij|{tEy5h#bHHB
zPFi;)T6v>o@c11BAW1QTja&e&*^9(ODJXx7AO%5CxJqRfvbTcYa$MF3Jb)2Ml^2t-
zjS}sKxdX$NXJ<CeH3v$D+OTk7OON3QlfL1>Y<SKS$;Rj^>Zz&Bi)W&>Dv$aP>=pg$
zq19Hd86fD{dcHSE;-$-jVr=tsb8^E+r~{#yFykS3A=uSbwHuU)UbQCK_?i(|vI3Dr
zL<GJ?bIj3FB`HK13<FyRL1~S0zLNe%9uhqVfGk9k1*_FiDsiVwtyGyG6vG`xHVzc&
za~}X5JXmyo=EqTaq}mq02$wLjF-sGBKBJ(g#Ka{XA+V;PLvZ5Ic`36--nrI!T(hpn
zg+rJih=upC^cogU#L6ob+~C+yl_xn?lF?U01%es}zFXr+z_Brtjb|fWAS(2Y>_n}e
z=t`gW)TJfN$8C@pXrOE?v1$_)VFVmb*$3t|UnJrxJIeIA<Vfjr29i243?~m!&{vmY
zzOmL2mJW~trHUd!Q-MZVtECD8KuF0mxD@77Ktg3-Z+O9e^0L%Ui{dxD)P!lbbZ6d2
zQt$)zHjse`Qsp%g6H1j*CKk}ZUfTT9Mrv+#5Q3#s-oir4mw=_#BQewflOV7jE+jNr
zt8AmV7MT))s~|GgcoyK)2rT9WNMIENhfo%m&XbWtmPjm9ozs*MCk2ZY%EVZfbD4Os
z1>t{TyhOLmTvb74t*N;YN`OK6QHIS5jG)nHz)3wZNPj6Z!|JdjDY~W%?dyd^aPZm*
z-RU9C=pSYhRrL&9*HV_4BqGbJd^xss3IZLXxLVZ`c@cE3k(Sx;!h|gSDu}A}LY(b@
z0_0TJNPZ?0f>qAeLUtIH*wWH1=ZT8q*Gk#3cv9?Pz``5~mdTOQ*p>_<Oz{QpQAWB`
z(lJe~l@PY!WnS|#w{Tzuga9X!$q0q>oLoaHbZmqUsV8IZpqRj(3@}tJ6e)07!&jA+
z!c3yyO3g&rH$0)_BQLW^y<oVYhB392OB5q!7W{nq7DG>+10P@zGRFc1Q)Gu|z|-rH
zA5Fwo_^B`(_|&11PoOB5C2ZoHJk}NfGM}ksdamasVbLj<st$w;X^wvR(rX8Mo<W+W
zMkXD@H~b{<BeS42fo2@5)xlF*k`vF6m~HH>2I{=7MLUBzzD_4+!Wgoh$N_dHe<gw=
zG%2QaC;gSzl6GgdjSCdiVd;X#=)@W&a!bheC09ULzCRBk4Il`5NSoLwDO6ZU(xV^B
zutY#HHu%&~O@Bed2i)KU1eA&(6h3!B;~{`h84f{2@JDPCfki$1Nl+DIgSI|%2E(N~
z4NjUqH9YvRgyEc87|Inn4#e@NtbF9SbiXW#L_)1mGlW3Bm>j{jRP6y?joliMOSKix
zfw;56Ehp}hzBARrO|($10+yleOpWG90jF^QFf0uOuS<wy(qtYmP^V_b&&{-jtQv<h
zIUnUPNQIHHpt&XvFOi6ApiUd8gH>q@?2$~*(YfduhHILUwgj9-o{OWRyP2Aai_koN
zDk8cPM8Ti@{4E+6>S}!pb!S3dRVf0!afc#VnguY^OUFb^F&hwRh{&L_!8}Sta>Qv9
zTCv^mQYkBIxGE@Cbdzz6RPlj37H$A-gL7W2X{gv)5C|fN-xn^rmo218_yJJb60g-P
z$(N3facII+@F?WOJ`iMN(F0yn%P4?|P9d#?G+d~nUl7D<ih0ps=u=^IQE<j<EI0u1
zqq!`P+P$F16az7)#ehy4Ql)dgDpg+5BBHd)c@TV^s8d#hxpW{>8=W>zg=EJ+m=yyO
zHtFrbgfMZ^o?f)AdJXDvthyppVMYpAB6)G3HFag?HG{qNRdnu{r8@*T(cK0HTbG$a
zMB)MklvqZT1pT}^>qCNNb`L{se6UE5X!dBtMFhm7qDrh{$po@osK=GT6H*hJD>25H
zAt<thS(XxxJU5OinJM(*(gLSSdb%lYC`K^c&{nBo**?nVPB78I0z?#?s};oc2nW=d
zCb2w(@|6GlpennkhC?`!NFeG|Y+p&-?ey{rGX%;_C6Y3j3a_L?1ugn50|fk|UT6~;
zoZ01EB+A&SamW=ExTUnO;2GxR-GPTfs##(Jq8tR;vrN6Q>a_?wP~vH;cPy=EhFXeD
z{P{XTJECfaauZq|&rZ3BFL21D1R`6HfpQ|@e{fE62?*vHVxu(krP?AO`7???S0f>+
zGAAy_Lr<8b9--e0vy2)`iVKHqYa9y}&@!s9pNR<!=CZ)IfjYb}P?cg<lD6eeaH!+F
z`BV`Pfs^6|kY5(_GfRAho*1L1Jr$|OtQ&+Izo<3{ULZhQ`v4}8>0fJwVfuv3S%j@p
z!SkW@Jw=(uKgqmL_?#?2lc?eX*YufUCqYRn%;+`Dea`^GY8VlL24KZBg4hg(mP#1M
zav)?O^j97P?bbqrRzcH?vVp6h+d;EI&TxfQYnc)dn-sg{Kd?AKyO(8`eLZo^P#WK%
zStMp1Ll6oDfH7(#s`;0gK@4E>ql*JkYm%zN%AzEp9xJDa1@S@wOHa{1Co2TYbIe~z
zm_Udlh#|ub2x6BP3fzlBmn-am=TsFBWjHtrQ-Xo-RY^z4-EfaTOk{4)mJ67Qm~!Zi
zxZstE-jh-jW`r4EHdwsP$Zo2&b0;Gjr)GS58+l>rDynoI1p7zG_{^MKlKe{#LuFOp
zIYMjdL~;}_X0u6oc(24~R!LH>R8>_nL4=CASR2(ucs$o)7NfKBA|o(!*U>5H6rLz?
zmKa95h}=_#iUDvQBaf^!Neatqm6QoN3B67F7({MDV8=#Pkb83$85{abshCc)Iso`|
zz^8;_Xg${v<*4|ppF8mzt3;T-u-x-DljN(QIHxL%rgR83WoVh`u}&|79T-96rvWC9
za_No|rysV1Hsq(a-&HdWnd$*!4a;Zh29*eV;{<tjW)rgDT)Bf1k=rISX#rga9oRY{
zBuG@Ni@2x~zgZ<wUPe8n6$VdHkn4o12=FBJWjXhKZ-BOJMfp1DlcWI@<j74~Vmxy&
zK)v1u#@2WwqLAgD^@1U3SjXn!^DF#cV+3(JR;@rnVC#!j%h6w+H-$qF&()f#k=+K3
zBC%~})WoErfiac7{_1H(@2v;%$X*^%G%HWeCAaoosntYs|IivYQ%0SiyV@iS-F?A|
zCgR@7WidHt5|Y9yN~=Q6Lem0K?EQNOP0dofQ(U#}a$Ga49Jx*$x70;wvBD#~6B|O$
zo8r;rt0<Fse!g_R8kY@7mYtcT-bK-pgP(1Iodg31B#Mp)6M+#O#?F{Y9NQ_Ktvb$-
zI)B^Z1vk&jQ9fKw77~3*sIX1t#&Oz!FQ?V9x_o#Gh+{Fb{&}9QqlB<ks^Bzd>~P8&
z(Achy(H7!0BJJx!C?!p1Hd*A^r6nD9G&wV7h8zcRYz_*or-605)X@iP$X9xiG1n7L
zay7)zWf2&*$VZIpn>dPt?k!A-!kx0gRa7!ToG0oYDXubXAce8%#<81{=|^*|XX-}a
z-WtdfKVk=<pTHH#9n!F5J+Wz~wnd1v4_q1M2D`W^$d6q4ks6$r*~w%@-jhE*!8DC6
zbZlp_6MK4yZMpCU$Xj_CWoxx+TQuxsE4Ni)upIuIi9G}ve1RS@-jq@nMyn%M0AzBO
z-4ar!#o=3K@&-iCLYy}Z^cPM!cLOB2SQ{-yeunvVS?S5-+z^kH>#|^N1!?Mt&m1M}
z=n7+W1lZ(kNXjrdXN5g3&JQnC8>2O|xQJahw947TD|NVoN+uau9<2yW{U|5VVx^)?
zIYEdBurTQuzcAsTdVC8RYGvYEWfhRwCA(bcTG7#r<4%~)w1Kf$-Ft8wNL5%=l$^N1
zXQWRgmh&?_B8}tJ&dju_W~tM=K2;McwyVdzG8>h$x;g8yUQ(*5CTS~f#O8iz;7hr>
z^Y&9LYRuXuIawt68G9bzDE*eSs}aPLuoWLjSn?~rEr5KB@nXG$^Q5XIbe2!p!FZ^U
zL)e5X^DiX=I{fBV!RRWV4z@{d25uD*uoYWTVMlj#D~#PKg4y*ef%ZDa0LLV&i1D)1
zCkSa~f{XN`6HjzXVDdhB3zbM+G{i!0d7fpgr(O@3+=KLfT%?`Up=Rv^%`GTYj0HtR
zz+S?x3@fVPzy*QorbRrByI<+FDcag~ErBOG5oM$DWS*7FdApZKt#2b)AavpaaTKAQ
z%KG>n72~)G0pQ54v*Yt@Fu5vGdFySQ9w5UB4%P^avZzc@+!W+7a5?UORjtSpvUN~=
z76r=M`|-3X9#(|H+PgI3acfmx4x@H4uh!Y}D$6(?>X2Nw;+82=H*3M#<68j$q+mN^
z541WPUiPw+d3zX1vS7zSI&C7yA~aKFTNih+F_jQBCf}}-QC5xeWI*s^@@WAVHq!<k
zX|dpUO2vjk#?-xryLI;UeEGNKWdWQ?yPbHN7PgDpm@VG{3#{yTR3rVYpA5b|Ilt^N
zTeyHAf2dn&Cmu5yVa4_xFs5zXrSr>dot#`<_K%4L5=)JpcH>hwgSQFE#T_DvXT*$t
zg-`Y``{g&xevXZVhHj=!Gik)>1YF_a+jp=@%uzWaM2;`)o8iMJvKuK**0s|~jNVea
zhc`A6SgRZr^TA~Cq<r#7|2^1L*o=Sjxju{!57b2m!!q_=Yy-zydK4w=Y_MLPeAXE*
zow}#esrk3fcxFz!ABf`A<XtfJ4SNuFRX)nf^^<Irk64H&MyD5taX}C{RDah5%s|5J
za^hePDp%RyyYrL9@w`&xMBP?cq*FK~raD<;-UcF$T(MUaofXgeN5AUy*U>7=<}6U+
z*+JZC#*O>p-S)2LRK$)@Ms9-#;BeLNW>txXixxWQPU271ES`_mUHei=smDZ-<>Ks<
z`BA@m)9KhY`O3^qr%f}xZx6#T4vzG@WU7GWD>3M^Uh-r)SzkRWt14ri&@wGEJMA2#
zzg4J75IJ`T@W_@&ESDZ3mdUeGXY}){JPN{qXmWc0FzpuFILkWV4xA!EOv*>eV6iHf
z-+enG&L-^bwBlwu>vkI9f!3jJ-z5}@G9exnSF3iv{i|OlE1BQG*A2S`vgw3&;ukr0
z5K7*XW6;CFi{7dtSEv$_#dy|i#M2grCW#NB?@l2ZV^id6b=F^<EH3*aoQlMvWu`@|
zk#^0WrUp;9cfj<50C6&3-Rqq!z8RdihopBZZiLgr_+r{=1|k-{M=Z=WQ7~LCM%nu0
zSwDk4oFOdC6nyDvGq%RGF3cTtIA5MbgZbHTuvm}s!82Pal{OA^tCh|st+1s!YQ9H(
z<bqX_t=h$l-r&WkBkU3Vy4`d(>$cJh5|gk|>?1Rmovd%$z0pyBRkOz)1_HU?YQ$aJ
zmDT1R<#GPU4*H0xcm+DUe&o^3riVY7PCJd13@V1uyJamKp?KeVF#qOBS#xI!=B#nk
z%%;CppgRNM@0LgG6c^{^a=jQmI-VzF4G5)~PFm*lwAIvhLOe3>0x5N5QS#+5U$2h(
z>%sXEx?|t5Yc6JR$E098EW7W5MQnLyFo%H+UJSjds1S#}-#S1hW||tiPvdL`kO|$h
z>($wCJ*t^wCh0aB@o8~rS`V=3J2L{<eTWcQzUZC27*^{MQ&}7~34N_1osDAym3!=2
zX31KX9$kB6Nl|n<!v{W(?~`Mjy>_WYmc6LN2}X~OFibYDw3>Af;z^e|fh@q1N8BwL
z(f!PRQxc<}^+r*<&$cjeEG(KtmisY_8@0zQ6`50&l`!}B{Z*UDdE)XwH4cJC{ApS=
zbSDh=Ih`W9*UVvF!zUz1rCweH@o9Y8J?+TM%zAu}S%Qu!R?xlZqlJpho@GEma?@yH
z&8JKWcSAe8ZkWSRJab1Kz>2te5YA@BAxRNLI=a1E22RYf!YtQ=FX!3voOyy-{1oSj
zFIqz59*^_9Mae(aIKi_%yve4snZ(V{p%GW$C~BWAV<ujb+2BQg<dYoq7N+jgcsA`E
z#&$w_`YwI)o{_4Yb%yPa`r@nS96=}xwr<gF#ed3rz_85OQ#dQBS$ozeG7!`&O`6hb
z9YSL#PCF{Ld!RT{E~Dgl0&6e&gDcW1XW~w9fJGKUBQxI~sM<*Kf9JK<9#$eptamz{
zktdEXI$AaNLE!-6Z@om2jk3I~fU>RDee`Yq&LBp&56mm=KicK14EguucsNc?v%y3_
zT;PyW+kH^?Y^3tbUy6k+R;+ehC3^?6&r@8K<%-p2AC&%<**|}jjN1KGzUKH`sfn6)
zyW|?3w233^143nyB*5MpNuD{CK}+zJPFo=x0&2DwO8DyOZ#`f0<-}FkL$lFf5yn!&
z+R*NU5{2o7x5dSiHoKY5q(S3=#6BJy1mD^RR7Wi4{73D+%u~cGLnbtxq+NT_VD@$U
zpn{=Sm&E?X*>J^z$|z<uRvzXwMp=8!P>qOI68T?cgT>&AU1qCh_Zv;!NbiR*wb#GA
z0MG2V#Hws{ub**1LxPuHj7bjJuGkwm2*VsYOVodq%Pd;JLo8En+;tZXGOs=J1YAns
zD64N!Rkk9DrDmK?S%kG>H`8igK%~pfY&KYwYk){6S{<2S*z$T0OSSZ5<~-}QJ3Wcn
z7o9^U+OcT`${2>dTk467-0Ve<9RxO(Y&<<+0o6SS*e(n10!U5987?d(>$4$CS!T?5
z7S8NxD|EB{As(1|3VTF4Fu2OgOYC79o|^lIADHfY;yXaw`HL)f&I(v_b>Y5gHMD8z
z_c3%md9{0-){Vhq3Krz-YozJ>_`$?Eb0JKyfh;G$Y^sU*G}-RLL-v=gFI_>I9BJF4
z8IVM|>HE3y0YWT+W0!M`+jYz|X6vcIAMAcC^<;(A=2_0N;CT=L!k$hi*qbNFARA^l
z*y;2+23O{g^uTmAQDN^41&E)4^C!tskBvVS5vj(^@`gjv_qd!=!b@3wn~k_r^p%yV
zFrB0=^rM<W#J(baN>*_;<W!uiR?HP+ATZ|r!GIw)6B8Q|%o1$=1YsjgNsHBV-}q9u
znUh9xM8S5a8i!2{M5?;)gOEr{AUM7pW=YU}JydRb5XYgZ=b=B~S3So8<u-Wmf&Wnt
z3xB2l`|YNG%$w}0-YwXpy<1C0pbGbHM3nGCG5+)V11pg74ij>NNgA}Y-IR=-$xtPC
zc7`hGNP}O<M)Pio0(L``tz@Tiw{Y{p7X-Oe0=7eazjq>R#kRf=pVsd5<~A8SdQx%Q
z4zqiCRoACxx4Yc1QC!N&EmpNta=B6&2Hd4m<DF{RR^t^*4zb&v!X9AoRD}S!&Q3L3
z$XsEP3Ifq?JuB#8*>_a2<lbpu|B|zIsgT3Yo5H?zraVSt-Ay&yq?PO;Qk+M#X$m-w
zuwFcRGkj@$Q+b5kJtgCso~r)JxPinN^f8`(nSFU-M^ywNa%S(9PwG9kpqOW<MXG85
zdU-zXad|^KE6-fc;*$o?kN$PWH5IS&&@WgrB?oSD{Pp#M-Bc~TSlRH&okzo4%c+O#
zh?L67IG#U=0ua_@S4J*p$tElLs=!pjmX*=+vto{VsPhDf!eUPWTmMVv{n8T<(GYkJ
z5H8kXEn^9O8Y-*3F!HS0fcUX|o?8#bF(|Z%EZmrJ*h6MI7ee%eGZ$qLStx^L9D9OA
zS`xV%=9wW*Dt}E<t1o4U8<<o?BXgay-VNBpz4UA{hGPfb)9h$Q^JKKbrU@8=M3rH@
zJnkjOLL0;wB{syayI2`LRnX}}j^A*BXxYo;Lcv)4Gv{0hAe-tVCGsTiji`q~-R3@W
zpX;VH4wNzQdM+l)X1wAQl0bW|$j6lk7HT;eJmzSVHe9i)O3}D9>2tZyVL~;1O;g3b
z$q*L(o(i<%`Hs^(x-G|~R_e<@1@~Z!0TYgn;KK=&+*!h}8)D3C)|WZ-*@Cl1q#+5d
zuA5{)=ye+?xgBLw8IvKF4tc`Mm=|@~^Ox=#?A3{E#UiG<Hbi1O@d-9XYTWx#s;N2(
zylTY;=t6XDy$EGPc&fvLQXN>mNYwMITEN~lE0%6LePGq0BN>Uld<@U9C4Avm0YQPF
z$uR&EH6|k}5;7RE<L$k#k|Bl-D~2XqL1rkRV(x??-W;jf=2M!m81`4~N9>ST)v!vY
zvd}XkmceO_F~)isX86OV1&TORMUS!1L)i?rfH;Q39=R_%32+Cm<czGq#6mcfvmKtv
zQH;0G2w~Vz2=|od3AZQMsKel@BwC0SOA}F$6ChRrM*QM4j0C|1(jw<5qPaMf$Y3gV
zvJr$daFS0fR1oeSINmdUlyKsyBPiiYVpUVE`o5_SI5nbNv2j-u8__7RHJS<+H#I>>
z4#iUBzCcxR9FIvTv;+inNP)0Cf-{Hdz>TW54G4hM1O3IhP+s<6g98w@8{fukZ~`A!
zDxZ5!1WU)t4(&vG`uk#ZkOBniP|iumxv%mcXeqGIxB_WJw1@7xC1T$&b1>2<sY5>7
zk|g)?$RWG<@oNxbLfgX59~Fe4;3>a3+Zn4O7Klgo>_ez3Z_s3NTU)D-V1uz51LvyE
zU=bU1Y)~Hu$(M-}{F5bLz9bK`p!<-YYKDX4+(CgxWOWgBtAnR1O$r|Rf&Ob(Hz>w~
z1hDJ3usOYkP<cB)uol4|AJKJ@K7`b|ME8=A>tDD?c}2K?5Wap~ZJJcZ9zP|1JP;8)
zXk8PhB;mw`JCWfleIeKT>JsVlfR}TXLZWTWpl4Gqv+zZc&qE@K1UkJHX<RLm-j~BH
zJ;_Z4RFH?&R&}`LvASvpr{%fk=Pjx~Z%wx&9?mM<#}4wQH9$oN#g->M7|^LLmkv`d
zg~eqb7p}|U7t5uKoElc@@a@CbWEh8^ZrjuYTOqp7ZIJX0!Q`f)e@Ip!_d`@qLtm#$
zzq%YwhY?TQLDgqSx4bb2V1z?p8ozJ=Ew1e}$a+|>3eL{#!b(g3hQ7Em0`)uzmm;JG
zH%8p(dQ4nGZ9JvN;k6u8U*qK1K3mRw&0F#*1&s+Fl^jlyoi2+noK#EMfMi+}n=clN
zx|+|>V<F3M3>7}#3R{IWVX6x0^R>H1q8i=jA^~EY;5fX&v4tp8@i;Mxx@^dLt)$_=
zO2FBaTFeiXH_>gSd}|>}90W4>*p~3}M7#RsL9kUm??LVbEG;+s;D!EPQuX6CYq(@B
z+sEnzq2r%)*p#`KZSH6|{PaV+t-c1yof7-Hso#oLw6|LtMJ-tBZqX!WvW+eW_Fune
zv7`NB=K}<$-tLaN=h=8|yweacwZ2ouYs|moPPHI;y(7)K10w{#xYJj>99wy}NbOyG
zg6?i-?1}RD;n&VTTz}YOWmToJYuBw?pu_sHZxbHMY$8>+t1Wj5#WN(&-YJ|NVpL95
zhNhbmibUWt=OV^UE%6PM49s@Ut<gheWMIZA+)nqn4UO#Bsjtp#ydCF(bTH3_*-Smu
zUraX9k4%xOn4>pbkjIFK=Zp0XW*F;|S)8iN4Q?xhtM~|F$rV&kW*h9(R&W({;G#nM
z)kFd$#nn=GA&d}{BAv9Ts?}cs!T!Wsm2>qci}SfOK))X=R_-$%<hRWm5Jz-kXk|2V
zB~#O`sF65_ge%6Bc|U-nDqRX^OvNzFla`c``B`x<$Rinx>_iIAAQd)vvmo)D(7^eV
z0||qX<b!bXxuvqBEawy=29hWG0HTu~uk1(wO{3&6rp6MV$=FRs;DppNwOR{|pwZbm
zEe15qqrfz}k|;)z(qqphm**5rgC{%-foH+2s^X%;4mz}u$2mf4N5l#{S*MG}V(UT<
z+sJVRh~WfCEg^v|@{~zlgEPp+8=$}<0?u#@zi=XdhB|o`>iFRhbn#|ccuSTXWK$1R
zp*Nb-iDqXY=YEJ_62gU?EUoxWn=GmLA&=}|H%^6HQqyQ2!y@NCu4%al#f+$W4FxW8
zm7iJU4Heykr?MROa9x3mj&l9CV(VrS8b?;|Q|NHOdH~)2I{2_dTiVgwdl?stECFHq
zTvS5#`t>9drpHJmD_1Oc6^%|1lFp!2mc3j!;+EQSf(%q>unNQ`ft)*MMd}n6Ui=b^
zdyjrZ><47r5J8}erL5SL7GybyDtHUysp0oPT!hGTmQ5I~NL8BbBrF*IvVX}P8f7sc
zI*zS0nT~ES21obHIq&42fZ9^Mu(D=Or}n@``G^}kC94*(!zvRn?woa-L<g>WE$7f>
zxRrw$Jr=9voTtepTrO9x$`x%~He=OgBY{ITvo5|KaRA@8P$qEP{}yK4By6!@DBHu;
z2_gx|kQ+b$E2spHC2s>so+rtwEmtm-B_Un@%!=h<?3!(P(<wObUWsN?77Ka61_>Qm
z05lsx$eMJ$d@&?>tQRRkhkhLP$1_{7@Eo;AJ^2lx<7|ZcLqZNLa`7S7^W$f|Cwaw&
z6LLG~RyfFp9yjGjdF#Qeth|&Z9Y(>Th!2F(WsjE==aXkLtW6K!T1O+o5PBMHx4$lz
z&qg2d1E7FrIo9<!<-TFp*y21{uQ+tRhm~mk*y3Q949p%PTfu1qatGg^EOOSoLC_Wp
z_}QP(Cxn}+b^YvQz5eb+pQSl=+M)GW*kLi&;$$E@8jU`F)-O>KXD1pnC@Wg6K`()-
z*6Wv}5ukXh#q9E9VOFaN+x<$7o{YZvW~F3<m64nFo-~Tcrd=8zjn?Z`9<Z0{Ba9MB
zc*s~qgY~P?Xq3e%2e#roV#)%^Z6Fo3M<1_W4X&PZ$%+kCNpF3tp?7MdqmO9*J}WuM
zmQ!2I($=uJPu45f>o=dQxtq}pv1B&Zo_bg|*N7cavU>9JlP|Aw9AjoW$11ExCN|n>
z`juUc)^C3GXPL6I!Vr-*t%O_F_d)OE`+q<BcoCGGj!am`oz<{RHeqP=`N^x%%h9kz
zT?KK{&8^1^!(2>#VF&B=_v@Ga+>9IPG_`Txh%_k97^5ynpS(g?%bA_t@5CLPu`XD=
zb6NIg^vU<@b;b3nPr0#%%hkmj7>ysl8m-FbX37<dsbAUqW)rd<(qF&)`1{c+=O!3O
z!QkD(S|*0Jw0`$$;L>hWjt`yLv?7l9YquIbdHM1B#V|}Sx~E0zSCqbkR?K}*2H!t<
z^D#!n^%D;1Zh&Qvr$oI^)^CQF928Ew+!i5*Y>HvIiZEV1dD$O~HP;w8TJ;9t+e6G=
zv=7ah4!hm^obuif%^=J9%h8`b8lCk_C%w4%oV#jbJic)Mlr!n|n~%Rg>vITmzqrqx
zKtkT8G+AYjo~)kyr}cbUx!I@br<}uIOPZBmP^`cE?)x{x!4(IUKsR?p4OzkP&99L3
z(J(Z#Ph*a)TQ_49urRFt%Ta&eP(zphd}QCC=Hl!6)e<eWEqB5$K5xiL!Imx+1;w+E
zUwrh*i+&lOw(fUNyB!?ux>V(Q#DCum7GWd);*e`ClWUd<13AJ(oXKDu-*0ti)2?;y
z8aB_qe%AkH{c?CRk2~?_hli~uR<SKa_0?!}vi@#<#;uU<>Fi=Qxi&7M1i-^L{g?dM
zC+-}!?sHRRhvO`I2=HM2JwJy@Pd{(8IGD5BkqIJw!V0i?m3CT;d|K=fEwF=ECjy(M
zpUcQ*d=2VhJ>K$6O=q7THXDB1b<<%3`|1&!)U9s!!*FWM4J^09M;{IGB&QpYTr`<J
zuFDqfdaevwI6UAtf7gwkT}WQ9vpDR|PA_J=6bE+j>(R+~>u1B<ifv4b-GTM^qc)(c
zC(H?7v=H*{iNFT*#b~II(?Nr)oHt0pdO3W_b(>s{)lX*=+3DGqEz-qV_i+oW>iYa^
z+v<^i)LTBYA&p#O*&UW&oQy_izZ~VEc;^KZ>`kcw`}~Zrzz1f{9hDPG;d8{Vb*gbZ
zy||4~Xobm)5LcYGIDfktl6`bEx?bce?sl1$?M{=JLVrXiH0^SYbr+e3IvW+|R%7y=
zTTKGh<Cm>**Uom$jyVq!2a8eiAcbcpB_+pT8FTUN@(-K;vt959>OcISAJqT;pFfpu
Vjs4wpK(~MM=0|#bu<7w%{x1-0sn`Gj

diff --git a/src/assets/images/login-bg.jpg b/src/assets/images/login-bg.jpg
deleted file mode 100644
index 993b958e243926e4dd5b1a415c879965117a3419..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 32872
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
Vk3V|iuRnJ0#=E5TTkrnQ|1Z@Pvk(9P

diff --git a/src/assets/images/login-bg.svg b/src/assets/images/login-bg.svg
index e22366f9..a0fbc13f 100644
--- a/src/assets/images/login-bg.svg
+++ b/src/assets/images/login-bg.svg
@@ -1,71 +1,71 @@
 <svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="100%" height="100%" viewBox="0 0 1400 800">
+  <style>
+    :root {
+      --blue: rgba(64, 158, 255, 0.08);
+      --grey: rgba(144, 147, 153, 0.05);
+      --orange: rgba(230, 162, 60, 0.06);
+      --green: rgba(144, 238, 144, 0.06);
+    }
 
-  <!-- 主波浪 (蓝色系) -->
-  <path d="M-200 450 Q100 400 400 450 T1000 430"
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --blue: rgba(64, 158, 255, 0.04);
+        --grey: rgba(144, 147, 153, 0.03);
+        --orange: rgba(230, 162, 60, 0.04);
+        --green: rgba(144, 238, 144, 0.04);
+      }
+    }
+  </style>
+
+  <!-- 左侧波浪 -->
+  <path d="M-50 550 Q200 500 450 550 T950 530"
         fill="none"
         stroke="#409EFF"
-        stroke-width="8"
-        stroke-opacity="0.4"
+        stroke-width="1.5"
+        stroke-opacity="0.05"
         stroke-linecap="round">
-    <animate attributeName="d"
-             values="M-200 450 Q100 400 400 450 T1000 430;
-                    M-200 460 Q100 420 400 440 T1000 420;
-                    M-200 450 Q100 400 400 450 T1000 430"
-             dur="12s"
-             repeatCount="indefinite"/>
   </path>
 
-  <!-- 次级波浪 (金色系) -->
-  <path d="M-150 550 Q200 520 500 560 T1300 530"
+  <!-- 右侧波浪 -->
+  <path d="M450 650 Q800 620 1150 660 T1550 630"
         fill="none"
-        stroke="#FF914D"
-        stroke-width="5"
-        stroke-opacity="0.3"
+        stroke="#909399"
+        stroke-width="1"
+        stroke-opacity="0.03"
         stroke-linecap="round">
-    <animate attributeName="d"
-             values="M-150 550 Q200 520 500 560 T1300 530;
-                    M-150 540 Q200 530 500 550 T1300 520;
-                    M-150 550 Q200 520 500 560 T1300 530"
-             dur="9s"
-             repeatCount="indefinite"/>
-  </path>
-
-  <!-- 动态流动线 -->
-  <path d="M-100 600 Q300 620 700 580 T1400 590"
-        fill="none"
-        stroke="#FF6B6B"
-        stroke-width="3"
-        stroke-opacity="0.25"
-        stroke-dasharray="20 10">
-    <animate attributeName="stroke-dashoffset"
-             from="0" to="100"
-             dur="15s"
-             repeatCount="indefinite"/>
   </path>
 
-  <!-- 主园球 -->
-  <circle cx="220" cy="220" r="160" fill="#37B6FF" stroke="#37B6FF" stroke-width="8">
-    <animateMotion path="M 0 0 L 30 15 Z" dur="6s" repeatCount="indefinite"/>
+  <!-- 右下方圆形 -->
+  <circle cx="950" cy="400" r="70" 
+          fill="var(--blue)" 
+          stroke="#409EFF" 
+          stroke-width="1" 
+          stroke-opacity="0.05">
   </circle>
 
-  <!-- 半球形 -->
-  <path d="M 100 350 A 150 150 0 1 1 400 350 Q400 370 380 370 L 250 370 L 120 370 Q100 370 100 350" fill="#FF914D">
-    <animateMotion path="M 800 -200 L 800 -300 L 800 -200" dur="20s" begin="0s" repeatCount="indefinite"/>
-    <animateTransform attributeType="XML" attributeName="transform" begin="0s" dur="30s" type="rotate" values="0 210 530 ; -30 210 530 ; 0 210 530" keyTimes="0 ; 0.5 ; 1" repeatCount="indefinite"/>
+  <!-- 左上方半球形  -->
+  <g transform="rotate(-10, 300, 180)">
+    <path d="M 180 180 A 120 120 0 1 1 420 180 Q420 195 405 195 L 310 195 L 195 195 Q180 195 180 180" 
+          fill="var(--orange)" 
+          stroke="#E6A23C" 
+          stroke-width="1" 
+          stroke-opacity="0.05">
+    </path>
+  </g>
+
+  <!-- 左下方三角形 -->
+  <path d="M300 600 L380 520 L420 650 Z" 
+        fill="var(--green)" 
+        stroke="#909399" 
+        stroke-width="1" 
+        stroke-opacity="0.04">
   </path>
 
   <!-- 旋转方块 -->
-  <rect x="1000" y="420" rx="20" ry="20" width="110" height="110" fill="#FABBD8" stroke="#FABBD8" stroke-width="3">
+ <rect x="1000" y="420" rx="10" ry="10" width="60" height="60" fill="rgba(169, 174, 184, 0.1)" stroke="rgba(169, 174, 184, 0.2)" stroke-width="1" opacity="0.5">
     <animateTransform attributeType="XML" attributeName="transform"
                       begin="0s" dur="30s" type="rotate"
                       from="0 1450 550" to="360 1450 550"
                       repeatCount="indefinite"/>
   </rect>
-
-  <!-- 动态光点 -->
-  <circle cx="1050" cy="580" r="24" fill="#FFD93D" opacity="0.9">
-    <animateMotion path="M 0 0 L -25 35 Z" dur="8s" repeatCount="indefinite"/>
-    <animate attributeName="r" values="24;28;24" dur="4s" repeatCount="indefinite"/>
-  </circle>
-
 </svg>
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index e6c6581b..32f9f0d2 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -57,14 +57,6 @@
         </div>
       </el-form-item>
 
-      <!-- 快捷登录 -->
-      <div flex-y-center gap-10px>
-        <el-text size="default">{{ t("login.quickFill") }}</el-text>
-        <el-link type="danger" @click="setLoginCredentials('root', '123456')">ROOT</el-link>
-        <el-link type="warning" @click="setLoginCredentials('admin', '123456')">ADMIN</el-link>
-        <el-link type="primary" @click="setLoginCredentials('test', '123456')">TEST</el-link>
-      </div>
-
       <div class="flex-x-between w-full">
         <el-checkbox v-model="loginFormData.rememberMe">{{ t("login.rememberMe") }}</el-checkbox>
         <el-link type="primary" :underline="false" @click="toOtherForm('resetPwd')">
@@ -240,12 +232,6 @@ function checkCapsLock(event: KeyboardEvent) {
   }
 }
 
-// 设置登录凭证
-const setLoginCredentials = (username: string, password: string) => {
-  loginFormData.value.username = username;
-  loginFormData.value.password = password;
-};
-
 const emit = defineEmits(["update:modelValue"]);
 function toOtherForm(type: "register" | "resetPwd") {
   emit("update:modelValue", type);

From 679198e8d3ec16d0e04f452b711f65e5f621eef6 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 4 Apr 2025 00:58:30 +0800
Subject: [PATCH 296/497] =?UTF-8?q?docs:=20:memo:=20=E8=A1=A5=E5=85=85=20J?=
 =?UTF-8?q?S=20=E7=89=88=E6=9C=AC=E9=A1=B9=E7=9B=AE=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5f0737c2..a22a335b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
 
 ## 项目简介
 
-[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 基于 Vue3、Vite、TypeScript 和 Element-Plus 搭建的极简开箱即用企业级后台管理前端模板。 （配套 Java 后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) 和 Node 后端 [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)）。
+[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 基于 Vue3、Vite、TypeScript 和 Element-Plus 搭建的极简开箱即用企业级后台管理前端模板。 配套 Java 后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) 和 Node 后端 [youlai-nest](https://gitee.com/youlaiorg/youlai-nest) 。 提供开发简版[vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) 和 JS 版本[vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) 供开发者快速开发。
 
 
 ## 项目特色
@@ -58,6 +58,7 @@
 | 项目 | Gitee   | Github    | GitCode|
 | ---- | ----| ---- | ---- |
 | vue3-element-admin 标准版| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
+| vue3-element-admin JS版| [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin-js) | [vue3-element-admin-js](https://github.com/youlaitech/vue3-element-admin-js) | [vue3-element-admin-js](https://gitcode.com/youlai/vue3-element-admin-js) |
 | vue3-element-admin 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
 | Java 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
 | Node 后端 | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)       | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
@@ -205,4 +206,4 @@ Thanks to all the contributors!
 
 ② 直接添加微信 **`haoxianrui`** 备注「前端/后端/全栈」。
 
-![有来技术公众号](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
\ No newline at end of file
+![有来技术公众号](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)

From 8be462eb8aa1bcf9561ef1feaaaf1048ff229664 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 4 Apr 2025 00:59:05 +0800
Subject: [PATCH 297/497] chore: :hammer: bump version to 2.26.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index dceb5e11..573fc4f2 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.25.2",
+  "version": "2.26.0",
   "private": true,
   "type": "module",
   "scripts": {

From e63253f11b9b7dc12463250be8ee880671145d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E4=BB=8A?=
 <11555891+metabytes@user.noreply.gitee.com>
Date: Mon, 7 Apr 2025 10:15:06 +0000
Subject: [PATCH 298/497] =?UTF-8?q?update=20src/components/Dict/index.vue.?=
 =?UTF-8?q?=20=E5=AD=97=E5=85=B8=E5=A2=9E=E5=8A=A0=20select-multiple=20?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 如今 <11555891+metabytes@user.noreply.gitee.com>
---
 src/components/Dict/index.vue | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 14dbc9c7..35f3b48e 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -1,9 +1,10 @@
 <template>
   <el-select
-    v-if="type === 'select'"
+    v-if="type === 'select' || type === 'select-multiple'"
     v-model="selectedValue"
     :placeholder="placeholder"
     :disabled="disabled"
+    :multiple="type === 'select-multiple'"
     clearable
     :style="style"
     @change="handleChange"
@@ -93,28 +94,30 @@ const emit = defineEmits(["update:modelValue"]);
 const options = ref<Array<{ label: string; value: string | number }>>([]);
 
 const selectedValue = ref<any>(
-  typeof props.modelValue === "string" || typeof props.modelValue === "number"
-    ? props.modelValue
-    : Array.isArray(props.modelValue)
+  ["select-multiple", "checkbox"].includes(props.type)
+    ? Array.isArray(props.modelValue)
+      ? props.modelValue
+      : []
+    : typeof props.modelValue === "string" || typeof props.modelValue === "number"
       ? props.modelValue
       : undefined
 );
 
 // 监听 modelValue 和 options 的变化
 watch(
-  [() => props.modelValue, () => options.value],
-  ([newValue, newOptions]) => {
-    if (newOptions.length > 0 && newValue !== undefined) {
-      if (props.type === "checkbox") {
-        selectedValue.value = Array.isArray(newValue) ? newValue : [];
-      } else {
+  [() => props.modelValue, () => props.type, () => options.value],
+  ([newValue, newType, newOptions]) => {
+    if (["select-multiple", "checkbox"].includes(newType)) {
+      selectedValue.value = Array.isArray(newValue) ? newValue : [];
+    } else {
+      if (newOptions.length > 0 && newValue !== undefined && newValue !== null) {
         const matchedOption = newOptions.find(
           (option) => String(option.value) === String(newValue)
         );
-        selectedValue.value = matchedOption?.value;
+        selectedValue.value = matchedOption?.value ?? undefined;
+      } else {
+        selectedValue.value = undefined;
       }
-    } else {
-      selectedValue.value = undefined;
     }
   },
   { immediate: true }

From 8e522f127f0c3fed102362d12171b72239531966 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E4=BB=8A?=
 <11555891+metabytes@user.noreply.gitee.com>
Date: Mon, 7 Apr 2025 10:19:33 +0000
Subject: [PATCH 299/497] =?UTF-8?q?update=20src/components/Dict/DictLabel.?=
 =?UTF-8?q?vue.=20=E6=94=AF=E6=8C=81=E5=A4=9A=E4=B8=AA=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC=E5=B1=95=E7=A4=BA=EF=BC=8C=E4=BE=8B=E5=A6=82=EF=BC=9A?=
 =?UTF-8?q?=E4=BC=A0=E5=85=A5=20modelValue=20=E6=98=AF=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=95=B0=E7=BB=84=EF=BC=88['1',=20'2',=20'3']=EF=BC=89?=
 =?UTF-8?q?=EF=BC=8C=E5=B1=95=E7=A4=BA=E5=A4=9A=E4=B8=AA=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=EF=BC=88el-tag=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 如今 <11555891+metabytes@user.noreply.gitee.com>
---
 src/components/Dict/DictLabel.vue | 54 ++++++++++++++++++++-----------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index b68ee155..c0a2cfba 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -1,9 +1,18 @@
 <template>
-  <template v-if="tagType">
-    <el-tag :type="tagType" :size="tagSize">{{ label }}</el-tag>
+  <template v-if="Array.isArray(modelValue)">
+    <el-tag
+      v-for="(tag, index) in tagList"
+      :key="index"
+      :type="tag.tagType"
+      :size="tagSize"
+      class="me-1"
+    >
+      {{ tag.label }}
+    </el-tag>
   </template>
   <template v-else>
-    <span>{{ label }}</span>
+    <el-tag v-if="tagType" :type="tagType" :size="tagSize">{{ label }}</el-tag>
+    <span v-else>{{ label }}</span>
   </template>
 </template>
 <script setup lang="ts">
@@ -11,16 +20,20 @@ import { useDictStore } from "@/store";
 
 const props = defineProps({
   code: String, // 字典编码
-  modelValue: [String, Number], // 字典项的值
+  modelValue: [String, Number, Array], // 字典项的值
   size: {
     type: String,
     default: "default", // 标签大小
   },
 });
 const label = ref("");
-const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>(); // 标签类型
+type TagType = "success" | "info" | "warning" | "danger" | "primary";
+const tagType = ref<TagType | undefined>(undefined);
 const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "large" | "small"); // 标签大小
 
+// 多个标签时使用
+const tagList = ref<Array<{ label: string; tagType?: TagType }>>([]);
+
 const dictStore = useDictStore();
 /**
  * 根据字典项的值获取对应的 label 和 tagType
@@ -36,24 +49,27 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
   // 查找对应的字典项
   const dictItem = dictItems.find((item) => item.value == value);
   return {
-    label: dictItem?.label || "",
-    tagType: dictItem?.tagType,
+    label: dictItem?.label || String(value),
+    tagType: dictItem?.tagType as TagType,
   };
 };
-/**
- * 更新 label 和 tagType
- */
+
 const updateLabelAndTag = async () => {
-  console.log("updateLabelAndTag", props.code, props.modelValue);
-  if (!props.code || props.modelValue === undefined) return;
-  const { label: newLabel, tagType: newTagType } = await getLabelAndTagByValue(
-    props.code,
-    props.modelValue
-  );
-  label.value = newLabel;
-  tagType.value = newTagType as typeof tagType.value;
-};
+  if (!props.code || props.modelValue === undefined || props.modelValue === null) return;
+
+  await dictStore.loadDictItems(props.code);
 
+  if (Array.isArray(props.modelValue)) {
+    const results = await Promise.all(
+      props.modelValue.map((val) => getLabelAndTagByValue(props.code!, val))
+    );
+    tagList.value = results;
+  } else {
+    const result = await getLabelAndTagByValue(props.code, props.modelValue);
+    label.value = result.label;
+    tagType.value = result.tagType as typeof tagType.value;
+  }
+};
 watch([() => props.code, () => props.modelValue], updateLabelAndTag);
 
 onMounted(updateLabelAndTag);

From 30374397dd0640770e1a40c460b1f76d205938d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=82=E4=BB=8A?=
 <11555891+metabytes@user.noreply.gitee.com>
Date: Tue, 8 Apr 2025 08:40:23 +0000
Subject: [PATCH 300/497] =?UTF-8?q?update=20src/components/Dict/index.vue.?=
 =?UTF-8?q?=201.=20type=20=E6=94=AF=E6=8C=81=20select-multiple=EF=BC=8C?=
 =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E7=9A=84=20type=20validator=20=E6=B2=A1?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=AE=83=E3=80=82=202.=20selectedValue=20?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=82=203.=20watch=20=E9=80=BB=E8=BE=91=E7=AE=80=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E9=81=BF=E5=85=8D=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 如今 <11555891+metabytes@user.noreply.gitee.com>
---
 src/components/Dict/index.vue | 39 ++++++++++++++---------------------
 1 file changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 35f3b48e..977d914a 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -1,6 +1,7 @@
 <template>
+  <!-- Select / Select-Multiple -->
   <el-select
-    v-if="type === 'select' || type === 'select-multiple'"
+    v-if="['select', 'select-multiple'].includes(type)"
     v-model="selectedValue"
     :placeholder="placeholder"
     :disabled="disabled"
@@ -17,6 +18,7 @@
     />
   </el-select>
 
+  <!-- Radio -->
   <el-radio-group
     v-else-if="type === 'radio'"
     v-model="selectedValue"
@@ -34,6 +36,7 @@
     </el-radio>
   </el-radio-group>
 
+  <!-- Checkbox -->
   <el-checkbox-group
     v-else-if="type === 'checkbox'"
     v-model="selectedValue"
@@ -53,6 +56,7 @@
 </template>
 
 <script setup lang="ts">
+import { ref, watch, onMounted } from "vue";
 import { useDictStore } from "@/store";
 
 const dictStore = useDictStore();
@@ -69,7 +73,8 @@ const props = defineProps({
   type: {
     type: String,
     default: "select",
-    validator: (value: string) => ["select", "radio", "checkbox"].includes(value),
+    validator: (value: string) =>
+      ["select", "select-multiple", "radio", "checkbox"].includes(value),
   },
   placeholder: {
     type: String,
@@ -81,11 +86,7 @@ const props = defineProps({
   },
   style: {
     type: Object,
-    default: () => {
-      return {
-        width: "300px",
-      };
-    },
+    default: () => ({ width: "300px" }),
   },
 });
 
@@ -93,37 +94,29 @@ const emit = defineEmits(["update:modelValue"]);
 
 const options = ref<Array<{ label: string; value: string | number }>>([]);
 
+// 动态初始化 selectedValue
 const selectedValue = ref<any>(
   ["select-multiple", "checkbox"].includes(props.type)
     ? Array.isArray(props.modelValue)
       ? props.modelValue
       : []
-    : typeof props.modelValue === "string" || typeof props.modelValue === "number"
-      ? props.modelValue
-      : undefined
+    : (props.modelValue ?? undefined)
 );
 
-// 监听 modelValue 和 options 的变化
+// 同步 selectedValue 与 props.modelValue
 watch(
-  [() => props.modelValue, () => props.type, () => options.value],
-  ([newValue, newType, newOptions]) => {
-    if (["select-multiple", "checkbox"].includes(newType)) {
+  () => props.modelValue,
+  (newValue) => {
+    if (["select-multiple", "checkbox"].includes(props.type)) {
       selectedValue.value = Array.isArray(newValue) ? newValue : [];
     } else {
-      if (newOptions.length > 0 && newValue !== undefined && newValue !== null) {
-        const matchedOption = newOptions.find(
-          (option) => String(option.value) === String(newValue)
-        );
-        selectedValue.value = matchedOption?.value ?? undefined;
-      } else {
-        selectedValue.value = undefined;
-      }
+      selectedValue.value = newValue ?? undefined;
     }
   },
   { immediate: true }
 );
 
-// 监听 selectedValue 的变化并触发 update:modelValue
+// selectedValue 改变时回传给父组件
 function handleChange(val: any) {
   emit("update:modelValue", val);
 }

From 4313b388a0b801258b3f7f28941da6e71acd8d88 Mon Sep 17 00:00:00 2001
From: Ray Hao <1490493387@qq.com>
Date: Thu, 10 Apr 2025 11:53:21 +0800
Subject: [PATCH 301/497] Update README.md

---
 README.md | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index a22a335b..e1bc37c0 100644
--- a/README.md
+++ b/README.md
@@ -82,10 +82,10 @@
 
 - **环境准备**
 
-| 环境类型       | 版本要求                     | 下载链接                     |
-|----------------|-----------------------------|-----------------------------|
-| **开发工具**   | Visual Studio Code (最新版) | [官方下载](https://code.visualstudio.com/Download) |
-| **运行环境**   | Node.js 18.x (推荐18.16.1)  | [中文镜像](https://npmmirror.com/mirrors/node/v18.16.1/) |
+| 环境类型       | 名称                     |
+|----------------|-----------------------------|
+| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/[https://www.jetbrains.com.cn/webstorm/](https://www.jetbrains.com.cn/webstorm/) |
+| **运行环境**   | Node 18 + (推荐[22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
 > ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
 
 
@@ -196,9 +196,11 @@ Thanks to all the contributors!
 
 [![contributors](https://contrib.rocks/image?repo=youlaitech/vue3-element-admin)](https://github.com/youlaitech/vue3-element-admin/graphs/contributors)
 
-## G-Star
 
-![](https://foruda.gitee.com/images/1728577513089814203/95f2a70d_716974.jpeg)
+## 特别感谢
+- 感谢 [Jetbrains](https://www.jetbrains.com.cn/) 为项目提供的 [WebStorm](https://www.jetbrains.com/community/opensource/#support) 授权
+- 感谢 [GitCode](https://gitcode.com/) 官方的 [G-Star](https://gitcode.com/g-star) 认证
+  ![](https://foruda.gitee.com/images/1728577513089814203/95f2a70d_716974.jpeg)
 
 ## 加群交流
 

From 376a6a4e3783cac05254f03e337ee4e8a8129472 Mon Sep 17 00:00:00 2001
From: Ray Hao <1490493387@qq.com>
Date: Thu, 10 Apr 2025 11:54:43 +0800
Subject: [PATCH 302/497] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e1bc37c0..6b456278 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@
 
 | 环境类型       | 名称                     |
 |----------------|-----------------------------|
-| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/[https://www.jetbrains.com.cn/webstorm/](https://www.jetbrains.com.cn/webstorm/) |
+| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/(WebStorm)(https://www.jetbrains.com.cn/webstorm/) |
 | **运行环境**   | Node 18 + (推荐[22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
 > ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
 

From 2b2b4e5b36e3691e4d052b6cb31c7c37c25c2ef5 Mon Sep 17 00:00:00 2001
From: Ray Hao <1490493387@qq.com>
Date: Thu, 10 Apr 2025 11:55:44 +0800
Subject: [PATCH 303/497] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 6b456278..8e74ea1d 100644
--- a/README.md
+++ b/README.md
@@ -84,7 +84,7 @@
 
 | 环境类型       | 名称                     |
 |----------------|-----------------------------|
-| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/(WebStorm)(https://www.jetbrains.com.cn/webstorm/) |
+| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/[WebStorm](https://www.jetbrains.com.cn/webstorm/) |
 | **运行环境**   | Node 18 + (推荐[22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
 > ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
 

From ac609c12827452fe6e396eb029140e8d8c5120c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Thu, 10 Apr 2025 23:20:13 +0800
Subject: [PATCH 304/497] =?UTF-8?q?feat:=20:sparkles:=20pageSearch?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=8D=A1=E7=89=87?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=B8=83=E5=B1=80=E9=85=8D=E7=BD=AE=EF=BC=8C=E7=BA=A7?=
 =?UTF-8?q?=E8=81=94=E6=93=8D=E4=BD=9C=E6=95=B0=E6=8D=AE=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue   | 67 ++++++++++++++--------------
 src/components/CURD/types.ts         | 18 +++++---
 src/views/demo/curd/config/search.ts | 22 +++++----
 uno.config.ts                        |  6 +++
 4 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 19553d2d..6e742b18 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,34 +1,28 @@
 <template>
-  <el-card
-    v-show="visible"
-    v-hasPerm="[`${searchConfig.pageName}:query`]"
-    shadow="never"
-    class="mb-2.5"
-  >
-    <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+  <el-card v-show="visible" v-bind="cardAttrs">
+    <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
           v-show="isExpand ? true : index < showNumber"
-          :label="item.label"
+          :label="item?.label"
           :prop="item.prop"
         >
           <!-- Label -->
-          <template v-if="item.tips" #label>
+          <template v-if="item?.tips" #label>
             <span class="flex-y-center">
               {{ item.label }}
               <el-tooltip v-bind="getTooltipProps(item.tips)">
                 <QuestionFilled class="w-4 h-4 mx-1" />
               </el-tooltip>
-              {{ searchConfig.colon === false ? "" : ":" }}
+              {{ searchConfig.colon ? ":" : "" }}
             </span>
           </template>
-          <template v-else #label>
-            {{ item.label }} {{ searchConfig.colon === false ? "" : ":" }}
-          </template>
+          <template v-else #label>{{ item.label }} {{ searchConfig.colon ? ":" : "" }}</template>
 
           <component
             :is="componentMap[item?.type ? item?.type : 'input']"
             v-model.trim="queryParams[item.prop]"
+            style="width: 100%"
             v-bind="item.attrs"
             :config="item.attrs"
             v-on="item.events || {}"
@@ -45,16 +39,12 @@
         <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
         <el-button icon="refresh" @click="handleReset">重置</el-button>
         <!-- 展开/收起 -->
-        <el-link
-          v-if="isExpandable && formItems.length > showNumber"
-          class="ml-3"
-          type="primary"
-          :underline="false"
-          @click="isExpand = !isExpand"
-        >
-          {{ isExpand ? "收起" : "展开" }}
-          <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
-        </el-link>
+        <template v-if="isExpandable && formItems.length > showNumber">
+          <el-link class="ml-3" type="primary" :underline="false" @click="isExpand = !isExpand">
+            {{ isExpand ? "收起" : "展开" }}
+            <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
+          </el-link>
+        </template>
       </el-form-item>
     </el-form>
   </el-card>
@@ -93,14 +83,29 @@ const queryFormRef = ref<FormInstance>();
 // 是否显示
 const visible = ref(true);
 // 响应式的formItems
-const formItems = reactive(props.searchConfig.formItems);
+const formItems = reactive(props.searchConfig?.formItems ?? []);
 // 是否可展开/收缩
-const isExpandable = ref(props.searchConfig.isExpandable ?? true);
+const isExpandable = ref(props.searchConfig?.isExpandable ?? true);
 // 是否已展开
 const isExpand = ref(false);
 // 表单项展示数量，若可展开，超出展示数量的表单项隐藏
 const showNumber = computed(() =>
-  isExpandable.value ? (props.searchConfig.showNumber ?? 3) : formItems.length
+  isExpandable.value ? (props.searchConfig?.showNumber ?? 3) : formItems.length
+);
+// 卡片组件自定义属性（累名、阴影、权限等）
+const cardAttrs = computed<IObject>(() => {
+  let auth = props.searchConfig?.pageName
+    ? { "v-hasPerm": [`${props.searchConfig.pageName}:query`] }
+    : {};
+  return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
+    ? { class: "mb-2.5", shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
+    : { class: "mb-2.5", shadow: "never", ...auth };
+});
+// 是否使用自适应网格布局
+const isGrid = computed(() =>
+  props.searchConfig?.grid
+    ? "grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 4xl:grid-cols-6 gap-5"
+    : "flex flex-wrap gap-x-8 gap-y-4"
 );
 // 搜索表单数据
 const queryParams = reactive<IObject>({});
@@ -110,10 +115,10 @@ const getTooltipProps = (tips: any) => {
 };
 
 onMounted(() => {
-  formItems.map((item) => {
+  formItems.forEach((item) => {
     item.initFn && item.initFn(item);
     if (item.type === "input-tag" || item.type === "custom-tag") {
-      queryParams[item.prop] = item.initialValue ?? [];
+      queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
       queryParams[item.prop] = item.initialValue ?? null;
     } else {
@@ -142,12 +147,6 @@ defineExpose({
 :deep(.el-input-number .el-input__inner) {
   text-align: left;
 }
-.el-form {
-  display: flex;
-  flex-wrap: wrap;
-  row-gap: 1rem;
-  column-gap: 2rem;
-}
 .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 75eb82f3..1f98af43 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -40,15 +40,15 @@ export type ComponentType =
 
 export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName: string;
-  // 标签冒号
+  pageName?: string;
+  // 标签冒号(默认：false)
   colon?: boolean;
-  // 表单项
-  formItems: Array<{
+  // 表单项(默认：[])
+  formItems?: Array<{
     // 组件类型(如input,select等)
     type?: ComponentType;
     // 标签文本
-    label: string;
+    label?: string;
     // 标签提示
     tips?: string | IObject;
     // 键名
@@ -64,10 +64,14 @@ export interface ISearchConfig {
     // 初始化数据函数扩展
     initFn?: (formItem: IObject) => void;
   }>;
-  // 是否开启展开和收缩
+  // 是否开启展开和收缩(默认：true)
   isExpandable?: boolean;
-  // 默认展示的表单项数量
+  // 默认展示的表单项数量(默认：3)
   showNumber?: number;
+  // 卡片属性
+  cardAttrs?: IObject;
+  // 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
+  grid?: boolean;
 }
 
 export interface IContentConfig<T = any> {
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index 9c863a73..6e78a415 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,6 +1,11 @@
 import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
 
+const selectOptions = reactive([
+  { label: "启用", value: 1 },
+  { label: "禁用", value: 0 },
+]);
+
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
   colon: false,
@@ -16,9 +21,11 @@ const searchConfig: ISearchConfig = {
         style: { width: "200px" },
       },
       events: {
-        // 监听输入框输入事件
-        blur: (e) => console.log("失去焦点: ", e),
-        focus: (e) => console.log("获得焦点: ", e),
+        change: (e) => {
+          console.log("输入框的值: ", e);
+          // 级联操作示例，需要使用reactive提前定义数组
+          // selectOptions.push({ label: e, value: e });
+        },
       },
     },
     {
@@ -50,12 +57,11 @@ const searchConfig: ISearchConfig = {
         clearable: true,
         style: { width: "200px" },
       },
-      options: [
-        { label: "启用", value: 1 },
-        { label: "禁用", value: 0 },
-      ],
+      options: selectOptions,
       events: {
-        change: (e) => console.log("发生变化: ", e),
+        change: function (e) {
+          console.log("选中的值: ", e);
+        },
       },
     },
     {
diff --git a/uno.config.ts b/uno.config.ts
index e08e746f..d308d598 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -45,6 +45,12 @@ export default defineConfig({
       primary: "var(--el-color-primary)",
       primary_dark: "var(--el-color-primary-light-5)",
     },
+    breakpoints: Object.fromEntries(
+      [640, 768, 1024, 1280, 1536, 1920, 2048].map((size, index) => [
+        ["sm", "md", "lg", "xl", "2xl", "3xl", "4xl"][index],
+        `${size}px`,
+      ])
+    ),
   },
   presets: [
     presetUno(),

From 6bed716c0a283c373b62a70de991604c84da7450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Fri, 11 Apr 2025 01:07:28 +0800
Subject: [PATCH 305/497] =?UTF-8?q?feat:=20:sparkles:=20pageContent?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue | 14 ++++++--------
 src/components/CURD/PageSearch.vue  |  6 +++---
 src/components/CURD/types.ts        | 10 +++++++---
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 7c52a8b6..36bc5d27 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -315,14 +315,12 @@
     </el-table>
     <!-- 分页 -->
     <template v-if="showPagination">
-      <el-scrollbar>
-        <div class="mt-[12px]">
-          <el-pagination
-            v-bind="pagination"
-            @size-change="handleSizeChange"
-            @current-change="handleCurrentChange"
-          />
-        </div>
+      <el-scrollbar :class="['mt-3', { 'flex-x-end': contentConfig?.pagePosition === 'right' }]">
+        <el-pagination
+          v-bind="pagination"
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+        />
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 6e742b18..e1573e7e 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-card v-show="visible" v-bind="cardAttrs">
+  <el-card v-show="visible" v-bind="cardAttrs" class="mb-2.5!">
     <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
@@ -98,8 +98,8 @@ const cardAttrs = computed<IObject>(() => {
     ? { "v-hasPerm": [`${props.searchConfig.pageName}:query`] }
     : {};
   return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
-    ? { class: "mb-2.5", shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
-    : { class: "mb-2.5", shadow: "never", ...auth };
+    ? { shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
+    : { shadow: "never", ...auth };
 });
 // 是否使用自适应网格布局
 const isGrid = computed(() =>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 1f98af43..01ab1243 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -6,6 +6,8 @@ import type {
   PaginationProps,
   TableProps,
   ColProps,
+  ButtonType,
+  CardProps,
 } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
@@ -69,7 +71,7 @@ export interface ISearchConfig {
   // 默认展示的表单项数量(默认：3)
   showNumber?: number;
   // 卡片属性
-  cardAttrs?: IObject;
+  cardAttrs?: Partial<CardProps>;
   // 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
   grid?: boolean;
 }
@@ -79,6 +81,8 @@ export interface IContentConfig<T = any> {
   pageName: string;
   // table组件属性
   table?: Omit<TableProps<any>, "data">;
+  // 分页组件位置(默认：left)
+  pagePosition?: "left" | "right";
   // pagination组件属性
   pagination?:
     | boolean
@@ -132,7 +136,7 @@ export interface IContentConfig<T = any> {
         icon?: string;
         name: string;
         text: string;
-        type?: "primary" | "success" | "warning" | "danger" | "info";
+        type?: ButtonType;
       }
   >;
   // 表格工具栏右侧图标
@@ -198,7 +202,7 @@ export interface IContentConfig<T = any> {
           icon?: string;
           name: string;
           text: string;
-          type?: "primary" | "success" | "warning" | "danger" | "info";
+          type?: ButtonType;
           render?: (row: IObject) => boolean;
         }
     >;

From 8afa82f911802b237e74b024918b578ea6756eee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 13 Apr 2025 22:45:25 +0800
Subject: [PATCH 306/497] =?UTF-8?q?fix:=20:bug:=20pageSearch=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=9D=83=E9=99=90=E6=A0=A1=E9=AA=8C=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue | 14 ++++++++------
 src/components/CURD/types.ts       |  2 +-
 src/directive/permission/index.ts  |  4 ++--
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index e1573e7e..9f5d15c0 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,10 @@
 <template>
-  <el-card v-show="visible" v-bind="cardAttrs" class="mb-2.5!">
+  <el-card
+    v-show="visible"
+    v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
+    v-bind="cardAttrs"
+    class="mb-2.5!"
+  >
     <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
       <template v-for="(item, index) in formItems" :key="item.prop">
         <el-form-item
@@ -94,12 +99,9 @@ const showNumber = computed(() =>
 );
 // 卡片组件自定义属性（累名、阴影、权限等）
 const cardAttrs = computed<IObject>(() => {
-  let auth = props.searchConfig?.pageName
-    ? { "v-hasPerm": [`${props.searchConfig.pageName}:query`] }
-    : {};
   return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
-    ? { shadow: "never", ...auth, ...props.searchConfig.cardAttrs }
-    : { shadow: "never", ...auth };
+    ? { shadow: "never", ...props.searchConfig.cardAttrs }
+    : { shadow: "never" };
 });
 // 是否使用自适应网格布局
 const isGrid = computed(() =>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 01ab1243..7881b9a4 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -41,7 +41,7 @@ export type ComponentType =
   | "cascader";
 
 export interface ISearchConfig {
-  // 页面名称(参与组成权限标识,如sys:user:xxx)
+  // 页面名称(参与组成权限标识,如sys:user:xxx),不填则不进行权限校验
   pageName?: string;
   // 标签冒号(默认：false)
   colon?: boolean;
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 6dd29950..2683d22e 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -18,8 +18,8 @@ export const hasPerm: Directive = {
 
     const { roles, perms } = useUserStore().userInfo;
 
-    // 超级管理员拥有所有权限
-    if (roles.includes("ROOT")) {
+    // 超级管理员拥有所有权限，如果是”*:*:*”权限标识，则不需要进行权限校验
+    if (roles.includes("ROOT") || requiredPerms.includes("*:*:*")) {
       return;
     }
 

From 52790a6c10a228fa15250c59ca32701cbd87a816 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 15 Apr 2025 09:38:41 +0800
Subject: [PATCH 307/497] =?UTF-8?q?feat:=20:sparkles:=20=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E4=BD=BF=E7=94=A8vueuse?=
 =?UTF-8?q?=E7=9A=84useTransition=E5=87=BD=E6=95=B0=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=87=E6=B8=A1=E5=8A=A8=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 42 +++++++++++++++++++++++++++++++----
 1 file changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 28b0c31b..7f9f3c64 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -114,7 +114,7 @@
 
               <div class="flex-x-between mt-2">
                 <div class="flex-y-center">
-                  <span class="text-lg">{{ visitStatsData.todayUvCount }}</span>
+                  <span class="text-lg">{{ Math.round(transitionUvCount) }}</span>
                   <span
                     :class="[
                       'text-xs',
@@ -134,7 +134,7 @@
 
               <div class="flex-x-between mt-2 text-sm text-gray">
                 <span>总访客数</span>
-                <span>{{ visitStatsData.totalUvCount }}</span>
+                <span>{{ Math.round(transitionTotalUvCount) }}</span>
               </div>
             </el-card>
           </template>
@@ -174,7 +174,7 @@
 
               <div class="flex-x-between mt-2">
                 <div class="flex-y-center">
-                  <span class="text-lg">{{ visitStatsData.todayPvCount }}</span>
+                  <span class="text-lg">{{ Math.round(transitionPvCount) }}</span>
                   <span
                     :class="[
                       'text-xs',
@@ -194,7 +194,7 @@
 
               <div class="flex-x-between mt-2 text-sm text-gray">
                 <span>总浏览量</span>
-                <span>{{ visitStatsData.totalPvCount }}</span>
+                <span>{{ Math.round(transitionTotalPvCount) }}</span>
               </div>
             </el-card>
           </template>
@@ -288,6 +288,7 @@ import { dayjs } from "element-plus";
 import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log.api";
 import { useUserStore } from "@/store/modules/user.store";
 import { formatGrowthRate } from "@/utils";
+import { useTransition } from "@vueuse/core";
 
 interface VersionItem {
   id: string;
@@ -360,6 +361,39 @@ const visitStatsData = ref<VisitStatsVO>({
   totalPvCount: 0,
 });
 
+// 数字过渡动画
+const transitionUvCount = useTransition(
+  computed(() => visitStatsData.value.todayUvCount),
+  {
+    duration: 1000,
+    transition: [0.25, 0.1, 0.25, 1.0], // CSS cubic-bezier
+  }
+);
+
+const transitionTotalUvCount = useTransition(
+  computed(() => visitStatsData.value.totalUvCount),
+  {
+    duration: 1200,
+    transition: [0.25, 0.1, 0.25, 1.0],
+  }
+);
+
+const transitionPvCount = useTransition(
+  computed(() => visitStatsData.value.todayPvCount),
+  {
+    duration: 1000,
+    transition: [0.25, 0.1, 0.25, 1.0],
+  }
+);
+
+const transitionTotalPvCount = useTransition(
+  computed(() => visitStatsData.value.totalPvCount),
+  {
+    duration: 1200,
+    transition: [0.25, 0.1, 0.25, 1.0],
+  }
+);
+
 // 访问趋势日期范围（单位：天）
 const visitTrendDateRange = ref(7);
 // 访问趋势图表配置

From 0fa7df5e2ae7ba331ee26d50066cb991d6502a17 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 15 Apr 2025 18:32:56 +0800
Subject: [PATCH 308/497] =?UTF-8?q?fix:=20=E8=88=AA=E6=A0=8F=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E5=9B=BE=E6=A0=87=E5=9E=82=E7=9B=B4=E5=B1=85=E4=B8=AD?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=E9=97=AE=E9=A2=98=E5=8F=8A=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E4=B8=8B=E9=80=9A=E7=9F=A5=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavBar/components/NavbarRight.vue      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 8d15aa01..10c6606d 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -107,10 +107,11 @@ function logout() {
   justify-content: center;
 
   & > * {
-    display: inline-block;
+    display: flex;
+    align-items: center;
+    justify-content: center;
     min-width: 40px;
     height: $navbar-height;
-    line-height: $navbar-height;
     color: var(--el-text-color);
     text-align: center;
     cursor: pointer;
@@ -141,6 +142,12 @@ function logout() {
 .layout-top .navbar__right--white > *,
 .layout-mix .navbar__right--white > * {
   color: #fff;
+
+  // 强制所有svg图标为白色（包括通知图标）
+  :deep(svg) {
+    color: #fff;
+    fill: #fff;
+  }
 }
 
 .dark .navbar__right > *:hover {

From 45348cca91a7aff6ec061ccd094fdd8f0628660e Mon Sep 17 00:00:00 2001
From: XFeng <wxfengg@gmail.com>
Date: Tue, 15 Apr 2025 20:44:24 +0800
Subject: [PATCH 309/497] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E5=B8=83=E5=B1=80=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E5=9B=9B=E7=AD=89=E5=88=86=E3=80=81=E5=B7=A6=E5=8F=B3=E5=AF=B9?=
 =?UTF-8?q?=E9=BD=90=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss                         | 26 +++++-
 src/views/codegen/index.vue                   | 56 ++++++------
 src/views/system/config/index.vue             | 35 +++++---
 src/views/system/dept/index.vue               | 50 ++++++-----
 src/views/system/dict/dict-item.vue           | 33 ++++---
 src/views/system/dict/index.vue               | 33 ++++---
 src/views/system/log/index.vue                | 58 +++++++------
 src/views/system/menu/index.vue               | 34 +++++---
 .../system/notice/components/MyNotice.vue     | 53 +++++++-----
 src/views/system/notice/index.vue             | 62 ++++++++------
 src/views/system/role/index.vue               | 36 +++++---
 src/views/system/user/index.vue               | 85 ++++++++++---------
 12 files changed, 340 insertions(+), 221 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index 654335ac..f4e8c579 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -5,12 +5,34 @@
 }
 
 .search-bar {
-  padding: 18px 0 0 10px;
-  margin-bottom: 10px;
+  padding: 18px 18px 0;
+  margin-bottom: 15px;
   background-color: var(--el-bg-color-overlay);
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
   box-shadow: var(--el-box-shadow-light);
+
+  //搜索表单按钮组全局样式
+  .search-form-btn-box {
+    flex: 1;
+    padding-right: 13px;
+
+    .search-form-btn-box-item {
+      display: flex;
+      align-items: center;
+      justify-content: end;
+      width: 100%;
+    }
+  }
+
+  :deep(.el-form-item) {
+    width: 100% !important;
+  }
+
+  .el-form--inline .el-form-item {
+    display: flex !important;
+    margin-right: 0px !important;
+  }
 }
 
 .table-container > .el-card__header {
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index 60ea6d63..ad089bdc 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -1,30 +1,38 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item prop="keywords" label="关键字">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="表名"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" @click="handleQuery">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
-        </el-form-item>
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item prop="keywords" label="关键字">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="表名"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" @click="handleQuery">
+                  <template #icon>
+                    <Search />
+                  </template>
+                  搜索
+                </el-button>
+                <el-button @click="handleResetQuery">
+                  <template #icon>
+                    <Refresh />
+                  </template>
+                  重置
+                </el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 14e9da16..8d5b82cd 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -2,19 +2,28 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="keywords">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="请输入配置键\配置名称"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-        </el-form-item>
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="请输入配置键\配置名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index ed926967..9e094f18 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,27 +1,37 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="keywords">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="部门名称"
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="部门名称"
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="部门状态" prop="status">
+              <el-select v-model="queryParams.status" placeholder="全部" clearable>
+                <el-option :value="1" label="正常" />
+                <el-option :value="0" label="禁用" />
+              </el-select>
+            </el-form-item>
+          </el-col>
 
-        <el-form-item label="部门状态" prop="status">
-          <el-select v-model="queryParams.status" placeholder="全部" clearable class="!w-[100px]">
-            <el-option :value="1" label="正常" />
-            <el-option :value="0" label="禁用" />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
-            搜索
-          </el-button>
-          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-        </el-form-item>
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
+                  搜索
+                </el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index 17ef6336..71ace3df 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -3,18 +3,27 @@
   <div class="app-container">
     <div class="search-bar mt-5">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="keywords">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="字典标签/字典值"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
-        </el-form-item>
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="字典标签/字典值"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 7de44c87..e5be5296 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -3,18 +3,27 @@
   <div class="app-container">
     <div class="search-bar">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="keywords">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="字典名称/编码"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
-        </el-form-item>
+        <el-row :gutter="20">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="字典名称/编码"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 582018c4..f76dc531 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -2,31 +2,41 @@
   <div class="app-container">
     <div class="search-bar">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item prop="keywords" label="关键字">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="日志内容"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item prop="createTime" label="操作时间">
-          <el-date-picker
-            v-model="queryParams.createTime"
-            :editable="false"
-            class="!w-[240px]"
-            type="daterange"
-            range-separator="~"
-            start-placeholder="开始时间"
-            end-placeholder="截止时间"
-            value-format="YYYY-MM-DD"
-          />
-        </el-form-item>
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item prop="keywords" label="关键字">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="日志内容"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item prop="createTime" label="操作时间">
+              <el-date-picker
+                v-model="queryParams.createTime"
+                :editable="false"
+                class="!w-[240px]"
+                type="daterange"
+                range-separator="~"
+                start-placeholder="开始时间"
+                end-placeholder="截止时间"
+                value-format="YYYY-MM-DD"
+              />
+            </el-form-item>
+          </el-col>
 
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-        </el-form-item>
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 31a7e6d5..6841593a 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,19 +1,27 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="关键字" prop="keywords">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="菜单名称"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-        </el-form-item>
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="菜单名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index 75e5e4b1..b877b6b5 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -2,28 +2,37 @@
   <div class="app-container">
     <div class="search-bar">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item label="通知标题" prop="title">
-          <el-input
-            v-model="queryParams.title"
-            placeholder="关键字"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleQuery()">
-            <template #icon>
-              <Search />
-            </template>
-            搜索
-          </el-button>
-          <el-button @click="handleResetQuery()">
-            <template #icon>
-              <Refresh />
-            </template>
-            重置
-          </el-button>
-        </el-form-item>
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="通知标题" prop="title">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="关键字"
+                clearable
+                @keyup.enter="handleQuery()"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" @click="handleQuery()">
+                  <template #icon>
+                    <Search />
+                  </template>
+                  搜索
+                </el-button>
+                <el-button @click="handleResetQuery()">
+                  <template #icon>
+                    <Refresh />
+                  </template>
+                  重置
+                </el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 75cabbac..dc53dd52 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,31 +1,43 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-suffix=":">
-        <el-form-item label="标题" prop="title">
-          <el-input
-            v-model="queryParams.title"
-            placeholder="标题"
-            clearable
-            @keyup.enter="handleQuery()"
-          />
-        </el-form-item>
-        <el-form-item label="发布状态" prop="publishStatus">
-          <el-select
-            v-model="queryParams.publishStatus"
-            class="!w-[100px]"
-            clearable
-            placeholder="全部"
-          >
-            <el-option :value="0" label="未发布" />
-            <el-option :value="1" label="已发布" />
-            <el-option :value="-1" label="已撤回" />
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
-        </el-form-item>
+      <el-form
+        ref="queryFormRef"
+        :model="queryParams"
+        :inline="true"
+        label-suffix=":"
+        label-width="auto"
+      >
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="标题" prop="title">
+              <el-input
+                v-model="queryParams.title"
+                placeholder="标题"
+                clearable
+                @keyup.enter="handleQuery()"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item label="发布状态" prop="publishStatus">
+              <el-select v-model="queryParams.publishStatus" clearable placeholder="全部">
+                <el-option :value="0" label="未发布" />
+                <el-option :value="1" label="已发布" />
+                <el-option :value="-1" label="已撤回" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c14815d0..c64038d7 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,20 +1,28 @@
 <template>
   <div class="app-container">
     <div class="search-bar">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-form-item prop="keywords" label="关键字">
-          <el-input
-            v-model="queryParams.keywords"
-            placeholder="角色名称"
-            clearable
-            @keyup.enter="handleQuery"
-          />
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-        </el-form-item>
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+        <el-row :gutter="22">
+          <el-col :span="24" :md="12" :lg="6">
+            <el-form-item prop="keywords" label="关键字">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="角色名称"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+          </el-col>
+
+          <div class="search-form-btn-box">
+            <div class="search-form-btn-box-item">
+              <el-form-item>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+              </el-form-item>
+            </div>
+          </div>
+        </el-row>
       </el-form>
     </div>
 
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f94ad4c2..f07fbd4d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -10,46 +10,51 @@
       <!-- 用户列表 -->
       <el-col :lg="20" :xs="24">
         <div class="search-bar">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="用户名/昵称/手机号"
-                clearable
-                style="width: 200px"
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-
-            <el-form-item label="状态" prop="status">
-              <el-select
-                v-model="queryParams.status"
-                placeholder="全部"
-                clearable
-                class="!w-[100px]"
-              >
-                <el-option label="正常" :value="1" />
-                <el-option label="禁用" :value="0" />
-              </el-select>
-            </el-form-item>
-
-            <el-form-item label="创建时间">
-              <el-date-picker
-                v-model="queryParams.createTime"
-                :editable="false"
-                class="!w-[240px]"
-                type="daterange"
-                range-separator="~"
-                start-placeholder="开始时间"
-                end-placeholder="截止时间"
-                value-format="YYYY-MM-DD"
-              />
-            </el-form-item>
-
-            <el-form-item>
-              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-              <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-            </el-form-item>
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+            <el-row :gutter="22">
+              <el-col :span="24" :md="12" :lg="6">
+                <el-form-item label="关键字" prop="keywords">
+                  <el-input
+                    v-model="queryParams.keywords"
+                    placeholder="用户名/昵称/手机号"
+                    clearable
+                    @keyup.enter="handleQuery"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24" :md="12" :lg="6">
+                <el-form-item label="状态" prop="status">
+                  <el-select v-model="queryParams.status" placeholder="全部" clearable>
+                    <el-option label="正常" :value="1" />
+                    <el-option label="禁用" :value="0" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+
+              <el-col :span="24" :md="12" :lg="6">
+                <el-form-item label="创建时间">
+                  <el-date-picker
+                    v-model="queryParams.createTime"
+                    :editable="false"
+                    type="daterange"
+                    range-separator="~"
+                    start-placeholder="开始时间"
+                    end-placeholder="截止时间"
+                    value-format="YYYY-MM-DD"
+                  />
+                </el-form-item>
+              </el-col>
+
+              <div class="search-form-btn-box">
+                <div class="search-form-btn-box-item">
+                  <el-form-item>
+                    <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                    <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+                  </el-form-item>
+                </div>
+              </div>
+            </el-row>
           </el-form>
         </div>
 

From 4cc36629a8635f5b77aafea19a6595bccbe9fffb Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 15 Apr 2025 23:31:17 +0800
Subject: [PATCH 310/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E8=B0=83=E6=95=B4=E5=92=8C=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dict/DictLabel.vue             |  54 ++++-----
 src/components/Dict/index.vue                 |  46 ++++----
 src/styles/index.scss                         |  78 +++++++++----
 src/views/codegen/index.vue                   |  60 +++++-----
 src/views/system/config/index.vue             |  75 ++++++-------
 src/views/system/dept/index.vue               |  93 ++++++++--------
 src/views/system/dict/index.vue               |  55 +++++-----
 src/views/system/log/index.vue                |  72 ++++++------
 src/views/system/menu/index.vue               |  69 ++++++------
 .../system/notice/components/MyNotice.vue     |  67 ++++++------
 src/views/system/notice/index.vue             | 102 ++++++++---------
 src/views/system/role/index.vue               |  57 +++++-----
 src/views/system/user/index.vue               | 103 +++++++++---------
 13 files changed, 468 insertions(+), 463 deletions(-)

diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index c0a2cfba..b68ee155 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -1,18 +1,9 @@
 <template>
-  <template v-if="Array.isArray(modelValue)">
-    <el-tag
-      v-for="(tag, index) in tagList"
-      :key="index"
-      :type="tag.tagType"
-      :size="tagSize"
-      class="me-1"
-    >
-      {{ tag.label }}
-    </el-tag>
+  <template v-if="tagType">
+    <el-tag :type="tagType" :size="tagSize">{{ label }}</el-tag>
   </template>
   <template v-else>
-    <el-tag v-if="tagType" :type="tagType" :size="tagSize">{{ label }}</el-tag>
-    <span v-else>{{ label }}</span>
+    <span>{{ label }}</span>
   </template>
 </template>
 <script setup lang="ts">
@@ -20,20 +11,16 @@ import { useDictStore } from "@/store";
 
 const props = defineProps({
   code: String, // 字典编码
-  modelValue: [String, Number, Array], // 字典项的值
+  modelValue: [String, Number], // 字典项的值
   size: {
     type: String,
     default: "default", // 标签大小
   },
 });
 const label = ref("");
-type TagType = "success" | "info" | "warning" | "danger" | "primary";
-const tagType = ref<TagType | undefined>(undefined);
+const tagType = ref<"success" | "warning" | "info" | "primary" | "danger" | undefined>(); // 标签类型
 const tagSize = ref<"default" | "large" | "small">(props.size as "default" | "large" | "small"); // 标签大小
 
-// 多个标签时使用
-const tagList = ref<Array<{ label: string; tagType?: TagType }>>([]);
-
 const dictStore = useDictStore();
 /**
  * 根据字典项的值获取对应的 label 和 tagType
@@ -49,27 +36,24 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
   // 查找对应的字典项
   const dictItem = dictItems.find((item) => item.value == value);
   return {
-    label: dictItem?.label || String(value),
-    tagType: dictItem?.tagType as TagType,
+    label: dictItem?.label || "",
+    tagType: dictItem?.tagType,
   };
 };
-
+/**
+ * 更新 label 和 tagType
+ */
 const updateLabelAndTag = async () => {
-  if (!props.code || props.modelValue === undefined || props.modelValue === null) return;
-
-  await dictStore.loadDictItems(props.code);
-
-  if (Array.isArray(props.modelValue)) {
-    const results = await Promise.all(
-      props.modelValue.map((val) => getLabelAndTagByValue(props.code!, val))
-    );
-    tagList.value = results;
-  } else {
-    const result = await getLabelAndTagByValue(props.code, props.modelValue);
-    label.value = result.label;
-    tagType.value = result.tagType as typeof tagType.value;
-  }
+  console.log("updateLabelAndTag", props.code, props.modelValue);
+  if (!props.code || props.modelValue === undefined) return;
+  const { label: newLabel, tagType: newTagType } = await getLabelAndTagByValue(
+    props.code,
+    props.modelValue
+  );
+  label.value = newLabel;
+  tagType.value = newTagType as typeof tagType.value;
 };
+
 watch([() => props.code, () => props.modelValue], updateLabelAndTag);
 
 onMounted(updateLabelAndTag);
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 977d914a..14dbc9c7 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -1,11 +1,9 @@
 <template>
-  <!-- Select / Select-Multiple -->
   <el-select
-    v-if="['select', 'select-multiple'].includes(type)"
+    v-if="type === 'select'"
     v-model="selectedValue"
     :placeholder="placeholder"
     :disabled="disabled"
-    :multiple="type === 'select-multiple'"
     clearable
     :style="style"
     @change="handleChange"
@@ -18,7 +16,6 @@
     />
   </el-select>
 
-  <!-- Radio -->
   <el-radio-group
     v-else-if="type === 'radio'"
     v-model="selectedValue"
@@ -36,7 +33,6 @@
     </el-radio>
   </el-radio-group>
 
-  <!-- Checkbox -->
   <el-checkbox-group
     v-else-if="type === 'checkbox'"
     v-model="selectedValue"
@@ -56,7 +52,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onMounted } from "vue";
 import { useDictStore } from "@/store";
 
 const dictStore = useDictStore();
@@ -73,8 +68,7 @@ const props = defineProps({
   type: {
     type: String,
     default: "select",
-    validator: (value: string) =>
-      ["select", "select-multiple", "radio", "checkbox"].includes(value),
+    validator: (value: string) => ["select", "radio", "checkbox"].includes(value),
   },
   placeholder: {
     type: String,
@@ -86,7 +80,11 @@ const props = defineProps({
   },
   style: {
     type: Object,
-    default: () => ({ width: "300px" }),
+    default: () => {
+      return {
+        width: "300px",
+      };
+    },
   },
 });
 
@@ -94,29 +92,35 @@ const emit = defineEmits(["update:modelValue"]);
 
 const options = ref<Array<{ label: string; value: string | number }>>([]);
 
-// 动态初始化 selectedValue
 const selectedValue = ref<any>(
-  ["select-multiple", "checkbox"].includes(props.type)
-    ? Array.isArray(props.modelValue)
+  typeof props.modelValue === "string" || typeof props.modelValue === "number"
+    ? props.modelValue
+    : Array.isArray(props.modelValue)
       ? props.modelValue
-      : []
-    : (props.modelValue ?? undefined)
+      : undefined
 );
 
-// 同步 selectedValue 与 props.modelValue
+// 监听 modelValue 和 options 的变化
 watch(
-  () => props.modelValue,
-  (newValue) => {
-    if (["select-multiple", "checkbox"].includes(props.type)) {
-      selectedValue.value = Array.isArray(newValue) ? newValue : [];
+  [() => props.modelValue, () => options.value],
+  ([newValue, newOptions]) => {
+    if (newOptions.length > 0 && newValue !== undefined) {
+      if (props.type === "checkbox") {
+        selectedValue.value = Array.isArray(newValue) ? newValue : [];
+      } else {
+        const matchedOption = newOptions.find(
+          (option) => String(option.value) === String(newValue)
+        );
+        selectedValue.value = matchedOption?.value;
+      }
     } else {
-      selectedValue.value = newValue ?? undefined;
+      selectedValue.value = undefined;
     }
   },
   { immediate: true }
 );
 
-// selectedValue 改变时回传给父组件
+// 监听 selectedValue 的变化并触发 update:modelValue
 function handleChange(val: any) {
   emit("update:modelValue", val);
 }
diff --git a/src/styles/index.scss b/src/styles/index.scss
index f4e8c579..bf6a3b3b 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -4,42 +4,76 @@
   padding: 15px;
 }
 
-.search-bar {
-  padding: 18px 18px 0;
-  margin-bottom: 15px;
+// 进度条颜色
+#nprogress .bar {
+  background-color: var(--el-color-primary);
+}
+
+// 全局搜索区域样式
+.search-container {
+  padding: 18px 16px 0;
+  margin-bottom: 16px;
   background-color: var(--el-bg-color-overlay);
   border: 1px solid var(--el-border-color-light);
   border-radius: 4px;
-  box-shadow: var(--el-box-shadow-light);
 
-  //搜索表单按钮组全局样式
-  .search-form-btn-box {
-    flex: 1;
-    padding-right: 13px;
+  .search-buttons {
+    margin-right: 0;
+  }
+
+  .el-form-item {
+    margin-bottom: 18px;
+  }
+}
+
+// 表格区域样式 (BEM规范)
+.data-table {
+  margin-bottom: 16px;
 
-    .search-form-btn-box-item {
+  // 表格工具栏区域
+  &__toolbar {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+
+    &--actions,
+    &--tools {
       display: flex;
-      align-items: center;
-      justify-content: end;
-      width: 100%;
+      gap: 8px;
     }
   }
 
-  :deep(.el-form-item) {
-    width: 100% !important;
+  // 表格内容区域
+  &__content {
+    margin: 8px 0;
   }
 
-  .el-form--inline .el-form-item {
-    display: flex !important;
-    margin-right: 0px !important;
+  // 分页区域
+  .el-pagination {
+    justify-content: flex-end;
+    margin-top: 16px;
   }
 }
 
-.table-container > .el-card__header {
-  padding: calc(var(--el-card-padding) - 8px) var(--el-card-padding);
+// 抽屉和对话框底部按钮区域
+.dialog-footer {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+  padding-top: 16px;
 }
 
-// 进度条颜色
-#nprogress .bar {
-  background-color: var(--el-color-primary);
+// 搜索表单固定宽度项
+.fixed-width-item {
+  &-sm {
+    width: 100px !important;
+  }
+
+  &-md {
+    width: 150px !important;
+  }
+
+  &-lg {
+    width: 200px !important;
+  }
 }
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index ad089bdc..b0bc3667 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -1,48 +1,42 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item prop="keywords" label="关键字">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="表名"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" @click="handleQuery">
-                  <template #icon>
-                    <Search />
-                  </template>
-                  搜索
-                </el-button>
-                <el-button @click="handleResetQuery">
-                  <template #icon>
-                    <Refresh />
-                  </template>
-                  重置
-                </el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item prop="keywords" label="关键字">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="表名"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" @click="handleQuery">
+            <template #icon>
+              <Search />
+            </template>
+            搜索
+          </el-button>
+          <el-button @click="handleResetQuery">
+            <template #icon>
+              <Refresh />
+            </template>
+            重置
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-container">
+    <el-card shadow="hover" class="table-card">
       <el-table
         ref="dataTableRef"
         v-loading="loading"
         :data="pageData"
         highlight-current-row
         border
+        class="data-table__content"
       >
         <el-table-column type="selection" width="55" align="center" />
         <el-table-column label="表名" prop="tableName" min-width="100" />
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 8d5b82cd..bbb4f7b8 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -1,50 +1,45 @@
 <!-- 系统配置 -->
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="请输入配置键\配置名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="关键字" prop="keywords">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="请输入配置键\配置名称"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
 
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button
-          v-hasPerm="['sys:config:add']"
-          type="success"
-          icon="plus"
-          @click="handleOpenDialog()"
-        >
-          新增
-        </el-button>
-        <el-button
-          v-hasPerm="['sys:config:refresh']"
-          color="#626aef"
-          icon="RefreshLeft"
-          @click="handleRefreshCache"
-        >
-          刷新缓存
-        </el-button>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button
+            v-hasPerm="['sys:config:add']"
+            type="success"
+            icon="plus"
+            @click="handleOpenDialog()"
+          >
+            新增
+          </el-button>
+          <el-button
+            v-hasPerm="['sys:config:refresh']"
+            color="#626aef"
+            icon="RefreshLeft"
+            @click="handleRefreshCache"
+          >
+            刷新缓存
+          </el-button>
+        </div>
       </div>
 
       <el-table
@@ -52,6 +47,8 @@
         v-loading="loading"
         :data="pageData"
         highlight-current-row
+        class="data-table__content"
+        border
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="index" label="序号" width="60" />
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 9e094f18..11197547 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -1,59 +1,53 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="部门名称"
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="部门状态" prop="status">
-              <el-select v-model="queryParams.status" placeholder="全部" clearable>
-                <el-option :value="1" label="正常" />
-                <el-option :value="0" label="禁用" />
-              </el-select>
-            </el-form-item>
-          </el-col>
+        <el-form-item label="关键字" prop="keywords">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="部门名称"
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="部门状态" prop="status">
+          <el-select v-model="queryParams.status" placeholder="全部" clearable style="width: 100px">
+            <el-option :value="1" label="正常" />
+            <el-option :value="0" label="禁用" />
+          </el-select>
+        </el-form-item>
 
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
-                  搜索
-                </el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item class="search-buttons">
+          <el-button class="filter-item" type="primary" icon="search" @click="handleQuery">
+            搜索
+          </el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button
-          v-hasPerm="['sys:dept:add']"
-          type="success"
-          icon="plus"
-          @click="handleOpenDialog()"
-        >
-          新增
-        </el-button>
-        <el-button
-          v-hasPerm="['sys:dept:delete']"
-          type="danger"
-          :disabled="selectIds.length === 0"
-          icon="delete"
-          @click="handleDelete()"
-        >
-          删除
-        </el-button>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button
+            v-hasPerm="['sys:dept:add']"
+            type="success"
+            icon="plus"
+            @click="handleOpenDialog()"
+          >
+            新增
+          </el-button>
+          <el-button
+            v-hasPerm="['sys:dept:delete']"
+            type="danger"
+            :disabled="selectIds.length === 0"
+            icon="delete"
+            @click="handleDelete()"
+          >
+            删除
+          </el-button>
+        </div>
       </div>
 
       <el-table
@@ -62,6 +56,7 @@
         row-key="id"
         default-expand-all
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+        class="data-table__content"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index e5be5296..8e90f54e 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -1,38 +1,38 @@
 <!-- 字典 -->
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-row :gutter="20">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="字典名称/编码"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
+        <el-form-item label="关键字" prop="keywords">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="字典名称/编码"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
 
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-[10px]">
-        <el-button type="success" icon="plus" @click="handleAddClick()">新增</el-button>
-        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
-          删除
-        </el-button>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button type="success" icon="plus" @click="handleAddClick()">新增</el-button>
+          <el-button
+            type="danger"
+            :disabled="ids.length === 0"
+            icon="delete"
+            @click="handleDelete()"
+          >
+            删除
+          </el-button>
+        </div>
       </div>
 
       <el-table
@@ -40,6 +40,7 @@
         highlight-current-row
         :data="tableData"
         border
+        class="data-table__content"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index f76dc531..57555603 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -1,47 +1,45 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item prop="keywords" label="关键字">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="日志内容"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item prop="createTime" label="操作时间">
-              <el-date-picker
-                v-model="queryParams.createTime"
-                :editable="false"
-                class="!w-[240px]"
-                type="daterange"
-                range-separator="~"
-                start-placeholder="开始时间"
-                end-placeholder="截止时间"
-                value-format="YYYY-MM-DD"
-              />
-            </el-form-item>
-          </el-col>
+        <el-form-item prop="keywords" label="关键字">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="日志内容"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
 
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item prop="createTime" label="操作时间">
+          <el-date-picker
+            v-model="queryParams.createTime"
+            :editable="false"
+            class="fixed-width-item-lg"
+            type="daterange"
+            range-separator="~"
+            start-placeholder="开始时间"
+            end-placeholder="截止时间"
+            value-format="YYYY-MM-DD"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <el-table v-loading="loading" :data="pageData" highlight-current-row border>
+    <el-card shadow="hover" class="data-table">
+      <el-table
+        v-loading="loading"
+        :data="pageData"
+        highlight-current-row
+        border
+        class="data-table__content"
+      >
         <el-table-column label="操作时间" prop="createTime" width="180" />
         <el-table-column label="操作人" prop="operator" width="120" />
         <el-table-column label="日志模块" prop="module" width="100" />
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 6841593a..4ef98d45 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -1,51 +1,48 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="菜单名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item label="关键字" prop="keywords">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="菜单名称"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button
-          v-hasPerm="['sys:menu:add']"
-          type="success"
-          icon="plus"
-          @click="handleOpenDialog('0')"
-        >
-          新增
-        </el-button>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button
+            v-hasPerm="['sys:menu:add']"
+            type="success"
+            icon="plus"
+            @click="handleOpenDialog('0')"
+          >
+            新增
+          </el-button>
+        </div>
       </div>
 
       <el-table
+        ref="dataTableRef"
         v-loading="loading"
-        :data="menuTableData"
-        highlight-current-row
         row-key="id"
+        :data="menuTableData"
         :tree-props="{
           children: 'children',
           hasChildren: 'hasChildren',
         }"
+        class="data-table__content"
         @row-click="handleRowClick"
       >
         <el-table-column label="菜单名称" min-width="200">
@@ -282,11 +279,11 @@
               始终显示
               <el-tooltip placement="bottom" effect="light">
                 <template #content>
-                  选择“是”，即使目录或菜单下只有一个子节点，也会显示父节点。
+                  选择"是"，即使目录或菜单下只有一个子节点，也会显示父节点。
                   <br />
-                  选择“否”，如果目录或菜单下只有一个子节点，则只显示该子节点，隐藏父节点。
+                  选择"否"，如果目录或菜单下只有一个子节点，则只显示该子节点，隐藏父节点。
                   <br />
-                  如果是叶子节点，请选择“否”。
+                  如果是叶子节点，请选择"否"。
                 </template>
                 <el-icon class="ml-1 cursor-pointer">
                   <QuestionFilled />
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index b877b6b5..a9cf7105 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -1,43 +1,42 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="通知标题" prop="title">
-              <el-input
-                v-model="queryParams.title"
-                placeholder="关键字"
-                clearable
-                @keyup.enter="handleQuery()"
-              />
-            </el-form-item>
-          </el-col>
-
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" @click="handleQuery()">
-                  <template #icon>
-                    <Search />
-                  </template>
-                  搜索
-                </el-button>
-                <el-button @click="handleResetQuery()">
-                  <template #icon>
-                    <Refresh />
-                  </template>
-                  重置
-                </el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item label="通知标题" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="关键字"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" @click="handleQuery()">
+            <template #icon>
+              <Search />
+            </template>
+            搜索
+          </el-button>
+          <el-button @click="handleResetQuery()">
+            <template #icon>
+              <Refresh />
+            </template>
+            重置
+          </el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <el-table ref="dataTableRef" v-loading="loading" :data="pageData" highlight-current-row>
+    <el-card shadow="hover" class="data-table">
+      <el-table
+        ref="dataTableRef"
+        v-loading="loading"
+        :data="pageData"
+        highlight-current-row
+        class="data-table__content"
+      >
         <el-table-column type="index" label="序号" width="60" />
         <el-table-column label="通知标题" prop="title" min-width="200" />
         <el-table-column align="center" label="通知类型" width="150">
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index dc53dd52..81cbc3de 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form
         ref="queryFormRef"
         :model="queryParams"
@@ -8,65 +9,64 @@
         label-suffix=":"
         label-width="auto"
       >
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="标题" prop="title">
-              <el-input
-                v-model="queryParams.title"
-                placeholder="标题"
-                clearable
-                @keyup.enter="handleQuery()"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="发布状态" prop="publishStatus">
-              <el-select v-model="queryParams.publishStatus" clearable placeholder="全部">
-                <el-option :value="0" label="未发布" />
-                <el-option :value="1" label="已发布" />
-                <el-option :value="-1" label="已撤回" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item label="标题" prop="title">
+          <el-input
+            v-model="queryParams.title"
+            placeholder="标题"
+            clearable
+            @keyup.enter="handleQuery()"
+          />
+        </el-form-item>
+
+        <el-form-item label="发布状态" prop="publishStatus">
+          <el-select
+            v-model="queryParams.publishStatus"
+            clearable
+            placeholder="全部"
+            style="width: 100px"
+          >
+            <el-option :value="0" label="未发布" />
+            <el-option :value="1" label="已发布" />
+            <el-option :value="-1" label="已撤回" />
+          </el-select>
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never" class="table-wrapper">
-      <template #header>
-        <el-button
-          v-hasPerm="['sys:notice:add']"
-          type="success"
-          icon="plus"
-          @click="handleOpenDialog()"
-        >
-          新增通知
-        </el-button>
-        <el-button
-          v-hasPerm="['sys:notice:delete']"
-          type="danger"
-          :disabled="selectIds.length === 0"
-          icon="delete"
-          @click="handleDelete()"
-        >
-          删除
-        </el-button>
-      </template>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button
+            v-hasPerm="['sys:notice:add']"
+            type="success"
+            icon="plus"
+            @click="handleOpenDialog()"
+          >
+            新增通知
+          </el-button>
+          <el-button
+            v-hasPerm="['sys:notice:delete']"
+            type="danger"
+            :disabled="selectIds.length === 0"
+            icon="delete"
+            @click="handleDelete()"
+          >
+            删除
+          </el-button>
+        </div>
+      </div>
 
       <el-table
         ref="dataTableRef"
         v-loading="loading"
         :data="pageData"
         highlight-current-row
+        class="data-table__content"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c64038d7..6a294113 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,37 +1,37 @@
 <template>
   <div class="app-container">
-    <div class="search-bar">
+    <!-- 搜索区域 -->
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item prop="keywords" label="关键字">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="角色名称"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item prop="keywords" label="关键字">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="角色名称"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-10px">
-        <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
-        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
-          删除
-        </el-button>
+    <el-card shadow="hover" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
+          <el-button
+            type="danger"
+            :disabled="ids.length === 0"
+            icon="delete"
+            @click="handleDelete()"
+          >
+            删除
+          </el-button>
+        </div>
       </div>
 
       <el-table
@@ -40,6 +40,7 @@
         :data="roleList"
         highlight-current-row
         border
+        class="data-table__content"
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f07fbd4d..fa77a297 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -9,58 +9,52 @@
 
       <!-- 用户列表 -->
       <el-col :lg="20" :xs="24">
-        <div class="search-bar">
+        <!-- 搜索区域 -->
+        <div class="search-container">
           <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
-            <el-row :gutter="22">
-              <el-col :span="24" :md="12" :lg="6">
-                <el-form-item label="关键字" prop="keywords">
-                  <el-input
-                    v-model="queryParams.keywords"
-                    placeholder="用户名/昵称/手机号"
-                    clearable
-                    @keyup.enter="handleQuery"
-                  />
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="24" :md="12" :lg="6">
-                <el-form-item label="状态" prop="status">
-                  <el-select v-model="queryParams.status" placeholder="全部" clearable>
-                    <el-option label="正常" :value="1" />
-                    <el-option label="禁用" :value="0" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-
-              <el-col :span="24" :md="12" :lg="6">
-                <el-form-item label="创建时间">
-                  <el-date-picker
-                    v-model="queryParams.createTime"
-                    :editable="false"
-                    type="daterange"
-                    range-separator="~"
-                    start-placeholder="开始时间"
-                    end-placeholder="截止时间"
-                    value-format="YYYY-MM-DD"
-                  />
-                </el-form-item>
-              </el-col>
-
-              <div class="search-form-btn-box">
-                <div class="search-form-btn-box-item">
-                  <el-form-item>
-                    <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                    <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-                  </el-form-item>
-                </div>
-              </div>
-            </el-row>
+            <el-form-item label="关键字" prop="keywords">
+              <el-input
+                v-model="queryParams.keywords"
+                placeholder="用户名/昵称/手机号"
+                clearable
+                @keyup.enter="handleQuery"
+              />
+            </el-form-item>
+
+            <el-form-item label="状态" prop="status">
+              <el-select
+                v-model="queryParams.status"
+                placeholder="全部"
+                clearable
+                style="width: 100px"
+              >
+                <el-option label="正常" :value="1" />
+                <el-option label="禁用" :value="0" />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item label="创建时间">
+              <el-date-picker
+                v-model="queryParams.createTime"
+                :editable="false"
+                type="daterange"
+                range-separator="~"
+                start-placeholder="开始时间"
+                end-placeholder="截止时间"
+                value-format="YYYY-MM-DD"
+              />
+            </el-form-item>
+
+            <el-form-item class="search-buttons">
+              <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+              <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+            </el-form-item>
           </el-form>
         </div>
 
-        <el-card shadow="never">
-          <div class="flex-x-between mb-10px">
-            <div>
+        <el-card shadow="hover" class="data-table">
+          <div class="data-table__toolbar">
+            <div class="data-table__toolbar--actions">
               <el-button
                 v-hasPerm="['sys:user:add']"
                 type="success"
@@ -79,7 +73,7 @@
                 删除
               </el-button>
             </div>
-            <div>
+            <div class="data-table__toolbar--tools">
               <el-button
                 v-hasPerm="'sys:user:import'"
                 icon="upload"
@@ -94,13 +88,20 @@
             </div>
           </div>
 
-          <el-table v-loading="loading" :data="pageData" @selection-change="handleSelectionChange">
+          <el-table
+            v-loading="loading"
+            :data="pageData"
+            border
+            stripe
+            highlight-current-row
+            class="data-table__content"
+            @selection-change="handleSelectionChange"
+          >
             <el-table-column type="selection" width="50" align="center" />
             <el-table-column label="用户名" prop="username" />
             <el-table-column label="昵称" width="150" align="center" prop="nickname" />
             <el-table-column label="性别" width="100" align="center">
               <template #default="scope">
-                <!-- 性别字典翻译 -->
                 <DictLabel v-model="scope.row.gender" code="gender" />
               </template>
             </el-table-column>

From 3499152d60cbe5a4f020625a0e0b46bff30c66a3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 15 Apr 2025 23:37:02 +0800
Subject: [PATCH 311/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E6=97=A0=E7=94=A8=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/index.scss          | 17 +----------------
 src/views/system/log/index.vue |  2 +-
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/styles/index.scss b/src/styles/index.scss
index bf6a3b3b..99d7f3b6 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -26,7 +26,7 @@
   }
 }
 
-// 表格区域样式 (BEM规范)
+// 表格区域样式
 .data-table {
   margin-bottom: 16px;
 
@@ -62,18 +62,3 @@
   justify-content: flex-end;
   padding-top: 16px;
 }
-
-// 搜索表单固定宽度项
-.fixed-width-item {
-  &-sm {
-    width: 100px !important;
-  }
-
-  &-md {
-    width: 150px !important;
-  }
-
-  &-lg {
-    width: 200px !important;
-  }
-}
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 57555603..d9ad0fc5 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -16,12 +16,12 @@
           <el-date-picker
             v-model="queryParams.createTime"
             :editable="false"
-            class="fixed-width-item-lg"
             type="daterange"
             range-separator="~"
             start-placeholder="开始时间"
             end-placeholder="截止时间"
             value-format="YYYY-MM-DD"
+            style="width: 200px"
           />
         </el-form-item>
 

From 5f886825bbc0700f9c1eaf717ac8cb32833b11e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Wed, 16 Apr 2025 23:28:29 +0800
Subject: [PATCH 312/497] =?UTF-8?q?feat:=20:sparkles:=20pageSearch?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=97=B4=E8=B7=9D?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=85=8D=E7=BD=AE=EF=BC=8C=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E5=B8=83=E5=B1=80=E6=8C=89=E9=92=AE=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue    | 148 ++++++++++++------------
 src/components/CURD/types.ts          |   7 +-
 src/components/InputTag/index.vue     |  47 ++++----
 src/main.ts                           |   2 -
 src/types/components.d.ts             |   2 +
 src/views/demo/curd/config/search.ts  |  81 +------------
 src/views/demo/curd/config/search2.ts | 158 ++++++++++++++++++++++++++
 src/views/demo/curd/index.vue         |   2 +
 vite.config.ts                        |   2 +
 9 files changed, 277 insertions(+), 172 deletions(-)
 create mode 100644 src/views/demo/curd/config/search2.ts

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 9f5d15c0..1c9696b6 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,65 +1,68 @@
 <template>
-  <el-card
-    v-show="visible"
-    v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
-    v-bind="cardAttrs"
-    class="mb-2.5!"
-  >
-    <el-form ref="queryFormRef" :model="queryParams" :inline="true" :class="isGrid">
-      <template v-for="(item, index) in formItems" :key="item.prop">
-        <el-form-item
-          v-show="isExpand ? true : index < showNumber"
-          :label="item?.label"
-          :prop="item.prop"
-        >
-          <!-- Label -->
-          <template v-if="item?.tips" #label>
-            <span class="flex-y-center">
-              {{ item.label }}
-              <el-tooltip v-bind="getTooltipProps(item.tips)">
-                <QuestionFilled class="w-4 h-4 mx-1" />
-              </el-tooltip>
-              {{ searchConfig.colon ? ":" : "" }}
-            </span>
-          </template>
-          <template v-else #label>{{ item.label }} {{ searchConfig.colon ? ":" : "" }}</template>
-
-          <component
-            :is="componentMap[item?.type ? item?.type : 'input']"
-            v-model.trim="queryParams[item.prop]"
-            style="width: 100%"
-            v-bind="item.attrs"
-            :config="item.attrs"
-            v-on="item.events || {}"
+  <div v-show="visible" style="margin-bottom: 12px" v-bind="cardAttrs">
+    <el-card
+      v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
+      v-bind="cardAttrs"
+    >
+      <el-form ref="queryFormRef" :model="queryParams" v-bind="formAttrs" :class="isGrid">
+        <template v-for="(item, index) in formItems" :key="item.prop">
+          <el-form-item
+            v-show="isExpand ? true : index < showNumber"
+            :label="item?.label"
+            :prop="item.prop"
           >
-            <template v-if="item.type === 'select'">
-              <template v-for="opt in item.options">
-                <el-option :label="opt.label" :value="opt.value" />
-              </template>
+            <!-- Label -->
+            <template v-if="item?.tips" #label>
+              <span class="flex-y-center">
+                {{ item.label }}
+                <el-tooltip v-bind="getTooltipProps(item.tips)">
+                  <QuestionFilled class="w-4 h-4 mx-1" />
+                </el-tooltip>
+                {{ searchConfig.colon ? ":" : "" }}
+              </span>
             </template>
-          </component>
-        </el-form-item>
-      </template>
-      <el-form-item>
-        <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
-        <el-button icon="refresh" @click="handleReset">重置</el-button>
-        <!-- 展开/收起 -->
-        <template v-if="isExpandable && formItems.length > showNumber">
-          <el-link class="ml-3" type="primary" :underline="false" @click="isExpand = !isExpand">
-            {{ isExpand ? "收起" : "展开" }}
-            <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
-          </el-link>
+            <template v-else #label>{{ item.label }} {{ searchConfig.colon ? ":" : "" }}</template>
+
+            <el-cascader
+              v-if="item.type === 'cascader'"
+              v-model.trim="queryParams[item.prop]"
+              v-bind="{ style: { width: '100%' }, ...item.attrs }"
+              v-on="item.events || {}"
+            />
+            <component
+              :is="componentMap.get(item?.type ?? 'input')"
+              v-else
+              v-model.trim="queryParams[item.prop]"
+              v-bind="{ style: { width: '100%' }, ...item.attrs }"
+              v-on="item.events || {}"
+            >
+              <template v-if="item.type === 'select'">
+                <template v-for="opt in item.options">
+                  <el-option :label="opt.label" :value="opt.value" />
+                </template>
+              </template>
+            </component>
+          </el-form-item>
         </template>
-      </el-form-item>
-    </el-form>
-  </el-card>
+        <el-form-item :class="{ 'col-[auto/-1] justify-self-end': searchConfig?.grid === 'right' }">
+          <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleReset">重置</el-button>
+          <!-- 展开/收起 -->
+          <template v-if="isExpandable && formItems.length > showNumber">
+            <el-link class="ml-3" type="primary" :underline="false" @click="isExpand = !isExpand">
+              {{ isExpand ? "收起" : "展开" }}
+              <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
+            </el-link>
+          </template>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
 </template>
 
 <script setup lang="ts">
 import type { IObject, ISearchConfig, ComponentType } from "./types";
 import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
-import { ElInput, ElInputNumber, ElInputTag, ElSelect, ElCascader } from "element-plus";
-import { ElTimePicker, ElTimeSelect, ElOption, ElDatePicker, ElTreeSelect } from "element-plus";
 import { type FormInstance } from "element-plus";
 import InputTag from "@/components/InputTag/index.vue";
 
@@ -71,18 +74,21 @@ const emit = defineEmits<{
   resetClick: [queryParams: IObject];
 }>();
 // 组件映射表
-const componentMap: Record<ComponentType, Component> = {
-  input: markRaw(ElInput),
-  select: markRaw(ElSelect),
-  cascader: markRaw(ElCascader),
-  "input-number": markRaw(ElInputNumber),
-  "date-picker": markRaw(ElDatePicker),
-  "time-picker": markRaw(ElTimePicker),
-  "time-select": markRaw(ElTimeSelect),
-  "tree-select": markRaw(ElTreeSelect),
-  "input-tag": markRaw(ElInputTag),
-  "custom-tag": markRaw(InputTag),
-};
+const componentMap = new Map<ComponentType, Component>([
+  /* eslint-disable */
+  // @ts-ignore
+  ["input", markRaw(ElInput)], // @ts-ignore
+  ["select", markRaw(ElSelect)], // @ts-ignore
+  ["cascader", markRaw(ElCascader)], // @ts-ignore
+  ["input-number", markRaw(ElInputNumber)], // @ts-ignore
+  ["date-picker", markRaw(ElDatePicker)], // @ts-ignore
+  ["time-picker", markRaw(ElTimePicker)], // @ts-ignore
+  ["time-select", markRaw(ElTimeSelect)], // @ts-ignore
+  ["tree-select", markRaw(ElTreeSelect)], // @ts-ignore
+  ["input-tag", markRaw(ElInputTag)], // @ts-ignore
+  ["custom-tag", markRaw(InputTag)],
+  /* eslint-enable */
+]);
 
 const queryFormRef = ref<FormInstance>();
 // 是否显示
@@ -97,11 +103,13 @@ const isExpand = ref(false);
 const showNumber = computed(() =>
   isExpandable.value ? (props.searchConfig?.showNumber ?? 3) : formItems.length
 );
-// 卡片组件自定义属性（累名、阴影、权限等）
+// 卡片组件自定义属性（阴影、自定义边距样式等）
 const cardAttrs = computed<IObject>(() => {
-  return props.searchConfig?.cardAttrs && props.searchConfig.cardAttrs instanceof Object
-    ? { shadow: "never", ...props.searchConfig.cardAttrs }
-    : { shadow: "never" };
+  return { shadow: "never", ...props.searchConfig?.cardAttrs };
+});
+// 表单组件自定义属性（label位置、宽度、对齐方式等）
+const formAttrs = computed(() => {
+  return { inline: true, ...props.searchConfig?.form };
 });
 // 是否使用自适应网格布局
 const isGrid = computed(() =>
@@ -119,7 +127,7 @@ const getTooltipProps = (tips: any) => {
 onMounted(() => {
   formItems.forEach((item) => {
     item.initFn && item.initFn(item);
-    if (item.type === "input-tag" || item.type === "custom-tag") {
+    if (["input-tag", "custom-tag", "cascader"].includes(item?.type ?? "")) {
       queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
       queryParams[item.prop] = item.initialValue ?? null;
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 7881b9a4..1283b93f 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -13,6 +13,7 @@ import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
 import type PageSearch from "./PageSearch.vue";
+import { CSSProperties } from "vue";
 
 export type PageSearchInstance = InstanceType<typeof PageSearch>;
 export type PageContentInstance = InstanceType<typeof PageContent>;
@@ -71,9 +72,11 @@ export interface ISearchConfig {
   // 默认展示的表单项数量(默认：3)
   showNumber?: number;
   // 卡片属性
-  cardAttrs?: Partial<CardProps>;
+  cardAttrs?: Partial<CardProps> & { style?: CSSProperties };
+  // form组件属性
+  form?: IForm;
   // 自适应网格布局(使用时表单不要添加 style: { width: "200px" })
-  grid?: boolean;
+  grid?: boolean | "left" | "right";
 }
 
 export interface IContentConfig<T = any> {
diff --git a/src/components/InputTag/index.vue b/src/components/InputTag/index.vue
index 885cd938..a22b993e 100644
--- a/src/components/InputTag/index.vue
+++ b/src/components/InputTag/index.vue
@@ -1,26 +1,29 @@
 <template>
-  <div class="flex-y-center gap-2">
-    <el-tag
-      v-for="tag in tags"
-      :key="tag"
-      closable
-      :disable-transitions="false"
-      v-bind="config.tagAttrs"
-      @close="handleClose(tag)"
-    >
-      {{ tag }}
-    </el-tag>
-    <el-input
-      v-if="inputVisible"
-      ref="inputRef"
-      v-model.trim="inputValue"
-      @keyup.enter.stop.prevent="handleInputConfirm"
-      @blur.stop.prevent="handleInputConfirm"
-    />
-    <el-button v-else v-bind="config.buttonAttrs" @click="showInput">
-      {{ config.buttonAttrs.btnText ? config.buttonAttrs.btnText : "+ New Tag" }}
-    </el-button>
-  </div>
+  <el-scrollbar>
+    <div class="flex-y-center gap-2">
+      <el-tag
+        v-for="tag in tags"
+        :key="tag"
+        closable
+        :disable-transitions="false"
+        v-bind="config.tagAttrs"
+        @close="handleClose(tag)"
+      >
+        {{ tag }}
+      </el-tag>
+      <el-input
+        v-if="inputVisible"
+        ref="inputRef"
+        v-model.trim="inputValue"
+        style="min-width: 100px"
+        @keyup.enter.stop.prevent="handleInputConfirm"
+        @blur.stop.prevent="handleInputConfirm"
+      />
+      <el-button v-else v-bind="config.buttonAttrs" @click="showInput">
+        {{ config.buttonAttrs.btnText ? config.buttonAttrs.btnText : "+ New Tag" }}
+      </el-button>
+    </div>
+  </el-scrollbar>
 </template>
 <script setup lang="ts">
 import type { InputInstance } from "element-plus";
diff --git a/src/main.ts b/src/main.ts
index 370f1ef5..0167bf8c 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,6 +1,4 @@
 import { createApp } from "vue";
-// TODO::不引入el-input-tag样式会丢失
-import "element-plus/es/components/input-tag/style/css";
 import App from "./App.vue";
 import setupPlugins from "@/plugins";
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index f1a615a6..4b31280f 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -19,6 +19,7 @@ declare module "vue" {
     ElBreadcrumbItem: (typeof import("element-plus/es"))["ElBreadcrumbItem"];
     ElButton: (typeof import("element-plus/es"))["ElButton"];
     ElCard: (typeof import("element-plus/es"))["ElCard"];
+    ElCascader: (typeof import("element-plus/es"))["ElCascader"];
     ElCheckbox: (typeof import("element-plus/es"))["ElCheckbox"];
     ElCheckboxGroup: (typeof import("element-plus/es"))["ElCheckboxGroup"];
     ElCol: (typeof import("element-plus/es"))["ElCol"];
@@ -56,6 +57,7 @@ declare module "vue" {
     ElTableColumn: (typeof import("element-plus/es"))["ElTableColumn"];
     ElTag: (typeof import("element-plus/es"))["ElTag"];
     ElText: (typeof import("element-plus/es"))["ElText"];
+    ElTimeSelect: (typeof import("element-plus/es"))["ElTimeSelect"];
     ElTooltip: (typeof import("element-plus/es"))["ElTooltip"];
     ElTree: (typeof import("element-plus/es"))["ElTree"];
     ElTreeSelect: (typeof import("element-plus/es"))["ElTreeSelect"];
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index 6e78a415..85b4c385 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,14 +1,8 @@
 import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
 
-const selectOptions = reactive([
-  { label: "启用", value: 1 },
-  { label: "禁用", value: 0 },
-]);
-
 const searchConfig: ISearchConfig = {
   pageName: "sys:user",
-  colon: false,
   formItems: [
     {
       tips: "支持模糊搜索",
@@ -20,13 +14,6 @@ const searchConfig: ISearchConfig = {
         clearable: true,
         style: { width: "200px" },
       },
-      events: {
-        change: (e) => {
-          console.log("输入框的值: ", e);
-          // 级联操作示例，需要使用reactive提前定义数组
-          // selectOptions.push({ label: e, value: e });
-        },
-      },
     },
     {
       type: "tree-select",
@@ -48,7 +35,6 @@ const searchConfig: ISearchConfig = {
       },
     },
     {
-      tips: { effect: "light", placement: "top", content: "自定义文字提示" },
       type: "select",
       label: "状态",
       prop: "status",
@@ -57,17 +43,15 @@ const searchConfig: ISearchConfig = {
         clearable: true,
         style: { width: "200px" },
       },
-      options: selectOptions,
-      events: {
-        change: function (e) {
-          console.log("选中的值: ", e);
-        },
-      },
+      options: [
+        { label: "启用", value: 1 },
+        { label: "禁用", value: 0 },
+      ],
     },
     {
       type: "date-picker",
       label: "创建时间",
-      prop: "createAt",
+      prop: "createTime",
       attrs: {
         type: "daterange",
         "range-separator": "~",
@@ -77,61 +61,6 @@ const searchConfig: ISearchConfig = {
         style: { width: "200px" },
       },
     },
-    {
-      type: "date-picker",
-      label: "日期选择器",
-      prop: "testDataPicker",
-      attrs: {
-        type: "date",
-        placeholder: "选择日期",
-        style: { width: "200px" },
-      },
-    },
-    {
-      type: "input-number",
-      label: "数字输入框",
-      prop: "testInputNumber",
-      attrs: {
-        controls: false,
-        placeholder: "请输入数字",
-        style: { width: "200px" },
-      },
-    },
-    {
-      type: "input-tag",
-      label: "标签选择器",
-      prop: "testInputTags",
-      attrs: {
-        clearable: true,
-        placeholder: "请输入",
-      },
-    },
-    {
-      type: "custom-tag",
-      label: "标签选择器",
-      prop: "testCustomTags",
-      attrs: {
-        buttonAttrs: { btnText: "+ New Tag" },
-        inputAttrs: {},
-        tagAttrs: {},
-      },
-    },
-    {
-      type: "time-picker",
-      label: "时间选择器",
-      prop: "testTimePicker",
-      attrs: {
-        style: { width: "200px" },
-      },
-    },
-    {
-      type: "time-select",
-      label: "时间选择",
-      prop: "testTimeSelect",
-      attrs: {
-        style: { width: "200px" },
-      },
-    },
   ],
 };
 
diff --git a/src/views/demo/curd/config/search2.ts b/src/views/demo/curd/config/search2.ts
new file mode 100644
index 00000000..0055b573
--- /dev/null
+++ b/src/views/demo/curd/config/search2.ts
@@ -0,0 +1,158 @@
+import DeptAPI from "@/api/system/dept.api";
+import type { ISearchConfig } from "@/components/CURD/types";
+
+const selectOptions = reactive([
+  { label: "启用", value: 1 },
+  { label: "禁用", value: 0 },
+]);
+
+const searchConfig: ISearchConfig = {
+  grid: "right",
+  colon: true,
+  showNumber: 3,
+  form: { labelPosition: "right", labelWidth: "90px" },
+  cardAttrs: { shadow: "hover", style: { "margin-bottom": "12px" } },
+  formItems: [
+    {
+      tips: { effect: "light", placement: "top", content: "自定义文字提示" },
+      type: "input",
+      label: "输入框",
+      prop: "testInput",
+      attrs: { placeholder: "请输入", clearable: true },
+      events: {
+        change: (e) => {
+          console.log("输入框的值: ", e);
+          // 级联操作示例，需要使用reactive提前定义数组
+          // selectOptions.push({ label: e, value: e });
+        },
+      },
+    },
+    {
+      type: "input-number",
+      label: "数字输入框",
+      prop: "testInputNumber",
+      attrs: { placeholder: "请输入", controls: false },
+    },
+    {
+      type: "select",
+      label: "下拉选择框",
+      prop: "testSelect",
+      attrs: { placeholder: "全部", clearable: true },
+      options: selectOptions,
+      events: {
+        change: function (e) {
+          console.log("选中的值: ", e);
+        },
+      },
+    },
+    {
+      type: "tree-select",
+      label: "树形选择框",
+      prop: "testTreeSelect",
+      attrs: {
+        placeholder: "请选择",
+        data: [],
+        filterable: true,
+        "check-strictly": true,
+        "render-after-expand": false,
+        clearable: true,
+      },
+      async initFn(formItem) {
+        formItem.attrs.data = await DeptAPI.getOptions();
+        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+        // this.attrs!.data = await DeptAPI.getOptions();
+      },
+    },
+    {
+      type: "cascader",
+      label: "级联选择器",
+      prop: "testCascader",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+        props: {
+          expandTrigger: "hover",
+          label: "label",
+          value: "value",
+          children: "children",
+        },
+        options: [
+          {
+            value: "guide",
+            label: "Guide",
+            children: [
+              {
+                value: "disciplines",
+                label: "Disciplines",
+                children: [
+                  {
+                    value: "consistency",
+                    label: "Consistency",
+                  },
+                ],
+              },
+              {
+                value: "navigation",
+                label: "Navigation",
+                children: [
+                  {
+                    value: "side nav",
+                    label: "Side Navigation",
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+    },
+    {
+      type: "date-picker",
+      label: "范围选择器",
+      prop: "createAt",
+      attrs: {
+        type: "daterange",
+        "range-separator": "~",
+        "start-placeholder": "开始时间",
+        "end-placeholder": "截止时间",
+        "value-format": "YYYY-MM-DD",
+      },
+    },
+    {
+      type: "date-picker",
+      label: "日期选择器",
+      prop: "testDataPicker",
+      attrs: { placeholder: "请选择", type: "date" },
+    },
+    {
+      type: "time-picker",
+      label: "时间选择器",
+      prop: "testTimePicker",
+      attrs: { placeholder: "请选择", clearable: true },
+    },
+    {
+      type: "time-select",
+      label: "时间选择",
+      prop: "testTimeSelect",
+      attrs: { placeholder: "请选择", clearable: true },
+    },
+    {
+      type: "input-tag",
+      label: "标签选择器",
+      prop: "testInputTags",
+      attrs: { placeholder: "请选择", clearable: true },
+    },
+    {
+      type: "custom-tag",
+      label: "标签选择器",
+      prop: "testCustomTags",
+      attrs: {
+        buttonAttrs: { btnText: "+ New Tag" },
+        inputAttrs: {},
+        tagAttrs: {},
+      },
+    },
+  ],
+};
+
+export default searchConfig;
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 6c21fc69..40eef43f 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -74,6 +74,7 @@
       </page-modal>
     </template>
     <template v-else>
+      <page-search ref="searchRef" :search-config="searchConfig2" @reset-click="handleResetClick" />
       <page-content
         ref="contentRef"
         :content-config="contentConfig2"
@@ -100,6 +101,7 @@ import contentConfig from "./config/content";
 import contentConfig2 from "./config/content2";
 import editModalConfig from "./config/edit";
 import searchConfig from "./config/search";
+import searchConfig2 from "./config/search2";
 
 const {
   searchRef,
diff --git a/vite.config.ts b/vite.config.ts
index c40347f3..19ff4ca1 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -121,6 +121,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es/components/breadcrumb/style/index",
         "element-plus/es/components/button/style/index",
         "element-plus/es/components/card/style/index",
+        "element-plus/es/components/cascader/style/index",
         "element-plus/es/components/checkbox-group/style/index",
         "element-plus/es/components/checkbox/style/index",
         "element-plus/es/components/col/style/index",
@@ -174,6 +175,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es/components/tag/style/index",
         "element-plus/es/components/text/style/index",
         "element-plus/es/components/time-picker/style/index",
+        "element-plus/es/components/time-select/style/index",
         "element-plus/es/components/timeline-item/style/index",
         "element-plus/es/components/timeline/style/index",
         "element-plus/es/components/tooltip/style/index",

From c3aefbb2dff150db1f3a9f19f47d6b2826e495ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Thu, 17 Apr 2025 23:09:42 +0800
Subject: [PATCH 313/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84TS=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E9=AB=98=E7=9A=84=E7=B1=BB=E5=9E=8B=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue |  22 +++---
 src/components/CURD/types.ts       | 110 +++++++++--------------------
 uno.config.ts                      |   2 +-
 3 files changed, 44 insertions(+), 90 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 1c9696b6..4d3a56aa 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="visible" style="margin-bottom: 12px" v-bind="cardAttrs">
+  <div v-show="visible" v-bind="{ style: { 'margin-bottom': '12px' }, ...cardAttrs }">
     <el-card
       v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
       v-bind="cardAttrs"
@@ -12,16 +12,15 @@
             :prop="item.prop"
           >
             <!-- Label -->
-            <template v-if="item?.tips" #label>
+            <template #label>
               <span class="flex-y-center">
-                {{ item.label }}
-                <el-tooltip v-bind="getTooltipProps(item.tips)">
+                {{ item?.label || "" }}
+                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
                   <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
-                {{ searchConfig.colon ? ":" : "" }}
+                <span v-if="searchConfig.colon" class="ml-0.5">:</span>
               </span>
             </template>
-            <template v-else #label>{{ item.label }} {{ searchConfig.colon ? ":" : "" }}</template>
 
             <el-cascader
               v-if="item.type === 'cascader'"
@@ -44,6 +43,7 @@
             </component>
           </el-form-item>
         </template>
+
         <el-form-item :class="{ 'col-[auto/-1] justify-self-end': searchConfig?.grid === 'right' }">
           <el-button icon="search" type="primary" @click="handleQuery">搜索</el-button>
           <el-button icon="refresh" @click="handleReset">重置</el-button>
@@ -61,9 +61,9 @@
 </template>
 
 <script setup lang="ts">
-import type { IObject, ISearchConfig, ComponentType } from "./types";
+import type { IObject, IForm, ISearchConfig, ISearchComponent } from "./types";
 import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
-import { type FormInstance } from "element-plus";
+import type { FormInstance, ElTooltipProps } from "element-plus";
 import InputTag from "@/components/InputTag/index.vue";
 
 // 定义接收的属性
@@ -74,7 +74,7 @@ const emit = defineEmits<{
   resetClick: [queryParams: IObject];
 }>();
 // 组件映射表
-const componentMap = new Map<ComponentType, Component>([
+const componentMap = new Map<ISearchComponent, Component>([
   /* eslint-disable */
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
@@ -108,7 +108,7 @@ const cardAttrs = computed<IObject>(() => {
   return { shadow: "never", ...props.searchConfig?.cardAttrs };
 });
 // 表单组件自定义属性（label位置、宽度、对齐方式等）
-const formAttrs = computed(() => {
+const formAttrs = computed<IForm>(() => {
   return { inline: true, ...props.searchConfig?.form };
 });
 // 是否使用自适应网格布局
@@ -120,7 +120,7 @@ const isGrid = computed(() =>
 // 搜索表单数据
 const queryParams = reactive<IObject>({});
 // 获取tooltip的属性
-const getTooltipProps = (tips: any) => {
+const getTooltipProps = (tips: string | Partial<ElTooltipProps>) => {
   return typeof tips === "string" ? { content: tips } : tips;
 };
 
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 1283b93f..178eb73d 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -1,14 +1,6 @@
-import type {
-  DialogProps,
-  DrawerProps,
-  FormItemRule,
-  FormProps,
-  PaginationProps,
-  TableProps,
-  ColProps,
-  ButtonType,
-  CardProps,
-} from "element-plus";
+import type { DialogProps, DrawerProps, FormItemRule, PaginationProps } from "element-plus";
+import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "element-plus";
+import type { ButtonType, ElTooltipProps } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
@@ -22,6 +14,25 @@ export type PageFormInstance = InstanceType<typeof PageForm>;
 
 export type IObject = Record<string, any>;
 
+type DataComponent = "date-picker" | "time-picker" | "time-select" | "custom-tag" | "input-tag";
+type InputComponent = "input" | "select" | "input-number" | "cascader" | "tree-select";
+type OtherComponent = "text" | "radio" | "checkbox" | "switch" | "custom";
+export type ISearchComponent = DataComponent | InputComponent;
+export type IComponentType = DataComponent | InputComponent | OtherComponent;
+
+type ToolbarLeft = "add" | "delete" | "import" | "export";
+type ToolbarRight = "refresh" | "filter" | "imports" | "exports" | "search";
+type ToolbarTable = "edit" | "view" | "delete";
+type IToolsButton = {
+  name?: string; // 按钮名称
+  text?: string; // 按钮文本
+  icon?: string; // 按钮图标
+  type?: ButtonType; // 按钮类型
+  auth?: Array<string> | string; // 按钮权限
+  attrs?: Partial<ButtonProps>; // 按钮属性
+};
+export type IToolsDefault = ToolbarLeft | ToolbarRight | ToolbarTable | IToolsButton;
+
 export interface IOperatData {
   name: string;
   row: IObject;
@@ -29,18 +40,6 @@ export interface IOperatData {
   $index: number;
 }
 
-export type ComponentType =
-  | "input"
-  | "select"
-  | "input-number"
-  | "date-picker"
-  | "time-picker"
-  | "time-select"
-  | "tree-select"
-  | "input-tag"
-  | "custom-tag"
-  | "cascader";
-
 export interface ISearchConfig {
   // 页面名称(参与组成权限标识,如sys:user:xxx),不填则不进行权限校验
   pageName?: string;
@@ -49,11 +48,11 @@ export interface ISearchConfig {
   // 表单项(默认：[])
   formItems?: Array<{
     // 组件类型(如input,select等)
-    type?: ComponentType;
+    type?: ISearchComponent;
     // 标签文本
     label?: string;
     // 标签提示
-    tips?: string | IObject;
+    tips?: string | Partial<ElTooltipProps>;
     // 键名
     prop: string;
     // 组件属性(input-tag组件支持join,btnText,size属性)
@@ -63,7 +62,7 @@ export interface ISearchConfig {
     // 可选项(适用于select组件)
     options?: Array<{ label: string; value: any }>;
     // 组件事件
-    events?: Record<string, (...args: any[]) => void>;
+    events?: Record<string, (...args: any) => void>;
     // 初始化数据函数扩展
     initFn?: (formItem: IObject) => void;
   }>;
@@ -81,7 +80,7 @@ export interface ISearchConfig {
 
 export interface IContentConfig<T = any> {
   // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName: string;
+  pageName?: string;
   // table组件属性
   table?: Omit<TableProps<any>, "data">;
   // 分页组件位置(默认：left)
@@ -128,34 +127,10 @@ export interface IContentConfig<T = any> {
   importsAction?: (data: IObject[]) => Promise<any>;
   // 主键名(默认为id)
   pk?: string;
-  // 表格工具栏(默认支持add,delete,export,也可自定义)
-  toolbar?: Array<
-    | "add"
-    | "delete"
-    | "import"
-    | "export"
-    | {
-        auth: string;
-        icon?: string;
-        name: string;
-        text: string;
-        type?: ButtonType;
-      }
-  >;
-  // 表格工具栏右侧图标
-  defaultToolbar?: Array<
-    | "refresh"
-    | "filter"
-    | "imports"
-    | "exports"
-    | "search"
-    | {
-        name: string;
-        icon: string;
-        title?: string;
-        auth?: string;
-      }
-  >;
+  // 表格工具栏(默认:add,delete,export,也可自定义)
+  toolbar?: Array<ToolbarLeft | IToolsButton>;
+  // 表格工具栏右侧图标(默认:refresh,filter,imports,exports,search)
+  defaultToolbar?: Array<ToolbarRight | IToolsButton>;
   // table组件列属性(额外的属性templet,operat,slotName)
   cols: Array<{
     type?: "default" | "selection" | "index" | "expand";
@@ -197,18 +172,7 @@ export interface IContentConfig<T = any> {
     // date模板相关参数
     dateFormat?: string;
     // tool模板相关参数
-    operat?: Array<
-      | "edit"
-      | "delete"
-      | {
-          auth?: string;
-          icon?: string;
-          name: string;
-          text: string;
-          type?: ButtonType;
-          render?: (row: IObject) => boolean;
-        }
-    >;
+    operat?: Array<ToolbarTable | IToolsButton>;
     // filter值拼接符
     filterJoin?: string;
     [key: string]: any;
@@ -243,17 +207,7 @@ export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
 // 表单项
 export type IFormItems<T = any> = Array<{
   // 组件类型(如input,select,radio,custom等，默认input)
-  type?:
-    | "input"
-    | "select"
-    | "radio"
-    | "switch"
-    | "checkbox"
-    | "tree-select"
-    | "date-picker"
-    | "input-number"
-    | "text"
-    | "custom";
+  type?: IComponentType;
   // 组件属性
   attrs?: IObject;
   // 组件可选项(适用于select,radio,checkbox组件)
diff --git a/uno.config.ts b/uno.config.ts
index d308d598..82913cab 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -46,7 +46,7 @@ export default defineConfig({
       primary_dark: "var(--el-color-primary-light-5)",
     },
     breakpoints: Object.fromEntries(
-      [640, 768, 1024, 1280, 1536, 1920, 2048].map((size, index) => [
+      [640, 768, 1024, 1280, 1536, 1920, 2560].map((size, index) => [
         ["sm", "md", "lg", "xl", "2xl", "3xl", "4xl"][index],
         `${size}px`,
       ])

From 80ea3a026237787f8545a830d3b1e67817a8369d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Fri, 18 Apr 2025 08:07:11 +0800
Subject: [PATCH 314/497] =?UTF-8?q?refactor:=20:recycle:=20pageContent?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=B7=A5=E5=85=B7=E6=A0=8F=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E9=80=82=E9=85=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E6=8C=89=E9=92=AE=E5=85=AC=E5=85=B1=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue    | 291 +++++++++----------------
 src/components/CURD/types.ts           |   9 +-
 src/views/demo/curd/config/content.ts  |  26 ++-
 src/views/demo/curd/config/content2.ts |   8 +-
 4 files changed, 129 insertions(+), 205 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 36bc5d27..49e3396b 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -1,142 +1,39 @@
 <template>
   <el-card shadow="never">
     <!-- 表格工具栏 -->
-    <div class="flex-x-between mb-[10px]">
+    <div class="flex flex-col md:flex-row justify-between gap-y-2.5 mb-2.5">
       <!-- 左侧工具栏 -->
-      <div>
-        <template v-for="item in toolbar" :key="item">
-          <template v-if="typeof item === 'string'">
-            <!-- 新增 -->
-            <template v-if="item === 'add'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="success"
-                icon="plus"
-                @click="handleToolbar(item)"
-              >
-                新增
-              </el-button>
-            </template>
-            <!-- 删除 -->
-            <template v-else-if="item === 'delete'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="danger"
-                icon="delete"
-                :disabled="removeIds.length === 0"
-                @click="handleToolbar(item)"
-              >
-                删除
-              </el-button>
-            </template>
-            <!-- 导入 -->
-            <template v-else-if="item === 'import'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="default"
-                icon="upload"
-                @click="handleToolbar(item)"
-              >
-                导入
-              </el-button>
-            </template>
-            <!-- 导出 -->
-            <template v-else-if="item === 'export'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                type="default"
-                icon="download"
-                @click="handleToolbar(item)"
-              >
-                导出
-              </el-button>
-            </template>
-          </template>
-          <!-- 其他 -->
-          <template v-else-if="typeof item === 'object'">
-            <el-button
-              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-              :icon="item.icon"
-              :type="item.type ?? 'default'"
-              @click="handleToolbar(item.name)"
-            >
-              {{ item.text }}
-            </el-button>
-          </template>
+      <div class="toolbar-left flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
+        <template v-for="btn in toolbarLeftBtn">
+          <el-button
+            v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+            :disabled="btn.name === 'delete' && removeIds.length === 0"
+            v-bind="btn.attrs"
+            @click="handleToolbar(btn.name)"
+          >
+            {{ btn.text }}
+          </el-button>
         </template>
       </div>
       <!-- 右侧工具栏 -->
-      <div>
-        <template v-for="item in defaultToolbar" :key="item">
-          <template v-if="typeof item === 'string'">
-            <!-- 刷新 -->
-            <template v-if="item === 'refresh'">
-              <el-button icon="refresh" circle title="刷新" @click="handleToolbar(item)" />
-            </template>
-            <!-- 筛选列 -->
-            <template v-else-if="item === 'filter'">
-              <el-popover placement="bottom" trigger="click">
-                <template #reference>
-                  <el-button icon="Operation" circle title="筛选列" />
-                </template>
-                <el-scrollbar max-height="350px">
-                  <template v-for="col in cols" :key="col">
-                    <el-checkbox v-if="col.prop" v-model="col.show" :label="col.label" />
-                  </template>
-                </el-scrollbar>
-              </el-popover>
-            </template>
-            <!-- 导出 -->
-            <template v-else-if="item === 'exports'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:export`]"
-                icon="download"
-                circle
-                title="导出"
-                @click="handleToolbar(item)"
-              />
-            </template>
-            <!-- 导入 -->
-            <template v-else-if="item === 'imports'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:import`]"
-                icon="upload"
-                circle
-                title="导入"
-                @click="handleToolbar(item)"
-              />
-            </template>
-            <!-- 搜索 -->
-            <template v-else-if="item === 'search'">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:query`]"
-                icon="search"
-                circle
-                title="搜索"
-                @click="handleToolbar(item)"
-              />
-            </template>
-          </template>
-          <!-- 其他 -->
-          <template v-else-if="typeof item === 'object'">
-            <template v-if="item.auth">
-              <el-button
-                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
+      <div class="toolbar-right flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
+        <template v-for="btn in toolbarRightBtn">
+          <el-popover v-if="btn.name === 'filter'" placement="bottom" trigger="click">
+            <template #reference>
+              <el-button v-bind="btn.attrs"></el-button>
             </template>
-            <template v-else>
-              <el-button
-                :icon="item.icon"
-                circle
-                :title="item.title"
-                @click="handleToolbar(item.name)"
-              />
-            </template>
-          </template>
+            <el-scrollbar max-height="350px">
+              <template v-for="col in cols" :key="col">
+                <el-checkbox v-if="col.prop" v-model="col.show" :label="col.label" />
+              </template>
+            </el-scrollbar>
+          </el-popover>
+          <el-button
+            v-else
+            v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+            v-bind="btn.attrs"
+            @click="handleToolbar(btn.name)"
+          ></el-button>
         </template>
       </div>
     </div>
@@ -257,52 +154,22 @@
             </template>
             <!-- 列操作栏 -->
             <template v-else-if="col.templet === 'tool'">
-              <template v-for="item in col.operat ?? ['edit', 'delete']" :key="item">
-                <template v-if="typeof item === 'string'">
-                  <!-- 编辑/删除 -->
-                  <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button
-                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'"
-                      :icon="item"
-                      size="small"
-                      link
-                      @click="
-                        handleOperat({
-                          name: item,
-                          row: scope.row,
-                          column: scope.column,
-                          $index: scope.$index,
-                        })
-                      "
-                    >
-                      {{ item === "edit" ? "编辑" : "删除" }}
-                    </el-button>
-                  </template>
-                </template>
-                <!-- 其他 -->
-                <template v-else-if="typeof item === 'object'">
-                  <el-button
-                    v-if="item.render === undefined || item.render(scope.row)"
-                    v-bind="
-                      item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                    "
-                    :icon="item.icon"
-                    :type="item.type ?? 'primary'"
-                    size="small"
-                    link
-                    @click="
-                      handleOperat({
-                        name: item.name,
-                        row: scope.row,
-                        column: scope.column,
-                        $index: scope.$index,
-                      })
-                    "
-                  >
-                    {{ item.text }}
-                  </el-button>
-                </template>
+              <template v-for="btn in tableToolbarBtn">
+                <el-button
+                  v-if="btn.render === undefined || btn.render(scope.row)"
+                  v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+                  v-bind="btn.attrs"
+                  @click="
+                    handleOperat({
+                      name: btn.name,
+                      row: scope.row,
+                      column: scope.column,
+                      $index: scope.$index,
+                    })
+                  "
+                >
+                  {{ btn.text }}
+                </el-button>
               </template>
             </template>
             <!-- 自定义 -->
@@ -464,12 +331,10 @@ import {
 } from "element-plus";
 import ExcelJS from "exceljs";
 import { reactive, ref } from "vue";
-import type { IContentConfig, IObject, IOperatData } from "./types";
+import type { IContentConfig, IObject, IOperatData, IToolsDefault } from "./types";
 
 // 定义接收的属性
-const props = defineProps<{
-  contentConfig: IContentConfig;
-}>();
+const props = defineProps<{ contentConfig: IContentConfig }>();
 // 定义自定义事件
 const emit = defineEmits<{
   addClick: [];
@@ -483,10 +348,50 @@ const emit = defineEmits<{
 
 // 主键
 const pk = props.contentConfig.pk ?? "id";
+// 表格工具栏按钮配置
+const config = computed(() => props.contentConfig);
+const authName = computed(() => props.contentConfig.pageName);
+const buttonConfig = reactive<Record<string, IObject>>({
+  add: { text: "新增", attrs: { icon: "plus", type: "success" }, auth: "add" },
+  delete: { text: "删除", attrs: { icon: "delete", type: "danger" }, auth: "delete" },
+  import: { text: "导入", attrs: { icon: "upload", type: "" }, auth: "import" },
+  export: { text: "导出", attrs: { icon: "download", type: "" }, auth: "export" },
+  refresh: { text: "刷新", attrs: { icon: "refresh", type: "" }, auth: "*:*:*" },
+  filter: { text: "筛选列", attrs: { icon: "operation", type: "" }, auth: "*:*:*" },
+  search: { text: "搜索", attrs: { icon: "search", type: "" }, auth: "search" },
+  imports: { text: "批量导入", attrs: { icon: "upload", type: "" }, auth: "imports" },
+  exports: { text: "批量导出", attrs: { icon: "download", type: "" }, auth: "exports" },
+  view: { text: "查看", attrs: { icon: "view", type: "primary" }, auth: "view" },
+  edit: { text: "编辑", attrs: { icon: "edit", type: "primary" }, auth: "edit" },
+});
+const createToolbar = (toolbar: Array<IToolsDefault>, attr = {}) => {
+  return toolbar.map((item) => {
+    const isString = typeof item === "string";
+    return {
+      name: isString ? item : item?.name || "",
+      text: isString ? buttonConfig[item].text : item?.text,
+      attrs: {
+        type: isString ? buttonConfig[item].type : "",
+        icon: isString ? buttonConfig[item].icon : "",
+        title: isString ? buttonConfig[item].text : item?.text,
+        ...attr,
+        ...(isString ? buttonConfig[item].attrs : item?.attrs),
+      },
+      render: isString ? undefined : (item?.render ?? undefined),
+      auth: isString ? buttonConfig[item].auth : (item?.auth ?? "*:*:*"),
+    };
+  });
+};
 // 表格左侧工具栏
-const toolbar = props.contentConfig.toolbar ?? ["add", "delete"];
+const toolbarLeft = props.contentConfig?.toolbar ?? ["add", "delete"];
+const toolbarLeftBtn = createToolbar(toolbarLeft, {});
 // 表格右侧工具栏
-const defaultToolbar = props.contentConfig.defaultToolbar ?? ["refresh", "filter"];
+const toolbarRight = props.contentConfig?.defaultToolbar ?? ["refresh", "filter"];
+const toolbarRightBtn = createToolbar(toolbarRight, { circle: true });
+// 表格操作工具栏
+const tableToolbar = config.value.cols[config.value.cols.length - 1].operat ?? ["edit", "delete"];
+const tableToolbarBtn = createToolbar(tableToolbar, { link: true, size: "small" });
+
 // 表格列
 const cols = ref(
   props.contentConfig.cols.map((col) => {
@@ -515,7 +420,7 @@ const pageData = ref<IObject[]>([]);
 // 显示分页
 const showPagination = props.contentConfig.pagination !== false;
 // 分页配置
-const defalutPagination = {
+const defaultPagination = {
   background: true,
   layout: "total, sizes, prev, pager, next, jumper",
   pageSize: 20,
@@ -525,8 +430,8 @@ const defalutPagination = {
 };
 const pagination = reactive(
   typeof props.contentConfig.pagination === "object"
-    ? { ...defalutPagination, ...props.contentConfig.pagination }
-    : defalutPagination
+    ? { ...defaultPagination, ...props.contentConfig.pagination }
+    : defaultPagination
 );
 // 分页相关的请求参数
 const request = props.contentConfig.request ?? {
@@ -649,7 +554,7 @@ function handleExports() {
         workbook.xlsx
           .writeBuffer()
           .then((buffer) => {
-            saveXlsx(buffer, filename);
+            saveXlsx(buffer, filename as string);
           })
           .catch((error) => console.log(error));
       });
@@ -663,7 +568,7 @@ function handleExports() {
     workbook.xlsx
       .writeBuffer()
       .then((buffer) => {
-        saveXlsx(buffer, filename);
+        saveXlsx(buffer, filename as string);
       })
       .catch((error) => console.log(error));
   }
@@ -975,4 +880,12 @@ function saveXlsx(fileData: any, fileName: string) {
 defineExpose({ fetchPageData, exportPageData, getFilterParams, getSelectionData });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.toolbar-left,
+.toolbar-right {
+  .el-button {
+    margin-right: 0 !important;
+    margin-left: 0 !important;
+  }
+}
+</style>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 178eb73d..4da18db3 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -1,6 +1,6 @@
 import type { DialogProps, DrawerProps, FormItemRule, PaginationProps } from "element-plus";
 import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "element-plus";
-import type { ButtonType, ElTooltipProps } from "element-plus";
+import type { ElTooltipProps } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
@@ -24,12 +24,11 @@ type ToolbarLeft = "add" | "delete" | "import" | "export";
 type ToolbarRight = "refresh" | "filter" | "imports" | "exports" | "search";
 type ToolbarTable = "edit" | "view" | "delete";
 type IToolsButton = {
-  name?: string; // 按钮名称
+  name: string; // 按钮名称
   text?: string; // 按钮文本
-  icon?: string; // 按钮图标
-  type?: ButtonType; // 按钮类型
   auth?: Array<string> | string; // 按钮权限
-  attrs?: Partial<ButtonProps>; // 按钮属性
+  attrs?: Partial<ButtonProps> & { style?: CSSProperties }; // 按钮属性
+  render?: (row: IObject) => boolean; // 条件渲染
 };
 export type IToolsDefault = ToolbarLeft | ToolbarRight | ToolbarTable | IToolsButton;
 
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index f4ce364c..ae49a160 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -4,7 +4,7 @@ import type { UserPageQuery } from "@/api/system/user.api";
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig<UserPageQuery> = {
-  pageName: "sys:user",
+  // pageName: "sys:demo", // 不写不进行按钮权限校验
   table: {
     border: true,
     highlightCurrentRow: true,
@@ -15,6 +15,12 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     pageSize: 20,
     pageSizes: [10, 20, 30, 50],
   },
+  parseData(res) {
+    return {
+      total: res.total,
+      list: res.list,
+    };
+  },
   indexAction: function (params) {
     return UserAPI.getPage(params);
   },
@@ -43,10 +49,9 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     "export",
     {
       name: "custom1",
-      icon: "plus",
       text: "自定义1",
-      auth: "import",
-      type: "info",
+      auth: "custom",
+      attrs: { icon: "plus", color: "#626AEF" },
     },
   ],
   defaultToolbar: ["refresh", "filter", "imports", "exports", "search"],
@@ -105,15 +110,22 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       templet: "tool",
       operat: [
         {
-          icon: "Document",
           name: "detail",
           text: "详情",
+          attrs: { icon: "Document" },
         },
         {
           name: "reset_pwd",
-          auth: "password:reset",
-          icon: "refresh-left",
           text: "重置密码",
+          auth: "password:reset",
+          attrs: {
+            icon: "refresh-left",
+            // color: "#626AEF", // 使用 text 属性，颜色不生效
+            style: {
+              "--el-button-text-color": "#626AEF",
+              "--el-button-hover-link-text-color": "#9197f4",
+            },
+          },
         },
         "edit",
         "delete",
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index 3da3999d..31fd514d 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -1,7 +1,7 @@
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig = {
-  pageName: "sys:user",
+  // pageName: "sys:demo", // 不写不进行按钮权限校验
   table: {
     showOverflowTooltip: true,
   },
@@ -117,11 +117,11 @@ const contentConfig: IContentConfig = {
       operat: [
         {
           name: "reset_pwd",
-          auth: "password:reset",
-          icon: "refresh-left",
           text: "重置密码",
-          type: "primary",
+          auth: "password:reset",
+          attrs: { icon: "refresh-left", type: "primary" },
           render(row) {
+            // 根据条件，显示或隐藏
             return row.id === 1;
           },
         },

From 7c8a149bcfc89fd92a8ffc6d4247c039d8c62917 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 18 Apr 2025 23:58:38 +0800
Subject: [PATCH 315/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96CURD=E7=BB=84=E4=BB=B6=E6=9D=83=E9=99=90=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将权限属性名从 auth 统一修改为 perm，保持命名一致性
更新 permPrefix 替代 pageName 作为权限前缀标识
优化权限检查逻辑，未设置权限标识的按钮默认显示
---
 src/components/CURD/PageContent.vue    | 144 +++++++++++++++++++------
 src/components/CURD/PageSearch.vue     |   5 +-
 src/components/CURD/types.ts           |  18 ++--
 src/views/demo/curd/config/add.ts      |   2 +-
 src/views/demo/curd/config/content.ts  |   6 +-
 src/views/demo/curd/config/content2.ts |   4 +-
 src/views/demo/curd/config/edit.ts     |   2 +-
 src/views/demo/curd/config/search.ts   |   2 +-
 8 files changed, 129 insertions(+), 54 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 49e3396b..526342c3 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -6,7 +6,7 @@
       <div class="toolbar-left flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
         <template v-for="btn in toolbarLeftBtn">
           <el-button
-            v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+            v-hasPerm="btn.perm ?? '*:*:*'"
             :disabled="btn.name === 'delete' && removeIds.length === 0"
             v-bind="btn.attrs"
             @click="handleToolbar(btn.name)"
@@ -30,7 +30,7 @@
           </el-popover>
           <el-button
             v-else
-            v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+            v-hasPerm="btn.perm ?? '*:*:*'"
             v-bind="btn.attrs"
             @click="handleToolbar(btn.name)"
           ></el-button>
@@ -100,7 +100,7 @@
                   :active-text="col.activeText ?? ''"
                   :inactive-text="col.inactiveText ?? ''"
                   :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  :disabled="!hasButtonPerm(col.prop)"
                   @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
                   "
@@ -113,7 +113,7 @@
                 <el-input
                   v-model="scope.row[col.prop]"
                   :type="col.inputType ?? 'text'"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  :disabled="!hasButtonPerm(col.prop)"
                   @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
                 />
               </template>
@@ -157,7 +157,7 @@
               <template v-for="btn in tableToolbarBtn">
                 <el-button
                   v-if="btn.render === undefined || btn.render(scope.row)"
-                  v-hasPerm="authName ? `${authName}:${btn.auth}` : '*:*:*'"
+                  v-hasPerm="btn.perm ?? '*:*:*'"
                   v-bind="btn.attrs"
                   @click="
                     handleOperat({
@@ -330,8 +330,9 @@ import {
   type TableInstance,
 } from "element-plus";
 import ExcelJS from "exceljs";
-import { reactive, ref } from "vue";
-import type { IContentConfig, IObject, IOperatData, IToolsDefault } from "./types";
+import { reactive, ref, computed } from "vue";
+import type { IContentConfig, IObject, IOperatData } from "./types";
+import type { IToolsButton } from "./types";
 
 // 定义接收的属性
 const props = defineProps<{ contentConfig: IContentConfig }>();
@@ -346,48 +347,123 @@ const emit = defineEmits<{
   filterChange: [data: IObject];
 }>();
 
-// 主键
-const pk = props.contentConfig.pk ?? "id";
+// 按钮文本映射
+const BUTTONS_TEXT: Record<string, string> = {
+  add: "新增",
+  delete: "删除",
+  import: "导入",
+  export: "导出",
+  refresh: "刷新",
+  filter: "筛选列",
+  search: "搜索",
+  imports: "批量导入",
+  exports: "批量导出",
+  view: "查看",
+  edit: "编辑",
+};
+
+// 按钮权限映射
+const AUTH_MAP: Record<string, string> = {
+  add: "add",
+  delete: "delete",
+  import: "import",
+  export: "export",
+  refresh: "*:*:*",
+  filter: "*:*:*",
+  search: "search",
+  imports: "imports",
+  exports: "exports",
+  view: "view",
+  edit: "edit",
+};
+
+// 按钮图标映射
+const BUTTONS_ICON: Record<string, string> = {
+  add: "plus",
+  delete: "delete",
+  import: "upload",
+  export: "download",
+  refresh: "refresh",
+  filter: "operation",
+  search: "search",
+  imports: "upload",
+  exports: "download",
+  view: "view",
+  edit: "edit",
+};
+
 // 表格工具栏按钮配置
 const config = computed(() => props.contentConfig);
-const authName = computed(() => props.contentConfig.pageName);
 const buttonConfig = reactive<Record<string, IObject>>({
-  add: { text: "新增", attrs: { icon: "plus", type: "success" }, auth: "add" },
-  delete: { text: "删除", attrs: { icon: "delete", type: "danger" }, auth: "delete" },
-  import: { text: "导入", attrs: { icon: "upload", type: "" }, auth: "import" },
-  export: { text: "导出", attrs: { icon: "download", type: "" }, auth: "export" },
-  refresh: { text: "刷新", attrs: { icon: "refresh", type: "" }, auth: "*:*:*" },
-  filter: { text: "筛选列", attrs: { icon: "operation", type: "" }, auth: "*:*:*" },
-  search: { text: "搜索", attrs: { icon: "search", type: "" }, auth: "search" },
-  imports: { text: "批量导入", attrs: { icon: "upload", type: "" }, auth: "imports" },
-  exports: { text: "批量导出", attrs: { icon: "download", type: "" }, auth: "exports" },
-  view: { text: "查看", attrs: { icon: "view", type: "primary" }, auth: "view" },
-  edit: { text: "编辑", attrs: { icon: "edit", type: "primary" }, auth: "edit" },
+  add: { text: "新增", attrs: { icon: "plus", type: "success" }, perm: "add" },
+  delete: { text: "删除", attrs: { icon: "delete", type: "danger" }, perm: "delete" },
+  import: { text: "导入", attrs: { icon: "upload", type: "" }, perm: "import" },
+  export: { text: "导出", attrs: { icon: "download", type: "" }, perm: "export" },
+  refresh: { text: "刷新", attrs: { icon: "refresh", type: "" }, perm: "*:*:*" },
+  filter: { text: "筛选列", attrs: { icon: "operation", type: "" }, perm: "*:*:*" },
+  search: { text: "搜索", attrs: { icon: "search", type: "" }, perm: "search" },
+  imports: { text: "批量导入", attrs: { icon: "upload", type: "" }, perm: "imports" },
+  exports: { text: "批量导出", attrs: { icon: "download", type: "" }, perm: "exports" },
+  view: { text: "查看", attrs: { icon: "view", type: "primary" }, perm: "view" },
+  edit: { text: "编辑", attrs: { icon: "edit", type: "primary" }, perm: "edit" },
 });
-const createToolbar = (toolbar: Array<IToolsDefault>, attr = {}) => {
+
+// 主键
+const pk = props.contentConfig.pk ?? "id";
+// 权限名称前缀
+const authPrefix = computed(() => props.contentConfig.permPrefix);
+
+// 获取按钮权限标识
+function getButtonPerm(action: string): string | null {
+  // 如果action已经包含完整路径(包含冒号)，则直接使用
+  if (action.includes(":")) {
+    return action;
+  }
+  // 否则使用权限前缀组合
+  return authPrefix.value ? `${authPrefix.value}:${action}` : null;
+}
+
+// 检查是否有权限
+function hasButtonPerm(action: string): boolean {
+  const perm = getButtonPerm(action);
+  // 如果没有设置权限标识，则默认具有权限
+  if (!perm) return true;
+  return hasAuth(perm);
+}
+
+// 创建工具栏按钮
+function createToolbar(toolbar: Array<string | IToolsButton>, attr = {}) {
   return toolbar.map((item) => {
     const isString = typeof item === "string";
     return {
       name: isString ? item : item?.name || "",
       text: isString ? buttonConfig[item].text : item?.text,
       attrs: {
-        type: isString ? buttonConfig[item].type : "",
-        icon: isString ? buttonConfig[item].icon : "",
-        title: isString ? buttonConfig[item].text : item?.text,
         ...attr,
         ...(isString ? buttonConfig[item].attrs : item?.attrs),
       },
       render: isString ? undefined : (item?.render ?? undefined),
-      auth: isString ? buttonConfig[item].auth : (item?.auth ?? "*:*:*"),
+      perm: isString
+        ? getButtonPerm(buttonConfig[item].perm)
+        : item?.perm
+          ? getButtonPerm(item.perm as string)
+          : "*:*:*",
     };
   });
-};
-// 表格左侧工具栏
-const toolbarLeft = props.contentConfig?.toolbar ?? ["add", "delete"];
-const toolbarLeftBtn = createToolbar(toolbarLeft, {});
-// 表格右侧工具栏
-const toolbarRight = props.contentConfig?.defaultToolbar ?? ["refresh", "filter"];
-const toolbarRightBtn = createToolbar(toolbarRight, { circle: true });
+}
+
+// 左侧工具栏按钮
+const toolbarLeftBtn = computed(() => {
+  if (!config.value.toolbar || config.value.toolbar.length === 0) return [];
+  return createToolbar(config.value.toolbar, {});
+});
+
+// 右侧工具栏按钮
+const toolbarRightBtn = computed(() => {
+  if (!config.value.defaultToolbar || config.value.defaultToolbar.length === 0) return [];
+  return createToolbar(config.value.defaultToolbar, { circle: true });
+});
+
 // 表格操作工具栏
 const tableToolbar = config.value.cols[config.value.cols.length - 1].operat ?? ["edit", "delete"];
 const tableToolbarBtn = createToolbar(tableToolbar, { link: true, size: "small" });
@@ -536,7 +612,7 @@ function handleCloseExportsModal() {
 function handleExports() {
   const filename = exportsFormData.filename
     ? exportsFormData.filename
-    : props.contentConfig.pageName;
+    : props.contentConfig.permPrefix || "export";
   const sheetname = exportsFormData.sheetname ? exportsFormData.sheetname : "sheet";
   const workbook = new ExcelJS.Workbook();
   const worksheet = workbook.addWorksheet(sheetname);
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 4d3a56aa..e36533aa 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,9 +1,6 @@
 <template>
   <div v-show="visible" v-bind="{ style: { 'margin-bottom': '12px' }, ...cardAttrs }">
-    <el-card
-      v-hasPerm="searchConfig?.pageName ? `${searchConfig.pageName}:query` : '*:*:*'"
-      v-bind="cardAttrs"
-    >
+    <el-card v-bind="cardAttrs">
       <el-form ref="queryFormRef" :model="queryParams" v-bind="formAttrs" :class="isGrid">
         <template v-for="(item, index) in formItems" :key="item.prop">
           <el-form-item
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 4da18db3..8b246948 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -23,10 +23,12 @@ export type IComponentType = DataComponent | InputComponent | OtherComponent;
 type ToolbarLeft = "add" | "delete" | "import" | "export";
 type ToolbarRight = "refresh" | "filter" | "imports" | "exports" | "search";
 type ToolbarTable = "edit" | "view" | "delete";
-type IToolsButton = {
+export type IToolsButton = {
   name: string; // 按钮名称
   text?: string; // 按钮文本
-  auth?: Array<string> | string; // 按钮权限
+  perm?: Array<string> | string; // 权限标识(可以是完整权限字符串如'sys:user:add'或操作权限如'add')
+  icon?: string; // 按钮图标
+  type?: string; // 按钮类型
   attrs?: Partial<ButtonProps> & { style?: CSSProperties }; // 按钮属性
   render?: (row: IObject) => boolean; // 条件渲染
 };
@@ -40,8 +42,8 @@ export interface IOperatData {
 }
 
 export interface ISearchConfig {
-  // 页面名称(参与组成权限标识,如sys:user:xxx),不填则不进行权限校验
-  pageName?: string;
+  // 权限前缀(如sys:user，用于组成权限标识)，不提供则不进行权限校验
+  permPrefix?: string;
   // 标签冒号(默认：false)
   colon?: boolean;
   // 表单项(默认：[])
@@ -78,8 +80,8 @@ export interface ISearchConfig {
 }
 
 export interface IContentConfig<T = any> {
-  // 页面名称(参与组成权限标识,如sys:user:xxx)
-  pageName?: string;
+  // 权限前缀(如sys:user，用于组成权限标识)，不提供则不进行权限校验
+  permPrefix?: string;
   // table组件属性
   table?: Omit<TableProps<any>, "data">;
   // 分页组件位置(默认：left)
@@ -181,8 +183,8 @@ export interface IContentConfig<T = any> {
 }
 
 export interface IModalConfig<T = any> {
-  // 页面名称
-  pageName?: string;
+  // 权限前缀(如sys:user，用于组成权限标识)，不提供则不进行权限校验
+  permPrefix?: string;
   // 主键名(主要用于编辑数据,默认为id)
   pk?: string;
   // 组件类型
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 0d753fb0..65d91f7a 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -2,7 +2,7 @@ import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
 
 const modalConfig: IModalConfig<UserForm> = {
-  pageName: "sys:user",
+  permPrefix: "sys:user",
   dialog: {
     title: "新增用户",
     width: 800,
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index ae49a160..680a38bb 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -4,7 +4,7 @@ import type { UserPageQuery } from "@/api/system/user.api";
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig<UserPageQuery> = {
-  // pageName: "sys:demo", // 不写不进行按钮权限校验
+  permPrefix: "sys:user", // 不写不进行按钮权限校验
   table: {
     border: true,
     highlightCurrentRow: true,
@@ -50,7 +50,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     {
       name: "custom1",
       text: "自定义1",
-      auth: "custom",
+      perm: "add",
       attrs: { icon: "plus", color: "#626AEF" },
     },
   ],
@@ -117,7 +117,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
         {
           name: "reset_pwd",
           text: "重置密码",
-          auth: "password:reset",
+          perm: "password:reset",
           attrs: {
             icon: "refresh-left",
             // color: "#626AEF", // 使用 text 属性，颜色不生效
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index 31fd514d..ad1b5478 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -1,7 +1,7 @@
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig = {
-  // pageName: "sys:demo", // 不写不进行按钮权限校验
+  // permPrefix: "sys:demo", // 不写不进行按钮权限校验
   table: {
     showOverflowTooltip: true,
   },
@@ -118,7 +118,7 @@ const contentConfig: IContentConfig = {
         {
           name: "reset_pwd",
           text: "重置密码",
-          auth: "password:reset",
+          perm: "password:reset",
           attrs: { icon: "refresh-left", type: "primary" },
           render(row) {
             // 根据条件，显示或隐藏
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index bcbe1d90..358f940b 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -4,7 +4,7 @@ import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore } from "@/store";
 
 const modalConfig: IModalConfig<UserForm> = {
-  pageName: "sys:user",
+  permPrefix: "sys:user",
   component: "drawer",
   drawer: {
     title: "修改用户",
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index 85b4c385..f4e6b5fa 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -2,7 +2,7 @@ import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
 
 const searchConfig: ISearchConfig = {
-  pageName: "sys:user",
+  permPrefix: "sys:user",
   formItems: [
     {
       tips: "支持模糊搜索",

From 4be53e180c96d908d94945e974909e4a72d30eee Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 19 Apr 2025 00:51:40 +0800
Subject: [PATCH 316/497] =?UTF-8?q?fix:=20:bug:=20eslint=20=E8=AD=A6?=
 =?UTF-8?q?=E5=91=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index e36533aa..1eedf14c 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -12,7 +12,12 @@
             <template #label>
               <span class="flex-y-center">
                 {{ item?.label || "" }}
-                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                <el-tooltip
+                  v-if="item?.tips"
+                  v-bind="
+                    typeof item.tips === 'string' ? { content: item.tips } : (item.tips as any)
+                  "
+                >
                   <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
                 <span v-if="searchConfig.colon" class="ml-0.5">:</span>
@@ -60,7 +65,7 @@
 <script setup lang="ts">
 import type { IObject, IForm, ISearchConfig, ISearchComponent } from "./types";
 import { ArrowUp, ArrowDown } from "@element-plus/icons-vue";
-import type { FormInstance, ElTooltipProps } from "element-plus";
+import type { FormInstance } from "element-plus";
 import InputTag from "@/components/InputTag/index.vue";
 
 // 定义接收的属性
@@ -116,10 +121,6 @@ const isGrid = computed(() =>
 );
 // 搜索表单数据
 const queryParams = reactive<IObject>({});
-// 获取tooltip的属性
-const getTooltipProps = (tips: string | Partial<ElTooltipProps>) => {
-  return typeof tips === "string" ? { content: tips } : tips;
-};
 
 onMounted(() => {
   formItems.forEach((item) => {

From 1978066a702e39f1f7fa96a6b4f3fa1e10ed78e1 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 19 Apr 2025 09:02:29 +0800
Subject: [PATCH 317/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 163 ++++++++++++++++++++--------
 1 file changed, 120 insertions(+), 43 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 8905f110..e3ff4625 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -53,22 +53,29 @@
 
       <template #footer>
         <div class="dialog-footer">
-          <div class="dialog-footer__shortcut">
-            <div class="i-svg:enter" />
+          <div class="ctrl-k-hint">
+            <span class="ctrl-k-text">Ctrl+K 快速打开</span>
           </div>
-          <span class="dialog-footer__text mr-3">选择</span>
-
-          <div class="dialog-footer__shortcut">
-            <div class="i-svg:down" />
-          </div>
-          <div class="dialog-footer__shortcut ml-1">
-            <div class="i-svg:up" />
-          </div>
-          <span class="dialog-footer__text mr-3">切换</span>
-          <div class="dialog-footer__shortcut">
-            <div class="i-svg:esc" />
+          <div class="shortcuts-group">
+            <div class="key-box">
+              <div class="key-btn">选择</div>
+            </div>
+            <div class="arrow-box">
+              <div class="arrow-up-down">
+                <div class="key-btn">
+                  <div class="i-svg:up" />
+                </div>
+                <div class="key-btn ml-1">
+                  <div class="i-svg:down" />
+                </div>
+              </div>
+              <span class="key-text">切换</span>
+            </div>
+            <div class="key-box">
+              <div class="key-btn esc-btn">ESC</div>
+              <span class="key-text">关闭</span>
+            </div>
           </div>
-          <span class="dialog-footer__text">退出</span>
         </div>
       </template>
     </el-dialog>
@@ -98,6 +105,26 @@ interface SearchItem {
   redirect?: string;
 }
 
+// 注册全局快捷键
+function handleKeyDown(e: KeyboardEvent) {
+  // 判断是否为Ctrl+K组合键
+  if ((e.ctrlKey || e.metaKey) && e.key.toLowerCase() === "k") {
+    e.preventDefault(); // 阻止默认行为
+    openSearchModal();
+  }
+}
+
+// 添加键盘事件监听
+onMounted(() => {
+  loadRoutes(permissionStore.routes);
+  document.addEventListener("keydown", handleKeyDown);
+});
+
+// 移除键盘事件监听
+onBeforeUnmount(() => {
+  document.removeEventListener("keydown", handleKeyDown);
+});
+
 // 打开搜索模态框
 function openSearchModal() {
   searchKeyword.value = "";
@@ -178,11 +205,6 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
     }
   });
 }
-
-// 初始化路由数据
-onMounted(() => {
-  loadRoutes(permissionStore.routes);
-});
 </script>
 
 <style scoped lang="scss">
@@ -213,34 +235,89 @@ onMounted(() => {
 .dialog-footer {
   display: flex;
   align-items: center;
-  justify-content: start;
+  justify-content: space-between;
+  width: 100%;
+}
 
-  &__shortcut {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 20px;
-    height: 18px;
-    padding: 0 0 1px;
-    color: var(--el-text-color-secondary);
-    background: rgba(125, 125, 125, 0.1);
-    border: 0;
-    border-radius: 2px;
-    box-shadow:
-      inset 0 -2px 0 0 #cdcde6,
-      inset 0 0 1px 1px #fff,
-      0 1px 2px 1px rgba(30, 35, 90, 0.4);
-  }
+.shortcuts-group {
+  display: flex;
+  gap: 15px;
+  align-items: center;
+}
+
+.key-box {
+  display: flex;
+  gap: 5px;
+  align-items: center;
+}
+
+.arrow-box {
+  display: flex;
+  gap: 5px;
+  align-items: center;
+}
+
+.arrow-up-down {
+  display: flex;
+  gap: 2px;
+  align-items: center;
+}
+
+.key-btn {
+  position: relative;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-width: 32px;
+  height: 20px;
+  padding: 0 4px;
+  font-size: 12px;
+  color: #606266;
+  background-color: white;
+  border: 1px solid #cdcde6;
+  border-radius: 3px;
+  box-shadow:
+    inset 0 -2px 0 0 #cdcde6,
+    inset 0 0 1px 1px #fff,
+    0 1px 2px rgba(30, 35, 90, 0.2);
 
-  &__text {
-    margin-left: 5px;
-    font-size: 14px;
-    color: var(--el-text-color-secondary);
+  &::before {
+    position: absolute;
+    top: 1px;
+    right: 1px;
+    left: 1px;
+    height: 50%;
+    pointer-events: none;
+    content: "";
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), rgba(255, 255, 255, 0));
+    border-radius: 2px 2px 0 0;
   }
 }
 
-.dialog-footer > [class^="i-svg:"] {
-  display: inline-block;
-  color: var(--el-text-color-secondary);
+.esc-btn {
+  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace;
+  font-size: 11px;
+}
+
+.key-text {
+  font-size: 12px;
+  color: #909399;
+}
+
+.ctrl-k-hint {
+  display: flex;
+  align-items: center;
+}
+
+.ctrl-k-text {
+  font-size: 12px;
+  color: #909399;
+}
+
+// 适配Element Plus对话框
+:deep(.el-dialog__footer) {
+  box-sizing: border-box;
+  padding-top: 10px;
+  text-align: right;
 }
 </style>

From 543f36f5b00a07c68b9c5824c3ddef29ee8b6e6e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 19 Apr 2025 16:50:28 +0800
Subject: [PATCH 318/497] =?UTF-8?q?feat:=20:sparkles:=20=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=B7=BB=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 251 ++++++++++++++++++++++++----
 1 file changed, 223 insertions(+), 28 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index e3ff4625..65bd7def 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -28,27 +28,68 @@
       </template>
 
       <div class="search-result">
-        <ul v-if="displayResults.length > 0">
-          <li
-            v-for="(item, index) in displayResults"
-            :key="item.path"
-            :class="[
-              'search-result__item',
-              {
-                'search-result__item--active': index === activeIndex,
-              },
-            ]"
-            @click="navigateToRoute(item)"
-          >
-            <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
-              <component :is="item.icon.replace('el-icon-', '')" />
-            </el-icon>
-            <div v-else-if="item.icon" :class="`i-svg:${item.icon}`" />
-            <div v-else class="i-svg:menu" />
-            <span class="ml-2">{{ item.title }}</span>
-          </li>
-        </ul>
-        <el-empty v-else description="暂无数据" />
+        <!-- 搜索历史 -->
+        <template v-if="searchKeyword === '' && searchHistory.length > 0">
+          <div class="search-history">
+            <div class="search-history__title">
+              搜索历史
+              <el-button
+                type="primary"
+                text
+                size="small"
+                class="search-history__clear"
+                @click="clearHistory"
+              >
+                <el-icon><Delete /></el-icon>
+              </el-button>
+            </div>
+            <ul class="search-history__list">
+              <li
+                v-for="(item, index) in searchHistory"
+                :key="index"
+                class="search-history__item"
+                @click="navigateToRoute(item)"
+              >
+                <div class="search-history__icon">
+                  <el-icon><Clock /></el-icon>
+                </div>
+                <span class="search-history__name">{{ item.title }}</span>
+                <div class="search-history__action">
+                  <el-icon @click.stop="removeHistoryItem(index)"><Close /></el-icon>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </template>
+
+        <!-- 搜索结果 -->
+        <template v-else>
+          <ul v-if="displayResults.length > 0">
+            <li
+              v-for="(item, index) in displayResults"
+              :key="item.path"
+              :class="[
+                'search-result__item',
+                {
+                  'search-result__item--active': index === activeIndex,
+                },
+              ]"
+              @click="navigateToRoute(item)"
+            >
+              <el-icon v-if="item.icon && item.icon.startsWith('el-icon')">
+                <component :is="item.icon.replace('el-icon-', '')" />
+              </el-icon>
+              <div v-else-if="item.icon" :class="`i-svg:${item.icon}`" />
+              <div v-else class="i-svg:menu" />
+              <span class="ml-2">{{ item.title }}</span>
+            </li>
+          </ul>
+        </template>
+
+        <!-- 无搜索历史显示 -->
+        <div v-if="searchKeyword === '' && searchHistory.length === 0" class="no-history">
+          <p class="no-history__text">没有搜索历史</p>
+        </div>
       </div>
 
       <template #footer>
@@ -83,10 +124,15 @@
 </template>
 
 <script setup lang="ts">
+import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import router from "@/router";
 import { usePermissionStore } from "@/store";
 import { isExternal } from "@/utils";
 import { RouteRecordRaw } from "vue-router";
+import { Clock, Close, Delete } from "@element-plus/icons-vue";
+
+const HISTORY_KEY = "menu_search_history";
+const MAX_HISTORY = 5;
 
 const permissionStore = usePermissionStore();
 const isModalVisible = ref(false);
@@ -96,6 +142,7 @@ const excludedRoutes = ref(["/redirect", "/login", "/401", "/404"]);
 const menuItems = ref<SearchItem[]>([]);
 const searchResults = ref<SearchItem[]>([]);
 const activeIndex = ref(-1);
+const searchHistory = ref<SearchItem[]>([]);
 
 interface SearchItem {
   title: string;
@@ -105,6 +152,57 @@ interface SearchItem {
   redirect?: string;
 }
 
+// 从本地存储加载搜索历史
+function loadSearchHistory() {
+  const historyStr = localStorage.getItem(HISTORY_KEY);
+  if (historyStr) {
+    try {
+      searchHistory.value = JSON.parse(historyStr);
+    } catch {
+      searchHistory.value = [];
+    }
+  }
+}
+
+// 保存搜索历史到本地存储
+function saveSearchHistory() {
+  localStorage.setItem(HISTORY_KEY, JSON.stringify(searchHistory.value));
+}
+
+// 添加项目到搜索历史
+function addToHistory(item: SearchItem) {
+  // 检查是否已存在
+  const index = searchHistory.value.findIndex((i) => i.path === item.path);
+
+  // 如果存在则移除
+  if (index !== -1) {
+    searchHistory.value.splice(index, 1);
+  }
+
+  // 添加到历史开头
+  searchHistory.value.unshift(item);
+
+  // 限制历史记录数量
+  if (searchHistory.value.length > MAX_HISTORY) {
+    searchHistory.value = searchHistory.value.slice(0, MAX_HISTORY);
+  }
+
+  // 保存到本地存储
+  saveSearchHistory();
+}
+
+// 移除历史记录项
+function removeHistoryItem(index: number) {
+  searchHistory.value.splice(index, 1);
+  saveSearchHistory();
+}
+
+// 清空历史记录
+function clearHistory() {
+  searchHistory.value = [];
+  localStorage.removeItem(HISTORY_KEY);
+}
+
 // 注册全局快捷键
 function handleKeyDown(e: KeyboardEvent) {
   // 判断是否为Ctrl+K组合键
@@ -117,6 +215,7 @@ function handleKeyDown(e: KeyboardEvent) {
 // 添加键盘事件监听
 onMounted(() => {
   loadRoutes(permissionStore.routes);
+  loadSearchHistory();
   document.addEventListener("keydown", handleKeyDown);
 });
 
@@ -179,6 +278,9 @@ function navigateResults(direction: string) {
 // 跳转到
 function navigateToRoute(item: SearchItem) {
   closeSearchModal();
+  // 添加到历史记录
+  addToHistory(item);
+
   if (isExternal(item.path)) {
     window.open(item.path, "_blank");
   } else {
@@ -232,6 +334,92 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
   }
 }
 
+/* 搜索历史样式 */
+.search-history {
+  &__title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 0 12px;
+    font-size: 12px;
+    line-height: 34px;
+    color: var(--el-text-color-secondary);
+  }
+
+  &__clear {
+    padding: 2px;
+    font-size: 12px;
+
+    &:hover {
+      color: var(--el-color-danger);
+    }
+  }
+
+  &__list {
+    padding: 0;
+    margin: 0;
+  }
+
+  &__icon {
+    display: flex;
+    align-items: center;
+    margin-right: 10px;
+    font-size: 16px;
+    color: var(--el-text-color-secondary);
+  }
+
+  &__name {
+    flex: 1;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 14px;
+    color: var(--el-text-color-primary);
+    white-space: nowrap;
+  }
+
+  &__action {
+    padding: 4px;
+    color: var(--el-text-color-secondary);
+    border-radius: 4px;
+    opacity: 0;
+    transition: opacity 0.2s;
+
+    &:hover {
+      color: var(--el-color-danger);
+      background-color: var(--el-fill-color);
+    }
+  }
+
+  &__item {
+    display: flex;
+    align-items: center;
+    height: 40px;
+    padding: 0 12px;
+    cursor: pointer;
+
+    &:hover {
+      background-color: var(--el-fill-color-light);
+
+      .search-history__action {
+        opacity: 1;
+      }
+    }
+  }
+}
+
+/* 没有搜索历史时的样式 */
+.no-history {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100px;
+
+  &__text {
+    font-size: 14px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
 .dialog-footer {
   display: flex;
   align-items: center;
@@ -272,13 +460,13 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
   height: 20px;
   padding: 0 4px;
   font-size: 12px;
-  color: #606266;
-  background-color: white;
-  border: 1px solid #cdcde6;
+  color: var(--el-text-color-regular);
+  background-color: var(--el-fill-color-blank);
+  border: 1px solid var(--el-border-color);
   border-radius: 3px;
   box-shadow:
-    inset 0 -2px 0 0 #cdcde6,
-    inset 0 0 1px 1px #fff,
+    inset 0 -2px 0 0 var(--el-border-color),
+    inset 0 0 1px 1px var(--el-color-white),
     0 1px 2px rgba(30, 35, 90, 0.2);
 
   &::before {
@@ -301,7 +489,7 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
 
 .key-text {
   font-size: 12px;
-  color: #909399;
+  color: var(--el-text-color-secondary);
 }
 
 .ctrl-k-hint {
@@ -311,7 +499,7 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
 
 .ctrl-k-text {
   font-size: 12px;
-  color: #909399;
+  color: var(--el-text-color-secondary);
 }
 
 // 适配Element Plus对话框
@@ -320,4 +508,11 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
   padding-top: 10px;
   text-align: right;
 }
+
+// 暗黑模式适配
+html.dark {
+  .key-btn::before {
+    background: linear-gradient(to bottom, rgba(255, 255, 255, 0.1), rgba(255, 255, 255, 0));
+  }
+}
 </style>

From d543aac63e84861c68b9a3dc7b8c223073875b14 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 19 Apr 2025 23:34:10 +0800
Subject: [PATCH 319/497] =?UTF-8?q?chore:=20:hammer:=20=E8=A7=84=E8=8C=83?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90=E6=A0=87=E8=AF=86=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D(=E6=A8=A1=E5=9D=97:=E5=AD=90=E6=A8=A1=E5=9D=97:?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E5=85=B6=E4=B8=AD=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=98=AF=E5=A4=9A=E4=B8=AA=E5=8D=95=E8=AF=8D?=
 =?UTF-8?q?=E5=BB=BA=E8=AE=AE=E7=94=A8=E4=B8=AD=E5=88=92=E7=BA=BF=E5=88=86?=
 =?UTF-8?q?=E5=89=B2=EF=BC=8C=E4=B8=8D=E8=83=BD=E4=BD=BF=E7=94=A8=E5=86=92?=
 =?UTF-8?q?=E5=8F=B7)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index fa77a297..f4150c49 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -119,7 +119,7 @@
             <el-table-column label="操作" fixed="right" width="220">
               <template #default="scope">
                 <el-button
-                  v-hasPerm="'sys:user:password:reset'"
+                  v-hasPerm="'sys:user:reset-password'"
                   type="primary"
                   icon="RefreshLeft"
                   size="small"

From bf16ca596312aeb7fc09f7daf5ae20a2ab568a62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 20 Apr 2025 17:26:08 +0800
Subject: [PATCH 320/497] =?UTF-8?q?fix:=20:bug:=20eslint=20=E6=89=93?=
 =?UTF-8?q?=E5=8C=85=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageForm.vue   | 23 ++++++++++-----------
 src/components/CURD/PageSearch.vue | 33 +++++++++++++++---------------
 src/components/CURD/types.ts       |  3 +--
 3 files changed, 28 insertions(+), 31 deletions(-)

diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
index 7fff077b..e0ff8aab 100644
--- a/src/components/CURD/PageForm.vue
+++ b/src/components/CURD/PageForm.vue
@@ -5,21 +5,15 @@
         <el-col v-show="!item.hidden" v-bind="item.col">
           <el-form-item :label="item.label" :prop="item.prop">
             <!-- Label -->
-            <template v-if="item.tips" #label>
-              <span>
-                {{ item.label }}
-                <el-tooltip
-                  placement="bottom"
-                  effect="light"
-                  :content="item.tips"
-                  :raw-content="true"
-                >
-                  <el-icon style="vertical-align: -0.15em" size="16">
-                    <QuestionFilled />
-                  </el-icon>
+            <template #label>
+              <span class="flex-y-center">
+                {{ item?.label || "" }}
+                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                  <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
               </span>
             </template>
+
             <!-- Input 输入框 -->
             <template v-if="item.type === 'input' || item.type === undefined">
               <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
@@ -151,6 +145,11 @@ function setFormItemData(key: string, value: any) {
   formData[key] = value;
 }
 
+// 获取tooltip提示框属性
+const getTooltipProps = (tips: string | IObject) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+
 // 暴露的属性和方法
 defineExpose({ formRef, getFormData, setFormData, setFormItemData });
 </script>
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 1eedf14c..7d4c9d23 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -12,12 +12,7 @@
             <template #label>
               <span class="flex-y-center">
                 {{ item?.label || "" }}
-                <el-tooltip
-                  v-if="item?.tips"
-                  v-bind="
-                    typeof item.tips === 'string' ? { content: item.tips } : (item.tips as any)
-                  "
-                >
+                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
                   <QuestionFilled class="w-4 h-4 mx-1" />
                 </el-tooltip>
                 <span v-if="searchConfig.colon" class="ml-0.5">:</span>
@@ -92,7 +87,10 @@ const componentMap = new Map<ISearchComponent, Component>([
   /* eslint-enable */
 ]);
 
+// 存储表单实例
 const queryFormRef = ref<FormInstance>();
+// 存储查询参数
+const queryParams = reactive<IObject>({});
 // 是否显示
 const visible = ref(true);
 // 响应式的formItems
@@ -119,12 +117,21 @@ const isGrid = computed(() =>
     ? "grid grid-cols-1 md:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4 3xl:grid-cols-5 4xl:grid-cols-6 gap-5"
     : "flex flex-wrap gap-x-8 gap-y-4"
 );
-// 搜索表单数据
-const queryParams = reactive<IObject>({});
+
+// 获取tooltip提示框属性
+const getTooltipProps = (tips: string | IObject) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+// 查询/重置操作
+const handleQuery = () => emit("queryClick", queryParams);
+const handleReset = () => {
+  queryFormRef.value?.resetFields();
+  emit("resetClick", queryParams);
+};
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item.initFn && item.initFn(item);
+    item?.initFn && item.initFn(item);
     if (["input-tag", "custom-tag", "cascader"].includes(item?.type ?? "")) {
       queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
@@ -134,14 +141,6 @@ onMounted(() => {
     }
   });
 });
-
-// 查询/重置操作
-const handleQuery = () => emit("queryClick", queryParams);
-const handleReset = () => {
-  queryFormRef.value?.resetFields();
-  emit("resetClick", queryParams);
-};
-
 // 暴露的属性和方法
 defineExpose({
   // 获取分页数据
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 8b246948..5db9295d 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -1,6 +1,5 @@
 import type { DialogProps, DrawerProps, FormItemRule, PaginationProps } from "element-plus";
 import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "element-plus";
-import type { ElTooltipProps } from "element-plus";
 import type PageContent from "./PageContent.vue";
 import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
@@ -53,7 +52,7 @@ export interface ISearchConfig {
     // 标签文本
     label?: string;
     // 标签提示
-    tips?: string | Partial<ElTooltipProps>;
+    tips?: string | IObject;
     // 键名
     prop: string;
     // 组件属性(input-tag组件支持join,btnText,size属性)

From ce748496c6dee9305e9344cd6d5d6e036f813a0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 20 Apr 2025 23:24:37 +0800
Subject: [PATCH 321/497] =?UTF-8?q?refactor:=20:recycle:=20pageModal?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=EF=BC=8C=E6=9B=B4=E6=96=B0=E4=BD=BF=E7=94=A8=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue    |  67 +---
 src/components/CURD/PageModal.vue      | 479 ++++++++++---------------
 src/components/CURD/types.ts           |  26 +-
 src/components/CURD/usePage.ts         |  16 +-
 src/views/demo/curd/config/content.ts  |   4 +-
 src/views/demo/curd/config/content2.ts |  15 +-
 src/views/demo/curd/config/edit.ts     |  17 +-
 src/views/demo/curd/config/edit2.ts    | 105 ++++++
 src/views/demo/curd/index.vue          | 106 +++---
 9 files changed, 407 insertions(+), 428 deletions(-)
 create mode 100644 src/views/demo/curd/config/edit2.ts

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 526342c3..fd461292 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -160,7 +160,7 @@
                   v-hasPerm="btn.perm ?? '*:*:*'"
                   v-bind="btn.attrs"
                   @click="
-                    handleOperat({
+                    handleOperate({
                       name: btn.name,
                       row: scope.row,
                       column: scope.column,
@@ -331,7 +331,7 @@ import {
 } from "element-plus";
 import ExcelJS from "exceljs";
 import { reactive, ref, computed } from "vue";
-import type { IContentConfig, IObject, IOperatData } from "./types";
+import type { IContentConfig, IObject, IOperateData } from "./types";
 import type { IToolsButton } from "./types";
 
 // 定义接收的属性
@@ -343,55 +343,10 @@ const emit = defineEmits<{
   searchClick: [];
   toolbarClick: [name: string];
   editClick: [row: IObject];
-  operatClick: [data: IOperatData];
   filterChange: [data: IObject];
+  operateClick: [data: IOperateData];
 }>();
 
-// 按钮文本映射
-const BUTTONS_TEXT: Record<string, string> = {
-  add: "新增",
-  delete: "删除",
-  import: "导入",
-  export: "导出",
-  refresh: "刷新",
-  filter: "筛选列",
-  search: "搜索",
-  imports: "批量导入",
-  exports: "批量导出",
-  view: "查看",
-  edit: "编辑",
-};
-
-// 按钮权限映射
-const AUTH_MAP: Record<string, string> = {
-  add: "add",
-  delete: "delete",
-  import: "import",
-  export: "export",
-  refresh: "*:*:*",
-  filter: "*:*:*",
-  search: "search",
-  imports: "imports",
-  exports: "exports",
-  view: "view",
-  edit: "edit",
-};
-
-// 按钮图标映射
-const BUTTONS_ICON: Record<string, string> = {
-  add: "plus",
-  delete: "delete",
-  import: "upload",
-  export: "download",
-  refresh: "refresh",
-  filter: "operation",
-  search: "search",
-  imports: "upload",
-  exports: "download",
-  view: "view",
-  edit: "edit",
-};
-
 // 表格工具栏按钮配置
 const config = computed(() => props.contentConfig);
 const buttonConfig = reactive<Record<string, IObject>>({
@@ -821,18 +776,8 @@ function handleToolbar(name: string) {
 }
 
 // 操作列
-function handleOperat(data: IOperatData) {
-  switch (data.name) {
-    case "edit":
-      emit("editClick", data.row);
-      break;
-    case "delete":
-      handleDelete(data.row[pk]);
-      break;
-    default:
-      emit("operatClick", data);
-      break;
-  }
+function handleOperate(data: IOperateData) {
+  emit("operateClick", data);
 }
 
 // 属性修改
@@ -953,7 +898,7 @@ function saveXlsx(fileData: any, fileName: string) {
 }
 
 // 暴露的属性和方法
-defineExpose({ fetchPageData, exportPageData, getFilterParams, getSelectionData });
+defineExpose({ fetchPageData, exportPageData, getFilterParams, getSelectionData, handleRefresh });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index e2e3f2c7..10ab9952 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -3,97 +3,55 @@
   <template v-if="modalConfig.component === 'drawer'">
     <el-drawer
       v-model="modalVisible"
-      :append-to-body="true"
-      v-bind="modalConfig.drawer"
-      @close="handleCloseModal"
+      v-bind="{ destroyOnClose: true, ...modalConfig.drawer }"
+      @close="handleClose"
     >
       <!-- 表单 -->
-      <el-form
-        ref="formRef"
-        label-width="auto"
-        v-bind="modalConfig.form"
-        :model="formData"
-        :rules="formRules"
-      >
+      <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
         <el-row :gutter="20">
           <template v-for="item in formItems" :key="item.prop">
             <el-col v-show="!item.hidden" v-bind="item.col">
               <el-form-item :label="item.label" :prop="item.prop">
                 <!-- Label -->
-                <template v-if="item.tips" #label>
+                <template #label>
                   <span>
-                    {{ item.label }}
-                    <el-tooltip
-                      placement="bottom"
-                      effect="light"
-                      :content="item.tips"
-                      :raw-content="true"
-                    >
-                      <el-icon style="vertical-align: -0.15em" size="16">
-                        <QuestionFilled />
-                      </el-icon>
+                    {{ item?.label || "" }}
+                    <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                      <QuestionFilled class="w-4 h-4 mx-1" />
                     </el-tooltip>
+                    <span v-if="modalConfig.colon" class="ml-0.5">:</span>
                   </span>
                 </template>
-                <!-- Input 输入框 -->
-                <template v-if="item.type === 'input' || item.type === undefined">
-                  <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
-                </template>
-                <!-- Select 选择器 -->
-                <template v-else-if="item.type === 'select'">
-                  <el-select v-model="formData[item.prop]" v-bind="item.attrs">
-                    <template v-for="option in item.options" :key="option.value">
-                      <el-option v-bind="option" />
-                    </template>
-                  </el-select>
-                </template>
-                <!-- Radio 单选框 -->
-                <template v-else-if="item.type === 'radio'">
-                  <el-radio-group v-model="formData[item.prop]" v-bind="item.attrs">
-                    <template v-for="option in item.options" :key="option.value">
-                      <el-radio v-bind="option" />
-                    </template>
-                  </el-radio-group>
-                </template>
-                <!-- switch 开关 -->
-                <template v-else-if="item.type === 'switch'">
-                  <el-switch v-model="formData[item.prop]" inline-prompt v-bind="item.attrs" />
-                </template>
-                <!-- Checkbox 多选框 -->
-                <template v-else-if="item.type === 'checkbox'">
-                  <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
-                    <template v-for="option in item.options" :key="option.value">
-                      <el-checkbox v-bind="option" />
-                    </template>
-                  </el-checkbox-group>
-                </template>
-                <!-- Input Number 数字输入框 -->
-                <template v-else-if="item.type === 'input-number'">
-                  <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
-                </template>
-                <!-- TreeSelect 树形选择 -->
-                <template v-else-if="item.type === 'tree-select'">
-                  <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
-                </template>
-                <!-- DatePicker 日期选择器 -->
-                <template v-else-if="item.type === 'date-picker'">
-                  <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
-                </template>
-                <!-- Text 文本 -->
-                <template v-else-if="item.type === 'text'">
-                  <el-text v-bind="item.attrs">
-                    {{ formData[item.prop] }}
-                  </el-text>
-                </template>
-                <!-- 自定义 -->
-                <template v-else-if="item.type === 'custom'">
+
+                <!-- components -->
+                <template v-if="item.type === 'custom'">
                   <slot
                     :name="item.slotName ?? item.prop"
                     :prop="item.prop"
                     :form-data="formData"
                     :attrs="item.attrs"
-                  />
+                    style="width: 100%"
+                  ></slot>
                 </template>
+                <component
+                  :is="componentMap.get(item.type)"
+                  v-else
+                  v-model.trim="formData[item.prop]"
+                  v-bind="{ style: { width: '100%' }, ...item.attrs }"
+                >
+                  <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
+                    <component
+                      :is="childrenMap.get(item.type)"
+                      v-for="opt in item.options"
+                      :label="opt.label"
+                      :value="opt.value"
+                    ></component>
+                  </template>
+
+                  <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
+                    <slot :name="item.slotName" />
+                  </template>
+                </component>
               </el-form-item>
             </el-col>
           </template>
@@ -101,13 +59,8 @@
       </el-form>
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
-        <div v-if="!formDisable">
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="handleClose">取 消</el-button>
-        </div>
-        <div v-else>
-          <el-button @click="handleClose">关闭</el-button>
-        </div>
+        <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
+        <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
       </template>
     </el-drawer>
   </template>
@@ -115,115 +68,61 @@
   <template v-else>
     <el-dialog
       v-model="modalVisible"
-      :align-center="true"
-      :append-to-body="true"
-      width="70vw"
-      v-bind="modalConfig.dialog"
-      style="padding-right: 0"
-      @close="handleCloseModal"
+      v-bind="{ destroyOnClose: true, appendToBody: true, ...modalConfig.dialog }"
+      @close="handleClose"
     >
-      <!-- 滚动 -->
-      <el-scrollbar max-height="60vh">
-        <!-- 表单 -->
-        <el-form
-          ref="formRef"
-          label-width="auto"
-          v-bind="modalConfig.form"
-          style="padding-right: var(--el-dialog-padding-primary)"
-          :model="formData"
-          :rules="formRules"
-        >
-          <el-row :gutter="20">
-            <template v-for="item in formItems" :key="item.prop">
-              <el-col v-show="!item.hidden" v-bind="item.col">
-                <el-form-item :label="item.label" :prop="item.prop">
-                  <!-- Label -->
-                  <template v-if="item.tips" #label>
-                    <span>
-                      {{ item.label }}
-                      <el-tooltip
-                        placement="bottom"
-                        effect="light"
-                        :content="item.tips"
-                        :raw-content="true"
-                      >
-                        <el-icon style="vertical-align: -0.15em" size="16">
-                          <QuestionFilled />
-                        </el-icon>
-                      </el-tooltip>
-                    </span>
-                  </template>
-                  <!-- Input 输入框 -->
-                  <template v-if="item.type === 'input' || item.type === undefined">
-                    <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
-                  </template>
-                  <!-- Select 选择器 -->
-                  <template v-else-if="item.type === 'select'">
-                    <el-select v-model="formData[item.prop]" v-bind="item.attrs">
-                      <template v-for="option in item.options" :key="option.value">
-                        <el-option v-bind="option" />
-                      </template>
-                    </el-select>
-                  </template>
-                  <!-- Radio 单选框 -->
-                  <template v-else-if="item.type === 'radio'">
-                    <el-radio-group v-model="formData[item.prop]" v-bind="item.attrs">
-                      <template v-for="option in item.options" :key="option.value">
-                        <el-radio v-bind="option" />
-                      </template>
-                    </el-radio-group>
-                  </template>
-                  <!-- switch 开关 -->
-                  <template v-else-if="item.type === 'switch'">
-                    <el-switch v-model="formData[item.prop]" inline-prompt v-bind="item.attrs" />
-                  </template>
-                  <!-- Checkbox 多选框 -->
-                  <template v-else-if="item.type === 'checkbox'">
-                    <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
-                      <template v-for="option in item.options" :key="option.value">
-                        <el-checkbox v-bind="option" />
-                      </template>
-                    </el-checkbox-group>
-                  </template>
-                  <!-- Input Number 数字输入框 -->
-                  <template v-else-if="item.type === 'input-number'">
-                    <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
-                  </template>
-                  <!-- TreeSelect 树形选择 -->
-                  <template v-else-if="item.type === 'tree-select'">
-                    <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
-                  </template>
-                  <!-- DatePicker 日期选择器 -->
-                  <template v-else-if="item.type === 'date-picker'">
-                    <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
-                  </template>
-                  <!-- Text 文本 -->
-                  <template v-else-if="item.type === 'text'">
-                    <el-text v-bind="item.attrs">
-                      {{ formData[item.prop] }}
-                    </el-text>
-                  </template>
-                  <!-- 自定义 -->
-                  <template v-else-if="item.type === 'custom'">
-                    <slot
-                      :name="item.slotName ?? item.prop"
-                      :prop="item.prop"
-                      :form-data="formData"
-                      :attrs="item.attrs"
-                    />
+      <!-- 表单 -->
+      <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
+        <el-row :gutter="20">
+          <template v-for="item in formItems" :key="item.prop">
+            <el-col v-show="!item.hidden" v-bind="item.col">
+              <el-form-item :label="item.label" :prop="item.prop">
+                <!-- Label -->
+                <template #label>
+                  <span class="flex-y-center">
+                    {{ item?.label || "" }}
+                    <el-tooltip v-if="item?.tips">
+                      <QuestionFilled class="w-4 h-4 mx-1" />
+                    </el-tooltip>
+                    <span v-if="modalConfig.colon" class="ml-0.5">:</span>
+                  </span>
+                </template>
+
+                <!-- components -->
+                <template v-if="item.type === 'custom'">
+                  <slot
+                    :name="item.slotName ?? item.prop"
+                    :prop="item.prop"
+                    :form-data="formData"
+                    :attrs="item.attrs"
+                  ></slot>
+                </template>
+                <component
+                  :is="componentMap.get(item.type)"
+                  v-else
+                  v-model.trim="formData[item.prop]"
+                  v-bind="{ style: { width: '100%' }, ...item.attrs }"
+                >
+                  <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
+                    <component
+                      :is="childrenMap.get(item.type)"
+                      v-for="opt in item.options"
+                      :label="opt.label"
+                      :value="opt.value"
+                    >
+                      <slot v-if="item.slotName" :name="item.slotName"></slot>
+                    </component>
                   </template>
-                </el-form-item>
-              </el-col>
-            </template>
-          </el-row>
-        </el-form>
-      </el-scrollbar>
+                </component>
+              </el-form-item>
+            </el-col>
+          </template>
+        </el-row>
+      </el-form>
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
-        <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" @click="handleSubmit">确 定</el-button>
-          <el-button @click="handleClose">取 消</el-button>
-        </div>
+        <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
+        <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
       </template>
     </el-dialog>
   </template>
@@ -232,67 +131,62 @@
 <script setup lang="ts">
 import { useThrottleFn } from "@vueuse/core";
 import type { FormInstance, FormRules } from "element-plus";
-import { nextTick, reactive, ref, watch, watchEffect } from "vue";
 import type { IModalConfig, IObject } from "./types";
+import InputTag from "@/components/InputTag/index.vue";
+import IconSelect from "@/components/IconSelect/index.vue";
 
 // 定义接收的属性
-const props = defineProps<{
-  modalConfig: IModalConfig;
-}>();
+const props = defineProps<{ modalConfig: IModalConfig }>();
 // 自定义事件
-const emit = defineEmits<{
-  submitClick: [];
-}>();
+const emit = defineEmits<{ submitClick: [] }>();
+// 组件映射表
+/* eslint-disable */
+const componentMap = new Map([
+  // @ts-ignore
+  ["input", markRaw(ElInput)], // @ts-ignore
+  ["select", markRaw(ElSelect)], // @ts-ignore
+  ["switch", markRaw(ElSwitch)], // @ts-ignore
+  ["cascader", markRaw(ElCascader)], // @ts-ignore
+  ["input-number", markRaw(ElInputNumber)], // @ts-ignore
+  ["input-tag", markRaw(InputTag)], // @ts-ignore
+  ["time-picker", markRaw(ElTimePicker)], // @ts-ignore
+  ["time-select", markRaw(ElTimeSelect)], // @ts-ignore
+  ["date-picker", markRaw(ElDatePicker)], // @ts-ignore
+  ["tree-select", markRaw(ElTreeSelect)], // @ts-ignore"
+  ["custom-tag", markRaw(InputTag)], // @ts-ignore
+  ["text", markRaw(ElText)], // @ts-ignore
+  ["radio", markRaw(ElRadioGroup)], // @ts-ignore"
+  ["checkbox", markRaw(ElCheckboxGroup)], // @ts-ignore"
+  ["icon-select", markRaw(IconSelect)], // @ts-ignore"
+  ["custom", ""],
+]);
+const childrenMap = new Map([
+  // @ts-ignore
+  ["select", markRaw(ElOption)], // @ts-ignore
+  ["radio", markRaw(ElRadio)], // @ts-ignore"
+  ["checkbox", markRaw(ElCheckbox)],
+]);
+/* eslint-enable */
 
 const pk = props.modalConfig.pk ?? "id";
 const modalVisible = ref(false);
 const formRef = ref<FormInstance>();
-const formItems = reactive(props.modalConfig.formItems);
+const formItems = reactive(props.modalConfig.formItems ?? []);
 const formData = reactive<IObject>({});
 const formRules: FormRules = {};
 const formDisable = ref(false);
-const prepareFuncs = [];
-for (const item of formItems) {
-  item.initFn && item.initFn(item);
-  formData[item.prop] = item.initialValue ?? "";
-  formRules[item.prop] = item.rules ?? [];
-
-  if (item.watch !== undefined) {
-    prepareFuncs.push(() => {
-      watch(
-        () => formData[item.prop],
-        (newValue, oldValue) => {
-          item.watch && item.watch(newValue, oldValue, formData, formItems);
-        }
-      );
-    });
-  }
-
-  if (item.computed !== undefined) {
-    prepareFuncs.push(() => {
-      watchEffect(() => {
-        item.computed && (formData[item.prop] = item.computed(formData));
-      });
-    });
-  }
-
-  if (item.watchEffect !== undefined) {
-    prepareFuncs.push(() => {
-      watchEffect(() => {
-        item.watchEffect && item.watchEffect(formData);
-      });
-    });
-  }
-}
-prepareFuncs.forEach((func) => func());
-
-// 获取表单数据
-function getFormData(key?: string) {
-  return key === undefined ? formData : (formData[key] ?? undefined);
-}
 
+// 获取tooltip提示框属性
+const getTooltipProps = (tips: string | IObject) => {
+  return typeof tips === "string" ? { content: tips } : tips;
+};
+// 隐藏弹窗
+const handleClose = () => {
+  modalVisible.value = false;
+  formRef.value?.resetFields();
+};
 // 设置表单值
-function setFormData(data: IObject) {
+const setFormData = (data: IObject) => {
   for (const key in formData) {
     if (Object.prototype.hasOwnProperty.call(formData, key) && key in data) {
       formData[key] = data[key];
@@ -301,77 +195,74 @@ function setFormData(data: IObject) {
   if (Object.prototype.hasOwnProperty.call(data, pk)) {
     formData[pk] = data[pk];
   }
-}
-
-// 设置表单项值
-function setFormItemData(key: string, value: any) {
-  formData[key] = value;
-}
-
-// 显示modal
-function setModalVisible(data: IObject = {}) {
-  modalVisible.value = true;
-  // nextTick解决赋值后重置表单无效问题
-  nextTick(() => {
-    Object.values(data).length > 0 && setFormData(data);
-  });
-}
-
+};
 // 表单提交
 const handleSubmit = useThrottleFn(() => {
   formRef.value?.validate((valid: boolean) => {
-    if (valid) {
-      if (typeof props.modalConfig.beforeSubmit === "function") {
-        props.modalConfig.beforeSubmit(formData);
-      }
-      props.modalConfig.formAction(formData).then(() => {
-        let msg = "操作成功";
-        if (props.modalConfig.component === "drawer") {
-          if (props.modalConfig.drawer?.title) {
-            msg = `${props.modalConfig.drawer?.title}成功`;
-          }
-        } else {
-          if (props.modalConfig.dialog?.title) {
-            msg = `${props.modalConfig.dialog?.title}成功`;
-          }
-        }
-        ElMessage.success(msg);
-        emit("submitClick");
-        handleClose();
-      });
+    if (!valid) return;
+    if (typeof props.modalConfig.beforeSubmit === "function") {
+      props.modalConfig.beforeSubmit(formData);
+    }
+    if (!props.modalConfig?.formAction) {
+      ElMessage.error("未配置exportAction");
+      return;
     }
+    props.modalConfig.formAction(formData).then(() => {
+      let msg = "操作成功";
+      if (props.modalConfig.component === "drawer") {
+        msg = `${props.modalConfig.drawer?.title}成功`;
+      } else {
+        msg = `${props.modalConfig.dialog?.title}成功`;
+      }
+      ElMessage.success(msg);
+      emit("submitClick");
+      handleClose();
+    });
   });
 }, 3000);
 
-// 隐藏弹窗
-function handleClose() {
-  modalVisible.value = false;
-}
-
-// 关闭弹窗
-function handleCloseModal() {
-  formRef.value?.resetFields();
-  nextTick(() => {
-    formRef.value?.clearValidate();
-  });
-}
+onMounted(() => {
+  formItems.forEach((item) => {
+    item.initFn && item.initFn(item);
+    formRules[item.prop] = item?.rules ?? [];
+    props.modalConfig.form = { labelWidth: "auto", ...props.modalConfig?.form };
 
-// 禁用表单--用于详情时候用
-function handleDisabled(disable: boolean) {
-  formDisable.value = disable;
-  props.modalConfig.formItems.forEach((item) => {
-    if (item) {
-      if (item.attrs) {
-        item.attrs.disabled = disable;
-      } else {
-        item.attrs = { disabled: disable };
-      }
+    if (["input-tag", "custom-tag", "cascader"].includes(item.type)) {
+      formData[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
+    } else if (item.type === "input-number") {
+      formData[item.prop] = item.initialValue ?? null;
+    } else {
+      formData[item.prop] = item.initialValue ?? "";
     }
   });
-}
+});
 
 // 暴露的属性和方法
-defineExpose({ setModalVisible, getFormData, setFormData, setFormItemData, handleDisabled });
+defineExpose({
+  setFormData,
+  // 展示/因此 modal
+  setModalVisible: (visible: boolean = true) => (modalVisible.value = visible),
+  // 获取表单数据
+  getFormData: (key: string) => formData[key] ?? formData,
+  // 设置表单项值
+  setFormItemData: (key: string, value: any) => (formData[key] = value),
+  // 禁用表单
+  handleDisabled: (disable: boolean) => {
+    formDisable.value = disable;
+    props.modalConfig.form = {
+      ...props.modalConfig.form,
+      disabled: disable,
+    };
+  },
+});
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+:deep(.el-input-number .el-input__inner) {
+  text-align: left;
+}
+:deep(.el-input-number.is-without-controls .el-input__wrapper) {
+  padding-right: 11px !important ;
+  padding-left: 11px !important;
+}
+</style>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 5db9295d..a9da104a 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -15,7 +15,7 @@ export type IObject = Record<string, any>;
 
 type DataComponent = "date-picker" | "time-picker" | "time-select" | "custom-tag" | "input-tag";
 type InputComponent = "input" | "select" | "input-number" | "cascader" | "tree-select";
-type OtherComponent = "text" | "radio" | "checkbox" | "switch" | "custom";
+type OtherComponent = "text" | "radio" | "checkbox" | "switch" | "icon-select" | "custom";
 export type ISearchComponent = DataComponent | InputComponent;
 export type IComponentType = DataComponent | InputComponent | OtherComponent;
 
@@ -26,14 +26,12 @@ export type IToolsButton = {
   name: string; // 按钮名称
   text?: string; // 按钮文本
   perm?: Array<string> | string; // 权限标识(可以是完整权限字符串如'sys:user:add'或操作权限如'add')
-  icon?: string; // 按钮图标
-  type?: string; // 按钮类型
   attrs?: Partial<ButtonProps> & { style?: CSSProperties }; // 按钮属性
   render?: (row: IObject) => boolean; // 条件渲染
 };
 export type IToolsDefault = ToolbarLeft | ToolbarRight | ToolbarTable | IToolsButton;
 
-export interface IOperatData {
+export interface IOperateData {
   name: string;
   row: IObject;
   column: IObject;
@@ -184,9 +182,11 @@ export interface IContentConfig<T = any> {
 export interface IModalConfig<T = any> {
   // 权限前缀(如sys:user，用于组成权限标识)，不提供则不进行权限校验
   permPrefix?: string;
+  // 标签冒号(默认：false)
+  colon?: boolean;
   // 主键名(主要用于编辑数据,默认为id)
   pk?: string;
-  // 组件类型
+  // 组件类型(默认：dialog)
   component?: "dialog" | "drawer";
   // dialog组件属性
   dialog?: Partial<Omit<DialogProps, "modelValue">>;
@@ -195,7 +195,7 @@ export interface IModalConfig<T = any> {
   // form组件属性
   form?: IForm;
   // 表单项
-  formItems: IFormItems<T>;
+  formItems: IFormItems;
   // 提交之前处理
   beforeSubmit?: (data: T) => void;
   // 提交的网络请求函数(需返回promise)
@@ -205,9 +205,9 @@ export interface IModalConfig<T = any> {
 export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
 
 // 表单项
-export type IFormItems<T = any> = Array<{
+export type IFormItems = Array<{
   // 组件类型(如input,select,radio,custom等，默认input)
-  type?: IComponentType;
+  type: IComponentType;
   // 组件属性
   attrs?: IObject;
   // 组件可选项(适用于select,radio,checkbox组件)
@@ -222,7 +222,7 @@ export type IFormItems<T = any> = Array<{
   // 标签文本
   label: string;
   // 标签提示
-  tips?: string;
+  tips?: string | IObject;
   // 键名
   prop: string;
   // 验证规则
@@ -233,12 +233,8 @@ export type IFormItems<T = any> = Array<{
   hidden?: boolean;
   // layout组件Col属性
   col?: Partial<ColProps>;
-  // 监听函数
-  watch?: (newValue: any, oldValue: any, data: T, items: IObject[]) => void;
-  // 计算属性函数
-  computed?: (data: T) => any;
-  // 监听收集函数
-  watchEffect?: (data: T) => void;
+  // 组件事件
+  events?: Record<string, (...args: any) => void>;
   // 初始化数据函数扩展
   initFn?: (item: IObject) => void;
 }>;
diff --git a/src/components/CURD/usePage.ts b/src/components/CURD/usePage.ts
index d0fa0090..b5f6c557 100644
--- a/src/components/CURD/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -23,9 +23,18 @@ function usePage() {
     addModalRef.value?.setModalVisible();
   }
   // 编辑
-  function handleEditClick(row: IObject) {
-    //显示编辑表单 根据数据进行填充
-    editModalRef.value?.setModalVisible(row);
+  async function handleEditClick(row: IObject, callback?: (result?: IObject) => IObject) {
+    editModalRef.value?.setModalVisible();
+    editModalRef.value?.handleDisabled(false);
+    let from = await (callback?.(row) ?? Promise.resolve(row));
+    editModalRef.value?.setFormData(from ? from : row);
+  }
+  // 编辑
+  async function handleViewClick(row: IObject, callback?: (result?: IObject) => IObject) {
+    editModalRef.value?.setModalVisible();
+    editModalRef.value?.handleDisabled(true);
+    let from = await (callback?.(row) ?? Promise.resolve(row));
+    editModalRef.value?.setFormData(from ? from : row);
   }
   // 表单提交
   function handleSubmitClick() {
@@ -58,6 +67,7 @@ function usePage() {
     handleResetClick,
     handleAddClick,
     handleEditClick,
+    handleViewClick,
     handleSubmitClick,
     handleExportClick,
     handleSearchClick,
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 680a38bb..020b1fd1 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -112,12 +112,12 @@ const contentConfig: IContentConfig<UserPageQuery> = {
         {
           name: "detail",
           text: "详情",
-          attrs: { icon: "Document" },
+          attrs: { icon: "Document", type: "primary" },
         },
         {
           name: "reset_pwd",
           text: "重置密码",
-          perm: "password:reset",
+          // perm: "password-reset",
           attrs: {
             icon: "refresh-left",
             // color: "#626AEF", // 使用 text 属性，颜色不生效
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config/content2.ts
index ad1b5478..11a82169 100644
--- a/src/views/demo/curd/config/content2.ts
+++ b/src/views/demo/curd/config/content2.ts
@@ -5,6 +5,7 @@ const contentConfig: IContentConfig = {
   table: {
     showOverflowTooltip: true,
   },
+  pagePosition: "right",
   toolbar: [],
   indexAction: function (params) {
     // 模拟发起网络请求获取列表数据
@@ -14,7 +15,7 @@ const contentConfig: IContentConfig = {
       list: [
         {
           id: 1,
-          username: "tom",
+          username: "root",
           avatar: "https://foruda.gitee.com/images/1723603502796844527/03cdca2a_716974.gif",
           percent: 99,
           price: 10,
@@ -115,14 +116,16 @@ const contentConfig: IContentConfig = {
       width: 220,
       templet: "tool",
       operat: [
+        "view",
+        "edit",
         {
-          name: "reset_pwd",
-          text: "重置密码",
-          perm: "password:reset",
-          attrs: { icon: "refresh-left", type: "primary" },
+          name: "delete",
+          text: "展示删除",
+          perm: "delete",
+          attrs: { icon: "delete", type: "danger" },
           render(row) {
             // 根据条件，显示或隐藏
-            return row.id === 1;
+            return row.id !== 1;
           },
         },
       ],
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 358f940b..1581d6a0 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -2,6 +2,8 @@ import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore } from "@/store";
+import DeptAPI from "@/api/system/dept.api";
+import RoleAPI from "@/api/system/role.api";
 
 const modalConfig: IModalConfig<UserForm> = {
   permPrefix: "sys:user",
@@ -11,12 +13,12 @@ const modalConfig: IModalConfig<UserForm> = {
     size: useAppStore().device === DeviceEnum.MOBILE ? "80%" : 500,
   },
   pk: "id",
+  beforeSubmit(data) {
+    console.log("beforeSubmit", data);
+  },
   formAction: function (data) {
     return UserAPI.update(data.id as string, data);
   },
-  beforeSubmit(data) {
-    console.log("提交之前处理", data);
-  },
   formItems: [
     {
       label: "用户名",
@@ -49,12 +51,17 @@ const modalConfig: IModalConfig<UserForm> = {
         "check-strictly": true,
         "render-after-expand": false,
       },
+      async initFn(formItem) {
+        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+        formItem.attrs.data = await DeptAPI.getOptions();
+      },
     },
     {
       type: "custom",
       label: "性别",
       prop: "gender",
       initialValue: 1,
+      attrs: { style: { width: "100%" } },
     },
     {
       label: "角色",
@@ -67,6 +74,9 @@ const modalConfig: IModalConfig<UserForm> = {
       },
       options: [],
       initialValue: [],
+      async initFn(formItem) {
+        formItem.options = await RoleAPI.getOptions();
+      },
     },
     {
       type: "input",
@@ -105,6 +115,7 @@ const modalConfig: IModalConfig<UserForm> = {
       prop: "status",
       type: "switch",
       attrs: {
+        inlinePrompt: true,
         activeText: "正常",
         inactiveText: "禁用",
         activeValue: 1,
diff --git a/src/views/demo/curd/config/edit2.ts b/src/views/demo/curd/config/edit2.ts
new file mode 100644
index 00000000..d69ee6f2
--- /dev/null
+++ b/src/views/demo/curd/config/edit2.ts
@@ -0,0 +1,105 @@
+import type { IModalConfig } from "@/components/CURD/types";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+import { useAppStore } from "@/store";
+
+const modalConfig: IModalConfig = {
+  permPrefix: "sys:user",
+  component: "drawer",
+  colon: true,
+  pk: "id",
+  drawer: {
+    title: "修改用户",
+    size: useAppStore().device === DeviceEnum.MOBILE ? "80%" : 500,
+  },
+  form: { labelPosition: "right", labelWidth: "auto" },
+  beforeSubmit(data) {
+    console.log("beforeSubmit", data);
+  },
+  formAction: function (data) {
+    // return UserAPI.update(data.id as string, data);
+    // 模拟发起网络请求修改字段
+    ElMessage.success(JSON.stringify(data));
+    return Promise.resolve(null);
+  },
+  formItems: [
+    {
+      tips: { effect: "light", placement: "top", content: "自定义文字提示" },
+      type: "input",
+      label: "文本",
+      prop: "username",
+      attrs: { placeholder: "请输入", clearable: true },
+    },
+    {
+      type: "input-number",
+      label: "百分比",
+      prop: "percent",
+      attrs: { placeholder: "请输入", controls: false },
+      slotName: "suffix",
+    },
+    {
+      type: "input-number",
+      label: "货币符",
+      prop: "price",
+      attrs: { placeholder: "请输入", controls: false },
+      slotName: "prefix",
+    },
+    {
+      type: "input",
+      label: "链接",
+      prop: "url",
+      attrs: { placeholder: "请输入", clearable: true },
+    },
+    {
+      type: "icon-select",
+      label: "链接",
+      prop: "icon",
+    },
+    {
+      type: "custom",
+      label: "列表值",
+      prop: "gender",
+      slotName: "gender",
+      attrs: { style: { width: "100%" } },
+    },
+    {
+      type: "select",
+      label: "自定义",
+      prop: "status",
+      attrs: { placeholder: "全部", clearable: true },
+      options: [
+        { label: "启用", value: 1 },
+        { label: "禁用", value: 0 },
+      ],
+    },
+    {
+      type: "switch",
+      label: "Switch",
+      prop: "status2",
+      attrs: {
+        inlinePrompt: true,
+        activeValue: 1,
+        inactiveValue: 0,
+        activeText: "启用",
+        inactiveText: "禁用",
+      },
+    },
+    {
+      type: "input-number",
+      label: "输入框",
+      prop: "sort",
+      attrs: { placeholder: "请输入", controls: false },
+    },
+    {
+      type: "date-picker",
+      label: "日期格式化",
+      prop: "createTime",
+      attrs: {
+        type: "datetime",
+        format: "YYYY/MM/DD hh:mm:ss",
+        "value-format": "x",
+      },
+    },
+  ],
+};
+
+export default reactive(modalConfig);
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 40eef43f..0ceeb080 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -26,11 +26,10 @@
         ref="contentRef"
         :content-config="contentConfig"
         @add-click="handleAddClick"
-        @edit-click="handleEditClick"
         @export-click="handleExportClick"
         @search-click="handleSearchClick"
         @toolbar-click="handleToolbarClick"
-        @operat-click="handleOperatClick"
+        @operate-click="handleOperateClick"
         @filter-change="handleFilterChange"
       >
         <template #status="scope">
@@ -75,10 +74,11 @@
     </template>
     <template v-else>
       <page-search ref="searchRef" :search-config="searchConfig2" @reset-click="handleResetClick" />
+
       <page-content
         ref="contentRef"
         :content-config="contentConfig2"
-        @operat-click="handleOperatClick"
+        @operate-click="handleOperateClick2"
       >
         <template #status="scope">
           <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
@@ -86,20 +86,31 @@
           </el-tag>
         </template>
       </page-content>
+
+      <page-modal ref="editModalRef" :modal-config="editModalConfig2">
+        <template #suffix>
+          <span style="color: black">%</span>
+        </template>
+        <template #prefix>
+          <span>$</span>
+        </template>
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+        </template>
+      </page-modal>
     </template>
   </div>
 </template>
 
 <script setup lang="ts">
 import UserAPI from "@/api/system/user.api";
-import DeptAPI from "@/api/system/dept.api";
-import RoleAPI from "@/api/system/role.api";
-import type { IObject, IOperatData } from "@/components/CURD/types";
+import type { IObject, IOperateData } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
 import contentConfig from "./config/content";
 import contentConfig2 from "./config/content2";
 import editModalConfig from "./config/edit";
+import editModalConfig2 from "./config/edit2";
 import searchConfig from "./config/search";
 import searchConfig2 from "./config/search2";
 
@@ -111,7 +122,8 @@ const {
   handleQueryClick,
   handleResetClick,
   // handleAddClick,
-  // handleEditClick,
+  handleEditClick,
+  handleViewClick,
   handleSubmitClick,
   handleExportClick,
   handleSearchClick,
@@ -121,22 +133,8 @@ const {
 // 新增
 async function handleAddClick() {
   addModalRef.value?.setModalVisible();
-  // 加载部门下拉数据源
-  addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
-  // 加载角色下拉数据源
-  addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
-}
-// 编辑
-async function handleEditClick(row: IObject) {
-  editModalRef.value?.handleDisabled(false);
-  editModalRef.value?.setModalVisible();
-  // 加载部门下拉数据源
-  editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
-  // 加载角色下拉数据源
-  editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
-  // 根据id获取数据进行填充
-  const data = await UserAPI.getFormData(row.id);
-  editModalRef.value?.setFormData(data);
+  // 加载下拉数据源，建议在初始化配置项 initFn 中加载，避免多次请求
+  // addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
 }
 // 其他工具栏
 function handleToolbarClick(name: string) {
@@ -145,11 +143,22 @@ function handleToolbarClick(name: string) {
     ElMessage.success("点击了自定义1按钮");
   }
 }
-// 其他操作列
-async function handleOperatClick(data: IOperatData) {
-  console.log(data);
-  // 重置密码
-  if (data.name === "reset_pwd") {
+
+// 表格工具栏
+const handleOperateClick = (data: IObject) => {
+  if (data.name === "detail") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "查看" };
+    handleViewClick(data.row, async () => {
+      // 加载下拉数据源，建议在初始化配置项 initFn 中加载，避免多次请求
+      // editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+      return await UserAPI.getFormData(data.row.id); // 根据ID获取详情
+    });
+  } else if (data.name === "edit") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "修改" };
+    handleEditClick(data.row, async () => {
+      return await UserAPI.getFormData(data.row.id); // 根据ID获取详情
+    });
+  } else if (data.name === "reset_pwd") {
     ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
@@ -162,23 +171,32 @@ async function handleOperatClick(data: IOperatData) {
         ElMessage.success("密码重置成功，新密码是：" + value);
       });
     });
-  } else if (data.name === "detail") {
-    // 禁用表单编辑
-    editModalRef.value?.handleDisabled(true);
-    // 打开抽屉
-    editModalRef.value?.setModalVisible();
-    // 修改抽屉标题
-    editModalConfig.drawer = { ...editModalConfig.drawer, title: "用户详情" };
-    // 加载部门下拉数据源
-    editModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
-    // 加载角色下拉数据源
-    editModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
-    // 根据id获取数据进行填充
-    const formData = await UserAPI.getFormData(data.row.id);
-    // 设置表单数据
-    editModalRef.value?.setFormData(formData);
+  } else if (data.name === "delete") {
+    ElMessageBox.confirm("确认删除?", "警告", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning",
+    })
+      .then(function () {
+        UserAPI.deleteByIds(data.row.id).then(() => {
+          ElMessage.success("删除成功");
+          contentRef.value?.handleRefresh(true); // 刷新列表
+        });
+      })
+      .catch(() => {});
   }
-}
+};
+const handleOperateClick2 = (data: IOperateData) => {
+  if (data.name === "view") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "查看" };
+    handleViewClick(data.row);
+  } else if (data.name === "edit") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "修改" };
+    handleEditClick(data.row);
+  } else if (data.name === "delete") {
+    ElMessage.success("模拟删除成功");
+  }
+};
 
 // 切换示例
 const isA = ref(true);

From 2dab0b5b4d32ca54e81b62cd7c5930b8a8009120 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 00:17:54 +0800
Subject: [PATCH 322/497] =?UTF-8?q?fix(SingleImageUpload):=20:bug:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A1=A8=E6=A0=BC=E9=87=8C=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E8=AE=BE=E7=BD=AE=E5=AE=BD=E5=BA=A6=E6=97=A0=E6=95=88?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/SingleImageUpload.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index f528b248..cda5cfd3 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -166,14 +166,14 @@ const onError = (error: any) => {
 
 <style scoped lang="scss">
 :deep(.el-upload--picture-card) {
-  /*  width: var(--el-upload-picture-card-size);
-  height: var(--el-upload-picture-card-size); */
   width: v-bind("props.style.width");
   height: v-bind("props.style.height");
 }
 
 .single-upload {
   position: relative;
+  width: v-bind("props.style.width");
+  height: v-bind("props.style.height");
   overflow: hidden;
   cursor: pointer;
   border: 1px var(--el-border-color) solid;

From 081b087a435cb2bcfcf19fdfb7c7b06f3475ca2e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 00:26:10 +0800
Subject: [PATCH 323/497] =?UTF-8?q?fix(SidebarMenuItem):=20:bug:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A7=8B=E7=BB=88=E6=98=BE=E7=A4=BA=E4=B8=BA?=
 =?UTF-8?q?=E5=90=A6=E6=83=85=E5=86=B5=E4=B8=8BonlyOneChild=E6=9C=AA?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E5=AF=BC=E8=87=B4onlyOneChild.meta=E5=9B=A0u?=
 =?UTF-8?q?ndefined=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# #IC2HMX
---
 src/layout/components/Sidebar/components/SidebarMenuItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
index 01ac79f6..ede0ef3c 100644
--- a/src/layout/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layout/components/Sidebar/components/SidebarMenuItem.vue
@@ -4,8 +4,8 @@
     <template
       v-if="
         // 未配置始终显示，使用唯一子节点替换父节点显示为叶子节点
-        (!item.meta?.alwaysShow &&
-          hasOneShowingChild(item.children, item) &&
+        (hasOneShowingChild(item.children, item) &&
+          !item.meta?.alwaysShow &&
           (!onlyOneChild.children || onlyOneChild.noShowingChildren)) ||
         // 即使配置了始终显示，但无子节点，也显示为叶子节点
         (item.meta?.alwaysShow && !item.children)

From 1cb1d2605e911c9757845ea9a8b248c0fc681d3d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 00:27:21 +0800
Subject: [PATCH 324/497] =?UTF-8?q?fix:=20:bug:=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E4=B8=8BCURD=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=97=E8=A1=A8=E9=80=89=E4=B8=AD=E7=9A=84=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/variables.scss | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 2aae5378..7987c80f 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -34,10 +34,6 @@
   --menu-hover: #e6f4ff; // 菜单悬停背景色 浅色主题-白色侧边栏配色下仅占位，实际颜色由 el-menu-item 组件决定
   --sidebar-logo-background: #f5f5f5; // 侧边栏 Logo 背景色
   --sidebar-logo-text-color: #333; // 侧边栏 Logo 文字颜色
-  // 修复表格 fixed 列被选中后由于透明色导致叠字的 bug
-  .el-table {
-    --el-table-current-row-bg-color: rgb(235 243 250);
-  }
 }
 
 /** 浅色主题-深蓝色侧边栏配色 */

From ecbcda4d110edbb60c9a92498f85d010eb3018a8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 00:30:18 +0800
Subject: [PATCH 325/497] chore: :hammer: bump version to 2.27.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CURD 组件完善重构
菜单搜索组件样式优化
图片组件设置宽度无效问题修复
新增菜单设置始终显示为否报错修复
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 573fc4f2..dd026262 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.26.0",
+  "version": "2.27.0",
   "private": true,
   "type": "module",
   "scripts": {

From 9e47f25520a947d5d975a8d7f72ded50d2976dd3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 00:35:55 +0800
Subject: [PATCH 326/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8Deslint?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
index e0ff8aab..d879d899 100644
--- a/src/components/CURD/PageForm.vue
+++ b/src/components/CURD/PageForm.vue
@@ -85,7 +85,7 @@ const props = withDefaults(defineProps<IPageForm>(), {
 });
 
 const formRef = ref<FormInstance>();
-const formItems = reactive(props.formItems);
+const formItems = reactive<any>(props.formItems);
 const formData = reactive<IObject>({});
 const formRules: FormRules = {};
 const prepareFuncs = [];

From 4b1614952b2875a1bbce0522f6f43a07cce8716b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Mon, 21 Apr 2025 22:12:58 +0800
Subject: [PATCH 327/497] =?UTF-8?q?feat:=20:sparkles:=20pageModal=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BA=A7=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E4=B8=8E=E4=BD=BF=E7=94=A8=E6=A1=88=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue |  40 ++--
 src/components/CURD/PageModal.vue   | 277 ++++++++++++++--------------
 src/components/CURD/types.ts        |  49 ++---
 src/components/CURD/usePage.ts      |  55 ++++--
 src/views/demo/curd/config/add.ts   |  20 +-
 src/views/demo/curd/config/add2.ts  |  59 ++++++
 src/views/demo/curd/index.vue       |  58 +++---
 7 files changed, 330 insertions(+), 228 deletions(-)
 create mode 100644 src/views/demo/curd/config/add2.ts

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index fd461292..68e01afb 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -503,19 +503,24 @@ function handleDelete(id?: number | string) {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
-  }).then(function () {
-    if (props.contentConfig.deleteAction) {
-      props.contentConfig.deleteAction(ids).then(() => {
-        ElMessage.success("删除成功");
-        removeIds.value = [];
-        //清空选中项
-        tableRef.value?.clearSelection();
-        handleRefresh(true);
-      });
-    } else {
-      ElMessage.error("未配置deleteAction");
-    }
-  });
+  })
+    .then(function () {
+      if (props.contentConfig.deleteAction) {
+        props.contentConfig
+          .deleteAction(ids)
+          .then(() => {
+            ElMessage.success("删除成功");
+            removeIds.value = [];
+            //清空选中项
+            tableRef.value?.clearSelection();
+            handleRefresh(true);
+          })
+          .catch(() => {});
+      } else {
+        ElMessage.error("未配置deleteAction");
+      }
+    })
+    .catch(() => {});
 }
 
 // 导出表单
@@ -777,7 +782,14 @@ function handleToolbar(name: string) {
 
 // 操作列
 function handleOperate(data: IOperateData) {
-  emit("operateClick", data);
+  switch (data.name) {
+    case "delete":
+      props.contentConfig?.deleteAction && handleDelete(data.row[pk]);
+      break;
+    default:
+      emit("operateClick", data);
+      break;
+  }
 }
 
 // 属性修改
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index 10ab9952..fe1fa5c9 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -1,147 +1,151 @@
 <template>
-  <!-- drawer -->
-  <template v-if="modalConfig.component === 'drawer'">
-    <el-drawer
-      v-model="modalVisible"
-      v-bind="{ destroyOnClose: true, ...modalConfig.drawer }"
-      @close="handleClose"
-    >
-      <!-- 表单 -->
-      <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
-        <el-row :gutter="20">
-          <template v-for="item in formItems" :key="item.prop">
-            <el-col v-show="!item.hidden" v-bind="item.col">
-              <el-form-item :label="item.label" :prop="item.prop">
-                <!-- Label -->
-                <template #label>
-                  <span>
-                    {{ item?.label || "" }}
-                    <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
-                      <QuestionFilled class="w-4 h-4 mx-1" />
-                    </el-tooltip>
-                    <span v-if="modalConfig.colon" class="ml-0.5">:</span>
-                  </span>
-                </template>
+  <div>
+    <!-- drawer -->
+    <template v-if="modalConfig.component === 'drawer'">
+      <el-drawer
+        v-model="modalVisible"
+        v-bind="{ destroyOnClose: true, ...modalConfig.drawer }"
+        @close="handleClose"
+      >
+        <!-- 表单 -->
+        <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
+          <el-row :gutter="20">
+            <template v-for="item in formItems" :key="item.prop">
+              <el-col v-show="!item.hidden" v-bind="item.col">
+                <el-form-item :label="item.label" :prop="item.prop">
+                  <!-- Label -->
+                  <template #label>
+                    <span>
+                      {{ item?.label || "" }}
+                      <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                        <QuestionFilled class="w-4 h-4 mx-1" />
+                      </el-tooltip>
+                      <span v-if="modalConfig.colon" class="ml-0.5">:</span>
+                    </span>
+                  </template>
 
-                <!-- components -->
-                <template v-if="item.type === 'custom'">
-                  <slot
-                    :name="item.slotName ?? item.prop"
-                    :prop="item.prop"
-                    :form-data="formData"
-                    :attrs="item.attrs"
-                    style="width: 100%"
-                  ></slot>
-                </template>
-                <component
-                  :is="componentMap.get(item.type)"
-                  v-else
-                  v-model.trim="formData[item.prop]"
-                  v-bind="{ style: { width: '100%' }, ...item.attrs }"
-                >
-                  <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
-                    <component
-                      :is="childrenMap.get(item.type)"
-                      v-for="opt in item.options"
-                      :label="opt.label"
-                      :value="opt.value"
-                    ></component>
+                  <!-- components -->
+                  <template v-if="item.type === 'custom'">
+                    <slot
+                      :name="item.slotName ?? item.prop"
+                      :prop="item.prop"
+                      :form-data="formData"
+                      :attrs="item.attrs"
+                    ></slot>
                   </template>
+                  <component
+                    :is="componentMap.get(item.type)"
+                    v-else
+                    v-model.trim="formData[item.prop]"
+                    v-bind="{ style: { width: '100%' }, ...item.attrs }"
+                  >
+                    <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
+                      <component
+                        :is="childrenMap.get(item.type)"
+                        v-for="opt in item.options"
+                        :label="opt.label"
+                        :value="opt.value"
+                      ></component>
+                    </template>
 
-                  <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
-                    <slot :name="item.slotName" />
+                    <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
+                      <slot :name="item.slotName" />
+                    </template>
+                  </component>
+                </el-form-item>
+              </el-col>
+            </template>
+          </el-row>
+        </el-form>
+        <!-- 弹窗底部操作按钮 -->
+        <template #footer>
+          <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
+          <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
+        </template>
+      </el-drawer>
+    </template>
+    <!-- dialog -->
+    <template v-else>
+      <el-dialog
+        v-model="modalVisible"
+        v-bind="{ destroyOnClose: true, ...modalConfig.dialog }"
+        @close="handleClose"
+      >
+        <!-- 表单 -->
+        <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
+          <el-row :gutter="20">
+            <template v-for="item in formItems" :key="item.prop">
+              <el-col v-show="!item.hidden" v-bind="item.col">
+                <el-form-item :label="item.label" :prop="item.prop">
+                  <!-- Label -->
+                  <template #label>
+                    <span>
+                      {{ item?.label || "" }}
+                      <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                        <QuestionFilled class="w-4 h-4 mx-1" />
+                      </el-tooltip>
+                      <span v-if="modalConfig.colon" class="ml-0.5">:</span>
+                    </span>
                   </template>
-                </component>
-              </el-form-item>
-            </el-col>
-          </template>
-        </el-row>
-      </el-form>
-      <!-- 弹窗底部操作按钮 -->
-      <template #footer>
-        <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
-        <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
-      </template>
-    </el-drawer>
-  </template>
-  <!-- dialog -->
-  <template v-else>
-    <el-dialog
-      v-model="modalVisible"
-      v-bind="{ destroyOnClose: true, appendToBody: true, ...modalConfig.dialog }"
-      @close="handleClose"
-    >
-      <!-- 表单 -->
-      <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
-        <el-row :gutter="20">
-          <template v-for="item in formItems" :key="item.prop">
-            <el-col v-show="!item.hidden" v-bind="item.col">
-              <el-form-item :label="item.label" :prop="item.prop">
-                <!-- Label -->
-                <template #label>
-                  <span class="flex-y-center">
-                    {{ item?.label || "" }}
-                    <el-tooltip v-if="item?.tips">
-                      <QuestionFilled class="w-4 h-4 mx-1" />
-                    </el-tooltip>
-                    <span v-if="modalConfig.colon" class="ml-0.5">:</span>
-                  </span>
-                </template>
 
-                <!-- components -->
-                <template v-if="item.type === 'custom'">
-                  <slot
-                    :name="item.slotName ?? item.prop"
-                    :prop="item.prop"
-                    :form-data="formData"
-                    :attrs="item.attrs"
-                  ></slot>
-                </template>
-                <component
-                  :is="componentMap.get(item.type)"
-                  v-else
-                  v-model.trim="formData[item.prop]"
-                  v-bind="{ style: { width: '100%' }, ...item.attrs }"
-                >
-                  <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
-                    <component
-                      :is="childrenMap.get(item.type)"
-                      v-for="opt in item.options"
-                      :label="opt.label"
-                      :value="opt.value"
-                    >
-                      <slot v-if="item.slotName" :name="item.slotName"></slot>
-                    </component>
+                  <!-- components -->
+                  <template v-if="item.type === 'custom'">
+                    <slot
+                      :name="item.slotName ?? item.prop"
+                      :prop="item.prop"
+                      :form-data="formData"
+                      :attrs="item.attrs"
+                    ></slot>
                   </template>
-                </component>
-              </el-form-item>
-            </el-col>
-          </template>
-        </el-row>
-      </el-form>
-      <!-- 弹窗底部操作按钮 -->
-      <template #footer>
-        <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
-        <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
-      </template>
-    </el-dialog>
-  </template>
+                  <component
+                    :is="componentMap.get(item.type)"
+                    v-else
+                    v-model.trim="formData[item.prop]"
+                    v-bind="{ style: { width: '100%' }, ...item.attrs }"
+                  >
+                    <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
+                      <component
+                        :is="childrenMap.get(item.type)"
+                        v-for="opt in item.options"
+                        :label="opt.label"
+                        :value="opt.value"
+                      ></component>
+                    </template>
+
+                    <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
+                      <slot :name="item.slotName" />
+                    </template>
+                  </component>
+                </el-form-item>
+              </el-col>
+            </template>
+          </el-row>
+        </el-form>
+        <!-- 弹窗底部操作按钮 -->
+        <template #footer>
+          <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
+          <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
+        </template>
+      </el-dialog>
+    </template>
+  </div>
 </template>
 
 <script setup lang="ts">
 import { useThrottleFn } from "@vueuse/core";
 import type { FormInstance, FormRules } from "element-plus";
-import type { IModalConfig, IObject } from "./types";
+import type { IComponentType, IModalConfig, IObject } from "./types";
 import InputTag from "@/components/InputTag/index.vue";
 import IconSelect from "@/components/IconSelect/index.vue";
 
+defineSlots<{ [key: string]: (_args: any) => any }>();
 // 定义接收的属性
 const props = defineProps<{ modalConfig: IModalConfig }>();
 // 自定义事件
-const emit = defineEmits<{ submitClick: [] }>();
+const emit = defineEmits<{ submitClick: []; customSubmit: [queryParams: IObject] }>();
 // 组件映射表
 /* eslint-disable */
-const componentMap = new Map([
+const componentMap = new Map<IComponentType, any>([
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
   ["select", markRaw(ElSelect)], // @ts-ignore
@@ -160,7 +164,7 @@ const componentMap = new Map([
   ["icon-select", markRaw(IconSelect)], // @ts-ignore"
   ["custom", ""],
 ]);
-const childrenMap = new Map([
+const childrenMap = new Map<IComponentType, any>([
   // @ts-ignore
   ["select", markRaw(ElOption)], // @ts-ignore
   ["radio", markRaw(ElRadio)], // @ts-ignore"
@@ -168,13 +172,13 @@ const childrenMap = new Map([
 ]);
 /* eslint-enable */
 
-const pk = props.modalConfig.pk ?? "id";
-const modalVisible = ref(false);
-const formRef = ref<FormInstance>();
-const formItems = reactive(props.modalConfig.formItems ?? []);
-const formData = reactive<IObject>({});
-const formRules: FormRules = {};
-const formDisable = ref(false);
+const pk = props.modalConfig.pk ?? "id"; // 主键名，用于表单数据处理
+const modalVisible = ref(false); // 弹窗显示状态
+const formRef = ref<FormInstance>(); // 表单实例
+const formItems = reactive(props.modalConfig.formItems ?? []); // 表单配置项
+const formData = reactive<IObject>({}); // 表单数据
+const formRules: FormRules = {}; // 表单验证规则
+const formDisable = ref(false); // 表单禁用状态
 
 // 获取tooltip提示框属性
 const getTooltipProps = (tips: string | IObject) => {
@@ -204,17 +208,16 @@ const handleSubmit = useThrottleFn(() => {
       props.modalConfig.beforeSubmit(formData);
     }
     if (!props.modalConfig?.formAction) {
-      ElMessage.error("未配置exportAction");
+      emit("customSubmit", formData);
+      handleClose();
       return;
     }
     props.modalConfig.formAction(formData).then(() => {
-      let msg = "操作成功";
       if (props.modalConfig.component === "drawer") {
-        msg = `${props.modalConfig.drawer?.title}成功`;
+        ElMessage.success(`${props.modalConfig.drawer?.title}成功`);
       } else {
-        msg = `${props.modalConfig.dialog?.title}成功`;
+        ElMessage.success(`${props.modalConfig.dialog?.title}成功`);
       }
-      ElMessage.success(msg);
       emit("submitClick");
       handleClose();
     });
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index a9da104a..781f6063 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -13,11 +13,11 @@ export type PageFormInstance = InstanceType<typeof PageForm>;
 
 export type IObject = Record<string, any>;
 
-type DataComponent = "date-picker" | "time-picker" | "time-select" | "custom-tag" | "input-tag";
+type DateComponent = "date-picker" | "time-picker" | "time-select" | "custom-tag" | "input-tag";
 type InputComponent = "input" | "select" | "input-number" | "cascader" | "tree-select";
 type OtherComponent = "text" | "radio" | "checkbox" | "switch" | "icon-select" | "custom";
-export type ISearchComponent = DataComponent | InputComponent;
-export type IComponentType = DataComponent | InputComponent | OtherComponent;
+export type ISearchComponent = DateComponent | InputComponent;
+export type IComponentType = DateComponent | InputComponent | OtherComponent;
 
 type ToolbarLeft = "add" | "delete" | "import" | "export";
 type ToolbarRight = "refresh" | "filter" | "imports" | "exports" | "search";
@@ -44,26 +44,7 @@ export interface ISearchConfig {
   // 标签冒号(默认：false)
   colon?: boolean;
   // 表单项(默认：[])
-  formItems?: Array<{
-    // 组件类型(如input,select等)
-    type?: ISearchComponent;
-    // 标签文本
-    label?: string;
-    // 标签提示
-    tips?: string | IObject;
-    // 键名
-    prop: string;
-    // 组件属性(input-tag组件支持join,btnText,size属性)
-    attrs?: IObject;
-    // 初始值
-    initialValue?: any;
-    // 可选项(适用于select组件)
-    options?: Array<{ label: string; value: any }>;
-    // 组件事件
-    events?: Record<string, (...args: any) => void>;
-    // 初始化数据函数扩展
-    initFn?: (formItem: IObject) => void;
-  }>;
+  formItems?: IFormItems;
   // 是否开启展开和收缩(默认：true)
   isExpandable?: boolean;
   // 默认展示的表单项数量(默认：3)
@@ -199,36 +180,36 @@ export interface IModalConfig<T = any> {
   // 提交之前处理
   beforeSubmit?: (data: T) => void;
   // 提交的网络请求函数(需返回promise)
-  formAction: (data: T) => Promise<any>;
+  formAction?: (data: T) => Promise<any>;
 }
 
 export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
 
 // 表单项
 export type IFormItems = Array<{
-  // 组件类型(如input,select,radio,custom等，默认input)
+  // 组件类型(如input,select,radio,custom等)
   type: IComponentType;
+  // 标签提示
+  tips?: string | IObject;
+  // 标签文本
+  label: string;
+  // 键名
+  prop: string;
   // 组件属性
   attrs?: IObject;
-  // 组件可选项(适用于select,radio,checkbox组件)
+  // 组件可选项(只适用于select,radio,checkbox组件)
   options?: Array<{
     label: string;
     value: any;
     disabled?: boolean;
     [key: string]: any;
   }>;
-  // 插槽名(适用于组件类型为custom)
-  slotName?: string;
-  // 标签文本
-  label: string;
-  // 标签提示
-  tips?: string | IObject;
-  // 键名
-  prop: string;
   // 验证规则
   rules?: FormItemRule[];
   // 初始值
   initialValue?: any;
+  // 插槽名(适用于自定义组件，设置类型为custom)
+  slotName?: string;
   // 是否隐藏
   hidden?: boolean;
   // layout组件Col属性
diff --git a/src/components/CURD/usePage.ts b/src/components/CURD/usePage.ts
index b5f6c557..95ee9db0 100644
--- a/src/components/CURD/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -18,23 +18,50 @@ function usePage() {
     contentRef.value?.fetchPageData({ ...queryParams, ...filterParams }, true);
   }
   // 新增
-  function handleAddClick() {
-    //显示添加表单
-    addModalRef.value?.setModalVisible();
+  function handleAddClick(RefImpl?: Ref<PageContentInstance>) {
+    if (RefImpl) {
+      RefImpl?.value.setModalVisible();
+      RefImpl?.value.handleDisabled(false);
+    } else {
+      addModalRef.value?.setModalVisible();
+      addModalRef.value?.handleDisabled(false);
+    }
   }
   // 编辑
-  async function handleEditClick(row: IObject, callback?: (result?: IObject) => IObject) {
-    editModalRef.value?.setModalVisible();
-    editModalRef.value?.handleDisabled(false);
-    let from = await (callback?.(row) ?? Promise.resolve(row));
-    editModalRef.value?.setFormData(from ? from : row);
+  async function handleEditClick(
+    row: IObject,
+    callback?: (result?: IObject) => IObject,
+    RefImpl?: Ref<PageContentInstance>
+  ) {
+    if (RefImpl) {
+      RefImpl.value?.setModalVisible();
+      RefImpl.value?.handleDisabled(false);
+      let from = await (callback?.(row) ?? Promise.resolve(row));
+      RefImpl.value?.setFormData(from ? from : row);
+    } else {
+      editModalRef.value?.setModalVisible();
+      editModalRef.value?.handleDisabled(false);
+      let from = await (callback?.(row) ?? Promise.resolve(row));
+      editModalRef.value?.setFormData(from ? from : row);
+    }
   }
-  // 编辑
-  async function handleViewClick(row: IObject, callback?: (result?: IObject) => IObject) {
-    editModalRef.value?.setModalVisible();
-    editModalRef.value?.handleDisabled(true);
-    let from = await (callback?.(row) ?? Promise.resolve(row));
-    editModalRef.value?.setFormData(from ? from : row);
+  // 查看
+  async function handleViewClick(
+    row: IObject,
+    callback?: (result?: IObject) => IObject,
+    RefImpl?: Ref<PageContentInstance>
+  ) {
+    if (RefImpl) {
+      RefImpl.value?.setModalVisible();
+      RefImpl.value?.handleDisabled(true);
+      let from = await (callback?.(row) ?? Promise.resolve(row));
+      RefImpl.value?.setFormData(from ? from : row);
+    } else {
+      editModalRef.value?.setModalVisible();
+      editModalRef.value?.handleDisabled(true);
+      let from = await (callback?.(row) ?? Promise.resolve(row));
+      editModalRef.value?.setFormData(from ? from : row);
+    }
   }
   // 表单提交
   function handleSubmitClick() {
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 65d91f7a..f3598bd8 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,5 +1,7 @@
 import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
+import DeptAPI from "@/api/system/dept.api";
+import RoleAPI from "@/api/system/role.api";
 
 const modalConfig: IModalConfig<UserForm> = {
   permPrefix: "sys:user",
@@ -45,7 +47,7 @@ const modalConfig: IModalConfig<UserForm> = {
     {
       label: "所属部门",
       prop: "deptId",
-      rules: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
+      rules: [{ required: true, message: "所属部门不能为空", trigger: "change" }],
       type: "tree-select",
       attrs: {
         placeholder: "请选择所属部门",
@@ -54,17 +56,22 @@ const modalConfig: IModalConfig<UserForm> = {
         "check-strictly": true,
         "render-after-expand": false,
       },
+      async initFn(formItem) {
+        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+        formItem.attrs.data = await DeptAPI.getOptions();
+      },
     },
     {
       type: "custom",
       label: "性别",
       prop: "gender",
       initialValue: 1,
+      attrs: { style: { width: "100%" } },
     },
     {
       label: "角色",
       prop: "roleIds",
-      rules: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+      rules: [{ required: true, message: "用户角色不能为空", trigger: "change" }],
       type: "select",
       attrs: {
         placeholder: "请选择",
@@ -72,6 +79,9 @@ const modalConfig: IModalConfig<UserForm> = {
       },
       options: [],
       initialValue: [],
+      async initFn(formItem) {
+        formItem.options = await RoleAPI.getOptions();
+      },
     },
     {
       type: "input",
@@ -115,6 +125,12 @@ const modalConfig: IModalConfig<UserForm> = {
       ],
       initialValue: 1,
     },
+    {
+      type: "custom",
+      label: "二级弹窗",
+      prop: "openModal",
+      slotName: "openModal",
+    },
   ],
 };
 
diff --git a/src/views/demo/curd/config/add2.ts b/src/views/demo/curd/config/add2.ts
new file mode 100644
index 00000000..aefe2797
--- /dev/null
+++ b/src/views/demo/curd/config/add2.ts
@@ -0,0 +1,59 @@
+import { type UserForm } from "@/api/system/user.api";
+import type { IModalConfig } from "@/components/CURD/types";
+import DeptAPI from "@/api/system/dept.api";
+
+const modalConfig: IModalConfig<UserForm> = {
+  colon: true,
+  dialog: {
+    title: "二级弹窗",
+    width: 500,
+    draggable: true,
+  },
+  form: {
+    labelWidth: "auto",
+    labelPosition: "top",
+  },
+  formItems: [
+    {
+      label: "用户名",
+      prop: "username",
+      rules: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: { placeholder: "请输入" },
+    },
+    {
+      label: "用户昵称",
+      prop: "nickname",
+      rules: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: { placeholder: "请输入" },
+    },
+    {
+      label: "所属部门",
+      prop: "deptId",
+      rules: [{ required: true, message: "所属部门不能为空", trigger: "change" }],
+      type: "tree-select",
+      attrs: {
+        placeholder: "请选择",
+        data: [],
+        filterable: true,
+        "check-strictly": true,
+        "render-after-expand": false,
+      },
+      async initFn(formItem) {
+        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+        formItem.attrs.data = await DeptAPI.getOptions();
+      },
+    },
+    {
+      type: "custom",
+      label: "性别",
+      prop: "gender",
+      initialValue: 1,
+      attrs: { style: { width: "100%" } },
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 0ceeb080..c6cecb09 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -57,7 +57,17 @@
         @submit-click="handleSubmitClick"
       >
         <template #gender="scope">
-          <Dict v-model="scope.formData[scope.prop]" code="gender" />
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+        </template>
+        <template #openModal>
+          <el-button type="primary" @click="openSecondModal">打开二级弹窗</el-button>
+        </template>
+      </page-modal>
+
+      <!-- 二级弹窗 -->
+      <page-modal ref="addModalRef2" :modal-config="addModalConfig2" @custom-click="secondSubmit">
+        <template #gender="scope">
+          <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
         </template>
       </page-modal>
 
@@ -104,9 +114,10 @@
 
 <script setup lang="ts">
 import UserAPI from "@/api/system/user.api";
-import type { IObject, IOperateData } from "@/components/CURD/types";
+import type { IObject, IOperateData, PageContentInstance } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
+import addModalConfig2 from "./config/add2";
 import contentConfig from "./config/content";
 import contentConfig2 from "./config/content2";
 import editModalConfig from "./config/edit";
@@ -121,7 +132,7 @@ const {
   editModalRef,
   handleQueryClick,
   handleResetClick,
-  // handleAddClick,
+  handleAddClick,
   handleEditClick,
   handleViewClick,
   handleSubmitClick,
@@ -130,12 +141,8 @@ const {
   handleFilterChange,
 } = usePage();
 
-// 新增
-async function handleAddClick() {
-  addModalRef.value?.setModalVisible();
-  // 加载下拉数据源，建议在初始化配置项 initFn 中加载，避免多次请求
-  // addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
-}
+const addModalRef2 = ref();
+
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);
@@ -162,25 +169,14 @@ const handleOperateClick = (data: IObject) => {
     ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
       confirmButtonText: "确定",
       cancelButtonText: "取消",
-    }).then(({ value }) => {
-      if (!value || value.length < 6) {
-        ElMessage.warning("密码至少需要6位字符，请重新输入");
-        return false;
-      }
-      UserAPI.resetPassword(data.row.id, value).then(() => {
-        ElMessage.success("密码重置成功，新密码是：" + value);
-      });
-    });
-  } else if (data.name === "delete") {
-    ElMessageBox.confirm("确认删除?", "警告", {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning",
     })
-      .then(function () {
-        UserAPI.deleteByIds(data.row.id).then(() => {
-          ElMessage.success("删除成功");
-          contentRef.value?.handleRefresh(true); // 刷新列表
+      .then(({ value }) => {
+        if (!value || value.length < 6) {
+          ElMessage.warning("密码至少需要6位字符，请重新输入");
+          return false;
+        }
+        UserAPI.resetPassword(data.row.id, value).then(() => {
+          ElMessage.success("密码重置成功，新密码是：" + value);
         });
       })
       .catch(() => {});
@@ -198,6 +194,14 @@ const handleOperateClick2 = (data: IOperateData) => {
   }
 };
 
+// 打开二级弹窗
+const openSecondModal = () => {
+  handleAddClick(addModalRef2 as Ref<PageContentInstance>);
+};
+const secondSubmit = () => {
+  ElMessage.success("二级弹窗提交成功");
+};
+
 // 切换示例
 const isA = ref(true);
 </script>

From 8b0354412009b864f39f1f0adbfeea55a47e661d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Mon, 21 Apr 2025 23:21:49 +0800
Subject: [PATCH 328/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8DCURD?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6eslint=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageSearch.vue |  4 ++--
 src/components/CURD/types.ts       | 10 +++++-----
 src/components/CURD/usePage.ts     |  6 +++---
 src/views/demo/curd/index.vue      |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 7d4c9d23..91499213 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -26,7 +26,7 @@
               v-on="item.events || {}"
             />
             <component
-              :is="componentMap.get(item?.type ?? 'input')"
+              :is="componentMap.get(item.type)"
               v-else
               v-model.trim="queryParams[item.prop]"
               v-bind="{ style: { width: '100%' }, ...item.attrs }"
@@ -71,7 +71,7 @@ const emit = defineEmits<{
   resetClick: [queryParams: IObject];
 }>();
 // 组件映射表
-const componentMap = new Map<ISearchComponent, Component>([
+const componentMap = new Map<ISearchComponent, any>([
   /* eslint-disable */
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 781f6063..375f06e8 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -44,7 +44,7 @@ export interface ISearchConfig {
   // 标签冒号(默认：false)
   colon?: boolean;
   // 表单项(默认：[])
-  formItems?: IFormItems;
+  formItems?: IFormItems<ISearchComponent>;
   // 是否开启展开和收缩(默认：true)
   isExpandable?: boolean;
   // 默认展示的表单项数量(默认：3)
@@ -176,7 +176,7 @@ export interface IModalConfig<T = any> {
   // form组件属性
   form?: IForm;
   // 表单项
-  formItems: IFormItems;
+  formItems: IFormItems<IComponentType>;
   // 提交之前处理
   beforeSubmit?: (data: T) => void;
   // 提交的网络请求函数(需返回promise)
@@ -186,9 +186,9 @@ export interface IModalConfig<T = any> {
 export type IForm = Partial<Omit<FormProps, "model" | "rules">>;
 
 // 表单项
-export type IFormItems = Array<{
+export type IFormItems<T = IComponentType> = Array<{
   // 组件类型(如input,select,radio,custom等)
-  type: IComponentType;
+  type: T;
   // 标签提示
   tips?: string | IObject;
   // 标签文本
@@ -226,5 +226,5 @@ export interface IPageForm {
   // form组件属性
   form?: IForm;
   // 表单项
-  formItems: IFormItems;
+  formItems: IFormItems<IComponentType>;
 }
diff --git a/src/components/CURD/usePage.ts b/src/components/CURD/usePage.ts
index 95ee9db0..dd2d7be3 100644
--- a/src/components/CURD/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -18,7 +18,7 @@ function usePage() {
     contentRef.value?.fetchPageData({ ...queryParams, ...filterParams }, true);
   }
   // 新增
-  function handleAddClick(RefImpl?: Ref<PageContentInstance>) {
+  function handleAddClick(RefImpl?: Ref<PageModalInstance>) {
     if (RefImpl) {
       RefImpl?.value.setModalVisible();
       RefImpl?.value.handleDisabled(false);
@@ -31,7 +31,7 @@ function usePage() {
   async function handleEditClick(
     row: IObject,
     callback?: (result?: IObject) => IObject,
-    RefImpl?: Ref<PageContentInstance>
+    RefImpl?: Ref<PageModalInstance>
   ) {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
@@ -49,7 +49,7 @@ function usePage() {
   async function handleViewClick(
     row: IObject,
     callback?: (result?: IObject) => IObject,
-    RefImpl?: Ref<PageContentInstance>
+    RefImpl?: Ref<PageModalInstance>
   ) {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index c6cecb09..46fa472a 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -114,7 +114,7 @@
 
 <script setup lang="ts">
 import UserAPI from "@/api/system/user.api";
-import type { IObject, IOperateData, PageContentInstance } from "@/components/CURD/types";
+import type { IObject, IOperateData, PageModalInstance } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
 import addModalConfig2 from "./config/add2";
@@ -196,7 +196,7 @@ const handleOperateClick2 = (data: IOperateData) => {
 
 // 打开二级弹窗
 const openSecondModal = () => {
-  handleAddClick(addModalRef2 as Ref<PageContentInstance>);
+  handleAddClick(addModalRef2 as Ref<PageModalInstance>);
 };
 const secondSubmit = () => {
   ElMessage.success("二级弹窗提交成功");

From 558914f913f862ff3a8e4e6d94994578bee396ba Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 21 Apr 2025 23:58:50 +0800
Subject: [PATCH 329/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20sty?=
 =?UTF-8?q?lelint=20=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TagsView/index.vue | 252 ++++++++++++++++-------
 1 file changed, 181 insertions(+), 71 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 4c8f6122..9e507abd 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div class="tags-container">
+    <!-- 水平滚动容器 -->
     <el-scrollbar class="scroll-container" :vertical="false" @wheel="handleScroll">
       <router-link
         v-for="tag in visitedViews"
@@ -10,18 +11,20 @@
         @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
         @contextmenu.prevent="openContentMenu(tag, $event)"
       >
-        {{ translateRouteTitle(tag.title) }}
-        <el-icon
+        <!-- 标签文本 -->
+        <span class="tag-text">{{ translateRouteTitle(tag.title) }}</span>
+        <!-- 关闭按钮，固定标签不显示 -->
+        <span
           v-if="!isAffix(tag)"
           class="tag-close-icon"
           @click.prevent.stop="closeSelectedTag(tag)"
         >
-          <Close />
-        </el-icon>
+          ×
+        </span>
       </router-link>
     </el-scrollbar>
 
-    <!-- tag标签操作菜单 -->
+    <!-- 标签右键菜单 -->
     <ul
       v-show="contentMenuVisible"
       class="contextmenu"
@@ -62,18 +65,22 @@ import { translateRouteTitle } from "@/utils/i18n";
 
 import { usePermissionStore, useTagsViewStore, useSettingsStore, useAppStore } from "@/store";
 
-const { proxy } = getCurrentInstance()!;
+const instance = getCurrentInstance();
+const proxy = instance?.proxy;
 const router = useRouter();
 const route = useRoute();
 
+// 权限、标签页状态管理
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
 const appStore = useAppStore();
 
+// 响应式引用访问已访问的标签视图列表
 const { visitedViews } = storeToRefs(tagsViewStore);
 const settingsStore = useSettingsStore();
 const layout = computed(() => settingsStore.layout);
 
+// 当前选中的标签
 const selectedTag = ref<TagView>({
   path: "",
   fullPath: "",
@@ -83,10 +90,13 @@ const selectedTag = ref<TagView>({
   keepAlive: false,
 });
 
+// 固定标签列表
 const affixTags = ref<TagView[]>([]);
+// 右键菜单位置
 const left = ref(0);
 const top = ref(0);
 
+// 监听路由变化，添加标签并移动到当前标签位置
 watch(
   route,
   () => {
@@ -94,11 +104,13 @@ watch(
     moveToCurrentTag();
   },
   {
-    immediate: true, //初始化立即执行
+    immediate: true, // 初始化立即执行
   }
 );
 
-const contentMenuVisible = ref(false); // 右键菜单是否显示
+// 右键菜单显示状态
+const contentMenuVisible = ref(false);
+// 监听右键菜单显示状态，添加或移除点击事件监听器
 watch(contentMenuVisible, (value) => {
   if (value) {
     document.body.addEventListener("click", closeContentMenu);
@@ -109,11 +121,15 @@ watch(contentMenuVisible, (value) => {
 
 /**
  * 过滤出需要固定的标签
+ * @param routes 路由配置
+ * @param basePath 基础路径
+ * @returns 固定标签列表
  */
 function filterAffixTags(routes: RouteRecordRaw[], basePath = "/") {
   let tags: TagView[] = [];
   routes.forEach((route: RouteRecordRaw) => {
     const tagPath = resolve(basePath, route.path);
+    // 当路由设置了meta.affix属性时，加入固定标签列表
     if (route.meta?.affix) {
       tags.push({
         path: tagPath,
@@ -124,6 +140,7 @@ function filterAffixTags(routes: RouteRecordRaw[], basePath = "/") {
         keepAlive: route.meta?.keepAlive,
       });
     }
+    // 递归处理子路由
     if (route.children) {
       const tempTags = filterAffixTags(route.children, basePath + route.path);
       if (tempTags.length >= 1) {
@@ -134,17 +151,23 @@ function filterAffixTags(routes: RouteRecordRaw[], basePath = "/") {
   return tags;
 }
 
+/**
+ * 初始化标签列表，添加需要固定的标签
+ */
 function initTags() {
   const tags: TagView[] = filterAffixTags(permissionStore.routes);
   affixTags.value = tags;
   for (const tag of tags) {
-    // Must have tag name
+    // 必须有标签名称才添加
     if (tag.name) {
       tagsViewStore.addVisitedView(tag);
     }
   }
 }
 
+/**
+ * 添加当前路由到标签列表
+ */
 function addTags() {
   if (route.meta.title) {
     tagsViewStore.addView({
@@ -159,13 +182,15 @@ function addTags() {
   }
 }
 
+/**
+ * the purpose of this function is make sure to move the current active tag into the view
+ */
 function moveToCurrentTag() {
-  // 使用 nextTick() 的目的是确保在更新 tagsView 组件之前，scrollPaneRef 对象已经滚动到了正确的位置。
+  // 使用 nextTick() 确保在更新 tagsView 组件之前滚动到正确位置
   nextTick(() => {
     for (const tag of visitedViews.value) {
       if (tag.path === route.path) {
-        // when query is different then update
-        // route.query = { ...route.query, ...tag.query };
+        // 当查询参数不同时更新标签
         if (tag.fullPath !== route.fullPath) {
           tagsViewStore.updateVisitedView({
             name: route.name as string,
@@ -182,10 +207,19 @@ function moveToCurrentTag() {
   });
 }
 
+/**
+ * 判断标签是否为固定标签
+ * @param tag 标签对象
+ * @returns 是否为固定标签
+ */
 function isAffix(tag: TagView) {
   return tag?.affix;
 }
 
+/**
+ * 判断选中的标签是否为第一个可见标签
+ * @returns 是否为第一个可见标签
+ */
 function isFirstView() {
   return (
     selectedTag.value.path === "/dashboard" ||
@@ -193,6 +227,10 @@ function isFirstView() {
   );
 }
 
+/**
+ * 判断选中的标签是否为最后一个可见标签
+ * @returns 是否为最后一个可见标签
+ */
 function isLastView() {
   return (
     selectedTag.value.fullPath ===
@@ -200,6 +238,10 @@ function isLastView() {
   );
 }
 
+/**
+ * 刷新选中的标签页
+ * @param view 标签对象
+ */
 function refreshSelectedTag(view: TagView) {
   tagsViewStore.delCachedView(view);
   const { fullPath } = view;
@@ -208,6 +250,10 @@ function refreshSelectedTag(view: TagView) {
   });
 }
 
+/**
+ * 关闭选中的标签页
+ * @param view 标签对象
+ */
 function closeSelectedTag(view: TagView) {
   tagsViewStore.delView(view).then((res: any) => {
     if (tagsViewStore.isActive(view)) {
@@ -216,6 +262,9 @@ function closeSelectedTag(view: TagView) {
   });
 }
 
+/**
+ * 关闭选中标签左侧的所有标签
+ */
 function closeLeftTags() {
   tagsViewStore.delLeftViews(selectedTag.value).then((res: any) => {
     if (!res.visitedViews.find((item: any) => item.path === route.path)) {
@@ -223,6 +272,10 @@ function closeLeftTags() {
     }
   });
 }
+
+/**
+ * 关闭选中标签右侧的所有标签
+ */
 function closeRightTags() {
   tagsViewStore.delRightViews(selectedTag.value).then((res: any) => {
     if (!res.visitedViews.find((item: any) => item.path === route.path)) {
@@ -231,6 +284,9 @@ function closeRightTags() {
   });
 }
 
+/**
+ * 关闭除选中标签外的所有标签
+ */
 function closeOtherTags() {
   router.push(selectedTag.value);
   tagsViewStore.delOtherViews(selectedTag.value).then(() => {
@@ -238,6 +294,10 @@ function closeOtherTags() {
   });
 }
 
+/**
+ * 关闭所有标签
+ * @param view 标签对象
+ */
 function closeAllTags(view: TagView) {
   tagsViewStore.delAllViews().then((res: any) => {
     tagsViewStore.toLastView(res.visitedViews, view);
@@ -246,19 +306,21 @@ function closeAllTags(view: TagView) {
 
 /**
  * 打开右键菜单
+ * @param tag 标签对象
+ * @param e 鼠标事件
  */
 function openContentMenu(tag: TagView, e: MouseEvent) {
   const menuMinWidth = 105;
+  const offsetLeft = proxy?.$el.getBoundingClientRect().left; // 容器左边距
+  const offsetWidth = proxy?.$el.offsetWidth; // 容器宽度
+  const maxLeft = offsetWidth - menuMinWidth; // 左边界
+  const leftPosition = e.clientX - offsetLeft + 15; // 15: 右边距
 
-  const offsetLeft = proxy?.$el.getBoundingClientRect().left; // container margin left
-  const offsetWidth = proxy?.$el.offsetWidth; // container width
-  const maxLeft = offsetWidth - menuMinWidth; // left boundary
-  const l = e.clientX - offsetLeft + 15; // 15: margin right
-
-  if (l > maxLeft) {
+  // 确保菜单不超出容器右边界
+  if (leftPosition > maxLeft) {
     left.value = maxLeft;
   } else {
-    left.value = l;
+    left.value = leftPosition;
   }
 
   // 混合模式下，需要减去顶部菜单(fixed)的高度
@@ -280,12 +342,18 @@ function closeContentMenu() {
 }
 
 /**
- * 滚动事件
+ * 处理鼠标滚轮事件，实现水平滚动
  */
 function handleScroll() {
   closeContentMenu();
 }
 
+/**
+ * 寻找最外层父节点
+ * @param tree 路由树
+ * @param findName 要查找的节点名称
+ * @returns 最外层父节点
+ */
 function findOutermostParent(tree: any[], findName: string) {
   let parentMap: any = {};
 
@@ -314,6 +382,10 @@ function findOutermostParent(tree: any[], findName: string) {
   return null;
 }
 
+/**
+ * 重新激活顶部菜单
+ * @param newVal 新的路由名
+ */
 const againActiveTop = (newVal: string) => {
   if (layout.value !== "mix") return;
   const parent = findOutermostParent(permissionStore.routes, newVal);
@@ -321,6 +393,7 @@ const againActiveTop = (newVal: string) => {
     appStore.activeTopMenu(parent.path);
   }
 };
+
 // 如果是混合模式，更改selectedTag，需要对应高亮的activeTop
 watch(
   () => route.name,
@@ -333,6 +406,8 @@ watch(
     deep: true,
   }
 );
+
+// 组件挂载时初始化标签
 onMounted(() => {
   initTags();
 });
@@ -341,94 +416,129 @@ onMounted(() => {
 <style lang="scss" scoped>
 .tags-container {
   width: 100%;
-  height: $tags-view-height;
+  height: 34px;
   background-color: var(--el-bg-color);
   border: 1px solid var(--el-border-color-light);
   box-shadow: 0 1px 1px var(--el-box-shadow-light);
 
-  .tags-item {
-    display: inline-block;
-    padding: 3px 8px;
-    margin: 4px 0 0 5px;
-    font-size: 12px;
-    cursor: pointer;
-    border: 1px solid var(--el-border-color-light);
+  /* 滚动容器样式 */
+  .scroll-container {
+    position: relative;
+    width: 100%;
+    height: 100%;
+    overflow: hidden;
+    white-space: nowrap;
 
-    &:hover {
-      color: var(--el-color-primary);
+    :deep(.el-scrollbar__bar) {
+      bottom: 0px;
     }
 
+    :deep(.el-scrollbar__wrap) {
+      height: 49px;
+    }
+  }
+
+  /* 标签项样式 */
+  .tags-item {
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    height: 26px;
+    padding: 0 8px;
+    margin-top: 4px;
+    margin-left: 5px;
+    font-size: 12px;
+    line-height: 26px;
+    color: var(--el-text-color-primary);
+    background: var(--el-bg-color);
+    border: 1px solid var(--el-border-color);
+
+    /* 第一个和最后一个标签的边距调整 */
     &:first-of-type {
       margin-left: 15px;
     }
-
     &:last-of-type {
       margin-right: 15px;
     }
 
+    /* 标签文本样式 */
+    .tag-text {
+      display: inline-block;
+      vertical-align: middle;
+    }
+
+    /* 关闭按钮样式 */
     .tag-close-icon {
-      vertical-align: -0.15em;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      width: 16px;
+      height: 16px;
+      margin-left: 5px;
+      font-size: 12px;
+      font-weight: bold;
+      color: var(--el-text-color-secondary);
       cursor: pointer;
       border-radius: 50%;
+      transition: all 0.2s ease;
 
       &:hover {
-        color: #fff;
-        background-color: var(--el-color-primary);
+        color: var(--el-color-white);
+        background-color: var(--el-text-color-placeholder);
       }
     }
 
+    /* 活动标签样式 */
     &.active {
-      color: #fff;
+      color: var(--el-color-white);
       background-color: var(--el-color-primary);
-
+      border-color: var(--el-color-primary);
       &::before {
+        position: relative;
         display: inline-block;
         width: 8px;
         height: 8px;
-        margin-right: 5px;
+        margin-right: 2px;
         content: "";
-        background: #fff;
+        background: var(--el-color-white);
         border-radius: 50%;
       }
 
-      .tag-close-icon:hover {
-        color: var(--el-color-primary);
-        background-color: var(--el-fill-color-light);
+      /* 活动标签关闭按钮样式 */
+      .tag-close-icon {
+        color: var(--el-color-white);
+
+        &:hover {
+          color: var(--el-color-white);
+          background-color: rgba(255, 255, 255, 0.3);
+        }
       }
     }
   }
-}
-
-.contextmenu {
-  position: absolute;
-  z-index: 99;
-  font-size: 12px;
-  background: var(--el-bg-color-overlay);
-  border-radius: 4px;
-  box-shadow: var(--el-box-shadow-light);
-
-  li {
-    padding: 8px 16px;
-    cursor: pointer;
 
-    &:hover {
-      background: var(--el-fill-color-light);
+  /* 右键菜单样式 */
+  .contextmenu {
+    position: absolute;
+    z-index: 3000;
+    padding: 5px 0;
+    margin: 0;
+    font-size: 12px;
+    font-weight: 400;
+    color: var(--el-text-color-primary);
+    list-style-type: none;
+    background: var(--el-bg-color);
+    border-radius: 4px;
+    box-shadow: var(--el-box-shadow-light);
+
+    /* 菜单项样式 */
+    li {
+      padding: 7px 16px;
+      margin: 0;
+      cursor: pointer;
+      &:hover {
+        background: var(--el-fill-color-light);
+      }
     }
   }
 }
-
-.scroll-container {
-  position: relative;
-  width: 100%;
-  overflow: hidden;
-  white-space: nowrap;
-
-  .el-scrollbar__bar {
-    bottom: 0;
-  }
-
-  .el-scrollbar__wrap {
-    height: 49px;
-  }
-}
 </style>

From f7972a0c029915102a9140434e6ba43d8bfd6e25 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 22 Apr 2025 00:00:23 +0800
Subject: [PATCH 330/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20console.log=20=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dict/DictLabel.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index b68ee155..4cf23ea3 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -44,7 +44,6 @@ const getLabelAndTagByValue = async (dictCode: string, value: any) => {
  * 更新 label 和 tagType
  */
 const updateLabelAndTag = async () => {
-  console.log("updateLabelAndTag", props.code, props.modelValue);
   if (!props.code || props.modelValue === undefined) return;
   const { label: newLabel, tagType: newTagType } = await getLabelAndTagByValue(
     props.code,

From ddaba8232274c185246e7423ddd56e3fedf46e52 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 22 Apr 2025 00:18:24 +0800
Subject: [PATCH 331/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=BE=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/TagsView/index.vue | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 9e507abd..1966873e 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -416,28 +416,11 @@ onMounted(() => {
 <style lang="scss" scoped>
 .tags-container {
   width: 100%;
-  height: 34px;
+  height: $tags-view-height;
   background-color: var(--el-bg-color);
   border: 1px solid var(--el-border-color-light);
   box-shadow: 0 1px 1px var(--el-box-shadow-light);
 
-  /* 滚动容器样式 */
-  .scroll-container {
-    position: relative;
-    width: 100%;
-    height: 100%;
-    overflow: hidden;
-    white-space: nowrap;
-
-    :deep(.el-scrollbar__bar) {
-      bottom: 0px;
-    }
-
-    :deep(.el-scrollbar__wrap) {
-      height: 49px;
-    }
-  }
-
   /* 标签项样式 */
   .tags-item {
     position: relative;

From cad57b3dc0028d25f5e7d83823ed362a71ec07ba Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 22 Apr 2025 00:27:03 +0800
Subject: [PATCH 332/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/package.json b/package.json
index dd026262..fd5513df 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
-    "@stomp/stompjs": "^7.1.0",
+    "@stomp/stompjs": "^7.1.1",
     "@vueuse/core": "^12.8.2",
     "@wangeditor-next/editor": "^5.6.34",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
@@ -56,51 +56,51 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.7",
+    "element-plus": "^2.9.8",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^8.2.0",
-    "pinia": "^3.0.1",
+    "pinia": "^3.0.2",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.2",
+    "vue-i18n": "^11.1.3",
     "vue-router": "^4.5.0"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.0",
     "@commitlint/config-conventional": "^19.8.0",
-    "@eslint/js": "^9.23.0",
+    "@eslint/js": "^9.25.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.13.11",
+    "@types/node": "^22.14.1",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.27.0",
-    "@typescript-eslint/parser": "^8.27.0",
+    "@typescript-eslint/eslint-plugin": "^8.30.1",
+    "@typescript-eslint/parser": "^8.30.1",
     "@vitejs/plugin-vue": "^5.2.3",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.1",
-    "eslint": "^9.23.0",
-    "eslint-config-prettier": "^10.1.1",
-    "eslint-plugin-prettier": "^5.2.3",
+    "eslint": "^9.25.0",
+    "eslint-config-prettier": "^10.1.2",
+    "eslint-plugin-prettier": "^5.2.6",
     "eslint-plugin-vue": "^10.0.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.0",
+    "lint-staged": "^15.5.1",
     "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.5.3",
-    "sass": "^1.86.0",
-    "stylelint": "^16.16.0",
+    "sass": "^1.86.3",
+    "stylelint": "^16.18.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -108,14 +108,14 @@
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.39.0",
-    "typescript": "^5.8.2",
-    "typescript-eslint": "^8.27.0",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.30.1",
     "unocss": "65.4.3",
-    "unplugin-auto-import": "^19.1.1",
-    "unplugin-vue-components": "^28.4.1",
-    "vite": "^6.2.2",
-    "vite-plugin-mock-dev-server": "^1.8.4",
-    "vue-eslint-parser": "^10.1.1",
+    "unplugin-auto-import": "^19.1.2",
+    "unplugin-vue-components": "^28.5.0",
+    "vite": "^6.3.2",
+    "vite-plugin-mock-dev-server": "^1.8.5",
+    "vue-eslint-parser": "^10.1.3",
     "vue-tsc": "^2.2.8"
   },
   "engines": {

From fe295bcbba9e00624f695f23164baa3c13ba4325 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Tue, 22 Apr 2025 21:19:36 +0800
Subject: [PATCH 333/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=9C=AA=E4=BD=BF=E7=94=A8=E7=9A=84pageForm=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageForm.vue | 155 -------------------------------
 src/components/CURD/types.ts     |   2 -
 src/types/components.d.ts        |   1 -
 src/views/demo/curd/index.vue    |   5 +-
 4 files changed, 3 insertions(+), 160 deletions(-)
 delete mode 100644 src/components/CURD/PageForm.vue

diff --git a/src/components/CURD/PageForm.vue b/src/components/CURD/PageForm.vue
deleted file mode 100644
index d879d899..00000000
--- a/src/components/CURD/PageForm.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<template>
-  <el-form ref="formRef" label-width="auto" v-bind="form" :model="formData" :rules="formRules">
-    <el-row :gutter="20">
-      <template v-for="item in formItems" :key="item.prop">
-        <el-col v-show="!item.hidden" v-bind="item.col">
-          <el-form-item :label="item.label" :prop="item.prop">
-            <!-- Label -->
-            <template #label>
-              <span class="flex-y-center">
-                {{ item?.label || "" }}
-                <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
-                  <QuestionFilled class="w-4 h-4 mx-1" />
-                </el-tooltip>
-              </span>
-            </template>
-
-            <!-- Input 输入框 -->
-            <template v-if="item.type === 'input' || item.type === undefined">
-              <el-input v-model="formData[item.prop]" v-bind="item.attrs" />
-            </template>
-            <!-- Select 选择器 -->
-            <template v-else-if="item.type === 'select'">
-              <el-select v-model="formData[item.prop]" v-bind="item.attrs">
-                <template v-for="option in item.options" :key="option.value">
-                  <el-option v-bind="option" />
-                </template>
-              </el-select>
-            </template>
-            <!-- Radio 单选框 -->
-            <template v-else-if="item.type === 'radio'">
-              <el-radio-group v-model="formData[item.prop]" v-bind="item.attrs">
-                <template v-for="option in item.options" :key="option.value">
-                  <el-radio v-bind="option" />
-                </template>
-              </el-radio-group>
-            </template>
-            <!-- Checkbox 多选框 -->
-            <template v-else-if="item.type === 'checkbox'">
-              <el-checkbox-group v-model="formData[item.prop]" v-bind="item.attrs">
-                <template v-for="option in item.options" :key="option.value">
-                  <el-checkbox v-bind="option" />
-                </template>
-              </el-checkbox-group>
-            </template>
-            <!-- Input Number 数字输入框 -->
-            <template v-else-if="item.type === 'input-number'">
-              <el-input-number v-model="formData[item.prop]" v-bind="item.attrs" />
-            </template>
-            <!-- TreeSelect 树形选择 -->
-            <template v-else-if="item.type === 'tree-select'">
-              <el-tree-select v-model="formData[item.prop]" v-bind="item.attrs" />
-            </template>
-            <!-- DatePicker 日期选择器 -->
-            <template v-else-if="item.type === 'date-picker'">
-              <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
-            </template>
-            <!-- Text 文本 -->
-            <template v-else-if="item.type === 'text'">
-              <el-text v-bind="item.attrs">{{ formData[item.prop] }}</el-text>
-            </template>
-            <!-- 自定义 -->
-            <template v-else-if="item.type === 'custom'">
-              <slot
-                :name="item.slotName ?? item.prop"
-                :prop="item.prop"
-                :form-data="formData"
-                :attrs="item.attrs"
-              />
-            </template>
-          </el-form-item>
-        </el-col>
-      </template>
-    </el-row>
-  </el-form>
-</template>
-
-<script setup lang="ts">
-import type { FormInstance, FormRules } from "element-plus";
-import { reactive, ref, watch, watchEffect } from "vue";
-import { IObject, IPageForm } from "./types";
-
-// 定义接收的属性
-const props = withDefaults(defineProps<IPageForm>(), {
-  pk: "id",
-});
-
-const formRef = ref<FormInstance>();
-const formItems = reactive<any>(props.formItems);
-const formData = reactive<IObject>({});
-const formRules: FormRules = {};
-const prepareFuncs = [];
-for (const item of formItems) {
-  item.initFn && item.initFn(item);
-  formData[item.prop] = item.initialValue ?? "";
-  formRules[item.prop] = item.rules ?? [];
-
-  if (item.watch !== undefined) {
-    prepareFuncs.push(() => {
-      watch(
-        () => formData[item.prop],
-        (newValue, oldValue) => {
-          item.watch && item.watch(newValue, oldValue, formData, formItems);
-        }
-      );
-    });
-  }
-
-  if (item.computed !== undefined) {
-    prepareFuncs.push(() => {
-      watchEffect(() => {
-        item.computed && (formData[item.prop] = item.computed(formData));
-      });
-    });
-  }
-
-  if (item.watchEffect !== undefined) {
-    prepareFuncs.push(() => {
-      watchEffect(() => {
-        item.watchEffect && item.watchEffect(formData);
-      });
-    });
-  }
-}
-prepareFuncs.forEach((func) => func());
-
-// 获取表单数据
-function getFormData(key?: string) {
-  return key === undefined ? formData : (formData[key] ?? undefined);
-}
-
-// 设置表单值
-function setFormData(data: IObject) {
-  for (const key in formData) {
-    if (Object.prototype.hasOwnProperty.call(formData, key) && key in data) {
-      formData[key] = data[key];
-    }
-  }
-  if (Object.prototype.hasOwnProperty.call(data, props.pk)) {
-    formData[props.pk] = data[props.pk];
-  }
-}
-
-// 设置表单项值
-function setFormItemData(key: string, value: any) {
-  formData[key] = value;
-}
-
-// 获取tooltip提示框属性
-const getTooltipProps = (tips: string | IObject) => {
-  return typeof tips === "string" ? { content: tips } : tips;
-};
-
-// 暴露的属性和方法
-defineExpose({ formRef, getFormData, setFormData, setFormItemData });
-</script>
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 375f06e8..12ae896c 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -1,7 +1,6 @@
 import type { DialogProps, DrawerProps, FormItemRule, PaginationProps } from "element-plus";
 import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "element-plus";
 import type PageContent from "./PageContent.vue";
-import type PageForm from "./PageForm.vue";
 import type PageModal from "./PageModal.vue";
 import type PageSearch from "./PageSearch.vue";
 import { CSSProperties } from "vue";
@@ -9,7 +8,6 @@ import { CSSProperties } from "vue";
 export type PageSearchInstance = InstanceType<typeof PageSearch>;
 export type PageContentInstance = InstanceType<typeof PageContent>;
 export type PageModalInstance = InstanceType<typeof PageModal>;
-export type PageFormInstance = InstanceType<typeof PageForm>;
 
 export type IObject = Record<string, any>;
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 4b31280f..6347a7f0 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -76,7 +76,6 @@ declare module "vue" {
     NoticeDropdown: (typeof import("./../components/Notice/NoticeDropdown.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
-    PageForm: (typeof import("./../components/CURD/PageForm.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];
     PageSearch: (typeof import("./../components/CURD/PageSearch.vue"))["default"];
     Pagination: (typeof import("./../components/Pagination/index.vue"))["default"];
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 46fa472a..cc35325b 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -65,7 +65,7 @@
       </page-modal>
 
       <!-- 二级弹窗 -->
-      <page-modal ref="addModalRef2" :modal-config="addModalConfig2" @custom-click="secondSubmit">
+      <page-modal ref="addModalRef2" :modal-config="addModalConfig2" @custom-submit="secondSubmit">
         <template #gender="scope">
           <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
         </template>
@@ -198,7 +198,8 @@ const handleOperateClick2 = (data: IOperateData) => {
 const openSecondModal = () => {
   handleAddClick(addModalRef2 as Ref<PageModalInstance>);
 };
-const secondSubmit = () => {
+const secondSubmit = (formData: any) => {
+  console.log("secondSubmit", formData);
   ElMessage.success("二级弹窗提交成功");
 };
 

From 2899e13ecde2f575475055712472fdf436b1833c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Tue, 22 Apr 2025 23:02:46 +0800
Subject: [PATCH 334/497] =?UTF-8?q?feat:=20:sparkles:=20pageContent?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E5=88=86=E9=A1=B5=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue | 16 +++++++++++-----
 src/components/CURD/PageSearch.vue  |  4 ++--
 src/views/demo/curd/index.vue       |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 68e01afb..9b421e24 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -1,5 +1,7 @@
 <template>
-  <el-card shadow="never">
+  <div
+    class="rounded bg-[var(--el-bg-color)] border border-[var(--el-border-color)] p-5 h-full md:flex flex-1 flex-col md:overflow-auto"
+  >
     <!-- 表格工具栏 -->
     <div class="flex flex-col md:flex-row justify-between gap-y-2.5 mb-2.5">
       <!-- 左侧工具栏 -->
@@ -37,6 +39,7 @@
         </template>
       </div>
     </div>
+
     <!-- 列表 -->
     <el-table
       ref="tableRef"
@@ -44,6 +47,7 @@
       v-bind="contentConfig.table"
       :data="pageData"
       :row-key="pk"
+      class="flex-1"
       @selection-change="handleSelectionChange"
       @filter-change="handleFilterChange"
     >
@@ -180,16 +184,18 @@
         </el-table-column>
       </template>
     </el-table>
+
     <!-- 分页 -->
-    <template v-if="showPagination">
-      <el-scrollbar :class="['mt-3', { 'flex-x-end': contentConfig?.pagePosition === 'right' }]">
+    <div v-if="showPagination" class="mt-4">
+      <el-scrollbar :class="['h-8!', { 'flex-x-end': contentConfig?.pagePosition === 'right' }]">
         <el-pagination
           v-bind="pagination"
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
         />
       </el-scrollbar>
-    </template>
+    </div>
+
     <!-- 导出弹窗 -->
     <el-dialog
       v-model="exportsModalVisible"
@@ -314,7 +320,7 @@
         </div>
       </template>
     </el-dialog>
-  </el-card>
+  </div>
 </template>
 
 <script setup lang="ts">
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 91499213..4743565a 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-show="visible" v-bind="{ style: { 'margin-bottom': '12px' }, ...cardAttrs }">
+  <div v-show="visible">
     <el-card v-bind="cardAttrs">
       <el-form ref="queryFormRef" :model="queryParams" v-bind="formAttrs" :class="isGrid">
         <template v-for="(item, index) in formItems" :key="item.prop">
@@ -105,7 +105,7 @@ const showNumber = computed(() =>
 );
 // 卡片组件自定义属性（阴影、自定义边距样式等）
 const cardAttrs = computed<IObject>(() => {
-  return { shadow: "never", ...props.searchConfig?.cardAttrs };
+  return { shadow: "never", style: { "margin-bottom": "12px" }, ...props.searchConfig?.cardAttrs };
 });
 // 表单组件自定义属性（label位置、宽度、对齐方式等）
 const formAttrs = computed<IForm>(() => {
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index cc35325b..2201d158 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container h-full flex flex-1 flex-col">
     <div class="flex-x-between mb-10">
       <el-link
         href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/curd/index.vue"

From 0ab21ab02ceee93aa52974009705bfed4e93c3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Thu, 24 Apr 2025 00:18:42 +0800
Subject: [PATCH 335/497] =?UTF-8?q?fix:=20:bug:=20=E5=85=B1=E4=BA=AB?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=81=BF=E5=85=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue           |  6 +++-
 src/components/CURD/types.ts                  |  7 +----
 src/views/demo/curd/config/add.ts             | 21 ++++++-------
 src/views/demo/curd/config/edit.ts            | 21 ++++++-------
 src/views/demo/curd/config/options.ts         | 31 +++++++++++++++++++
 src/views/demo/curd/config/search.ts          | 18 +++++------
 .../curd/{config/add2.ts => config2/add.ts}   |  8 ++---
 .../content2.ts => config2/content.ts}        |  0
 .../curd/{config/edit2.ts => config2/edit.ts} |  0
 .../{config/search2.ts => config2/search.ts}  | 20 +++++-------
 src/views/demo/curd/index.vue                 | 17 ++++++----
 11 files changed, 84 insertions(+), 65 deletions(-)
 create mode 100644 src/views/demo/curd/config/options.ts
 rename src/views/demo/curd/{config/add2.ts => config2/add.ts} (82%)
 rename src/views/demo/curd/{config/content2.ts => config2/content.ts} (100%)
 rename src/views/demo/curd/{config/edit2.ts => config2/edit.ts} (100%)
 rename src/views/demo/curd/{config/search2.ts => config2/search.ts} (88%)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 9b421e24..d98b98fe 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -790,7 +790,11 @@ function handleToolbar(name: string) {
 function handleOperate(data: IOperateData) {
   switch (data.name) {
     case "delete":
-      props.contentConfig?.deleteAction && handleDelete(data.row[pk]);
+      if (props.contentConfig?.deleteAction) {
+        handleDelete(data.row[pk]);
+      } else {
+        emit("operateClick", data);
+      }
       break;
     default:
       emit("operateClick", data);
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 12ae896c..19095438 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -196,12 +196,7 @@ export type IFormItems<T = IComponentType> = Array<{
   // 组件属性
   attrs?: IObject;
   // 组件可选项(只适用于select,radio,checkbox组件)
-  options?: Array<{
-    label: string;
-    value: any;
-    disabled?: boolean;
-    [key: string]: any;
-  }>;
+  options?: Array<{ label: string; value: any; [key: string]: any }> | Ref<any[]>;
   // 验证规则
   rules?: FormItemRule[];
   // 初始值
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index f3598bd8..972861c2 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,7 +1,6 @@
 import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
-import DeptAPI from "@/api/system/dept.api";
-import RoleAPI from "@/api/system/role.api";
+import { deptArr, roleArr } from "./options";
 
 const modalConfig: IModalConfig<UserForm> = {
   permPrefix: "sys:user",
@@ -51,15 +50,15 @@ const modalConfig: IModalConfig<UserForm> = {
       type: "tree-select",
       attrs: {
         placeholder: "请选择所属部门",
-        data: [],
+        data: deptArr,
         filterable: true,
         "check-strictly": true,
         "render-after-expand": false,
       },
-      async initFn(formItem) {
-        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
-        formItem.attrs.data = await DeptAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+      //   formItem.attrs.data = await DeptAPI.getOptions();
+      // },
     },
     {
       type: "custom",
@@ -77,11 +76,11 @@ const modalConfig: IModalConfig<UserForm> = {
         placeholder: "请选择",
         multiple: true,
       },
-      options: [],
+      options: roleArr,
       initialValue: [],
-      async initFn(formItem) {
-        formItem.options = await RoleAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   formItem.options = await RoleAPI.getOptions();
+      // },
     },
     {
       type: "input",
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 1581d6a0..57b44448 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -2,8 +2,7 @@ import UserAPI, { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore } from "@/store";
-import DeptAPI from "@/api/system/dept.api";
-import RoleAPI from "@/api/system/role.api";
+import { deptArr, roleArr } from "./options";
 
 const modalConfig: IModalConfig<UserForm> = {
   permPrefix: "sys:user",
@@ -46,15 +45,15 @@ const modalConfig: IModalConfig<UserForm> = {
       type: "tree-select",
       attrs: {
         placeholder: "请选择所属部门",
-        data: [],
+        data: deptArr, // setup，Vue会自动解包ref，不需要.value
         filterable: true,
         "check-strictly": true,
         "render-after-expand": false,
       },
-      async initFn(formItem) {
-        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
-        formItem.attrs.data = await DeptAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+      //   formItem.attrs.data = await DeptAPI.getOptions();
+      // },
     },
     {
       type: "custom",
@@ -72,11 +71,11 @@ const modalConfig: IModalConfig<UserForm> = {
         placeholder: "请选择",
         multiple: true,
       },
-      options: [],
+      options: roleArr,
       initialValue: [],
-      async initFn(formItem) {
-        formItem.options = await RoleAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   formItem.options = await RoleAPI.getOptions();
+      // },
     },
     {
       type: "input",
diff --git a/src/views/demo/curd/config/options.ts b/src/views/demo/curd/config/options.ts
new file mode 100644
index 00000000..4fe2f479
--- /dev/null
+++ b/src/views/demo/curd/config/options.ts
@@ -0,0 +1,31 @@
+/** 公共下载数据，减少重复请求次数 */
+import DeptAPI from "@/api/system/dept.api";
+import RoleAPI from "@/api/system/role.api";
+
+interface OptionType {
+  label: string;
+  value: any;
+  [key: string]: any; // 允许其他属性
+}
+
+// 明确指定类型为 OptionType[]
+export let deptArr = ref<OptionType[]>([]);
+export let roleArr = ref<OptionType[]>([]);
+export let stateArr = ref<OptionType[]>([
+  { label: "启用", value: 1 },
+  { label: "禁用", value: 0 },
+]);
+
+// 初始化逻辑，在 onMounted 钩子中调用
+export const initOptions = async () => {
+  try {
+    // 使用Promise.all并行请求
+    const [dept, roles] = await Promise.all([DeptAPI.getOptions(), RoleAPI.getOptions()]);
+    // 获取部门选项并赋值
+    deptArr.value = dept;
+    // 获取角色选项并赋值
+    roleArr.value = roles;
+  } catch (error) {
+    console.error("初始化选项失败:", error);
+  }
+};
diff --git a/src/views/demo/curd/config/search.ts b/src/views/demo/curd/config/search.ts
index f4e6b5fa..35f29428 100644
--- a/src/views/demo/curd/config/search.ts
+++ b/src/views/demo/curd/config/search.ts
@@ -1,5 +1,5 @@
-import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
+import { deptArr, stateArr } from "./options";
 
 const searchConfig: ISearchConfig = {
   permPrefix: "sys:user",
@@ -21,18 +21,17 @@ const searchConfig: ISearchConfig = {
       prop: "deptId",
       attrs: {
         placeholder: "请选择",
-        data: [],
+        data: deptArr,
         filterable: true,
         "check-strictly": true,
         "render-after-expand": false,
         clearable: true,
         style: { width: "200px" },
       },
-      async initFn(formItem) {
-        formItem.attrs.data = await DeptAPI.getOptions();
-        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
-        // this.attrs!.data = await DeptAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+      //   formItem.attrs.data = await DeptAPI.getOptions();
+      // },
     },
     {
       type: "select",
@@ -43,10 +42,7 @@ const searchConfig: ISearchConfig = {
         clearable: true,
         style: { width: "200px" },
       },
-      options: [
-        { label: "启用", value: 1 },
-        { label: "禁用", value: 0 },
-      ],
+      options: stateArr,
     },
     {
       type: "date-picker",
diff --git a/src/views/demo/curd/config/add2.ts b/src/views/demo/curd/config2/add.ts
similarity index 82%
rename from src/views/demo/curd/config/add2.ts
rename to src/views/demo/curd/config2/add.ts
index aefe2797..0c5300ee 100644
--- a/src/views/demo/curd/config/add2.ts
+++ b/src/views/demo/curd/config2/add.ts
@@ -1,6 +1,6 @@
 import { type UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
-import DeptAPI from "@/api/system/dept.api";
+import { deptArr } from "../config/options";
 
 const modalConfig: IModalConfig<UserForm> = {
   colon: true,
@@ -35,15 +35,11 @@ const modalConfig: IModalConfig<UserForm> = {
       type: "tree-select",
       attrs: {
         placeholder: "请选择",
-        data: [],
+        data: deptArr,
         filterable: true,
         "check-strictly": true,
         "render-after-expand": false,
       },
-      async initFn(formItem) {
-        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
-        formItem.attrs.data = await DeptAPI.getOptions();
-      },
     },
     {
       type: "custom",
diff --git a/src/views/demo/curd/config/content2.ts b/src/views/demo/curd/config2/content.ts
similarity index 100%
rename from src/views/demo/curd/config/content2.ts
rename to src/views/demo/curd/config2/content.ts
diff --git a/src/views/demo/curd/config/edit2.ts b/src/views/demo/curd/config2/edit.ts
similarity index 100%
rename from src/views/demo/curd/config/edit2.ts
rename to src/views/demo/curd/config2/edit.ts
diff --git a/src/views/demo/curd/config/search2.ts b/src/views/demo/curd/config2/search.ts
similarity index 88%
rename from src/views/demo/curd/config/search2.ts
rename to src/views/demo/curd/config2/search.ts
index 0055b573..15611a7c 100644
--- a/src/views/demo/curd/config/search2.ts
+++ b/src/views/demo/curd/config2/search.ts
@@ -1,10 +1,5 @@
-import DeptAPI from "@/api/system/dept.api";
 import type { ISearchConfig } from "@/components/CURD/types";
-
-const selectOptions = reactive([
-  { label: "启用", value: 1 },
-  { label: "禁用", value: 0 },
-]);
+import { deptArr, stateArr } from "../config/options";
 
 const searchConfig: ISearchConfig = {
   grid: "right",
@@ -38,7 +33,7 @@ const searchConfig: ISearchConfig = {
       label: "下拉选择框",
       prop: "testSelect",
       attrs: { placeholder: "全部", clearable: true },
-      options: selectOptions,
+      options: stateArr as any,
       events: {
         change: function (e) {
           console.log("选中的值: ", e);
@@ -51,17 +46,16 @@ const searchConfig: ISearchConfig = {
       prop: "testTreeSelect",
       attrs: {
         placeholder: "请选择",
-        data: [],
+        data: deptArr,
         filterable: true,
         "check-strictly": true,
         "render-after-expand": false,
         clearable: true,
       },
-      async initFn(formItem) {
-        formItem.attrs.data = await DeptAPI.getOptions();
-        // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
-        // this.attrs!.data = await DeptAPI.getOptions();
-      },
+      // async initFn(formItem) {
+      //   // 注意:如果initFn函数不是箭头函数,this会指向此配置项对象,那么也就可以用this来替代形参formItem
+      //   formItem.attrs.data = await DeptAPI.getOptions();
+      // },
     },
     {
       type: "cascader",
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 2201d158..4ed75e73 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -117,13 +117,15 @@ import UserAPI from "@/api/system/user.api";
 import type { IObject, IOperateData, PageModalInstance } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
-import addModalConfig2 from "./config/add2";
 import contentConfig from "./config/content";
-import contentConfig2 from "./config/content2";
 import editModalConfig from "./config/edit";
-import editModalConfig2 from "./config/edit2";
 import searchConfig from "./config/search";
-import searchConfig2 from "./config/search2";
+import { initOptions } from "./config/options";
+
+import addModalConfig2 from "./config2/add";
+import contentConfig2 from "./config2/content";
+import editModalConfig2 from "./config2/edit";
+import searchConfig2 from "./config2/search";
 
 const {
   searchRef,
@@ -141,8 +143,6 @@ const {
   handleFilterChange,
 } = usePage();
 
-const addModalRef2 = ref();
-
 // 其他工具栏
 function handleToolbarClick(name: string) {
   console.log(name);
@@ -195,6 +195,7 @@ const handleOperateClick2 = (data: IOperateData) => {
 };
 
 // 打开二级弹窗
+const addModalRef2 = ref();
 const openSecondModal = () => {
   handleAddClick(addModalRef2 as Ref<PageModalInstance>);
 };
@@ -205,4 +206,8 @@ const secondSubmit = (formData: any) => {
 
 // 切换示例
 const isA = ref(true);
+
+onMounted(() => {
+  initOptions();
+});
 </script>

From fdf66164d89da704e15cd617a53471678976fc9e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 22 Apr 2025 22:15:15 +0800
Subject: [PATCH 336/497] =?UTF-8?q?feat:=20:sparkles:=20=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=AE=9E=E6=97=B6=E5=90=8C=E6=AD=A5=E5=92=8C=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/dict.api.ts                    |  14 +-
 src/components/Dict/DictLabel.vue             |  11 +
 src/components/Dict/index.vue                 |  23 +-
 src/hooks/useStomp.ts                         | 103 +++--
 src/hooks/useWebSocketDict.ts                 | 180 ++++++++
 src/hooks/useWebSocketOnlineUsers.ts          | 176 ++++++++
 src/plugins/index.ts                          |   3 +
 src/plugins/websocket.ts                      |  39 ++
 src/store/modules/dict.store.ts               |  11 +
 src/styles/reset.scss                         |   5 +-
 src/types/websocket.ts                        |  15 +
 src/views/dashboard/index.vue                 |  73 +++-
 src/views/demo/dict-sync.vue                  | 308 ++++++++++++++
 src/views/system/websocket/websocket-test.vue | 390 ++++++++++++++++++
 14 files changed, 1278 insertions(+), 73 deletions(-)
 create mode 100644 src/hooks/useWebSocketDict.ts
 create mode 100644 src/hooks/useWebSocketOnlineUsers.ts
 create mode 100644 src/plugins/websocket.ts
 create mode 100644 src/types/websocket.ts
 create mode 100644 src/views/demo/dict-sync.vue
 create mode 100644 src/views/system/websocket/websocket-test.vue

diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index 3a3d4da9..2c2d9f86 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -40,7 +40,7 @@ const DictAPI = {
    * @returns 字典表单数据
    */
   getFormData(id: string) {
-    return request<any, ResponseData<DictForm>>({
+    return request<any, DictForm>({
       url: `${DICT_BASE_URL}/${id}/form`,
       method: "get",
     });
@@ -130,7 +130,7 @@ const DictAPI = {
    * @returns 字典项表单数据
    */
   getDictItemFormData(dictCode: string, id: string) {
-    return request<any, ResponseData<DictItemForm>>({
+    return request<any, DictItemForm>({
       url: `${DICT_BASE_URL}/${dictCode}/items/${id}/form`,
       method: "get",
     });
@@ -303,12 +303,8 @@ export interface DictItemForm {
  * 字典项下拉选项
  */
 export interface DictItemOption {
-  /** 字典数据值 */
-  value: string;
-
-  /** 字典数据标签 */
+  value: number | string;
   label: string;
-
-  /** 标签类型 */
-  tagType: string;
+  tagType?: "" | "success" | "info" | "warning" | "danger";
+  [key: string]: any;
 }
diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index 4cf23ea3..1ef82bea 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -56,4 +56,15 @@ const updateLabelAndTag = async () => {
 watch([() => props.code, () => props.modelValue], updateLabelAndTag);
 
 onMounted(updateLabelAndTag);
+
+// 监听WebSocket字典更新事件，强制刷新标签
+watch(
+  () => dictStore.getDictItems(props.code || ""),
+  async () => {
+    if (props.code) {
+      await updateLabelAndTag();
+    }
+  },
+  { deep: true }
+);
 </script>
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index 14dbc9c7..ee5f1136 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -23,12 +23,7 @@
     :style="style"
     @change="handleChange"
   >
-    <el-radio
-      v-for="option in options"
-      :key="option.value"
-      :label="option.label"
-      :value="option.value"
-    >
+    <el-radio v-for="option in options" :key="option.value" :value="option.value">
       {{ option.label }}
     </el-radio>
   </el-radio-group>
@@ -40,12 +35,7 @@
     :style="style"
     @change="handleChange"
   >
-    <el-checkbox
-      v-for="option in options"
-      :key="option.value"
-      :label="option.label"
-      :value="option.value"
-    >
+    <el-checkbox v-for="option in options" :key="option.value" :value="option.value">
       {{ option.label }}
     </el-checkbox>
   </el-checkbox-group>
@@ -130,4 +120,13 @@ onMounted(async () => {
   await dictStore.loadDictItems(props.code);
   options.value = dictStore.getDictItems(props.code);
 });
+
+// 监听字典数据变化，确保WebSocket更新时刷新选项
+watch(
+  () => dictStore.getDictItems(props.code),
+  (newItems) => {
+    options.value = newItems;
+  },
+  { deep: true }
+);
 </script>
diff --git a/src/hooks/useStomp.ts b/src/hooks/useStomp.ts
index 302482dc..a6deb5a7 100644
--- a/src/hooks/useStomp.ts
+++ b/src/hooks/useStomp.ts
@@ -1,5 +1,6 @@
 import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
 import { getAccessToken } from "@/utils/auth";
+import { ref, watch } from "vue";
 
 export interface UseStompOptions {
   /** WebSocket 地址，不传时使用 VITE_APP_WS_ENDPOINT 环境变量 */
@@ -30,43 +31,46 @@ export function useStomp(options: UseStompOptions = {}) {
 
   /**
    * 初始化 STOMP 客户端
-   * 只有在 brokerURL 非空时才会初始化客户端
    */
   const initializeClient = () => {
-    if (!brokerURL.value) {
-      console.warn(
-        "brokerURL is required. Please set the WebSocket URL in your .env file (VITE_APP_WS_ENDPOINT)."
-      );
+    if (client.value) {
       return;
     }
 
-    if (!client.value) {
-      client.value = new Client({
-        brokerURL: brokerURL.value,
-        reconnectDelay: options.reconnectDelay ?? 5000,
-        debug: options.debug ? (msg) => console.log("[STOMP]", msg) : () => {},
-        connectHeaders: {
-          Authorization: `Bearer ${token}`,
-        },
-        heartbeatIncoming: 4000,
-        heartbeatOutgoing: 4000,
-      });
-
-      client.value.onConnect = (frame) => {
-        isConnected.value = true;
-        console.log("STOMP connected", frame);
-      };
-
-      client.value.onStompError = (frame) => {
-        console.error("Broker reported error: " + frame.headers["message"]);
-        console.error("Additional details: " + frame.body);
-      };
-
-      client.value.onWebSocketClose = (evt) => {
-        isConnected.value = false;
-        console.warn("WebSocket closed", evt);
-      };
-    }
+    // 创建 STOMP 客户端
+    client.value = new Client({
+      brokerURL: brokerURL.value,
+      connectHeaders: {
+        Authorization: `Bearer ${token}`,
+      },
+      debug: () => {},
+      reconnectDelay: 5000,
+      heartbeatIncoming: 4000,
+      heartbeatOutgoing: 4000,
+    });
+
+    // 设置连接监听器
+    client.value.onConnect = () => {
+      isConnected.value = true;
+      console.log("WebSocket连接已建立");
+    };
+
+    // 设置断开连接监听器
+    client.value.onDisconnect = () => {
+      isConnected.value = false;
+      console.log("WebSocket连接已断开");
+    };
+
+    // 设置 Web Socket 关闭监听器
+    client.value.onWebSocketClose = (event) => {
+      isConnected.value = false;
+      console.log(`WebSocket已关闭: ${event?.code} ${event?.reason}`);
+    };
+
+    // 设置错误监听器
+    client.value.onStompError = (frame) => {
+      console.error("STOMP错误:", frame.headers, frame.body);
+    };
   };
 
   // 监听 brokerURL 的变化，若地址改变则重新初始化
@@ -82,21 +86,27 @@ export function useStomp(options: UseStompOptions = {}) {
     }
   });
 
-  // 在组件挂载时检查并初始化客户端
-  onMounted(() => {
-    console.log("useStomp onMounted initializeClient");
-    initializeClient();
-  });
+  // 初始化客户端
+  initializeClient();
 
   /**
    * 激活连接（如果已经连接或正在激活则直接返回）
    */
   const connect = () => {
+    if (!client.value) {
+      initializeClient();
+    }
+
     if (client.value && (client.value.connected || client.value.active)) {
-      console.log("Already connected or connecting, skipping connect() call.");
       return;
     }
-    client.value?.activate();
+
+    if (!client.value) {
+      console.error("STOMP客户端初始化失败");
+      return;
+    }
+
+    client.value.activate();
   };
 
   /**
@@ -106,12 +116,23 @@ export function useStomp(options: UseStompOptions = {}) {
    * @returns 返回订阅 id，用于后续取消订阅
    */
   const subscribe = (destination: string, callback: (message: IMessage) => void): string => {
-    if (client.value) {
+    if (!client.value) {
+      return "";
+    }
+
+    if (!client.value.connected) {
+      return "";
+    }
+
+    try {
       const subscription = client.value.subscribe(destination, callback);
       subscriptions.set(subscription.id, subscription);
+      console.log(`订阅成功: ${destination}, ID: ${subscription.id}`);
       return subscription.id;
+    } catch (error) {
+      console.error(`订阅失败(${destination}):`, error);
+      return "";
     }
-    return "";
   };
 
   /**
diff --git a/src/hooks/useWebSocketDict.ts b/src/hooks/useWebSocketDict.ts
new file mode 100644
index 00000000..3eb4054a
--- /dev/null
+++ b/src/hooks/useWebSocketDict.ts
@@ -0,0 +1,180 @@
+import { useDictStoreHook } from "@/store/modules/dict.store";
+import { useStomp } from "@/hooks/useStomp";
+import { IMessage } from "@stomp/stompjs";
+
+// 字典消息类型
+export interface DictMessage {
+  dictCode: string;
+  timestamp: number;
+}
+
+// 字典事件回调类型
+export type DictMessageCallback = (message: DictMessage) => void;
+
+// 全局单例实例
+let instance: ReturnType<typeof createWebSocketDict> | null = null;
+
+// 创建WebSocket词典处理函数
+function createWebSocketDict() {
+  const dictStore = useDictStoreHook();
+
+  // 使用现有的useStomp
+  const { isConnected, connect, subscribe, unsubscribe, disconnect } = useStomp();
+
+  // 存储订阅ID
+  const subscriptionIds = ref<string[]>([]);
+
+  // 已订阅的主题
+  const subscribedTopics = ref<Set<string>>(new Set());
+
+  // 消息回调函数列表
+  const messageCallbacks = ref<DictMessageCallback[]>([]);
+
+  /**
+   * 注册字典消息回调
+   * @param callback 回调函数
+   */
+  const onDictMessage = (callback: DictMessageCallback) => {
+    messageCallbacks.value.push(callback);
+    return () => {
+      // 返回取消注册的函数
+      const index = messageCallbacks.value.indexOf(callback);
+      if (index !== -1) {
+        messageCallbacks.value.splice(index, 1);
+      }
+    };
+  };
+
+  /**
+   * 初始化WebSocket
+   */
+  const initWebSocket = async () => {
+    try {
+      // 连接WebSocket
+      connect();
+
+      // 设置字典订阅
+      setupDictSubscription();
+    } catch (error) {
+      console.error("[WebSocket] 初始化失败:", error);
+    }
+  };
+
+  /**
+   * 关闭WebSocket
+   */
+  const closeWebSocket = () => {
+    // 取消所有订阅
+    subscriptionIds.value.forEach((id) => {
+      unsubscribe(id);
+    });
+    subscriptionIds.value = [];
+    subscribedTopics.value.clear();
+
+    // 断开连接
+    disconnect();
+  };
+
+  /**
+   * 设置字典订阅
+   */
+  const setupDictSubscription = () => {
+    const topic = "/topic/dict";
+
+    // 防止重复订阅
+    if (subscribedTopics.value.has(topic)) {
+      console.log(`跳过重复订阅: ${topic}`);
+      return;
+    }
+
+    console.log(`开始尝试订阅字典主题: ${topic}`);
+
+    // 延迟订阅，确保连接先建立
+    const attemptSubscribe = () => {
+      if (!isConnected.value) {
+        console.log("等待WebSocket连接建立...");
+        // 500ms后再次尝试
+        setTimeout(attemptSubscribe, 500);
+        return;
+      }
+
+      // 检查是否已订阅
+      if (subscribedTopics.value.has(topic)) {
+        return;
+      }
+
+      console.log(`连接已建立，开始订阅: ${topic}`);
+
+      // 订阅字典更新
+      const subId = subscribe(topic, (message: IMessage) => {
+        handleDictEvent(message);
+      });
+
+      if (subId) {
+        subscriptionIds.value.push(subId);
+        subscribedTopics.value.add(topic);
+        console.log(`字典主题订阅成功: ${topic}`);
+      } else {
+        console.warn(`字典主题订阅失败，1秒后重试: ${topic}`);
+        // 尝试重新订阅
+        setTimeout(attemptSubscribe, 1000);
+      }
+    };
+
+    // 开始尝试订阅
+    attemptSubscribe();
+  };
+
+  /**
+   * 处理字典事件
+   * @param message STOMP消息
+   */
+  const handleDictEvent = (message: IMessage) => {
+    if (!message.body) return;
+
+    try {
+      // 记录接收到的消息
+      console.log(`收到字典更新消息: ${message.body}`);
+
+      // 尝试解析消息
+      const parsedData = JSON.parse(message.body) as DictMessage;
+      const dictCode = parsedData.dictCode;
+
+      if (!dictCode) return;
+
+      // 清除缓存，等待按需加载
+      dictStore.removeDictItem(dictCode);
+      console.log(`字典缓存已清除: ${dictCode}`);
+
+      // 调用所有注册的回调函数
+      messageCallbacks.value.forEach((callback) => {
+        try {
+          callback(parsedData);
+        } catch (callbackError) {
+          console.error("[WebSocket] 回调执行失败:", callbackError);
+        }
+      });
+
+      // 显示提示消息
+      console.info(`字典 ${dictCode} 已变更，将在下次使用时自动加载`);
+    } catch (error) {
+      console.error("[WebSocket] 解析消息失败:", error);
+    }
+  };
+
+  return {
+    isConnected,
+    initWebSocket,
+    closeWebSocket,
+    handleDictEvent,
+    onDictMessage,
+  };
+}
+
+// 导出单例实例的钩子
+export function useWebSocketDict() {
+  if (!instance) {
+    instance = createWebSocketDict();
+  }
+  return instance;
+}
diff --git a/src/hooks/useWebSocketOnlineUsers.ts b/src/hooks/useWebSocketOnlineUsers.ts
new file mode 100644
index 00000000..8921f1d9
--- /dev/null
+++ b/src/hooks/useWebSocketOnlineUsers.ts
@@ -0,0 +1,176 @@
+import { ref, onMounted, onUnmounted, watch } from "vue";
+import { useStomp } from "./useStomp";
+import { ElMessage } from "element-plus";
+
+export interface OnlineUserStats {
+  type: string; // 事件类型
+  count: number; // 当前在线用户数量
+  users?: any[]; // 用户列表（可选）
+  timestamp: number; // 时间戳
+}
+
+/**
+ * 在线用户WebSocket Hook
+ * 用于订阅后端推送的在线用户数量变化
+ */
+export function useWebSocketOnlineUsers() {
+  // 在线用户数量
+  const onlineUserCount = ref(0);
+
+  // 最后更新时间戳
+  const lastUpdateTime = ref(0);
+
+  // 连接状态
+  const isConnected = ref(false);
+
+  // 连接正在尝试中
+  const isConnecting = ref(false);
+
+  // 使用Stomp客户端
+  const { connect, subscribe, unsubscribe, disconnect, isConnected: stompConnected } = useStomp();
+
+  // 订阅ID
+  let subscriptionId = "";
+
+  // 重连次数
+  let reconnectCount = 0;
+  // 最大重连次数
+  const maxReconnectAttempts = 5;
+  // 重连计时器
+  let reconnectTimer: any = null;
+
+  // 监听Stomp连接状态
+  watch(stompConnected, (connected) => {
+    if (connected && isConnecting.value) {
+      isConnected.value = true;
+      isConnecting.value = false;
+      reconnectCount = 0;
+
+      // 一旦连接成功，立即订阅主题
+      subscribeToOnlineUsers();
+      console.log("WebSocket连接成功，已订阅在线用户主题");
+    }
+  });
+
+  /**
+   * 订阅在线用户主题
+   */
+  const subscribeToOnlineUsers = () => {
+    if (!stompConnected.value) return;
+
+    // 如果已经订阅，先取消订阅
+    if (subscriptionId) {
+      unsubscribe(subscriptionId);
+    }
+
+    // 订阅在线用户主题
+    subscriptionId = subscribe("/topic/online-users", (message) => {
+      try {
+        const data: OnlineUserStats = JSON.parse(message.body);
+
+        // 只有在消息类型为ONLINE_USERS_CHANGE时更新数据
+        if (data.type === "ONLINE_USERS_CHANGE") {
+          onlineUserCount.value = data.count || 0;
+          lastUpdateTime.value = data.timestamp || Date.now();
+        }
+      } catch (error) {
+        console.error("解析在线用户数据失败:", error);
+      }
+    });
+  };
+
+  /**
+   * 初始化WebSocket连接并订阅在线用户主题
+   */
+  const initWebSocket = () => {
+    if (isConnecting.value) return;
+
+    isConnecting.value = true;
+
+    // 连接WebSocket
+    connect();
+
+    // 设置连接超时
+    const connectionTimeout = setTimeout(() => {
+      if (!isConnected.value) {
+        console.warn("WebSocket连接超时，尝试重连");
+        attemptReconnect();
+      }
+    }, 5000);
+
+    // 监听连接状态变化，连接成功后清除超时计时器
+    const unwatch = watch(stompConnected, (connected) => {
+      if (connected) {
+        clearTimeout(connectionTimeout);
+        unwatch();
+      }
+    });
+  };
+
+  /**
+   * 尝试重新连接
+   */
+  const attemptReconnect = () => {
+    if (reconnectCount >= maxReconnectAttempts) {
+      console.error(`已达到最大重连次数(${maxReconnectAttempts})，停止重连`);
+      isConnecting.value = false;
+      ElMessage.error("WebSocket连接失败，请稍后刷新页面重试");
+      return;
+    }
+
+    reconnectCount++;
+    console.log(`尝试重连(${reconnectCount}/${maxReconnectAttempts})...`);
+
+    // 使用指数退避策略增加重连间隔
+    const delay = Math.min(1000 * Math.pow(2, reconnectCount), 30000);
+
+    // 清除之前的计时器
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+    }
+
+    // 设置重连计时器
+    reconnectTimer = setTimeout(() => {
+      connect();
+    }, delay);
+  };
+
+  /**
+   * 关闭WebSocket连接
+   */
+  const closeWebSocket = () => {
+    if (subscriptionId) {
+      unsubscribe(subscriptionId);
+      subscriptionId = "";
+    }
+
+    // 清除重连计时器
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+
+    disconnect();
+    isConnected.value = false;
+    isConnecting.value = false;
+  };
+
+  // 组件挂载时初始化WebSocket
+  onMounted(() => {
+    initWebSocket();
+  });
+
+  // 组件卸载时关闭WebSocket
+  onUnmounted(() => {
+    closeWebSocket();
+  });
+
+  return {
+    onlineUserCount,
+    lastUpdateTime,
+    isConnected,
+    isConnecting,
+    initWebSocket,
+    closeWebSocket,
+  };
+}
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index e5262519..98d26205 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -6,6 +6,7 @@ import { setupRouter } from "@/router";
 import { setupStore } from "@/store";
 import { setupElIcons } from "./icons";
 import { setupPermission } from "./permission";
+import { setupWebSocket } from "./websocket";
 import { InstallCodeMirror } from "codemirror-editor-vue3";
 
 export default {
@@ -22,6 +23,8 @@ export default {
     setupElIcons(app);
     // 路由守卫
     setupPermission();
+    // WebSocket服务
+    setupWebSocket();
     // 注册 CodeMirror
     app.use(InstallCodeMirror);
   },
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
new file mode 100644
index 00000000..3844dd9e
--- /dev/null
+++ b/src/plugins/websocket.ts
@@ -0,0 +1,39 @@
+import { useWebSocketDict } from "@/hooks/useWebSocketDict";
+import { getAccessToken } from "@/utils/auth";
+
+/**
+ * 初始化WebSocket服务
+ */
+export function setupWebSocket() {
+  console.log("[WebSocketPlugin] 开始初始化WebSocket服务...");
+
+  // 检查token是否存在
+  const token = getAccessToken();
+  if (!token) {
+    console.warn(
+      "[WebSocketPlugin] 未找到访问令牌，WebSocket初始化已跳过。用户登录后将自动重新连接。"
+    );
+    return;
+  }
+
+  try {
+    // 延迟初始化，确保应用完全启动
+    setTimeout(() => {
+      const dictWebSocket = useWebSocketDict();
+
+      // 初始化字典WebSocket服务
+      dictWebSocket.initWebSocket();
+      console.log("[WebSocketPlugin] 字典WebSocket初始化完成");
+
+      // 在窗口关闭前断开WebSocket连接
+      window.addEventListener("beforeunload", () => {
+        console.log("[WebSocketPlugin] 窗口即将关闭，断开WebSocket连接");
+        dictWebSocket.closeWebSocket();
+      });
+
+      console.log("[WebSocketPlugin] WebSocket服务初始化完成");
+    }, 1000); // 延迟1秒初始化
+  } catch (error) {
+    console.error("[WebSocketPlugin] 初始化WebSocket服务失败:", error);
+  }
+}
diff --git a/src/store/modules/dict.store.ts b/src/store/modules/dict.store.ts
index e053ed94..84f7ff56 100644
--- a/src/store/modules/dict.store.ts
+++ b/src/store/modules/dict.store.ts
@@ -42,6 +42,16 @@ export const useDictStore = defineStore("dict", () => {
     return dictCache.value[dictCode] || [];
   };
 
+  /**
+   * 移除指定字典项
+   * @param dictCode 字典编码
+   */
+  const removeDictItem = (dictCode: string) => {
+    if (dictCache.value[dictCode]) {
+      Reflect.deleteProperty(dictCache.value, dictCode);
+    }
+  };
+
   /**
    * 清空字典缓存
    */
@@ -52,6 +62,7 @@ export const useDictStore = defineStore("dict", () => {
   return {
     loadDictItems,
     getDictItems,
+    removeDictItem,
     clearDictCache,
   };
 });
diff --git a/src/styles/reset.scss b/src/styles/reset.scss
index 56689def..b3b43c7a 100644
--- a/src/styles/reset.scss
+++ b/src/styles/reset.scss
@@ -25,8 +25,9 @@ body {
   width: 100%;
   height: 100%;
   margin: 0;
-  font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei",
-    "微软雅黑", Arial, sans-serif;
+  font-family:
+    "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑",
+    Arial, sans-serif;
   line-height: inherit;
   -moz-osx-font-smoothing: grayscale;
   -webkit-font-smoothing: antialiased;
diff --git a/src/types/websocket.ts b/src/types/websocket.ts
new file mode 100644
index 00000000..30b56a2d
--- /dev/null
+++ b/src/types/websocket.ts
@@ -0,0 +1,15 @@
+/**
+ * WebSocket相关类型定义
+ */
+
+/**
+ * 字典WebSocket事件类型
+ */
+export interface DictWebSocketEvent {
+  /** 事件类型：更新或删除 */
+  type: "DICT_UPDATED" | "DICT_DELETED";
+  /** 字典编码 */
+  dictCode: string;
+  /** 时间戳 */
+  timestamp: number;
+}
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 7f9f3c64..ad38d539 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -81,8 +81,42 @@
 
     <!-- 数据统计 -->
     <el-row :gutter="10" class="mt-5">
+      <!-- 在线用户数量 -->
+      <el-col :span="8">
+        <el-card shadow="never">
+          <template #header>
+            <div class="flex-x-between">
+              <span class="text-gray">在线用户</span>
+              <el-tag type="danger" size="small">实时</el-tag>
+            </div>
+          </template>
+
+          <div class="flex-x-between mt-2">
+            <div class="flex-y-center">
+              <span class="text-lg transition-all duration-300 hover:scale-110">
+                {{ onlineUserCount }}
+              </span>
+              <span v-if="isConnected" class="ml-2 text-xs text-[#67c23a]">
+                <el-icon><Connection /></el-icon>
+                已连接
+              </span>
+              <span v-else class="ml-2 text-xs text-[#f56c6c]">
+                <el-icon><Failed /></el-icon>
+                未连接
+              </span>
+            </div>
+            <div class="i-svg:people w-8 h-8 animate-[pulse_2s_infinite]" />
+          </div>
+
+          <div class="flex-x-between mt-2 text-sm text-gray">
+            <span>更新时间</span>
+            <span>{{ formattedTime }}</span>
+          </div>
+        </el-card>
+      </el-col>
+
       <!-- 访客数(UV) -->
-      <el-col :span="12">
+      <el-col :span="8">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
@@ -142,7 +176,7 @@
       </el-col>
 
       <!-- 浏览量(PV) -->
-      <el-col :span="12">
+      <el-col :span="8">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
@@ -210,8 +244,8 @@
             <div class="flex-x-between">
               <span>访问趋势</span>
               <el-radio-group v-model="visitTrendDateRange" size="small">
-                <el-radio-button label="近7天" :value="7" />
-                <el-radio-button label="近30天" :value="30" />
+                <el-radio-button :value="7">近7天</el-radio-button>
+                <el-radio-button :value="30">近30天</el-radio-button>
               </el-radio-group>
             </div>
           </template>
@@ -288,7 +322,28 @@ import { dayjs } from "element-plus";
 import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log.api";
 import { useUserStore } from "@/store/modules/user.store";
 import { formatGrowthRate } from "@/utils";
-import { useTransition } from "@vueuse/core";
+import { useTransition, useDateFormat } from "@vueuse/core";
+import { Connection, Failed } from "@element-plus/icons-vue";
+import { useWebSocketOnlineUsers } from "@/hooks/useWebSocketOnlineUsers";
+
+// 在线用户数量组件相关
+const { onlineUserCount, lastUpdateTime, isConnected } = useWebSocketOnlineUsers();
+
+// 记录上一次的用户数量用于计算趋势
+const previousCount = ref(0);
+
+// 监听用户数量变化，计算趋势
+watch(onlineUserCount, (newCount, oldCount) => {
+  if (oldCount > 0) {
+    previousCount.value = oldCount;
+  }
+});
+
+// 格式化时间戳
+const formattedTime = computed(() => {
+  if (!lastUpdateTime.value) return "--";
+  return useDateFormat(lastUpdateTime, "HH:mm:ss").value;
+});
 
 interface VersionItem {
   id: string;
@@ -506,14 +561,14 @@ const updateVisitTrendChartOptions = (data: VisitTrendVO) => {
  */
 const computeGrowthRateClass = (growthRate?: number): string => {
   if (!growthRate) {
-    return "color-[--el-color-info]";
+    return "text-[--el-color-info]";
   }
   if (growthRate > 0) {
-    return "color-[--el-color-danger]";
+    return "text-[--el-color-danger]";
   } else if (growthRate < 0) {
-    return "color-[--el-color-success]";
+    return "text-[--el-color-success]";
   } else {
-    return "color-[--el-color-info]";
+    return "text-[--el-color-info]";
   }
 };
 
diff --git a/src/views/demo/dict-sync.vue b/src/views/demo/dict-sync.vue
new file mode 100644
index 00000000..08c6bd07
--- /dev/null
+++ b/src/views/demo/dict-sync.vue
@@ -0,0 +1,308 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header">
+          <span>字典WebSocket实时更新演示</span>
+          <el-tag :type="wsConnected ? 'success' : 'danger'" size="small" class="ml-2">
+            WebSocket {{ wsStatusText }}
+          </el-tag>
+        </div>
+      </template>
+
+      <el-alert type="info" :closable="false" class="mb-4">
+        本示例展示WebSocket实时更新字典缓存的效果。您可以编辑"男"性别字典项，保存后后端将通过WebSocket通知所有客户端刷新缓存。
+      </el-alert>
+
+      <el-row :gutter="16">
+        <el-col :span="8">
+          <el-card shadow="hover" class="dict-card">
+            <template #header>
+              <div class="flex justify-between items-center">
+                <span>性别字典项 - 男</span>
+                <el-button type="warning" size="small" @click="loadMaleDict">重新加载</el-button>
+              </div>
+            </template>
+            <div>
+              <div v-if="dictForm" class="dict-form">
+                <el-form :model="dictForm" label-width="80px">
+                  <el-form-item label="字典编码">
+                    <el-input v-model="dictForm.dictCode" disabled />
+                  </el-form-item>
+                  <el-form-item label="字典标签">
+                    <el-input v-model="dictForm.label" />
+                  </el-form-item>
+                  <el-form-item label="字典值">
+                    <el-input v-model="dictForm.value" disabled />
+                  </el-form-item>
+                  <el-form-item label="标记颜色">
+                    <el-select
+                      v-model="dictForm.tagType"
+                      placeholder="选择标签类型"
+                      style="width: 100%"
+                    >
+                      <el-option value="success" label="success">
+                        <el-tag type="success">success</el-tag>
+                      </el-option>
+                      <el-option value="warning" label="warning">
+                        <el-tag type="warning">warning</el-tag>
+                      </el-option>
+                      <el-option value="danger" label="danger">
+                        <el-tag type="danger">danger</el-tag>
+                      </el-option>
+                      <el-option value="info" label="info">
+                        <el-tag type="info">info</el-tag>
+                      </el-option>
+                      <el-option value="primary" label="primary">
+                        <el-tag type="primary">primary</el-tag>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item>
+                    <el-button type="primary" :loading="saving" @click="saveDict">保存</el-button>
+                    <el-button @click="loadMaleDict">重置</el-button>
+                  </el-form-item>
+                </el-form>
+              </div>
+              <el-empty v-else description="暂无字典数据" />
+            </div>
+          </el-card>
+        </el-col>
+
+        <!-- 列2: 字典组件展示 -->
+        <el-col :span="8">
+          <el-card shadow="hover" class="dict-card">
+            <template #header>
+              <div class="flex justify-between items-center">
+                <span>字典组件展示</span>
+                <el-button type="primary" size="small" @click="refreshDictComponent">
+                  手动刷新
+                </el-button>
+              </div>
+            </template>
+            <div class="dict-component-demo">
+              <h4 class="mt-4 mb-3">性别组件</h4>
+              <el-radio-group v-model="selectedGender">
+                <el-radio
+                  v-for="item in dictStore.getDictItems('gender')"
+                  :key="item.value"
+                  :value="item.value"
+                >
+                  {{ item.label }}
+                </el-radio>
+              </el-radio-group>
+
+              <h4 class="mt-4 mb-3">性别标签</h4>
+              <div>
+                <el-tag
+                  v-for="item in dictStore.getDictItems('gender')"
+                  :key="item.value"
+                  :type="item.tagType || undefined"
+                  class="mr-2"
+                >
+                  {{ item.label }}
+                </el-tag>
+              </div>
+
+              <div class="mt-4 pt-3 border-top">
+                <div class="text-muted mb-2">已选择值: {{ selectedGender }}</div>
+                <div class="text-muted">最后更新: {{ lastUpdateTime }}</div>
+              </div>
+            </div>
+          </el-card>
+        </el-col>
+
+        <!-- 列3: 字典缓存数据 -->
+        <el-col :span="8">
+          <el-card shadow="hover" class="dict-card">
+            <template #header>
+              <div class="flex justify-between items-center">
+                <span>字典缓存数据</span>
+                <div>
+                  <el-tag v-if="dictCacheStatus" type="success" class="ml-2" size="small">
+                    已缓存
+                  </el-tag>
+                  <el-tag v-else type="danger" class="ml-2" size="small">未缓存</el-tag>
+                </div>
+              </div>
+            </template>
+            <div class="cache-content">
+              <pre class="cache-data">{{
+                JSON.stringify(dictStore.getDictItems("gender"), null, 2)
+              }}</pre>
+            </div>
+          </el-card>
+        </el-col>
+      </el-row>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useDictStoreHook } from "@/store/modules/dict.store";
+import { useDateFormat } from "@vueuse/core";
+import DictAPI, { DictItemForm } from "@/api/system/dict.api";
+import { useWebSocketDict, DictMessage } from "@/hooks/useWebSocketDict";
+
+// 性别字典编码
+const DICT_CODE = "gender";
+// 男性字典项ID
+const MALE_ITEM_ID = "1";
+
+// 字典store
+const dictStore = useDictStoreHook();
+// 保存状态
+const saving = ref(false);
+// 最后更新时间
+const lastUpdateTime = ref("-");
+// 字典表单数据
+const dictForm = ref<DictItemForm | null>(null);
+// 选中的性别
+const selectedGender = ref("");
+
+// 初始化WebSocket
+const dictWebSocket = useWebSocketDict();
+
+// 获取连接状态
+const wsConnected = computed(() => dictWebSocket.isConnected);
+
+// WebSocket连接状态显示文本
+const wsStatusText = computed(() => (wsConnected.value ? "已连接" : "未连接"));
+
+// 保存WebSocket清理函数
+let unregisterCallback: (() => void) | null = null;
+
+// 当前选中字典的缓存状态
+const dictCacheStatus = computed(() => {
+  // 检查字典是否在缓存中
+  return dictStore.getDictItems(DICT_CODE).length > 0;
+});
+
+// 设置WebSocket
+const setupWebSocket = () => {
+  // 初始化WebSocket连接
+  dictWebSocket.initWebSocket();
+
+  // 注册字典消息回调
+  unregisterCallback = dictWebSocket.onDictMessage((message: DictMessage) => {
+    // 只有当消息是关于性别字典的更新时才处理
+    if (message.dictCode === DICT_CODE) {
+      // 更新最后更新时间
+      lastUpdateTime.value = useDateFormat(new Date(), "YYYY-MM-DD HH:mm:ss").value;
+
+      // 触发字典组件重新加载
+      nextTick(() => {
+        refreshDictComponent();
+      });
+    }
+  });
+};
+
+// 刷新字典组件，强制重新加载字典数据
+const refreshDictComponent = async () => {
+  // 这里重新获取字典数据以触发按需加载
+  await dictStore.loadDictItems(DICT_CODE);
+  ElMessage.success("字典组件已刷新");
+};
+
+// 加载男性字典表单数据
+const loadMaleDict = async () => {
+  // 获取男性字典项表单数据 - 使用接口 /dicts/gender/items/1/form
+  const data = await DictAPI.getDictItemFormData(DICT_CODE, MALE_ITEM_ID);
+  dictForm.value = data;
+};
+
+// 保存字典项
+const saveDict = async () => {
+  if (!dictForm.value) return;
+
+  saving.value = true;
+  try {
+    // dictForm的类型已经是DictItemForm，直接传入
+    await DictAPI.updateDictItem(DICT_CODE, MALE_ITEM_ID, dictForm.value);
+
+    // 更新时间
+    lastUpdateTime.value = useDateFormat(new Date(), "YYYY-MM-DD HH:mm:ss").value;
+
+    ElMessage.success("保存成功，后端将通过WebSocket通知所有客户端");
+  } catch (error) {
+    console.error("保存字典项失败:", error);
+    ElMessage.error("保存失败");
+  } finally {
+    saving.value = false;
+  }
+};
+
+// 组件挂载时加载性别字典
+onMounted(async () => {
+  await loadMaleDict();
+  // 加载初始字典数据
+  await dictStore.loadDictItems(DICT_CODE);
+  // 初始化选中性别为男
+  selectedGender.value = "1";
+  // 设置WebSocket
+  setupWebSocket();
+});
+
+// 组件卸载时清理WebSocket
+onUnmounted(() => {
+  unregisterCallback?.();
+});
+</script>
+
+<style scoped>
+.dict-card {
+  display: flex;
+  flex-direction: column;
+  height: 600px;
+  overflow: hidden;
+}
+
+.dict-card :deep(.el-card__body) {
+  flex: 1;
+  overflow: auto;
+}
+
+.dict-component-demo {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  padding: 12px;
+}
+
+.cache-content {
+  height: 100%;
+  overflow: hidden;
+}
+
+pre {
+  padding: 8px;
+  overflow-y: auto;
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+}
+
+.cache-data {
+  height: 100%;
+  padding: 8px;
+  overflow-y: auto;
+  font-size: 12px;
+  background-color: #f8f9fa;
+  border-radius: 4px;
+}
+
+.dict-form {
+  margin-bottom: 20px;
+}
+
+.text-muted {
+  font-size: 0.9em;
+  color: #909399;
+}
+
+.border-top {
+  border-top: 1px solid #ebeef5;
+}
+</style>
diff --git a/src/views/system/websocket/websocket-test.vue b/src/views/system/websocket/websocket-test.vue
new file mode 100644
index 00000000..553ea4a5
--- /dev/null
+++ b/src/views/system/websocket/websocket-test.vue
@@ -0,0 +1,390 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header">
+          <span>WebSocket测试</span>
+        </div>
+      </template>
+
+      <el-tabs v-model="activeTab">
+        <el-tab-pane label="连接状态" name="status">
+          <el-alert
+            :title="isConnected ? '已连接到WebSocket服务器' : '未连接到WebSocket服务器'"
+            :type="isConnected ? 'success' : 'error'"
+            :description="connectionMessage"
+            show-icon
+            :closable="false"
+          />
+
+          <div class="button-container">
+            <el-button
+              :type="isConnected ? 'warning' : 'primary'"
+              :loading="connecting"
+              @click="toggleConnection"
+            >
+              {{ isConnected ? "断开连接" : "连接" }}
+            </el-button>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="字典更新通知" name="dict">
+          <p class="section-desc">触发字典更新通知，所有在线用户会收到该通知</p>
+          <div class="form-container">
+            <el-form :model="dictForm" label-width="100px">
+              <el-form-item label="字典编码">
+                <el-input v-model="dictForm.dictCode" placeholder="请输入字典编码" />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="sendDictUpdate">发送字典更新通知</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="用户消息" name="message">
+          <p class="section-desc">向特定用户发送消息</p>
+          <div class="form-container">
+            <el-form :model="messageForm" label-width="100px">
+              <el-form-item label="接收用户">
+                <el-input v-model="messageForm.receiver" placeholder="请输入接收用户的用户名" />
+              </el-form-item>
+              <el-form-item label="消息内容">
+                <el-input
+                  v-model="messageForm.content"
+                  type="textarea"
+                  :rows="3"
+                  placeholder="请输入消息内容"
+                />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" @click="sendUserMessage">发送消息</el-button>
+                <el-button type="success" @click="sendBroadcast">发送广播</el-button>
+              </el-form-item>
+            </el-form>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="在线用户" name="online">
+          <div class="stats-container">
+            <el-statistic title="当前在线用户数">
+              <template #value>
+                <div class="statistic-value">{{ onlineStats.total }}</div>
+              </template>
+            </el-statistic>
+          </div>
+
+          <el-table v-loading="loadingUsers" :data="onlineUsers" style="width: 100%">
+            <el-table-column prop="username" label="用户名" width="180" />
+            <el-table-column prop="nickname" label="昵称" width="180" />
+            <el-table-column prop="loginTime" label="登录时间">
+              <template #default="scope">
+                {{ formatDate(scope.row.loginTime) }}
+              </template>
+            </el-table-column>
+          </el-table>
+
+          <div class="button-container">
+            <el-button type="primary" @click="fetchOnlineUsers">刷新列表</el-button>
+          </div>
+        </el-tab-pane>
+
+        <el-tab-pane label="消息记录" name="logs">
+          <div class="logs-container">
+            <div v-for="(log, index) in messageLogs" :key="index" class="log-item">
+              <div class="log-time">{{ formatDate(log.timestamp) }}</div>
+              <div class="log-content" :class="{ 'log-broadcast': log.isBroadcast }">
+                <span class="log-sender">{{ log.sender }}</span>
+                : {{ log.content }}
+                <el-tag v-if="log.isBroadcast" size="small" type="warning">广播</el-tag>
+              </div>
+            </div>
+            <div v-if="messageLogs.length === 0" class="empty-logs">暂无消息记录</div>
+          </div>
+
+          <div class="button-container">
+            <el-button type="danger" @click="clearLogs">清空记录</el-button>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-card>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, onUnmounted } from "vue";
+import { ElMessage } from "element-plus";
+import { useWebSocketDict } from "@/hooks/useWebSocketDict";
+import { useUserStore } from "@/store/modules/user";
+import { getDictList } from "@/api/dict";
+import { getOnlineUsers, getOnlineStats } from "@/api/user";
+
+const userStore = useUserStore();
+const { connectWebSocket, disconnectWebSocket, isConnected, sendMessage, subscribe } =
+  useWebSocketDict();
+
+// 状态变量
+const activeTab = ref("status");
+const connecting = ref(false);
+const connectionMessage = ref("WebSocket连接状态");
+const messageLogs = ref([]);
+const onlineUsers = ref([]);
+const onlineStats = ref({ total: 0 });
+const loadingUsers = ref(false);
+
+// 表单数据
+const dictForm = ref({
+  dictCode: "gender",
+});
+
+const messageForm = ref({
+  receiver: "",
+  content: "",
+});
+
+// 连接和断开WebSocket
+const toggleConnection = async () => {
+  connecting.value = true;
+  try {
+    if (isConnected.value) {
+      disconnectWebSocket();
+      connectionMessage.value = "已断开连接";
+    } else {
+      await connectWebSocket();
+      connectionMessage.value = "已成功连接到WebSocket服务器";
+      setupSubscriptions();
+    }
+  } catch (error) {
+    connectionMessage.value = `连接失败: ${error.message}`;
+    ElMessage.error(`WebSocket连接失败: ${error.message}`);
+  } finally {
+    connecting.value = false;
+  }
+};
+
+// 设置订阅
+const setupSubscriptions = () => {
+  // 订阅字典更新
+  subscribe("/topic/dict", (message) => {
+    addMessageLog({
+      sender: "System",
+      content: `字典 ${message.dictCode} 已更新`,
+      timestamp: new Date().getTime(),
+      isBroadcast: true,
+    });
+    ElMessage.success(`字典 ${message.dictCode} 已更新`);
+  });
+
+  // 订阅用户消息
+  const username = userStore.userInfo.username;
+  subscribe(`/user/${username}/messages`, (message) => {
+    addMessageLog({
+      sender: message.sender,
+      content: message.content,
+      timestamp: message.timestamp,
+      isBroadcast: false,
+    });
+    ElMessage.info(`收到来自 ${message.sender} 的消息`);
+  });
+
+  // 订阅广播消息
+  subscribe("/topic/public", (message) => {
+    addMessageLog({
+      sender: message.sender,
+      content: message.content,
+      timestamp: message.timestamp,
+      isBroadcast: true,
+    });
+    ElMessage.info(`收到来自 ${message.sender} 的广播消息`);
+  });
+
+  // 订阅在线用户更新
+  subscribe("/topic/users/online", (message) => {
+    ElMessage.info(`用户 ${message.username} ${message.online ? "上线" : "下线"}`);
+    fetchOnlineUsers();
+    fetchOnlineStats();
+  });
+};
+
+// 发送字典更新通知
+const sendDictUpdate = async () => {
+  try {
+    // 调用字典API触发更新
+    await getDictList({ dictCode: dictForm.value.dictCode });
+    ElMessage.success("字典更新通知已发送");
+  } catch (error) {
+    ElMessage.error(`发送失败: ${error.message}`);
+  }
+};
+
+// 发送用户消息
+const sendUserMessage = () => {
+  if (!messageForm.value.receiver || !messageForm.value.content) {
+    ElMessage.warning("请输入接收用户和消息内容");
+    return;
+  }
+
+  sendMessage(`/app/sendToUser/${messageForm.value.receiver}`, messageForm.value.content);
+
+  // 记录发送的消息
+  addMessageLog({
+    sender: userStore.userInfo.username,
+    content: `[发送给 ${messageForm.value.receiver}] ${messageForm.value.content}`,
+    timestamp: new Date().getTime(),
+    isBroadcast: false,
+  });
+
+  ElMessage.success("消息已发送");
+};
+
+// 发送广播消息
+const sendBroadcast = () => {
+  if (!messageForm.value.content) {
+    ElMessage.warning("请输入消息内容");
+    return;
+  }
+
+  sendMessage("/app/broadcast", messageForm.value.content);
+
+  ElMessage.success("广播消息已发送");
+};
+
+// 获取在线用户
+const fetchOnlineUsers = async () => {
+  loadingUsers.value = true;
+  try {
+    const res = await getOnlineUsers();
+    onlineUsers.value = res.data;
+  } catch (error) {
+    ElMessage.error(`获取在线用户失败: ${error.message}`);
+  } finally {
+    loadingUsers.value = false;
+  }
+};
+
+// 获取在线用户统计
+const fetchOnlineStats = async () => {
+  try {
+    const res = await getOnlineStats();
+    onlineStats.value = res.data;
+  } catch (error) {
+    ElMessage.error(`获取在线统计失败: ${error.message}`);
+  }
+};
+
+// 添加消息日志
+const addMessageLog = (log) => {
+  messageLogs.value.unshift(log);
+  // 限制日志数量
+  if (messageLogs.value.length > 100) {
+    messageLogs.value = messageLogs.value.slice(0, 100);
+  }
+};
+
+// 清空日志
+const clearLogs = () => {
+  messageLogs.value = [];
+};
+
+// 格式化日期
+const formatDate = (timestamp) => {
+  const date = new Date(timestamp);
+  return date.toLocaleString();
+};
+
+// 生命周期钩子
+onMounted(async () => {
+  try {
+    await connectWebSocket();
+    connectionMessage.value = "已成功连接到WebSocket服务器";
+    setupSubscriptions();
+    await fetchOnlineUsers();
+    await fetchOnlineStats();
+  } catch (error) {
+    connectionMessage.value = `连接失败: ${error.message}`;
+  }
+});
+
+onUnmounted(() => {
+  disconnectWebSocket();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+
+.card-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+}
+
+.section-desc {
+  margin-bottom: 20px;
+  color: #666;
+}
+
+.button-container {
+  display: flex;
+  justify-content: flex-end;
+  margin-top: 20px;
+}
+
+.form-container {
+  max-width: 600px;
+  margin-top: 20px;
+}
+
+.logs-container {
+  height: 400px;
+  padding: 12px;
+  margin-bottom: 20px;
+  overflow-y: auto;
+  border: 1px solid #ebeef5;
+  border-radius: 4px;
+}
+
+.log-item {
+  padding-bottom: 12px;
+  margin-bottom: 12px;
+  border-bottom: 1px solid #f0f0f0;
+}
+
+.log-time {
+  margin-bottom: 4px;
+  font-size: 12px;
+  color: #909399;
+}
+
+.log-content {
+  word-break: break-all;
+}
+
+.log-sender {
+  font-weight: bold;
+  color: #409eff;
+}
+
+.log-broadcast .log-sender {
+  color: #e6a23c;
+}
+
+.empty-logs {
+  padding: 20px;
+  color: #909399;
+  text-align: center;
+}
+
+.stats-container {
+  display: flex;
+  margin-bottom: 20px;
+}
+
+.statistic-value {
+  font-size: 24px;
+  font-weight: bold;
+  color: #409eff;
+}
+</style>

From ada4430ed5422dd86fde294d6debd24313ae257f Mon Sep 17 00:00:00 2001
From: white <qwhite@163.com>
Date: Fri, 25 Apr 2025 09:54:11 +0800
Subject: [PATCH 337/497] =?UTF-8?q?=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=93=E6=9E=9C=E4=B8=AD=E8=BF=9B=E8=A1=8C?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E8=B7=B3=E8=BD=AC=E6=97=B6=E6=9C=AA=E6=90=BA?=
 =?UTF-8?q?=E5=B8=A6=E5=88=9B=E5=BB=BA=E8=8F=9C=E5=8D=95=E6=97=B6=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E7=9A=84=E9=A2=9D=E5=A4=96=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MenuSearch/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 65bd7def..8e8e4d26 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -128,7 +128,7 @@ import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import router from "@/router";
 import { usePermissionStore } from "@/store";
 import { isExternal } from "@/utils";
-import { RouteRecordRaw } from "vue-router";
+import { RouteRecordRaw, LocationQueryRaw } from "vue-router";
 import { Clock, Close, Delete } from "@element-plus/icons-vue";
 
 const HISTORY_KEY = "menu_search_history";
@@ -150,6 +150,7 @@ interface SearchItem {
   name?: string;
   icon?: string;
   redirect?: string;
+  params?: LocationQueryRaw;
 }
 
 // 从本地存储加载搜索历史
@@ -284,7 +285,7 @@ function navigateToRoute(item: SearchItem) {
   if (isExternal(item.path)) {
     window.open(item.path, "_blank");
   } else {
-    router.push(item.path);
+    router.push({ path: item.path, query: item.params });
   }
 }
 
@@ -303,6 +304,7 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
         name: typeof route.name === "string" ? route.name : undefined,
         icon: route.meta.icon,
         redirect: typeof route.redirect === "string" ? route.redirect : undefined,
+        params: route.meta.params ? JSON.parse(JSON.stringify(toRaw(route.meta.params))) : undefined
       });
     }
   });

From d4d0a718650ec1d307c66ca5e10c59559a6f0a8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Fri, 25 Apr 2025 10:35:01 +0800
Subject: [PATCH 338/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=90=9C=E7=B4=A2=EF=BC=8C=E4=B8=8D=E9=87=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=BD=93=E5=89=8D=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E5=8F=91=E9=80=81=E4=B8=A4=E6=AC=A1=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/index.vue | 1 +
 src/views/system/dict/index.vue   | 1 +
 src/views/system/log/index.vue    | 1 +
 src/views/system/notice/index.vue | 1 +
 src/views/system/role/index.vue   | 1 +
 src/views/system/user/index.vue   | 1 +
 6 files changed, 6 insertions(+)

diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index bbb4f7b8..4696f18a 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -181,6 +181,7 @@ const rules = reactive({
 // 查询系统配置
 function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   ConfigAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 8e90f54e..de498561 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -175,6 +175,7 @@ const computedRules = computed(() => {
 // 查询
 function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   DictAPI.getPage(queryParams)
     .then((data) => {
       tableData.value = data.list;
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index d9ad0fc5..90ae693b 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -88,6 +88,7 @@ const pageData = ref<LogPageVO[]>();
 /** 查询 */
 function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   LogAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 81cbc3de..17870d2b 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -330,6 +330,7 @@ const currentNotice = ref<NoticeDetailVO>({});
 // 查询通知公告
 function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   NoticeAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 6a294113..ca331b3a 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -280,6 +280,7 @@ const parentChildLinked = ref(true);
 // 查询
 function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   RoleAPI.getPage(queryParams)
     .then((data) => {
       roleList.value = data.list;
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f4150c49..87a077d4 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -316,6 +316,7 @@ const importDialogVisible = ref(false);
 // 查询
 async function handleQuery() {
   loading.value = true;
+  queryParams.pageNum = 1;
   UserAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;

From 152789001a12f2295f862dc738e4e2450c0414dc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 25 Apr 2025 11:55:34 +0800
Subject: [PATCH 339/497] =?UTF-8?q?fix:=20:bug:=20=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=BD=B1=E5=93=8D=E6=89=93=E5=8C=85=E7=9A=84=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/websocket/websocket-test.vue | 390 ------------------
 1 file changed, 390 deletions(-)
 delete mode 100644 src/views/system/websocket/websocket-test.vue

diff --git a/src/views/system/websocket/websocket-test.vue b/src/views/system/websocket/websocket-test.vue
deleted file mode 100644
index 553ea4a5..00000000
--- a/src/views/system/websocket/websocket-test.vue
+++ /dev/null
@@ -1,390 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card class="box-card">
-      <template #header>
-        <div class="card-header">
-          <span>WebSocket测试</span>
-        </div>
-      </template>
-
-      <el-tabs v-model="activeTab">
-        <el-tab-pane label="连接状态" name="status">
-          <el-alert
-            :title="isConnected ? '已连接到WebSocket服务器' : '未连接到WebSocket服务器'"
-            :type="isConnected ? 'success' : 'error'"
-            :description="connectionMessage"
-            show-icon
-            :closable="false"
-          />
-
-          <div class="button-container">
-            <el-button
-              :type="isConnected ? 'warning' : 'primary'"
-              :loading="connecting"
-              @click="toggleConnection"
-            >
-              {{ isConnected ? "断开连接" : "连接" }}
-            </el-button>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="字典更新通知" name="dict">
-          <p class="section-desc">触发字典更新通知，所有在线用户会收到该通知</p>
-          <div class="form-container">
-            <el-form :model="dictForm" label-width="100px">
-              <el-form-item label="字典编码">
-                <el-input v-model="dictForm.dictCode" placeholder="请输入字典编码" />
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="sendDictUpdate">发送字典更新通知</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="用户消息" name="message">
-          <p class="section-desc">向特定用户发送消息</p>
-          <div class="form-container">
-            <el-form :model="messageForm" label-width="100px">
-              <el-form-item label="接收用户">
-                <el-input v-model="messageForm.receiver" placeholder="请输入接收用户的用户名" />
-              </el-form-item>
-              <el-form-item label="消息内容">
-                <el-input
-                  v-model="messageForm.content"
-                  type="textarea"
-                  :rows="3"
-                  placeholder="请输入消息内容"
-                />
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="sendUserMessage">发送消息</el-button>
-                <el-button type="success" @click="sendBroadcast">发送广播</el-button>
-              </el-form-item>
-            </el-form>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="在线用户" name="online">
-          <div class="stats-container">
-            <el-statistic title="当前在线用户数">
-              <template #value>
-                <div class="statistic-value">{{ onlineStats.total }}</div>
-              </template>
-            </el-statistic>
-          </div>
-
-          <el-table v-loading="loadingUsers" :data="onlineUsers" style="width: 100%">
-            <el-table-column prop="username" label="用户名" width="180" />
-            <el-table-column prop="nickname" label="昵称" width="180" />
-            <el-table-column prop="loginTime" label="登录时间">
-              <template #default="scope">
-                {{ formatDate(scope.row.loginTime) }}
-              </template>
-            </el-table-column>
-          </el-table>
-
-          <div class="button-container">
-            <el-button type="primary" @click="fetchOnlineUsers">刷新列表</el-button>
-          </div>
-        </el-tab-pane>
-
-        <el-tab-pane label="消息记录" name="logs">
-          <div class="logs-container">
-            <div v-for="(log, index) in messageLogs" :key="index" class="log-item">
-              <div class="log-time">{{ formatDate(log.timestamp) }}</div>
-              <div class="log-content" :class="{ 'log-broadcast': log.isBroadcast }">
-                <span class="log-sender">{{ log.sender }}</span>
-                : {{ log.content }}
-                <el-tag v-if="log.isBroadcast" size="small" type="warning">广播</el-tag>
-              </div>
-            </div>
-            <div v-if="messageLogs.length === 0" class="empty-logs">暂无消息记录</div>
-          </div>
-
-          <div class="button-container">
-            <el-button type="danger" @click="clearLogs">清空记录</el-button>
-          </div>
-        </el-tab-pane>
-      </el-tabs>
-    </el-card>
-  </div>
-</template>
-
-<script setup>
-import { ref, onMounted, onUnmounted } from "vue";
-import { ElMessage } from "element-plus";
-import { useWebSocketDict } from "@/hooks/useWebSocketDict";
-import { useUserStore } from "@/store/modules/user";
-import { getDictList } from "@/api/dict";
-import { getOnlineUsers, getOnlineStats } from "@/api/user";
-
-const userStore = useUserStore();
-const { connectWebSocket, disconnectWebSocket, isConnected, sendMessage, subscribe } =
-  useWebSocketDict();
-
-// 状态变量
-const activeTab = ref("status");
-const connecting = ref(false);
-const connectionMessage = ref("WebSocket连接状态");
-const messageLogs = ref([]);
-const onlineUsers = ref([]);
-const onlineStats = ref({ total: 0 });
-const loadingUsers = ref(false);
-
-// 表单数据
-const dictForm = ref({
-  dictCode: "gender",
-});
-
-const messageForm = ref({
-  receiver: "",
-  content: "",
-});
-
-// 连接和断开WebSocket
-const toggleConnection = async () => {
-  connecting.value = true;
-  try {
-    if (isConnected.value) {
-      disconnectWebSocket();
-      connectionMessage.value = "已断开连接";
-    } else {
-      await connectWebSocket();
-      connectionMessage.value = "已成功连接到WebSocket服务器";
-      setupSubscriptions();
-    }
-  } catch (error) {
-    connectionMessage.value = `连接失败: ${error.message}`;
-    ElMessage.error(`WebSocket连接失败: ${error.message}`);
-  } finally {
-    connecting.value = false;
-  }
-};
-
-// 设置订阅
-const setupSubscriptions = () => {
-  // 订阅字典更新
-  subscribe("/topic/dict", (message) => {
-    addMessageLog({
-      sender: "System",
-      content: `字典 ${message.dictCode} 已更新`,
-      timestamp: new Date().getTime(),
-      isBroadcast: true,
-    });
-    ElMessage.success(`字典 ${message.dictCode} 已更新`);
-  });
-
-  // 订阅用户消息
-  const username = userStore.userInfo.username;
-  subscribe(`/user/${username}/messages`, (message) => {
-    addMessageLog({
-      sender: message.sender,
-      content: message.content,
-      timestamp: message.timestamp,
-      isBroadcast: false,
-    });
-    ElMessage.info(`收到来自 ${message.sender} 的消息`);
-  });
-
-  // 订阅广播消息
-  subscribe("/topic/public", (message) => {
-    addMessageLog({
-      sender: message.sender,
-      content: message.content,
-      timestamp: message.timestamp,
-      isBroadcast: true,
-    });
-    ElMessage.info(`收到来自 ${message.sender} 的广播消息`);
-  });
-
-  // 订阅在线用户更新
-  subscribe("/topic/users/online", (message) => {
-    ElMessage.info(`用户 ${message.username} ${message.online ? "上线" : "下线"}`);
-    fetchOnlineUsers();
-    fetchOnlineStats();
-  });
-};
-
-// 发送字典更新通知
-const sendDictUpdate = async () => {
-  try {
-    // 调用字典API触发更新
-    await getDictList({ dictCode: dictForm.value.dictCode });
-    ElMessage.success("字典更新通知已发送");
-  } catch (error) {
-    ElMessage.error(`发送失败: ${error.message}`);
-  }
-};
-
-// 发送用户消息
-const sendUserMessage = () => {
-  if (!messageForm.value.receiver || !messageForm.value.content) {
-    ElMessage.warning("请输入接收用户和消息内容");
-    return;
-  }
-
-  sendMessage(`/app/sendToUser/${messageForm.value.receiver}`, messageForm.value.content);
-
-  // 记录发送的消息
-  addMessageLog({
-    sender: userStore.userInfo.username,
-    content: `[发送给 ${messageForm.value.receiver}] ${messageForm.value.content}`,
-    timestamp: new Date().getTime(),
-    isBroadcast: false,
-  });
-
-  ElMessage.success("消息已发送");
-};
-
-// 发送广播消息
-const sendBroadcast = () => {
-  if (!messageForm.value.content) {
-    ElMessage.warning("请输入消息内容");
-    return;
-  }
-
-  sendMessage("/app/broadcast", messageForm.value.content);
-
-  ElMessage.success("广播消息已发送");
-};
-
-// 获取在线用户
-const fetchOnlineUsers = async () => {
-  loadingUsers.value = true;
-  try {
-    const res = await getOnlineUsers();
-    onlineUsers.value = res.data;
-  } catch (error) {
-    ElMessage.error(`获取在线用户失败: ${error.message}`);
-  } finally {
-    loadingUsers.value = false;
-  }
-};
-
-// 获取在线用户统计
-const fetchOnlineStats = async () => {
-  try {
-    const res = await getOnlineStats();
-    onlineStats.value = res.data;
-  } catch (error) {
-    ElMessage.error(`获取在线统计失败: ${error.message}`);
-  }
-};
-
-// 添加消息日志
-const addMessageLog = (log) => {
-  messageLogs.value.unshift(log);
-  // 限制日志数量
-  if (messageLogs.value.length > 100) {
-    messageLogs.value = messageLogs.value.slice(0, 100);
-  }
-};
-
-// 清空日志
-const clearLogs = () => {
-  messageLogs.value = [];
-};
-
-// 格式化日期
-const formatDate = (timestamp) => {
-  const date = new Date(timestamp);
-  return date.toLocaleString();
-};
-
-// 生命周期钩子
-onMounted(async () => {
-  try {
-    await connectWebSocket();
-    connectionMessage.value = "已成功连接到WebSocket服务器";
-    setupSubscriptions();
-    await fetchOnlineUsers();
-    await fetchOnlineStats();
-  } catch (error) {
-    connectionMessage.value = `连接失败: ${error.message}`;
-  }
-});
-
-onUnmounted(() => {
-  disconnectWebSocket();
-});
-</script>
-
-<style scoped>
-.app-container {
-  padding: 20px;
-}
-
-.card-header {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-}
-
-.section-desc {
-  margin-bottom: 20px;
-  color: #666;
-}
-
-.button-container {
-  display: flex;
-  justify-content: flex-end;
-  margin-top: 20px;
-}
-
-.form-container {
-  max-width: 600px;
-  margin-top: 20px;
-}
-
-.logs-container {
-  height: 400px;
-  padding: 12px;
-  margin-bottom: 20px;
-  overflow-y: auto;
-  border: 1px solid #ebeef5;
-  border-radius: 4px;
-}
-
-.log-item {
-  padding-bottom: 12px;
-  margin-bottom: 12px;
-  border-bottom: 1px solid #f0f0f0;
-}
-
-.log-time {
-  margin-bottom: 4px;
-  font-size: 12px;
-  color: #909399;
-}
-
-.log-content {
-  word-break: break-all;
-}
-
-.log-sender {
-  font-weight: bold;
-  color: #409eff;
-}
-
-.log-broadcast .log-sender {
-  color: #e6a23c;
-}
-
-.empty-logs {
-  padding: 20px;
-  color: #909399;
-  text-align: center;
-}
-
-.stats-container {
-  display: flex;
-  margin-bottom: 20px;
-}
-
-.statistic-value {
-  font-size: 24px;
-  font-weight: bold;
-  color: #409eff;
-}
-</style>

From f3576d51f29e707dcbd001f0e24f29f910fb1a95 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 25 Apr 2025 18:39:26 +0800
Subject: [PATCH 340/497] =?UTF-8?q?refactor:=20:recycle:=20stomp=20?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E7=AE=A1=E7=90=86=E5=99=A8=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=8C=87=E6=95=B0=E9=80=80=E9=81=BF?=
 =?UTF-8?q?=E9=87=8D=E8=BF=9E=E7=AD=96=E7=95=A5=EF=BC=8C=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20WebSocket=20=E6=9C=8D=E5=8A=A1=E7=9A=84=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeDropdown/index.vue       |   2 +-
 src/hooks/index.ts                            |   7 +
 src/hooks/useWebSocketOnlineUsers.ts          | 176 ------------------
 src/hooks/{ => websocket/core}/useStomp.ts    |  91 ++++++++-
 src/hooks/websocket/index.ts                  |  11 ++
 .../services/useDictSync.ts}                  |  39 ++--
 .../websocket/services/useOnlineCount.ts      | 149 +++++++++++++++
 src/plugins/websocket.ts                      |   4 +-
 src/views/dashboard/index.vue                 |   4 +-
 src/views/demo/dict-sync.vue                  |   4 +-
 src/views/demo/websocket.vue                  |   2 +-
 11 files changed, 287 insertions(+), 202 deletions(-)
 create mode 100644 src/hooks/index.ts
 delete mode 100644 src/hooks/useWebSocketOnlineUsers.ts
 rename src/hooks/{ => websocket/core}/useStomp.ts (60%)
 create mode 100644 src/hooks/websocket/index.ts
 rename src/hooks/{useWebSocketDict.ts => websocket/services/useDictSync.ts} (80%)
 create mode 100644 src/hooks/websocket/services/useOnlineCount.ts

diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index dcf4b93c..9950a9e0 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -94,7 +94,7 @@ const noticeList = ref<NoticePageVO[]>([]);
 const noticeDialogVisible = ref(false);
 const noticeDetail = ref<NoticeDetailVO | null>(null);
 
-import { useStomp } from "@/hooks/useStomp";
+import { useStomp } from "@/hooks/websocket/core/useStomp";
 const { subscribe, unsubscribe, isConnected } = useStomp();
 
 watch(
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
new file mode 100644
index 00000000..abab537d
--- /dev/null
+++ b/src/hooks/index.ts
@@ -0,0 +1,7 @@
+/**
+ * 全局Hooks入口文件
+ * 导出所有可用的Hooks
+ */
+
+// 导出WebSocket相关Hook
+export * from "./websocket";
diff --git a/src/hooks/useWebSocketOnlineUsers.ts b/src/hooks/useWebSocketOnlineUsers.ts
deleted file mode 100644
index 8921f1d9..00000000
--- a/src/hooks/useWebSocketOnlineUsers.ts
+++ /dev/null
@@ -1,176 +0,0 @@
-import { ref, onMounted, onUnmounted, watch } from "vue";
-import { useStomp } from "./useStomp";
-import { ElMessage } from "element-plus";
-
-export interface OnlineUserStats {
-  type: string; // 事件类型
-  count: number; // 当前在线用户数量
-  users?: any[]; // 用户列表（可选）
-  timestamp: number; // 时间戳
-}
-
-/**
- * 在线用户WebSocket Hook
- * 用于订阅后端推送的在线用户数量变化
- */
-export function useWebSocketOnlineUsers() {
-  // 在线用户数量
-  const onlineUserCount = ref(0);
-
-  // 最后更新时间戳
-  const lastUpdateTime = ref(0);
-
-  // 连接状态
-  const isConnected = ref(false);
-
-  // 连接正在尝试中
-  const isConnecting = ref(false);
-
-  // 使用Stomp客户端
-  const { connect, subscribe, unsubscribe, disconnect, isConnected: stompConnected } = useStomp();
-
-  // 订阅ID
-  let subscriptionId = "";
-
-  // 重连次数
-  let reconnectCount = 0;
-  // 最大重连次数
-  const maxReconnectAttempts = 5;
-  // 重连计时器
-  let reconnectTimer: any = null;
-
-  // 监听Stomp连接状态
-  watch(stompConnected, (connected) => {
-    if (connected && isConnecting.value) {
-      isConnected.value = true;
-      isConnecting.value = false;
-      reconnectCount = 0;
-
-      // 一旦连接成功，立即订阅主题
-      subscribeToOnlineUsers();
-      console.log("WebSocket连接成功，已订阅在线用户主题");
-    }
-  });
-
-  /**
-   * 订阅在线用户主题
-   */
-  const subscribeToOnlineUsers = () => {
-    if (!stompConnected.value) return;
-
-    // 如果已经订阅，先取消订阅
-    if (subscriptionId) {
-      unsubscribe(subscriptionId);
-    }
-
-    // 订阅在线用户主题
-    subscriptionId = subscribe("/topic/online-users", (message) => {
-      try {
-        const data: OnlineUserStats = JSON.parse(message.body);
-
-        // 只有在消息类型为ONLINE_USERS_CHANGE时更新数据
-        if (data.type === "ONLINE_USERS_CHANGE") {
-          onlineUserCount.value = data.count || 0;
-          lastUpdateTime.value = data.timestamp || Date.now();
-        }
-      } catch (error) {
-        console.error("解析在线用户数据失败:", error);
-      }
-    });
-  };
-
-  /**
-   * 初始化WebSocket连接并订阅在线用户主题
-   */
-  const initWebSocket = () => {
-    if (isConnecting.value) return;
-
-    isConnecting.value = true;
-
-    // 连接WebSocket
-    connect();
-
-    // 设置连接超时
-    const connectionTimeout = setTimeout(() => {
-      if (!isConnected.value) {
-        console.warn("WebSocket连接超时，尝试重连");
-        attemptReconnect();
-      }
-    }, 5000);
-
-    // 监听连接状态变化，连接成功后清除超时计时器
-    const unwatch = watch(stompConnected, (connected) => {
-      if (connected) {
-        clearTimeout(connectionTimeout);
-        unwatch();
-      }
-    });
-  };
-
-  /**
-   * 尝试重新连接
-   */
-  const attemptReconnect = () => {
-    if (reconnectCount >= maxReconnectAttempts) {
-      console.error(`已达到最大重连次数(${maxReconnectAttempts})，停止重连`);
-      isConnecting.value = false;
-      ElMessage.error("WebSocket连接失败，请稍后刷新页面重试");
-      return;
-    }
-
-    reconnectCount++;
-    console.log(`尝试重连(${reconnectCount}/${maxReconnectAttempts})...`);
-
-    // 使用指数退避策略增加重连间隔
-    const delay = Math.min(1000 * Math.pow(2, reconnectCount), 30000);
-
-    // 清除之前的计时器
-    if (reconnectTimer) {
-      clearTimeout(reconnectTimer);
-    }
-
-    // 设置重连计时器
-    reconnectTimer = setTimeout(() => {
-      connect();
-    }, delay);
-  };
-
-  /**
-   * 关闭WebSocket连接
-   */
-  const closeWebSocket = () => {
-    if (subscriptionId) {
-      unsubscribe(subscriptionId);
-      subscriptionId = "";
-    }
-
-    // 清除重连计时器
-    if (reconnectTimer) {
-      clearTimeout(reconnectTimer);
-      reconnectTimer = null;
-    }
-
-    disconnect();
-    isConnected.value = false;
-    isConnecting.value = false;
-  };
-
-  // 组件挂载时初始化WebSocket
-  onMounted(() => {
-    initWebSocket();
-  });
-
-  // 组件卸载时关闭WebSocket
-  onUnmounted(() => {
-    closeWebSocket();
-  });
-
-  return {
-    onlineUserCount,
-    lastUpdateTime,
-    isConnected,
-    isConnecting,
-    initWebSocket,
-    closeWebSocket,
-  };
-}
diff --git a/src/hooks/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
similarity index 60%
rename from src/hooks/useStomp.ts
rename to src/hooks/websocket/core/useStomp.ts
index a6deb5a7..7b7cdb16 100644
--- a/src/hooks/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -7,12 +7,24 @@ export interface UseStompOptions {
   brokerURL?: string;
   /** 用于鉴权的 token，不传时使用 getAccessToken() 的返回值 */
   token?: string;
-  /** 重连延迟，单位毫秒，默认为 5000 */
+  /** 重连延迟，单位毫秒，默认为 8000 */
   reconnectDelay?: number;
+  /** 连接超时时间，单位毫秒，默认为 10000 */
+  connectionTimeout?: number;
+  /** 是否开启指数退避重连策略 */
+  useExponentialBackoff?: boolean;
+  /** 最大重连次数，默认为 5 */
+  maxReconnectAttempts?: number;
+  /** 最大重连延迟，单位毫秒，默认为 60000 */
+  maxReconnectDelay?: number;
   /** 是否开启调试日志 */
   debug?: boolean;
 }
 
+/**
+ * STOMP WebSocket连接Hook
+ * 用于管理WebSocket连接的建立、断开、重连和消息订阅
+ */
 export function useStomp(options: UseStompOptions = {}) {
   // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
   const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
@@ -20,9 +32,20 @@ export function useStomp(options: UseStompOptions = {}) {
 
   const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
   const token = options.token ?? defaultToken;
+  const reconnectDelay = options.reconnectDelay ?? 8000;
+  const connectionTimeout = options.connectionTimeout ?? 10000;
+  const useExponentialBackoff = options.useExponentialBackoff ?? false;
+  const maxReconnectAttempts = options.maxReconnectAttempts ?? 5;
+  const maxReconnectDelay = options.maxReconnectDelay ?? 60000;
 
   // 连接状态标记
   const isConnected = ref(false);
+  // 重连尝试次数
+  const reconnectCount = ref(0);
+  // 重连计时器
+  let reconnectTimer: any = null;
+  // 连接超时计时器
+  let connectionTimeoutTimer: any = null;
   // 存储所有订阅
   const subscriptions = new Map<string, StompSubscription>();
 
@@ -43,8 +66,8 @@ export function useStomp(options: UseStompOptions = {}) {
       connectHeaders: {
         Authorization: `Bearer ${token}`,
       },
-      debug: () => {},
-      reconnectDelay: 5000,
+      debug: options.debug ? console.log : () => {},
+      reconnectDelay: useExponentialBackoff ? 0 : reconnectDelay, // 使用自定义退避策略时禁用内置重连
       heartbeatIncoming: 4000,
       heartbeatOutgoing: 4000,
     });
@@ -52,6 +75,8 @@ export function useStomp(options: UseStompOptions = {}) {
     // 设置连接监听器
     client.value.onConnect = () => {
       isConnected.value = true;
+      reconnectCount.value = 0;
+      clearTimeout(connectionTimeoutTimer);
       console.log("WebSocket连接已建立");
     };
 
@@ -59,6 +84,11 @@ export function useStomp(options: UseStompOptions = {}) {
     client.value.onDisconnect = () => {
       isConnected.value = false;
       console.log("WebSocket连接已断开");
+
+      // 如果使用自定义指数退避重连策略，则在这里处理
+      if (useExponentialBackoff && reconnectCount.value < maxReconnectAttempts) {
+        handleReconnect();
+      }
     };
 
     // 设置 Web Socket 关闭监听器
@@ -73,6 +103,36 @@ export function useStomp(options: UseStompOptions = {}) {
     };
   };
 
+  /**
+   * 处理重连逻辑
+   */
+  const handleReconnect = () => {
+    if (reconnectCount.value >= maxReconnectAttempts) {
+      console.error(`已达到最大重连次数(${maxReconnectAttempts})，停止重连`);
+      return;
+    }
+
+    reconnectCount.value++;
+    console.log(`尝试重连(${reconnectCount.value}/${maxReconnectAttempts})...`);
+
+    // 使用指数退避策略增加重连间隔
+    const delay = useExponentialBackoff
+      ? Math.min(reconnectDelay * Math.pow(2, reconnectCount.value - 1), maxReconnectDelay)
+      : reconnectDelay;
+
+    // 清除之前的计时器
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+    }
+
+    // 设置重连计时器
+    reconnectTimer = setTimeout(() => {
+      if (!isConnected.value && client.value) {
+        client.value.activate();
+      }
+    }, delay);
+  };
+
   // 监听 brokerURL 的变化，若地址改变则重新初始化
   watch(brokerURL, (newURL, oldURL) => {
     if (newURL !== oldURL) {
@@ -106,6 +166,17 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
+    // 设置连接超时
+    clearTimeout(connectionTimeoutTimer);
+    connectionTimeoutTimer = setTimeout(() => {
+      if (!isConnected.value) {
+        console.warn("WebSocket连接超时");
+        if (useExponentialBackoff) {
+          handleReconnect();
+        }
+      }
+    }, connectionTimeout);
+
     client.value.activate();
   };
 
@@ -155,13 +226,27 @@ export function useStomp(options: UseStompOptions = {}) {
       console.log("Already disconnected, skipping disconnect() call.");
       return;
     }
+
+    // 清除所有计时器
+    if (reconnectTimer) {
+      clearTimeout(reconnectTimer);
+      reconnectTimer = null;
+    }
+
+    if (connectionTimeoutTimer) {
+      clearTimeout(connectionTimeoutTimer);
+      connectionTimeoutTimer = null;
+    }
+
     client.value?.deactivate();
     isConnected.value = false;
+    reconnectCount.value = 0;
   };
 
   return {
     client,
     isConnected,
+    reconnectCount,
     connect,
     subscribe,
     unsubscribe,
diff --git a/src/hooks/websocket/index.ts b/src/hooks/websocket/index.ts
new file mode 100644
index 00000000..3d44e748
--- /dev/null
+++ b/src/hooks/websocket/index.ts
@@ -0,0 +1,11 @@
+/**
+ * WebSocket相关Hook入口文件
+ * 统一导出所有WebSocket相关Hook
+ */
+
+// 核心基础Hook
+export { useStomp } from "./core/useStomp";
+
+// 业务服务Hook
+export { useOnlineCount } from "./services/useOnlineCount";
+export { useDictSync } from "./services/useDictSync";
diff --git a/src/hooks/useWebSocketDict.ts b/src/hooks/websocket/services/useDictSync.ts
similarity index 80%
rename from src/hooks/useWebSocketDict.ts
rename to src/hooks/websocket/services/useDictSync.ts
index 3eb4054a..d37fa8ba 100644
--- a/src/hooks/useWebSocketDict.ts
+++ b/src/hooks/websocket/services/useDictSync.ts
@@ -1,6 +1,7 @@
 import { useDictStoreHook } from "@/store/modules/dict.store";
-import { useStomp } from "@/hooks/useStomp";
+import { useStomp } from "../core/useStomp";
 import { IMessage } from "@stomp/stompjs";
+import { ref } from "vue";
 
 // 字典消息类型
 export interface DictMessage {
@@ -12,14 +13,21 @@ export interface DictMessage {
 export type DictMessageCallback = (message: DictMessage) => void;
 
 // 全局单例实例
-let instance: ReturnType<typeof createWebSocketDict> | null = null;
+let instance: ReturnType<typeof createDictSyncHook> | null = null;
 
-// 创建WebSocket词典处理函数
-function createWebSocketDict() {
+/**
+ * 创建字典同步Hook
+ * 负责监听后端字典变更并同步到前端
+ */
+function createDictSyncHook() {
   const dictStore = useDictStoreHook();
 
-  // 使用现有的useStomp
-  const { isConnected, connect, subscribe, unsubscribe, disconnect } = useStomp();
+  // 使用现有的useStomp，配置适合字典场景的重连参数
+  const { isConnected, connect, subscribe, unsubscribe, disconnect } = useStomp({
+    reconnectDelay: 10000, // 使用更长的重连延迟 - 10秒
+    connectionTimeout: 15000, // 更长的连接超时时间 - 15秒
+    useExponentialBackoff: false, // 字典数据不需要指数退避策略
+  });
 
   // 存储订阅ID
   const subscriptionIds = ref<string[]>([]);
@@ -89,12 +97,12 @@ function createWebSocketDict() {
 
     console.log(`开始尝试订阅字典主题: ${topic}`);
 
-    // 延迟订阅，确保连接先建立
+    // 使用简化的重试逻辑，依赖useStomp的连接管理
     const attemptSubscribe = () => {
       if (!isConnected.value) {
         console.log("等待WebSocket连接建立...");
-        // 500ms后再次尝试
-        setTimeout(attemptSubscribe, 500);
+        // 3秒后再次尝试
+        setTimeout(attemptSubscribe, 3000);
         return;
       }
 
@@ -115,9 +123,7 @@ function createWebSocketDict() {
         subscribedTopics.value.add(topic);
         console.log(`字典主题订阅成功: ${topic}`);
       } else {
-        console.warn(`字典主题订阅失败，1秒后重试: ${topic}`);
-        // 尝试重新订阅
-        setTimeout(attemptSubscribe, 1000);
+        console.warn(`字典主题订阅失败: ${topic}`);
       }
     };
 
@@ -171,10 +177,13 @@ function createWebSocketDict() {
   };
 }
 
-// 导出单例实例的钩子
-export function useWebSocketDict() {
+/**
+ * 字典同步Hook
+ * 用于监听后端字典变更并同步到前端
+ */
+export function useDictSync() {
   if (!instance) {
-    instance = createWebSocketDict();
+    instance = createDictSyncHook();
   }
   return instance;
 }
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/hooks/websocket/services/useOnlineCount.ts
new file mode 100644
index 00000000..587532fe
--- /dev/null
+++ b/src/hooks/websocket/services/useOnlineCount.ts
@@ -0,0 +1,149 @@
+import { ref, onMounted, onUnmounted, watch } from "vue";
+import { useStomp } from "../core/useStomp";
+import { ElMessage } from "element-plus";
+
+/**
+ * 在线用户计数Hook
+ * 用于订阅后端推送的在线用户数量变化
+ */
+export function useOnlineCount() {
+  // 在线用户数量
+  const onlineUserCount = ref(0);
+
+  // 最后更新时间戳
+  const lastUpdateTime = ref(0);
+
+  // 连接状态
+  const isConnected = ref(false);
+
+  // 连接正在尝试中
+  const isConnecting = ref(false);
+
+  // 使用Stomp客户端 - 配置使用指数退避策略
+  const {
+    connect,
+    subscribe,
+    unsubscribe,
+    disconnect,
+    isConnected: stompConnected,
+  } = useStomp({
+    reconnectDelay: 5000, // 初始重连延迟5秒
+    maxReconnectAttempts: 3, // 最大重连3次
+    connectionTimeout: 10000, // 连接超时10秒
+    useExponentialBackoff: true, // 启用指数退避
+  });
+
+  // 订阅ID
+  let subscriptionId = "";
+
+  // 连接超时计时器
+  let connectionTimeoutTimer: any = null;
+
+  // 监听Stomp连接状态
+  watch(stompConnected, (connected) => {
+    if (connected && isConnecting.value) {
+      isConnected.value = true;
+      isConnecting.value = false;
+
+      // 一旦连接成功，立即订阅主题
+      subscribeToOnlineCount();
+      console.log("WebSocket连接成功，已订阅在线用户计数主题");
+    }
+  });
+
+  /**
+   * 订阅在线用户计数主题
+   */
+  const subscribeToOnlineCount = () => {
+    if (!stompConnected.value) return;
+
+    // 如果已经订阅，先取消订阅
+    if (subscriptionId) {
+      unsubscribe(subscriptionId);
+    }
+
+    // 订阅在线用户计数主题
+    subscriptionId = subscribe("/topic/online-count", (message) => {
+      try {
+        const data = message.body;
+
+        const jsonData = JSON.parse(data);
+        const count = typeof jsonData === "number" ? jsonData : jsonData.count;
+
+        if (!isNaN(count)) {
+          onlineUserCount.value = count;
+          lastUpdateTime.value = Date.now();
+        }
+      } catch (error) {
+        console.error("解析在线用户数量失败:", error);
+      }
+    });
+  };
+
+  /**
+   * 初始化WebSocket连接并订阅在线用户主题
+   */
+  const initWebSocket = () => {
+    if (isConnecting.value) return;
+
+    isConnecting.value = true;
+
+    // 连接WebSocket
+    connect();
+
+    // 设置连接超时显示UI提示
+    connectionTimeoutTimer = setTimeout(() => {
+      if (!isConnected.value) {
+        console.warn("WebSocket连接超时，将自动尝试重连");
+        ElMessage.warning("正在尝试连接服务器，请稍候...");
+      }
+    }, 10000); // 较长的UI提示超时
+
+    // 监听连接状态变化，连接成功后清除超时计时器
+    const unwatch = watch(stompConnected, (connected) => {
+      if (connected) {
+        clearTimeout(connectionTimeoutTimer);
+        unwatch();
+      }
+    });
+  };
+
+  /**
+   * 关闭WebSocket连接
+   */
+  const closeWebSocket = () => {
+    if (subscriptionId) {
+      unsubscribe(subscriptionId);
+      subscriptionId = "";
+    }
+
+    // 清除连接超时计时器
+    if (connectionTimeoutTimer) {
+      clearTimeout(connectionTimeoutTimer);
+      connectionTimeoutTimer = null;
+    }
+
+    disconnect();
+    isConnected.value = false;
+    isConnecting.value = false;
+  };
+
+  // 组件挂载时初始化WebSocket
+  onMounted(() => {
+    initWebSocket();
+  });
+
+  // 组件卸载时关闭WebSocket
+  onUnmounted(() => {
+    closeWebSocket();
+  });
+
+  return {
+    onlineUserCount,
+    lastUpdateTime,
+    isConnected,
+    isConnecting,
+    initWebSocket,
+    closeWebSocket,
+  };
+}
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index 3844dd9e..890f438f 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,4 +1,4 @@
-import { useWebSocketDict } from "@/hooks/useWebSocketDict";
+import { useDictSync } from "@/hooks/websocket/services/useDictSync";
 import { getAccessToken } from "@/utils/auth";
 
 /**
@@ -19,7 +19,7 @@ export function setupWebSocket() {
   try {
     // 延迟初始化，确保应用完全启动
     setTimeout(() => {
-      const dictWebSocket = useWebSocketDict();
+      const dictWebSocket = useDictSync();
 
       // 初始化字典WebSocket服务
       dictWebSocket.initWebSocket();
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index ad38d539..6687ef95 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -324,10 +324,10 @@ import { useUserStore } from "@/store/modules/user.store";
 import { formatGrowthRate } from "@/utils";
 import { useTransition, useDateFormat } from "@vueuse/core";
 import { Connection, Failed } from "@element-plus/icons-vue";
-import { useWebSocketOnlineUsers } from "@/hooks/useWebSocketOnlineUsers";
+import { useOnlineCount } from "@/hooks/websocket/services/useOnlineCount";
 
 // 在线用户数量组件相关
-const { onlineUserCount, lastUpdateTime, isConnected } = useWebSocketOnlineUsers();
+const { onlineUserCount, lastUpdateTime, isConnected } = useOnlineCount();
 
 // 记录上一次的用户数量用于计算趋势
 const previousCount = ref(0);
diff --git a/src/views/demo/dict-sync.vue b/src/views/demo/dict-sync.vue
index 08c6bd07..6e10da0a 100644
--- a/src/views/demo/dict-sync.vue
+++ b/src/views/demo/dict-sync.vue
@@ -142,7 +142,7 @@
 import { useDictStoreHook } from "@/store/modules/dict.store";
 import { useDateFormat } from "@vueuse/core";
 import DictAPI, { DictItemForm } from "@/api/system/dict.api";
-import { useWebSocketDict, DictMessage } from "@/hooks/useWebSocketDict";
+import { useDictSync, DictMessage } from "@/hooks/websocket/services/useDictSync";
 
 // 性别字典编码
 const DICT_CODE = "gender";
@@ -161,7 +161,7 @@ const dictForm = ref<DictItemForm | null>(null);
 const selectedGender = ref("");
 
 // 初始化WebSocket
-const dictWebSocket = useWebSocketDict();
+const dictWebSocket = useDictSync();
 
 // 获取连接状态
 const wsConnected = computed(() => dictWebSocket.isConnected);
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 946fb464..32ddaaf8 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script setup lang="ts">
-import { useStomp } from "@/hooks/useStomp";
+import { useStomp } from "@/hooks/websocket/core/useStomp";
 import { useUserStoreHook } from "@/store/modules/user.store";
 
 const userStore = useUserStoreHook();

From 5ede0ceb9d81ae621448d4c429d6f342731a1daa Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 26 Apr 2025 09:25:42 +0800
Subject: [PATCH 341/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=89=8B=E6=9C=BA=E7=AB=AF=E6=98=BE=E7=A4=BA=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/index.vue | 113 ++++++++++++++++++++++------------
 1 file changed, 74 insertions(+), 39 deletions(-)

diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 6687ef95..b62eafe2 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -4,28 +4,29 @@
     <github-corner class="github-corner" />
 
     <el-card shadow="never" class="mt-2">
-      <el-row class="h-80px">
-        <el-col :span="18" :xs="24">
-          <div class="flex-x-start">
-            <img
-              class="w80px h80px rounded-full"
-              :src="http://github.com/userStore.userInfo.avatar%20+'?imageView2/1/w/80/h/80'"
-            />
-            <div class="ml-5">
-              <p>{{ greetings }}</p>
-              <p class="text-sm text-gray">今日天气晴朗，气温在15℃至25℃之间，东南风。</p>
-            </div>
+      <div class="flex flex-wrap">
+        <!-- 左侧问候语区域 -->
+        <div class="flex-1 flex items-start">
+          <img
+            class="w80px h80px rounded-full"
+            :src="http://github.com/userStore.userInfo.avatar%20+'?imageView2/1/w/80/h/80'"
+          />
+          <div class="ml-5">
+            <p>{{ greetings }}</p>
+            <p class="text-sm text-gray">今日天气晴朗，气温在15℃至25℃之间，东南风。</p>
           </div>
-        </el-col>
-
-        <el-col :span="6" :xs="24">
-          <el-row class="h-80px flex-y-center" :gutter="10">
-            <el-col :span="10">
-              <div class="font-bold color-#ff9a2e text-sm flex-y-center">
+        </div>
+
+        <!-- 右侧图标区域 - PC端 -->
+        <div class="hidden sm:block">
+          <div class="flex items-end space-x-6">
+            <!-- 仓库 -->
+            <div>
+              <div class="font-bold color-#ff9a2e text-sm flex items-center">
                 <el-icon class="mr-2px"><Folder /></el-icon>
                 仓库
               </div>
-              <div class="mt-3">
+              <div class="mt-3 whitespace-nowrap">
                 <el-link href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
                   <div class="i-svg:gitee text-lg color-#F76560" />
                 </el-link>
@@ -38,14 +39,15 @@
                   <div class="i-svg:gitcode text-lg color-#FF9A2E" />
                 </el-link>
               </div>
-            </el-col>
+            </div>
 
-            <el-col :span="10">
-              <div class="font-bold color-#4080ff text-sm flex-y-center">
+            <!-- 文档 -->
+            <div>
+              <div class="font-bold color-#4080ff text-sm flex items-center">
                 <el-icon class="mr-2px"><Document /></el-icon>
                 文档
               </div>
-              <div class="mt-3">
+              <div class="mt-3 whitespace-nowrap">
                 <el-link href="https://juejin.cn/post/7228990409909108793" target="_blank">
                   <div class="i-svg:juejin text-lg" />
                 </el-link>
@@ -61,29 +63,62 @@
                   <div class="i-svg:cnblogs text-lg" />
                 </el-link>
               </div>
-            </el-col>
+            </div>
 
-            <el-col :span="4">
-              <div class="font-bold color-#f76560 text-sm flex-y-center">
+            <!-- 视频 -->
+            <div>
+              <div class="font-bold color-#f76560 text-sm flex items-center">
                 <el-icon class="mr-2px"><VideoCamera /></el-icon>
                 视频
               </div>
-              <div class="mt-3">
+              <div class="mt-3 whitespace-nowrap">
                 <el-link href="https://www.bilibili.com/video/BV1eFUuYyEFj" target="_blank">
                   <div class="i-svg:bilibili text-lg" />
                 </el-link>
               </div>
-            </el-col>
-          </el-row>
-        </el-col>
-      </el-row>
+            </div>
+          </div>
+        </div>
+
+        <!-- 移动端图标区域 -->
+        <div class="w-full sm:hidden mt-3">
+          <div class="flex justify-end space-x-4 overflow-x-auto">
+            <!-- 仓库图标 -->
+            <el-link href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
+              <div class="i-svg:gitee text-lg color-#F76560" />
+            </el-link>
+            <el-link href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
+              <div class="i-svg:github text-lg color-#4080FF" />
+            </el-link>
+            <el-link href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
+              <div class="i-svg:gitcode text-lg color-#FF9A2E" />
+            </el-link>
+
+            <!-- 文档图标 -->
+            <el-link href="https://juejin.cn/post/7228990409909108793" target="_blank">
+              <div class="i-svg:juejin text-lg" />
+            </el-link>
+            <el-link href="https://youlai.blog.csdn.net/article/details/130191394" target="_blank">
+              <div class="i-svg:csdn text-lg" />
+            </el-link>
+            <el-link href="https://www.cnblogs.com/haoxianrui/p/17331952.html" target="_blank">
+              <div class="i-svg:cnblogs text-lg" />
+            </el-link>
+
+            <!-- 视频图标 -->
+            <el-link href="https://www.bilibili.com/video/BV1eFUuYyEFj" target="_blank">
+              <div class="i-svg:bilibili text-lg" />
+            </el-link>
+          </div>
+        </div>
+      </div>
     </el-card>
 
     <!-- 数据统计 -->
     <el-row :gutter="10" class="mt-5">
       <!-- 在线用户数量 -->
-      <el-col :span="8">
-        <el-card shadow="never">
+      <el-col :span="8" :xs="24" class="mb-xs-3">
+        <el-card shadow="never" class="h-full flex flex-col">
           <template #header>
             <div class="flex-x-between">
               <span class="text-gray">在线用户</span>
@@ -91,7 +126,7 @@
             </div>
           </template>
 
-          <div class="flex-x-between mt-2">
+          <div class="flex-x-between mt-2 flex-1">
             <div class="flex-y-center">
               <span class="text-lg transition-all duration-300 hover:scale-110">
                 {{ onlineUserCount }}
@@ -116,7 +151,7 @@
       </el-col>
 
       <!-- 访客数(UV) -->
-      <el-col :span="8">
+      <el-col :span="8" :xs="24" class="mb-xs-3">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
@@ -138,7 +173,7 @@
             </el-card>
           </template>
           <template v-if="!visitStatsLoading">
-            <el-card shadow="never">
+            <el-card shadow="never" class="h-full flex flex-col">
               <template #header>
                 <div class="flex-x-between">
                   <span class="text-gray">访客数(UV)</span>
@@ -146,7 +181,7 @@
                 </div>
               </template>
 
-              <div class="flex-x-between mt-2">
+              <div class="flex-x-between mt-2 flex-1">
                 <div class="flex-y-center">
                   <span class="text-lg">{{ Math.round(transitionUvCount) }}</span>
                   <span
@@ -176,7 +211,7 @@
       </el-col>
 
       <!-- 浏览量(PV) -->
-      <el-col :span="8">
+      <el-col :span="8" :xs="24">
         <el-skeleton :loading="visitStatsLoading" :rows="5" animated>
           <template #template>
             <el-card>
@@ -198,7 +233,7 @@
             </el-card>
           </template>
           <template v-if="!visitStatsLoading">
-            <el-card shadow="never">
+            <el-card shadow="never" class="h-full flex flex-col">
               <template #header>
                 <div class="flex-x-between">
                   <span class="text-gray">浏览量(PV)</span>
@@ -206,7 +241,7 @@
                 </div>
               </template>
 
-              <div class="flex-x-between mt-2">
+              <div class="flex-x-between mt-2 flex-1">
                 <div class="flex-y-center">
                   <span class="text-lg">{{ Math.round(transitionPvCount) }}</span>
                   <span

From 3deff743adc82397bd51d44f2b6f4f097138fdc3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 26 Apr 2025 09:26:19 +0800
Subject: [PATCH 342/497] chore: :hammer: bump version to 2.28.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index fd5513df..06e1d214 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.27.0",
+  "version": "2.28.0",
   "private": true,
   "type": "module",
   "scripts": {

From 3acbf8944767a358a551f271c9f94a79e483052d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 26 Apr 2025 19:54:14 +0800
Subject: [PATCH 343/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D`WebSo?=
 =?UTF-8?q?cket`=E6=8E=88=E6=9D=83=E4=BB=A4=E7=89=8C=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=AF=BC=E8=87=B4=E8=BF=9E=E6=8E=A5=E6=96=AD?=
 =?UTF-8?q?=E7=BA=BF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/websocket/core/useStomp.ts          | 44 +++++++++++++++++--
 .../websocket/services/useOnlineCount.ts      | 20 +++++++++
 2 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/src/hooks/websocket/core/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
index 7b7cdb16..4a02a6ba 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -28,10 +28,10 @@ export interface UseStompOptions {
 export function useStomp(options: UseStompOptions = {}) {
   // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
   const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
-  const defaultToken = getAccessToken();
+  // 不再使用defaultToken，每次连接时直接获取最新token
 
   const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
-  const token = options.token ?? defaultToken;
+  // 不再存储token，改为在初始化时获取
   const reconnectDelay = options.reconnectDelay ?? 8000;
   const connectionTimeout = options.connectionTimeout ?? 10000;
   const useExponentialBackoff = options.useExponentialBackoff ?? false;
@@ -60,11 +60,20 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
+    // 每次连接前重新获取最新令牌，不依赖之前的token值
+    const currentToken = getAccessToken();
+
+    // 检查令牌是否为空，如果为空则不进行连接
+    if (!currentToken) {
+      console.error("WebSocket连接失败：授权令牌为空，请先登录");
+      return;
+    }
+
     // 创建 STOMP 客户端
     client.value = new Client({
       brokerURL: brokerURL.value,
       connectHeaders: {
-        Authorization: `Bearer ${token}`,
+        Authorization: `Bearer ${currentToken}`,
       },
       debug: options.debug ? console.log : () => {},
       reconnectDelay: useExponentialBackoff ? 0 : reconnectDelay, // 使用自定义退避策略时禁用内置重连
@@ -95,11 +104,40 @@ export function useStomp(options: UseStompOptions = {}) {
     client.value.onWebSocketClose = (event) => {
       isConnected.value = false;
       console.log(`WebSocket已关闭: ${event?.code} ${event?.reason}`);
+
+      // 如果是授权问题导致的关闭，尝试重新获取令牌
+      if (event?.code === 1000 || event?.code === 1006 || event?.code === 1008) {
+        console.log("可能是授权问题导致连接关闭，尝试重新建立连接");
+
+        // 等待一段时间后再尝试重连，避免立即重连
+        setTimeout(() => {
+          // 强制重新初始化客户端，获取最新令牌
+          client.value = null;
+
+          // 检查当前是否有有效令牌
+          const freshToken = getAccessToken();
+          if (freshToken) {
+            initializeClient();
+            connect();
+          } else {
+            console.warn("没有有效令牌，暂不重连WebSocket");
+          }
+        }, 3000);
+      }
     };
 
     // 设置错误监听器
     client.value.onStompError = (frame) => {
       console.error("STOMP错误:", frame.headers, frame.body);
+
+      // 检查是否是授权错误
+      if (
+        frame.headers?.message?.includes("Unauthorized") ||
+        frame.body?.includes("Unauthorized") ||
+        frame.body?.includes("Token")
+      ) {
+        console.warn("WebSocket授权错误，请检查登录状态");
+      }
     };
   };
 
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/hooks/websocket/services/useOnlineCount.ts
index 587532fe..20f8a749 100644
--- a/src/hooks/websocket/services/useOnlineCount.ts
+++ b/src/hooks/websocket/services/useOnlineCount.ts
@@ -1,6 +1,7 @@
 import { ref, onMounted, onUnmounted, watch } from "vue";
 import { useStomp } from "../core/useStomp";
 import { ElMessage } from "element-plus";
+import { getAccessToken } from "@/utils/auth";
 
 /**
  * 在线用户计数Hook
@@ -86,16 +87,35 @@ export function useOnlineCount() {
   const initWebSocket = () => {
     if (isConnecting.value) return;
 
+    // 检查是否有可用的令牌
+    const hasToken = !!getAccessToken();
+    if (!hasToken) {
+      console.log("没有检测到有效令牌，不尝试WebSocket连接");
+      return;
+    }
+
     isConnecting.value = true;
 
     // 连接WebSocket
     connect();
 
     // 设置连接超时显示UI提示
+    clearTimeout(connectionTimeoutTimer);
     connectionTimeoutTimer = setTimeout(() => {
       if (!isConnected.value) {
         console.warn("WebSocket连接超时，将自动尝试重连");
         ElMessage.warning("正在尝试连接服务器，请稍候...");
+
+        // 超时后尝试重新连接
+        closeWebSocket();
+        setTimeout(() => {
+          // 再次检查令牌有效性
+          if (getAccessToken()) {
+            initWebSocket();
+          } else {
+            console.log("令牌无效，放弃重连");
+          }
+        }, 3000);
       }
     }, 10000); // 较长的UI提示超时
 

From 360df6a53eb9419d0cc106e6de141af1f1250553 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 26 Apr 2025 19:55:22 +0800
Subject: [PATCH 344/497] chore: :hammer: bump version to 2.28.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 06e1d214..e7c1cefc 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.28.0",
+  "version": "2.28.1",
   "private": true,
   "type": "module",
   "scripts": {

From 15abaf3ba9a94f2e73283f94e280faff2c5b855e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Sun, 27 Apr 2025 22:02:21 +0800
Subject: [PATCH 345/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E7=B1=BB=E5=9E=8B=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SizeSelect/index.vue           |  2 +-
 .../NavBar/components/NavbarRight.vue         |  5 ++--
 src/layout/components/Settings/index.vue      | 23 ++++++++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index e5a78b38..7d49bc5b 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -1,6 +1,6 @@
 <template>
   <!-- 布局大小 -->
-  <el-tooltip :content="$t('sizeSelect.tooltip')" effect="dark" placement="bottom">
+  <el-tooltip :content="t('sizeSelect.tooltip')" effect="dark" placement="bottom">
     <el-dropdown trigger="click" @command="handleSizeChange">
       <div>
         <div class="i-svg:size" />
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 10c6606d..b05911aa 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -27,10 +27,10 @@
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item @click="handleProfileClick">
-            {{ $t("navbar.profile") }}
+            {{ t("navbar.profile") }}
           </el-dropdown-item>
           <el-dropdown-item divided @click="logout">
-            {{ $t("navbar.logout") }}
+            {{ t("navbar.logout") }}
           </el-dropdown-item>
         </el-dropdown-menu>
       </template>
@@ -43,6 +43,7 @@
   </div>
 </template>
 <script setup lang="ts">
+const { t } = useI18n();
 import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
diff --git a/src/layout/components/Settings/index.vue b/src/layout/components/Settings/index.vue
index b86b8994..06554be0 100644
--- a/src/layout/components/Settings/index.vue
+++ b/src/layout/components/Settings/index.vue
@@ -2,11 +2,11 @@
   <el-drawer
     v-model="drawerVisible"
     size="300"
-    :title="$t('settings.project')"
+    :title="t('settings.project')"
     :before-close="handleCloseDrawer"
   >
     <section class="config-section">
-      <el-divider>{{ $t("settings.theme") }}</el-divider>
+      <el-divider>{{ t("settings.theme") }}</el-divider>
 
       <div class="flex-center">
         <el-switch
@@ -20,10 +20,10 @@
 
     <!-- 界面设置 -->
     <section class="config-section">
-      <el-divider>{{ $t("settings.interface") }}</el-divider>
+      <el-divider>{{ t("settings.interface") }}</el-divider>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ $t("settings.themeColor") }}</span>
+        <span class="text-xs">{{ t("settings.themeColor") }}</span>
         <el-color-picker
           v-model="selectedThemeColor"
           :predefine="colorPresets"
@@ -32,27 +32,27 @@
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ $t("settings.tagsView") }}</span>
+        <span class="text-xs">{{ t("settings.tagsView") }}</span>
         <el-switch v-model="settingsStore.tagsView" />
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ $t("settings.sidebarLogo") }}</span>
+        <span class="text-xs">{{ t("settings.sidebarLogo") }}</span>
         <el-switch v-model="settingsStore.sidebarLogo" />
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ $t("settings.watermark") }}</span>
+        <span class="text-xs">{{ t("settings.watermark") }}</span>
         <el-switch v-model="settingsStore.watermarkEnabled" />
       </div>
       <div v-if="!isDark" class="config-item flex-x-between">
-        <span class="text-xs">{{ $t("settings.sidebarColorScheme") }}</span>
+        <span class="text-xs">{{ t("settings.sidebarColorScheme") }}</span>
         <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
           <el-radio :value="SidebarColor.CLASSIC_BLUE">
-            {{ $t("settings.classicBlue") }}
+            {{ t("settings.classicBlue") }}
           </el-radio>
           <el-radio :value="SidebarColor.MINIMAL_WHITE">
-            {{ $t("settings.minimalWhite") }}
+            {{ t("settings.minimalWhite") }}
           </el-radio>
         </el-radio-group>
       </div>
@@ -60,13 +60,14 @@
 
     <!-- 布局设置 -->
     <section class="config-section">
-      <el-divider>{{ $t("settings.navigation") }}</el-divider>
+      <el-divider>{{ t("settings.navigation") }}</el-divider>
       <LayoutSelect v-model="settingsStore.layout" @update:model-value="handleLayoutChange" />
     </section>
   </el-drawer>
 </template>
 
 <script setup lang="ts">
+const { t } = useI18n();
 import { LayoutMode } from "@/enums/settings/layout.enum";
 import { ThemeMode } from "@/enums/settings/theme.enum";
 import { SidebarColor } from "@/enums/settings/theme.enum";

From 0907d9d4b17d7f81f4d08ad1ac771ec6a29dfc4f Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 28 Apr 2025 14:24:21 +0800
Subject: [PATCH 346/497] =?UTF-8?q?fix:=20:bug:=20(i18n):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在英文和中文语言文件中将 "thenetoggle" 错别字修正为 "themeToggle"
---
 src/lang/package/en.ts    | 2 +-
 src/lang/package/zh-cn.ts | 2 +-
 src/views/login/index.vue | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index edff4d40..73653665 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -6,7 +6,7 @@ export default {
   },
   // 登录页面国际化
   login: {
-    theneToggle: "Theme Switch",
+    themeToggle: "Theme Switch",
     languageToggle: "Language Switch",
     dark: "Dark",
     light: "Light",
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index f86191b6..b3313183 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -6,7 +6,7 @@ export default {
   },
   // 登录页面国际化
   login: {
-    theneToggle: "主题切换",
+    themeToggle: "主题切换",
     languageToggle: "语言切换",
     dark: "暗黑",
     light: "明亮",
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 2800b5d9..f8db7a56 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -2,7 +2,7 @@
   <div class="wh-full flex-center flex-col login">
     <!-- 右侧切换主题、语言按钮 -->
     <div class="flex flex-col gap-4px fixed top-40px right-40px text-lg">
-      <el-tooltip :content="t('login.theneToggle')" placement="left">
+      <el-tooltip :content="t('login.themeToggle')" placement="left">
         <CommonWrapper>
           <DarkModeSwitch />
         </CommonWrapper>

From ee1718b9d95b0f1d66e49b696a930206d3f49681 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 28 Apr 2025 14:30:01 +0800
Subject: [PATCH 347/497] =?UTF-8?q?fix:=20:bug:=20el-link=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BC=83=E7=94=A8underline=E5=B1=9E=E6=80=A7=E4=B8=BA?=
 =?UTF-8?q?boolean=E5=80=BC=E7=9A=84=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 :underline="false" 替换为 underline="never"
---
 src/components/CURD/PageContent.vue     | 2 +-
 src/components/CURD/PageSearch.vue      | 2 +-
 src/components/NoticeDropdown/index.vue | 4 ++--
 src/views/dashboard/index.vue           | 4 ++--
 src/views/demo/dictionary.vue           | 8 ++++----
 src/views/login/components/Login.vue    | 4 ++--
 src/views/login/components/Register.vue | 4 ++--
 src/views/login/components/ResetPwd.vue | 2 +-
 8 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index d98b98fe..ace91a2a 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -295,7 +295,7 @@
                     v-if="contentConfig.importTemplate"
                     type="primary"
                     icon="download"
-                    :underline="false"
+                    underline="never"
                     @click="handleDownloadTemplate"
                   >
                     下载模板
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 4743565a..afd380eb 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -46,7 +46,7 @@
           <el-button icon="refresh" @click="handleReset">重置</el-button>
           <!-- 展开/收起 -->
           <template v-if="isExpandable && formItems.length > showNumber">
-            <el-link class="ml-3" type="primary" :underline="false" @click="isExpand = !isExpand">
+            <el-link class="ml-3" type="primary" underline="never" @click="isExpand = !isExpand">
               {{ isExpand ? "收起" : "展开" }}
               <component :is="isExpand ? ArrowUp : ArrowDown" class="w-4 h-4 ml-2" />
             </el-link>
diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index 9950a9e0..0333ed88 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -35,7 +35,7 @@
             </div>
             <el-divider />
             <div class="flex-x-between">
-              <el-link type="primary" :underline="false" @click="handleViewMoreNotice">
+              <el-link type="primary" underline="never" @click="handleViewMoreNotice">
                 <span class="text-xs">查看更多</span>
                 <el-icon class="text-xs">
                   <ArrowRight />
@@ -44,7 +44,7 @@
               <el-link
                 v-if="noticeList.length > 0"
                 type="primary"
-                :underline="false"
+                underline="never"
                 @click="handleMarkAllAsRead"
               >
                 <span class="text-xs">全部已读</span>
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index b62eafe2..125c0dd6 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -295,7 +295,7 @@
               <span class="header-title">最新动态</span>
               <el-link
                 type="primary"
-                :underline="false"
+                underline="never"
                 href="https://gitee.com/youlaiorg/vue3-element-admin/releases"
                 target="_blank"
               >
@@ -331,7 +331,7 @@
                       :type="index === 0 ? 'primary' : 'info'"
                       :href="http://github.com/item.link"
                       target="_blank"
-                      :underline="false"
+                      underline="never"
                     >
                       详情
                       <el-icon class="link-icon"><TopRight /></el-icon>
diff --git a/src/views/demo/dictionary.vue b/src/views/demo/dictionary.vue
index 98bf4233..60969300 100644
--- a/src/views/demo/dictionary.vue
+++ b/src/views/demo/dictionary.vue
@@ -18,28 +18,28 @@ const arrayValue = ref(["1", "2"]); // 性别(值为Array)
     <el-form>
       <el-form-item label="性别">
         <dict v-model="stringValue" code="gender" />
-        <el-link :underline="false" type="primary" class="ml-5">
+        <el-link underline="never" type="primary" class="ml-5">
           值为String: const value = ref("1");
         </el-link>
       </el-form-item>
 
       <el-form-item label="性别">
         <dict v-model="numberValue" code="gender" />
-        <el-link :underline="false" type="success" class="ml-5">
+        <el-link underline="never" type="success" class="ml-5">
           值为Number: const value = ref(1);
         </el-link>
       </el-form-item>
 
       <el-form-item label="单选框字典">
         <dict v-model="numberValue" type="radio" code="gender" />
-        <el-link :underline="false" type="success" class="ml-5">
+        <el-link underline="never" type="success" class="ml-5">
           值为Number: const value = ref(1);
         </el-link>
       </el-form-item>
 
       <el-form-item label="复选框字典">
         <dict v-model="arrayValue" type="checkbox" code="gender" />
-        <el-link :underline="false" type="success" class="ml-5">
+        <el-link underline="never" type="success" class="ml-5">
           值为Array: const value = ref(["1", "2"]);
         </el-link>
       </el-form-item>
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 32f9f0d2..ebc84411 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -59,7 +59,7 @@
 
       <div class="flex-x-between w-full">
         <el-checkbox v-model="loginFormData.rememberMe">{{ t("login.rememberMe") }}</el-checkbox>
-        <el-link type="primary" :underline="false" @click="toOtherForm('resetPwd')">
+        <el-link type="primary" underline="never" @click="toOtherForm('resetPwd')">
           {{ t("login.forgetPassword") }}
         </el-link>
       </div>
@@ -74,7 +74,7 @@
 
     <div flex-center gap-10px>
       <el-text size="default">{{ t("login.noAccount") }}</el-text>
-      <el-link type="primary" :underline="false" @click="toOtherForm('register')">
+      <el-link type="primary" underline="never" @click="toOtherForm('register')">
         {{ t("login.reg") }}
       </el-link>
     </div>
diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue
index 37d21491..787e9f1b 100644
--- a/src/views/login/components/Register.vue
+++ b/src/views/login/components/Register.vue
@@ -77,7 +77,7 @@
       <el-form-item>
         <div class="flex-y-center w-full gap-10px">
           <el-checkbox v-model="isRead">{{ t("login.agree") }}</el-checkbox>
-          <el-link type="primary" :underline="false">{{ t("login.userAgreement") }}</el-link>
+          <el-link type="primary" underline="never">{{ t("login.userAgreement") }}</el-link>
         </div>
       </el-form-item>
 
@@ -90,7 +90,7 @@
     </el-form>
     <div flex-center gap-10px>
       <el-text size="default">{{ t("login.haveAccount") }}</el-text>
-      <el-link type="primary" :underline="false" @click="toLogin">{{ t("login.login") }}</el-link>
+      <el-link type="primary" underline="never" @click="toLogin">{{ t("login.login") }}</el-link>
     </div>
   </div>
 </template>
diff --git a/src/views/login/components/ResetPwd.vue b/src/views/login/components/ResetPwd.vue
index a504fe47..c8380025 100644
--- a/src/views/login/components/ResetPwd.vue
+++ b/src/views/login/components/ResetPwd.vue
@@ -19,7 +19,7 @@
 
     <div flex-center gap-10px>
       <el-text size="default">{{ t("login.thinkOfPasswd") }}</el-text>
-      <el-link type="primary" :underline="false" @click="toLogin">{{ t("login.login") }}</el-link>
+      <el-link type="primary" underline="never" @click="toLogin">{{ t("login.login") }}</el-link>
     </div>
   </div>
 </template>

From bb12dc9920ff202f1994cc12c36c7f5925a6e8a8 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 28 Apr 2025 15:32:30 +0800
Subject: [PATCH 348/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20el-?=
 =?UTF-8?q?link=20=E7=BB=84=E4=BB=B6=E5=BC=83=E7=94=A8underline=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=B8=BAboolean=E5=80=BC=E7=9A=84=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserImport.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index bcfb420e..38534daa 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -37,7 +37,7 @@
                   <el-link
                     type="primary"
                     icon="download"
-                    :underline="false"
+                    underline="never"
                     @click="handleDownloadTemplate"
                   >
                     下载模板

From bec22c3a983a5d9ed861c06818f80a0865db8568 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Tue, 29 Apr 2025 10:12:02 +0800
Subject: [PATCH 349/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=BA=E4=B8=AD=E5=BF=83=E5=BC=B9=E7=AA=97=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E9=87=8D=E7=BD=AE=E8=A1=A8=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

个人中心弹出样取消重置表单
---
 src/views/profile/index.vue | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 543c1445..947bb2fe 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -209,7 +209,7 @@
 
       <template #footer>
         <span class="dialog-footer">
-          <el-button @click="dialog.visible = false">取消</el-button>
+          <el-button @click="handleCancel">取消</el-button>
           <el-button type="primary" @click="handleSubmit">确定</el-button>
         </span>
       </template>
@@ -244,6 +244,10 @@ const dialog = reactive({
   title: "",
   type: "" as DialogType, // 修改账号资料,修改密码、绑定手机、绑定邮箱
 });
+const userProfileFormRef = ref();
+const passwordChangeFormRef = ref();
+const mobileBindingFormRef = ref();
+const emailBindingFormRef = ref();
 
 const userProfileForm = reactive<UserProfileForm>({});
 const passwordChangeForm = reactive<PasswordChangeForm>({});
@@ -410,6 +414,22 @@ const handleSubmit = async () => {
   }
 };
 
+/**
+ * 取消
+ */
+const handleCancel = () => {
+  dialog.visible = false;
+  if (dialog.type === DialogType.ACCOUNT) {
+    userProfileFormRef.value?.resetFields();
+  } else if (dialog.type === DialogType.PASSWORD) {
+    passwordChangeFormRef.value?.resetFields();
+  } else if (dialog.type === DialogType.MOBILE) {
+    mobileBindingFormRef.value?.resetFields();
+  } else if (dialog.type === DialogType.EMAIL) {
+    emailBindingFormRef.value?.resetFields();
+  }
+};
+
 const fileInput = ref<HTMLInputElement | null>(null);
 
 const triggerFileUpload = () => {

From ea6323084c84502a0d5b75ba6d1ca25088fd6532 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 29 Apr 2025 23:05:37 +0800
Subject: [PATCH 350/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20element-plus=20=E7=89=88=E6=9C=AC=20`2.9.8`=20=E2=86=92=20`2?=
 =?UTF-8?q?.9.9`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e7c1cefc..44813e7e 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.8",
+    "element-plus": "^2.9.9",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",

From 142d808a5e09de7dc9303f12f2b2fc81c7fe0385 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 29 Apr 2025 23:37:13 +0800
Subject: [PATCH 351/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=20websocket=20=E5=BC=80=E5=90=AF=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E9=85=8D=E7=BD=AE=20endpoint=20=E4=B8=8D?=
 =?UTF-8?q?=E8=BF=9E=E6=8E=A5=EF=BC=8C=E5=8D=95=E4=BE=8B=E6=8E=A7=E5=88=B6?=
 =?UTF-8?q?=20websocket=20=E9=87=8D=E5=A4=8D=E8=BF=9E=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/hooks/websocket/core/useStomp.ts          | 22 ++++++++++++-------
 src/hooks/websocket/services/useDictSync.ts   | 11 +++++-----
 .../websocket/services/useOnlineCount.ts      | 12 ++++++----
 src/plugins/websocket.ts                      | 18 +++++++++++++++
 4 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/src/hooks/websocket/core/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
index 4a02a6ba..74897755 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -28,14 +28,13 @@ export interface UseStompOptions {
 export function useStomp(options: UseStompOptions = {}) {
   // 默认值：brokerURL 从环境变量中获取，token 从 getAccessToken() 获取
   const defaultBrokerURL = import.meta.env.VITE_APP_WS_ENDPOINT || "";
-  // 不再使用defaultToken，每次连接时直接获取最新token
 
   const brokerURL = ref(options.brokerURL ?? defaultBrokerURL);
-  // 不再存储token，改为在初始化时获取
-  const reconnectDelay = options.reconnectDelay ?? 8000;
+  // 默认配置参数
+  const reconnectDelay = options.reconnectDelay ?? 15000; // 默认15秒重连间隔
   const connectionTimeout = options.connectionTimeout ?? 10000;
   const useExponentialBackoff = options.useExponentialBackoff ?? false;
-  const maxReconnectAttempts = options.maxReconnectAttempts ?? 5;
+  const maxReconnectAttempts = options.maxReconnectAttempts ?? 3; // 最多重连3次
   const maxReconnectDelay = options.maxReconnectDelay ?? 60000;
 
   // 连接状态标记
@@ -76,7 +75,7 @@ export function useStomp(options: UseStompOptions = {}) {
         Authorization: `Bearer ${currentToken}`,
       },
       debug: options.debug ? console.log : () => {},
-      reconnectDelay: useExponentialBackoff ? 0 : reconnectDelay, // 使用自定义退避策略时禁用内置重连
+      reconnectDelay: useExponentialBackoff ? 0 : reconnectDelay, // 禁用内置重连机制
       heartbeatIncoming: 4000,
       heartbeatOutgoing: 4000,
     });
@@ -195,12 +194,19 @@ export function useStomp(options: UseStompOptions = {}) {
       initializeClient();
     }
 
-    if (client.value && (client.value.connected || client.value.active)) {
+    if (!client.value) {
+      console.error("STOMP客户端初始化失败");
       return;
     }
 
-    if (!client.value) {
-      console.error("STOMP客户端初始化失败");
+    // 避免重复连接:检查是否已连接或正在连接
+    if (client.value.connected) {
+      console.log("WebSocket已经连接,跳过重复连接");
+      return;
+    }
+
+    if (client.value.active) {
+      console.log("WebSocket连接正在进行中,跳过重复连接请求");
       return;
     }
 
diff --git a/src/hooks/websocket/services/useDictSync.ts b/src/hooks/websocket/services/useDictSync.ts
index d37fa8ba..fa2257f3 100644
--- a/src/hooks/websocket/services/useDictSync.ts
+++ b/src/hooks/websocket/services/useDictSync.ts
@@ -24,9 +24,10 @@ function createDictSyncHook() {
 
   // 使用现有的useStomp，配置适合字典场景的重连参数
   const { isConnected, connect, subscribe, unsubscribe, disconnect } = useStomp({
-    reconnectDelay: 10000, // 使用更长的重连延迟 - 10秒
-    connectionTimeout: 15000, // 更长的连接超时时间 - 15秒
-    useExponentialBackoff: false, // 字典数据不需要指数退避策略
+    reconnectDelay: 20000, // 字典更新重连时间
+    connectionTimeout: 15000, // 连接超时阈值
+    useExponentialBackoff: false, // 使用固定间隔重连策略
+    maxReconnectAttempts: 3, // 最多重连3次
   });
 
   // 存储订阅ID
@@ -101,8 +102,8 @@ function createDictSyncHook() {
     const attemptSubscribe = () => {
       if (!isConnected.value) {
         console.log("等待WebSocket连接建立...");
-        // 3秒后再次尝试
-        setTimeout(attemptSubscribe, 3000);
+        // 10秒后再次尝试
+        setTimeout(attemptSubscribe, 10000);
         return;
       }
 
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/hooks/websocket/services/useOnlineCount.ts
index 20f8a749..4eae5471 100644
--- a/src/hooks/websocket/services/useOnlineCount.ts
+++ b/src/hooks/websocket/services/useOnlineCount.ts
@@ -28,9 +28,9 @@ export function useOnlineCount() {
     disconnect,
     isConnected: stompConnected,
   } = useStomp({
-    reconnectDelay: 5000, // 初始重连延迟5秒
-    maxReconnectAttempts: 3, // 最大重连3次
-    connectionTimeout: 10000, // 连接超时10秒
+    reconnectDelay: 15000, // 重连基础延迟
+    maxReconnectAttempts: 3, // 重连次数上限
+    connectionTimeout: 10000, // 连接超时
     useExponentialBackoff: true, // 启用指数退避
   });
 
@@ -56,7 +56,11 @@ export function useOnlineCount() {
    * 订阅在线用户计数主题
    */
   const subscribeToOnlineCount = () => {
-    if (!stompConnected.value) return;
+    if (!stompConnected.value) {
+      // 10秒后重试订阅
+      setTimeout(subscribeToOnlineCount, 10000);
+      return;
+    }
 
     // 如果已经订阅，先取消订阅
     if (subscriptionId) {
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index 890f438f..84745950 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,12 +1,28 @@
 import { useDictSync } from "@/hooks/websocket/services/useDictSync";
 import { getAccessToken } from "@/utils/auth";
 
+// 用于防止重复初始化的状态标记
+let isInitialized = false;
+
 /**
  * 初始化WebSocket服务
  */
 export function setupWebSocket() {
   console.log("[WebSocketPlugin] 开始初始化WebSocket服务...");
 
+  // 检查是否已经初始化
+  if (isInitialized) {
+    console.log("[WebSocketPlugin] WebSocket服务已经初始化,跳过重复初始化");
+    return;
+  }
+
+  // 检查环境变量是否配置
+  const wsEndpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
+  if (!wsEndpoint) {
+    console.log("[WebSocketPlugin] 未配置WebSocket端点,跳过WebSocket初始化");
+    return;
+  }
+
   // 检查token是否存在
   const token = getAccessToken();
   if (!token) {
@@ -29,9 +45,11 @@ export function setupWebSocket() {
       window.addEventListener("beforeunload", () => {
         console.log("[WebSocketPlugin] 窗口即将关闭，断开WebSocket连接");
         dictWebSocket.closeWebSocket();
+        isInitialized = false;
       });
 
       console.log("[WebSocketPlugin] WebSocket服务初始化完成");
+      isInitialized = true;
     }, 1000); // 延迟1秒初始化
   } catch (error) {
     console.error("[WebSocketPlugin] 初始化WebSocket服务失败:", error);

From d619e3c2e68b8e98f51f3c01d83052d06e964b2a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 29 Apr 2025 23:46:32 +0800
Subject: [PATCH 352/497] =?UTF-8?q?fix(websocket):=20:bug:=20=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84WebSocket=E7=AB=AF=E7=82=B9=E9=85=8D=E7=BD=AE=E6=A3=80?=
 =?UTF-8?q?=E6=9F=A5=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在所有WebSocket相关组件中添加对VITE_APP_WS_ENDPOINT的检查
确保未配置WebSocket端点时不会尝试建立连接
防止出现"brokerURL or webSocketFactory must be provided"错误
---
 src/hooks/websocket/core/useStomp.ts           | 12 ++++++++++++
 src/hooks/websocket/services/useDictSync.ts    |  7 +++++++
 src/hooks/websocket/services/useOnlineCount.ts |  7 +++++++
 3 files changed, 26 insertions(+)

diff --git a/src/hooks/websocket/core/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
index 74897755..a3874ff6 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -59,6 +59,12 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
+    // 检查WebSocket端点是否配置
+    if (!brokerURL.value) {
+      console.error("WebSocket连接失败: 未配置WebSocket端点URL");
+      return;
+    }
+
     // 每次连接前重新获取最新令牌，不依赖之前的token值
     const currentToken = getAccessToken();
 
@@ -190,6 +196,12 @@ export function useStomp(options: UseStompOptions = {}) {
    * 激活连接（如果已经连接或正在激活则直接返回）
    */
   const connect = () => {
+    // 检查是否有配置WebSocket端点
+    if (!brokerURL.value) {
+      console.error("WebSocket连接失败: 未配置WebSocket端点URL");
+      return;
+    }
+
     if (!client.value) {
       initializeClient();
     }
diff --git a/src/hooks/websocket/services/useDictSync.ts b/src/hooks/websocket/services/useDictSync.ts
index fa2257f3..d89f867f 100644
--- a/src/hooks/websocket/services/useDictSync.ts
+++ b/src/hooks/websocket/services/useDictSync.ts
@@ -59,6 +59,13 @@ function createDictSyncHook() {
    */
   const initWebSocket = async () => {
     try {
+      // 检查是否配置了WebSocket端点
+      const wsEndpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
+      if (!wsEndpoint) {
+        console.log("[WebSocket] 未配置WebSocket端点,跳过连接");
+        return;
+      }
+
       // 连接WebSocket
       connect();
 
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/hooks/websocket/services/useOnlineCount.ts
index 4eae5471..be81365c 100644
--- a/src/hooks/websocket/services/useOnlineCount.ts
+++ b/src/hooks/websocket/services/useOnlineCount.ts
@@ -91,6 +91,13 @@ export function useOnlineCount() {
   const initWebSocket = () => {
     if (isConnecting.value) return;
 
+    // 检查WebSocket端点是否配置
+    const wsEndpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
+    if (!wsEndpoint) {
+      console.log("未配置WebSocket端点(VITE_APP_WS_ENDPOINT),跳过WebSocket连接");
+      return;
+    }
+
     // 检查是否有可用的令牌
     const hasToken = !!getAccessToken();
     if (!hasToken) {

From 37afb00bdbc8c5108c7a78d696533d9a30a758bd Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 30 Apr 2025 08:16:12 +0800
Subject: [PATCH 353/497] =?UTF-8?q?docs:=20:memo:=20=E6=B7=BB=E5=8A=A0=20`?=
 =?UTF-8?q?APP`=20=E9=A2=84=E8=A7=88=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8e74ea1d..feefcc21 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
   <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.7-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.9-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
@@ -49,10 +49,15 @@
 
 ## 项目截图
 
+- 控制台
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118160647.png)
 
+- API 接口文档
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183539.png)
 
+- APP 端
+![](https://www.youlai.tech/storage/blog/2025/04/30/app.jpg)
+
 ## 项目源码
 
 | 项目 | Gitee   | Github    | GitCode|

From 91dafbc623f63acabe25b4430350d3c1f671c7d8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 30 Apr 2025 08:27:44 +0800
Subject: [PATCH 354/497] =?UTF-8?q?docs:=20:memo:=20=E6=8E=92=E7=89=88?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index feefcc21..45aa2d76 100644
--- a/README.md
+++ b/README.md
@@ -49,13 +49,16 @@
 
 ## 项目截图
 
-- 控制台
+🖥️ **控制台**
+
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118160647.png)
 
-- API 接口文档
+⚡**接口文档**
+
 ![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183539.png)
 
-- APP 端
+📲 **移动端**
+
 ![](https://www.youlai.tech/storage/blog/2025/04/30/app.jpg)
 
 ## 项目源码

From f4f402b871a189c3f7bcb9899db5f1886254a2fd Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 30 Apr 2025 09:07:50 +0800
Subject: [PATCH 355/497] =?UTF-8?q?docs:=20:memo:=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 45aa2d76..70cf5dc7 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@
 
 
 <div align="center">
-  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a>|  <a target="_blank" href="https://www.youlai.tech//vue3-element-admin">🌐 官网</a> | <a href="http://github.com/README.en-US.md">💬 English
+  <a target="_blank" href="https://vue.youlai.tech/">🖥️ 在线预览</a> | <a target="_blank" href="https://app.youlai.tech/">📲 移动端预览</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 阅读文档</a>|  <a target="_blank" href="https://www.youlai.tech//vue3-element-admin">🌐 官网</a> | <a href="http://github.com/README.en-US.md">💬 English
 </div>
 
 
@@ -51,7 +51,7 @@
 
 🖥️ **控制台**
 
-![](https://www.youlai.tech/storage/blog/2025/01/18/20250118160647.png)
+![](https://www.youlai.tech/storage/blog/2025/04/30/20250430085342.png)
 
 ⚡**接口文档**
 
@@ -65,23 +65,25 @@
 
 | 项目 | Gitee   | Github    | GitCode|
 | ---- | ----| ---- | ---- |
-| vue3-element-admin 标准版| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
+| vue3-element-admin ✅| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
 | vue3-element-admin JS版| [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin-js) | [vue3-element-admin-js](https://github.com/youlaitech/vue3-element-admin-js) | [vue3-element-admin-js](https://gitcode.com/youlai/vue3-element-admin-js) |
-| vue3-element-admin 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
+| vue3-element-admin 精简版 | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |[vue3-element-template](https://gitcode.com/youlai/vue3-element-template)|
+| vue-uniapp-admin 移动版 | [vue-uniapp-admin](https://gitee.com/youlaiorg/vue-uniapp-admin) | [vue-uniapp-admin](https://github.com/youlaitech/vue-uniapp-admin) |[vue-uniapp-admin](https://gitcode.com/youlai/vue-uniapp-admin)|
 | Java 后端 | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
 | Node 后端 | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)       | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
 
 
 
-## 项目文档
+## 开发指南
 
-| 文档名称          | 访问地址                                                                                   |
-|---------------|-------------------------------------------------------------------------------------------|
-| 项目 0 到 1  | [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)  |
+| 名称          | 地址     |
+|---------------|--------------------|
+| 视频教程 | [https://www.bilibili.com/video/BV1eFUuYyEFj](https://www.bilibili.com/video/BV1eFUuYyEFj)  |
+| 项目搭建  | [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)  |
 | 官方文档 | [https://www.youlai.tech/vue3-element-admin/](https://www.youlai.tech/vue3-element-admin/)  |
 | 代码规范     | [ESLint V9 + Prettier + Stylelint + EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723) |
-| Git 规范 | [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236) |
-| 在线接口文档 | [https://www.apifox.cn/apidoc](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
+| 提交规范 | [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236) |
+| 接口文档 | [https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
 
 
 
@@ -92,7 +94,7 @@
 
 | 环境类型       | 名称                     |
 |----------------|-----------------------------|
-| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download)/[WebStorm](https://www.jetbrains.com.cn/webstorm/) |
+| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download) |
 | **运行环境**   | Node 18 + (推荐[22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
 > ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
 
@@ -206,7 +208,7 @@ Thanks to all the contributors!
 
 
 ## 特别感谢
-- 感谢 [Jetbrains](https://www.jetbrains.com.cn/) 为项目提供的 [WebStorm](https://www.jetbrains.com/community/opensource/#support) 授权
+
 - 感谢 [GitCode](https://gitcode.com/) 官方的 [G-Star](https://gitcode.com/g-star) 认证
   ![](https://foruda.gitee.com/images/1728577513089814203/95f2a70d_716974.jpeg)
 

From 5cb8ad8f22c3e6f60d98f405d50131e36625f12c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 30 Apr 2025 09:08:47 +0800
Subject: [PATCH 356/497] chore: :hammer: bump version to 2.28.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 44813e7e..16ea448f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.28.1",
+  "version": "2.28.2",
   "private": true,
   "type": "module",
   "scripts": {

From a4b4d5cf8d05efd801b80309c4fd921d5ef1955f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 1 May 2025 06:47:13 +0800
Subject: [PATCH 357/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 174 ++++++++++++++++++++++++++++++------------------
 1 file changed, 110 insertions(+), 64 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index d07f5550..0a92b177 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -3,15 +3,15 @@
   <h1>vue3-element-admin</h1>
 
   <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.0.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.1-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.9-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
   </a>
 
   <a href="https://gitee.com/youlaiorg/vue3-element-admin" target="_blank">
-     <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
+    <img alt="有来技术" src="https://gitee.com/youlaiorg/vue3-element-admin/badge/star.svg"/>
    </a>
   <a href="https://github.com/youlaitech/vue3-element-admin" target="_blank">
     <img alt="有来技术" src="https://img.shields.io/github/stars/youlaitech/vue3-element-admin.svg?style=social&label=Stars"/>
@@ -19,65 +19,90 @@
   <a href="https://gitcode.com/youlai/vue3-element-admin" target="_blank">
     <img alt="有来技术" src="https://gitcode.com/youlai/vue3-element-admin/star/badge.svg"/>
   </a>
-</div>
 
+</div>
 
 ![](https://foruda.gitee.com/images/1708618984641188532/a7cca095_716974.png "rainbow.png")
 
+
 <div align="center">
- <a target="_blank" href="http://vue3.youlai.tech/">👀 Live Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📖 Read Documentation</a> |  <a target="_blank" href="https://www.youlai.tech/vue3-element-admin">🌐 Official Website</a> | 🌐 <a href="http://github.com/README.md">中文
+  <a target="_blank" href="https://vue.youlai.tech/">🖥️ Live Preview</a> | <a target="_blank" href="https://app.youlai.tech/">📲 Mobile Preview</a> |  <a target="_blank" href="https://juejin.cn/post/7228990409909108793">📑 Documentation</a>|  <a target="_blank" href="https://www.youlai.tech//vue3-element-admin">🌐 Official Website</a> | <a href="http://github.com/README.md">💬 中文
 </div>
 
 
+## Introduction
 
+[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) is a minimalist enterprise-level backend management frontend template built with Vue3, Vite, TypeScript, and Element-Plus. It comes with complementary Java backend [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) and Node backend [youlai-nest](https://gitee.com/youlaiorg/youlai-nest). A simplified version [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) and a JavaScript version [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) are also available for developers to quickly start development.
 
-## Introduction
 
-[vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) is a free and open-source admin template for backend management frontend, built with popular technologies such as Vue3, Vite5, TypeScript, Element-Plus, and Pinia (with accompanying [backend source code](https://gitee.com/youlaiorg/youlai-boot)).
+## Project Features
 
+- **Simple and Easy-to-use**: Upgraded version of [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) for Vue3, with minimal encapsulation and easy to get started.
+- **Data Interaction**: Support for `Mock` data and [online API documentation](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5), with accompanying [Java](https://gitee.com/youlaiorg/youlai-boot) and [Node](https://gitee.com/youlaiorg/youlai-nest) backend source code.
 
+- **System Functions**: Provides user management, role management, menu management, department management, dictionary management, and other functional modules.
+- **Permission Management**: Supports dynamic routing, button permissions, role permissions, and data permissions.
 
+- **Infrastructure**: Provides internationalization, multiple layouts, dark mode, full screen, watermark, API documentation, and code generator functionality.
+- **Continuous Updates**: Project is continuously updated with real-time updates of tools and dependencies.
 
-## Project Features
 
-- **Simple and Easy-to-use**: Upgraded version of [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) for Vue3, with minimal encapsulation and easy to get started.
+## Project Screenshots
 
-- **Data Interaction**: Support both local `Mock` data and remote API. Comes with [Java backend source code](https://gitee.com/youlaiorg/youlai-boot) and online API documentation.
+🖥️ **Dashboard**
 
-- **Permission Management**: Complete permission system for users, roles, menus, dictionaries, and departments.
+![](https://www.youlai.tech/storage/blog/2025/04/30/20250430085342.png)
 
-- **Essential Infrastructure**: Dynamic routing, button permissions, internationalization, code style, Git commit conventions, and common component encapsulation.
+⚡**API Documentation**
 
-- **Continuous Updates**: Since 2021, the project has maintained an open-source status with continuous updates, integrating new tools and dependencies in real time, and has accumulated a broad user base.
+![](https://www.youlai.tech/storage/blog/2025/01/18/20250118183539.png)
 
-## Project Preview
+📲 **Mobile Version**
 
-![Light Mode](https://foruda.gitee.com/images/1709651876583793739/0ba1ee1c_716974.png)
+![](https://www.youlai.tech/storage/blog/2025/04/30/app.jpg)
 
-![Dark Mode](https://foruda.gitee.com/images/1709651875494206224/2a2b0b53_716974.png)
+## Project Source Code
 
-![API Documentation](https://foruda.gitee.com/images/1687755822857820115/96054330_716974.png)
+| Project | Gitee   | Github    | GitCode|
+| ---- | ----| ---- | ---- |
+| vue3-element-admin ✅| [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) |
+| vue3-element-admin JS Version| [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin-js) | [vue3-element-admin-js](https://github.com/youlaitech/vue3-element-admin-js) | [vue3-element-admin-js](https://gitcode.com/youlai/vue3-element-admin-js) |
+| vue3-element-admin Lite Version | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |[vue3-element-template](https://gitcode.com/youlai/vue3-element-template)|
+| vue-uniapp-admin Mobile Version | [vue-uniapp-admin](https://gitee.com/youlaiorg/vue-uniapp-admin) | [vue-uniapp-admin](https://github.com/youlaitech/vue-uniapp-admin) |[vue-uniapp-admin](https://gitcode.com/youlai/vue-uniapp-admin)|
+| Java Backend | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) |[youlai-boot](https://gitcode.com/youlai/youlai-boot.git)|
+| Node Backend | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)       | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
 
-## Project Links
 
-| Project  | Gitee                                                        | Github                                                       | GitCode                                                      |
-|----------| ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| Frontend | [vue3-element-admin](https://gitee.com/youlaiorg/vue3-element-admin) | [vue3-element-admin](https://github.com/youlaitech/vue3-element-admin) | [vue3-element-admin](https://gitcode.net/youlai/vue3-element-admin) |
-| Lite     | [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) | [vue3-element-template](https://github.com/youlaitech/vue3-element-template) |-|
-| Backend  | [youlai-boot](https://gitee.com/youlaiorg/youlai-boot)       | [youlai-boot](https://github.com/haoxianrui/youlai-boot.git) | [youlai-boot](https://gitcode.net/youlai/youlai-boot)        |
 
-## Environment Setup
+## Development Guide
+
+| Name          | Link     |
+|---------------|--------------------|
+| Video Tutorial | [https://www.bilibili.com/video/BV1eFUuYyEFj](https://www.bilibili.com/video/BV1eFUuYyEFj)  |
+| Project Setup  | [Building a Backend Management System from Scratch with Vue3, Vite, TypeScript, and Element-Plus](https://blog.csdn.net/u013737132/article/details/130191394)  |
+| Official Documentation | [https://www.youlai.tech/vue3-element-admin/](https://www.youlai.tech/vue3-element-admin/)  |
+| Code Standards     | [ESLint V9 + Prettier + Stylelint + EditorConfig for Standardized and Unified Frontend Code Style](https://youlai.blog.csdn.net/article/details/145608723) |
+| Commit Standards | [Husky + Lint-staged + Commitlint + Commitizen + cz-git for Git Commit Standards](https://youlai.blog.csdn.net/article/details/145615236) |
+| API Documentation | [https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
 
-| Environment         | Name and Version                                             | Download Link                                               |
-| -------------------- | :----------------------------------------------------------- | ------------------------------------------------------------ |
-| **Development Tool** | VSCode                                                       | [Download](https://code.visualstudio.com/Download)           |
-| **Runtime Environment** | Node ≥18                                                    | [Download](http://nodejs.cn/download)                        |
 
 
 ## Project Setup
 
+
+- **Environment Preparation**
+
+| Environment Type | Name                     |
+|----------------|-----------------------------|
+| **Development Tool**   | [Visual Studio Code](https://code.visualstudio.com/Download) |
+| **Runtime Environment**   | Node 18 + (Recommended [22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
+> ⚠️ Note: Node.js version 20.6.0 has compatibility issues, please don't use it
+
+
+- **Quick Start**
+
 ```bash
-# Clone the repository
+# Clone repository
 git clone https://gitee.com/youlaiorg/vue3-element-admin.git
 
 # Change directory
@@ -86,48 +111,59 @@ cd vue3-element-admin
 # Install pnpm
 npm install pnpm -g
 
+# Set mirror source (optional)
+pnpm config set registry https://registry.npmmirror.com
+
 # Install dependencies
 pnpm install
 
-# Start the project
+# Start development server
 pnpm run dev
 ```
 
+
 ## Project Deployment
 
+After executing the `pnpm run build` command, the project will be bundled and a `dist` directory will be generated. Next, upload the files from the `dist` directory to the `/usr/share/nginx/html` directory on your server and configure Nginx for reverse proxy.
+
 ```bash
-# Build the project
 pnpm run build
+```
 
-# Upload files to the remote server
-Copy the files generated in the `dist` directory to the `/usr/share/nginx/html` directory.
+Here is an example Nginx configuration:
 
-# nginx.cofig configuration
+```nginx
 server {
-	listen     80;
-	server_name  localhost;
-	location / {
-			root /usr/share/nginx/html;
-			index index.html index.htm;
-	}
-	# Reverse proxy configuration
-	location /prod-api/ {
-			proxy_pass http://vapi.youlai.tech/; # Replace vapi.youlai.tech with your backend API address
-	}
+    listen      80;
+    server_name localhost;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    # Reverse proxy configuration
+    location /prod-api/ {
+        # Please replace api.youlai.tech with your backend API address, and keep the trailing slash /
+        proxy_pass http://api.youlai.tech/;
+    }
 }
 ```
 
+For more detailed information, please refer to this article: [Nginx Installation and Configuration](https://blog.csdn.net/u013737132/article/details/145667694).
+
 ## Local Mock
 
-The project supports both online API and local mock API. By default, it uses the online API. If you want to switch to the mock API, modify the value of `VITE_MOCK_DEV_SERVER` in the `.env.development` file to `true`.
+The project supports both online and local Mock interfaces. By default, it uses online interfaces. To switch to Mock interfaces, modify the `VITE_MOCK_DEV_SERVER` value in the `.env.development` file to `true`.
 
 ## Backend API
 
-> If you have a basic understanding of Java development, follow these steps to convert online API to local backend API and set up a full-stack development environment.
+> If you have a basic understanding of Java development, follow these steps to convert online API to local backend API and create an enterprise-level full-stack development environment to help you on your full-stack journey.
 
 1. Get the backend source code based on `Java` and `SpringBoot` from [youlai-boot](https://gitee.com/youlaiorg/youlai-boot.git).
-2. Follow the instructions in the backend project's README.md to set up the local environment.
-3. Modify the value of `VITE_APP_API_URL` in the `.env.development` file to `http://localhost:8989`, replacing it with the backend API URL.
+2. Follow the instructions in the backend project's README.md to [set up and run locally](https://gitee.com/youlaiorg/youlai-boot#%E9%A1%B9%E7%9B%AE%E8%BF%90%E8%A1%8C).
+3. Modify the value of `VITE_APP_API_URL` in the `.env.development` file, changing it from https://api.youlai.tech to http://localhost:8989.
+
 
 ## Notes
 
@@ -141,20 +177,18 @@ The project supports both online API and local mock API. By default, it uses the
 
   Try upgrading your browser, as older browser engines may not support certain new JavaScript syntax, such as optional chaining operator `?.`.
 
+- **Project synchronization with repository updates**
+
+  After synchronizing the project with repository updates, it is recommended to run `pnpm install` to update dependencies before starting.
+
 - **Red highlight on project components, functions, and imports**
 
   Restart VSCode to try again.
 
 - **Other issues**
 
-  If you have any other issues or suggestions, please open an [issue](https://gitee.com/youlaiorg/vue3-element-admin/issues/new).
+  If you have any other issues or suggestions, please open an [ISSUE](https://gitee.com/youlaiorg/vue3-element-admin/issues/new).
 
-## Project Documentation
-
-- [Building a Backend Management System from Scratch with Vue3, Vite, TypeScript, and Element-Plus](https://blog.csdn.net/u013737132/article/details/130191394)
-
-- [ESLint+Prettier+Stylelint+EditorConfig for Standardized and Unified Frontend Code Style](https://blog.csdn.net/u013737132/article/details/130190788)
-- [Git Commit Conventions with Husky, Lint-staged, Commitlint, Commitizen, and cz-git](https://blog.csdn.net/u013737132/article/details/130191363)
 
 ## Commit Conventions
 
@@ -162,15 +196,27 @@ Execute `pnpm run commit` to invoke interactive git commit and complete the info
 
 ![](https://foruda.gitee.com/images/1687755823165218215/c1705416_716974.png)
 
-## Community 🚀
 
-> **Follow "Youlai Tech" WeChat Official Account to get the QR code for the community.**
->
-> If the QR code for the community has expired, please add my WeChat (haoxianrui) and indicate whether you are interested in "Frontend", "Backend", or "Full Stack" to get the latest QR code.
->
-> This measure is taken to ensure the quality of the community and prevent marketing advertising from infiltrating. Thank you for your understanding!
+## Project Statistics
+
+![](https://repobeats.axiom.co/api/embed/aa7cca3d6fa9c308fc659fa6e09af9a1910506c3.svg "Repobeats analytics image")
+
+
+Thanks to all the contributors!
+
+[![contributors](https://contrib.rocks/image?repo=youlaitech/vue3-element-admin)](https://github.com/youlaitech/vue3-element-admin/graphs/contributors)
+
+
+## Special Thanks
+
+- Thanks to the [GitCode](https://gitcode.com/) official [G-Star](https://gitcode.com/g-star) certification
+  ![](https://foruda.gitee.com/images/1728577513089814203/95f2a70d_716974.jpeg)
+
+## Community
+
+① Follow the "Youlai Tech" WeChat Official Account, click the **Group Chat** menu to get the QR code (this measure is taken to prevent ads from entering the group, thanks for your understanding and support).
+
+② Directly add WeChat **`haoxianrui`** with a note indicating "Frontend/Backend/Full Stack".
 
-| Official Account | Community |
-|:----:|:----:|
-| ![Youlai Tech WeChat Official Account QR Code](https://foruda.gitee.com/images/1687689212187063809/3c69eaee_716974.png) | ![Community QR Code](https://foruda.gitee.com/images/1687689212139273561/6a65ef69_716974.png) |
+![Youlai Tech WeChat Official Account](https://foruda.gitee.com/images/1737108820762592766/3390ed0d_716974.png)
 

From c6c1f3c0e3cf707e5946e1bb660e252883bb9bdc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 6 May 2025 14:11:31 +0800
Subject: [PATCH 358/497] =?UTF-8?q?fix:=20=E5=88=86=E9=A1=B5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/config/index.vue   | 15 ++++++++++-----
 src/views/system/dict/dict-item.vue | 18 ++++++++++++------
 src/views/system/dict/index.vue     | 19 ++++++++++++-------
 src/views/system/log/index.vue      | 16 +++++++++++-----
 src/views/system/role/index.vue     | 15 ++++++++++-----
 src/views/system/user/index.vue     | 28 ++++++++++++++++------------
 6 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 4696f18a..a12a9c59 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -87,7 +87,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -178,10 +178,9 @@ const rules = reactive({
   configValue: [{ required: true, message: "请输入系统配置值", trigger: "blur" }],
 });
 
-// 查询系统配置
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   ConfigAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
@@ -192,11 +191,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行复选框选中项变化
diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index 71ace3df..dea401e0 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -18,8 +18,8 @@
           <div class="search-form-btn-box">
             <div class="search-form-btn-box-item">
               <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
               </el-form-item>
             </div>
           </div>
@@ -83,7 +83,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -173,8 +173,8 @@ const computedRules = computed(() => {
   return rules;
 });
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
   DictAPI.getDictItemPage(dictCode.value, queryParams)
     .then((data) => {
@@ -186,11 +186,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行选择
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index de498561..4ada8af8 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -14,8 +14,8 @@
         </el-form-item>
 
         <el-form-item class="search-buttons">
-          <el-button type="primary" icon="search" @click="handleQuery()">搜索</el-button>
-          <el-button icon="refresh" @click="handleResetQuery()">重置</el-button>
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -89,7 +89,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -172,10 +172,9 @@ const computedRules = computed(() => {
   return rules;
 });
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   DictAPI.getPage(queryParams)
     .then((data) => {
       tableData.value = data.list;
@@ -186,11 +185,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行选择
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 90ae693b..028040aa 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -56,7 +56,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
   </div>
@@ -85,10 +85,9 @@ const queryParams = reactive<LogPageQuery>({
 // 日志表格数据
 const pageData = ref<LogPageVO[]>();
 
-/** 查询 */
-function handleQuery() {
+/** 获取数据 */
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   LogAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;
@@ -98,12 +97,19 @@ function handleQuery() {
       loading.value = false;
     });
 }
+
+/** 查询（重置页码后获取数据） */
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 /** 重置查询 */
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
   queryParams.createTime = undefined;
-  handleQuery();
+  fetchData();
 }
 
 onMounted(() => {
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ca331b3a..8697902b 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -94,7 +94,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery"
+        @pagination="fetchData"
       />
     </el-card>
 
@@ -277,10 +277,9 @@ const isExpanded = ref(true);
 
 const parentChildLinked = ref(true);
 
-// 查询
-function handleQuery() {
+// 获取数据
+function fetchData() {
   loading.value = true;
-  queryParams.pageNum = 1;
   RoleAPI.getPage(queryParams)
     .then((data) => {
       roleList.value = data.list;
@@ -291,11 +290,17 @@ function handleQuery() {
     });
 }
 
+// 查询（重置页码后获取数据）
+function handleQuery() {
+  queryParams.pageNum = 1;
+  fetchData();
+}
+
 // 重置查询
 function handleResetQuery() {
   queryFormRef.value.resetFields();
   queryParams.pageNum = 1;
-  handleQuery();
+  fetchData();
 }
 
 // 行复选框选中
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 87a077d4..ae943cbe 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -157,7 +157,7 @@
             v-model:total="total"
             v-model:page="queryParams.pageNum"
             v-model:limit="queryParams.pageSize"
-            @pagination="handleQuery"
+            @pagination="fetchData"
           />
         </el-card>
       </el-col>
@@ -313,18 +313,22 @@ const roleOptions = ref<OptionType[]>();
 // 导入弹窗显示状态
 const importDialogVisible = ref(false);
 
-// 查询
-async function handleQuery() {
+// 获取数据
+async function fetchData() {
   loading.value = true;
+  try {
+    const data = await UserAPI.getPage(queryParams);
+    pageData.value = data.list;
+    total.value = data.total;
+  } finally {
+    loading.value = false;
+  }
+}
+
+// 查询（重置页码后获取数据）
+function handleQuery() {
   queryParams.pageNum = 1;
-  UserAPI.getPage(queryParams)
-    .then((data) => {
-      pageData.value = data.list;
-      total.value = data.total;
-    })
-    .finally(() => {
-      loading.value = false;
-    });
+  fetchData();
 }
 
 // 重置查询
@@ -333,7 +337,7 @@ function handleResetQuery() {
   queryParams.pageNum = 1;
   queryParams.deptId = undefined;
   queryParams.createTime = undefined;
-  handleQuery();
+  fetchData();
 }
 
 // 选中项发生变化

From 0fc856508f9747bc2cf06496669d9ff6698f77ac Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 6 May 2025 14:13:10 +0800
Subject: [PATCH 359/497] chore: :hammer: bump version to 2.28.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 16ea448f..715b1112 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.28.2",
+  "version": "2.28.3",
   "private": true,
   "type": "module",
   "scripts": {

From f9695bbeae4358a983f46f876c3ab5fa74be82b0 Mon Sep 17 00:00:00 2001
From: zhangyuanpeng <1016062422@qq.com>
Date: Tue, 6 May 2025 17:27:00 +0800
Subject: [PATCH 360/497] =?UTF-8?q?fix:=20:bug:=20=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E6=A0=8F=E6=B0=B4=E5=B9=B3=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

水平滚动样式恢复及鼠标滚轮水平滚动
---
 src/layout/components/TagsView/index.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 1966873e..d020958e 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="tags-container">
     <!-- 水平滚动容器 -->
-    <el-scrollbar class="scroll-container" :vertical="false" @wheel="handleScroll">
+    <el-scrollbar ref="scrollbarRef" class="scroll-container" @wheel="handleScroll">
       <router-link
         v-for="tag in visitedViews"
         ref="tagRef"
@@ -344,8 +344,16 @@ function closeContentMenu() {
 /**
  * 处理鼠标滚轮事件，实现水平滚动
  */
-function handleScroll() {
+const scrollbarRef = ref();
+function handleScroll(event: any) {
   closeContentMenu();
+  // 检查是否有横向滚动条
+  if (scrollbarRef.value.wrapRef.scrollWidth > scrollbarRef.value.wrapRef.clientWidth) {
+    const wheelDelta = event.wheelDelta || 0; // 向上滚动时为120，向下滚动时为-120
+    const scrollLeft = scrollbarRef.value.wrapRef.scrollLeft; // 当前滚动条到左边的距离
+    // 设置滚动条到左边的距离
+    scrollbarRef.value.setScrollLeft(scrollLeft - wheelDelta);
+  }
 }
 
 /**
@@ -421,6 +429,11 @@ onMounted(() => {
   border: 1px solid var(--el-border-color-light);
   box-shadow: 0 1px 1px var(--el-box-shadow-light);
 
+  /* 滚动容器样式 */
+  .scroll-container {
+    white-space: nowrap;
+  }
+
   /* 标签项样式 */
   .tags-item {
     position: relative;

From e36f5c813fce2762ff02552f922da8133edb502f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 9 May 2025 12:56:00 +0800
Subject: [PATCH 361/497] =?UTF-8?q?refactor(eslint):=20:recycle:=20eslint?=
 =?UTF-8?q?=20=E8=A7=84=E5=88=99=E9=85=8D=E7=BD=AE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.js                            |   99 --
 eslint.config.ts                            |  176 +++
 package.json                                |    3 +-
 src/components/MenuSearch/index.vue         |    5 +-
 src/hooks/websocket/core/useStomp.ts        |    2 +-
 src/hooks/websocket/services/useDictSync.ts |    2 +-
 src/types/auto-imports.d.ts                 | 1577 +++++--------------
 vite.config.ts                              |    7 +-
 8 files changed, 579 insertions(+), 1292 deletions(-)
 delete mode 100644 eslint.config.js
 create mode 100644 eslint.config.ts

diff --git a/eslint.config.js b/eslint.config.js
deleted file mode 100644
index 28ccc1b5..00000000
--- a/eslint.config.js
+++ /dev/null
@@ -1,99 +0,0 @@
-// https://eslint.nodejs.cn/docs/latest/use/configure/configuration-files
-
-import globals from "globals";
-import pluginJs from "@eslint/js"; // JavaScript 规则
-import pluginVue from "eslint-plugin-vue"; // Vue 规则
-import pluginTypeScript from "@typescript-eslint/eslint-plugin"; // TypeScript 规则
-
-import parserVue from "vue-eslint-parser"; // Vue 解析器
-import parserTypeScript from "@typescript-eslint/parser"; // TypeScript 解析器
-
-import configPrettier from "eslint-config-prettier"; // 禁用与 Prettier 冲突的规则
-import pluginPrettier from "eslint-plugin-prettier"; // 运行 Prettier 规则
-
-// 解析自动导入配置
-import fs from "fs";
-const autoImportConfig = JSON.parse(fs.readFileSync(".eslintrc-auto-import.json", "utf-8"));
-
-/** @type {import('eslint').Linter.Config[]} */
-export default [
-  // 指定检查文件和忽略文件
-  {
-    files: ["**/*.{js,mjs,cjs,ts,vue}"],
-    ignores: ["**/*.d.ts"],
-  },
-  // 全局配置
-  {
-    languageOptions: {
-      globals: {
-        ...globals.browser,
-        ...globals.node,
-        ...autoImportConfig.globals,
-        ...{
-          PageQuery: "readonly",
-          PageResult: "readonly",
-          OptionType: "readonly",
-          ResponseData: "readonly",
-          ExcelResult: "readonly",
-          TagView: "readonly",
-          AppSettings: "readonly",
-          __APP_INFO__: "readonly",
-        },
-      },
-    },
-    plugins: { prettier: pluginPrettier },
-    rules: {
-      ...configPrettier.rules, // 关闭与 Prettier 冲突的规则
-      ...pluginPrettier.configs.recommended.rules, // 启用 Prettier 规则
-      "prettier/prettier": "error", // 强制 Prettier 格式化
-      "no-unused-vars": [
-        "error",
-        {
-          argsIgnorePattern: "^_", // 忽略参数名以 _ 开头的参数未使用警告
-          varsIgnorePattern: "^[A-Z0-9_]+$", // 忽略变量名为大写字母、数字或下划线组合的未使用警告（枚举定义未使用场景）
-          ignoreRestSiblings: true, // 忽略解构赋值中同级未使用变量的警告
-        },
-      ],
-    },
-  },
-  // JavaScript 配置
-  pluginJs.configs.recommended,
-
-  // TypeScript 配置
-  {
-    files: ["**/*.ts"],
-    ignores: ["**/*.d.ts"], // 排除d.ts文件
-    languageOptions: {
-      parser: parserTypeScript,
-      parserOptions: {
-        sourceType: "module",
-      },
-    },
-    plugins: { "@typescript-eslint": pluginTypeScript },
-    rules: {
-      ...pluginTypeScript.configs.strict.rules, // TypeScript 严格规则
-      "@typescript-eslint/no-explicit-any": "off", // 允许使用 any
-      "@typescript-eslint/no-empty-function": "off", // 允许空函数
-      "@typescript-eslint/no-empty-object-type": "off", // 允许空对象类型
-    },
-  },
-
-  // Vue 配置
-  {
-    files: ["**/*.vue"],
-    languageOptions: {
-      parser: parserVue,
-      parserOptions: {
-        parser: parserTypeScript,
-        sourceType: "module",
-      },
-    },
-    plugins: { vue: pluginVue, "@typescript-eslint": pluginTypeScript },
-    processor: pluginVue.processors[".vue"],
-    rules: {
-      ...pluginVue.configs.recommended.rules, // Vue 推荐规则
-      "vue/no-v-html": "off", // 允许 v-html
-      "vue/multi-word-component-names": "off", // 允许单个单词组件名
-    },
-  },
-];
diff --git a/eslint.config.ts b/eslint.config.ts
new file mode 100644
index 00000000..319b85fe
--- /dev/null
+++ b/eslint.config.ts
@@ -0,0 +1,176 @@
+// https://eslint.org/docs/latest/use/configure/configuration-files-new
+
+import eslint from "@eslint/js";
+import pluginVue from "eslint-plugin-vue";
+import pluginTypeScript from "@typescript-eslint/eslint-plugin";
+import parserTypeScript from "@typescript-eslint/parser";
+import vueParser from "vue-eslint-parser";
+import globals from "globals";
+import configPrettier from "eslint-config-prettier";
+
+// 解析自动导入配置
+import fs from "node:fs";
+let autoImportGlobals = {};
+try {
+  autoImportGlobals =
+    JSON.parse(fs.readFileSync("./.eslintrc-auto-import.json", "utf-8")).globals || {};
+} catch (error) {
+  // 文件不存在或解析错误时使用空对象
+  console.warn("Could not load auto-import globals", error);
+}
+
+// Element Plus组件
+const elementPlusComponents = {
+  // Element Plus 组件添加为全局变量，避免 no-undef 报错
+  ElInput: "readonly",
+  ElSelect: "readonly",
+  ElSwitch: "readonly",
+  ElCascader: "readonly",
+  ElInputNumber: "readonly",
+  ElTimePicker: "readonly",
+  ElTimeSelect: "readonly",
+  ElDatePicker: "readonly",
+  ElTreeSelect: "readonly",
+  ElText: "readonly",
+  ElRadioGroup: "readonly",
+  ElCheckboxGroup: "readonly",
+  ElOption: "readonly",
+  ElRadio: "readonly",
+  ElCheckbox: "readonly",
+  ElInputTag: "readonly",
+  ElForm: "readonly",
+  ElFormItem: "readonly",
+  ElTable: "readonly",
+  ElTableColumn: "readonly",
+  ElButton: "readonly",
+  ElDialog: "readonly",
+  ElPagination: "readonly",
+  ElMessage: "readonly",
+  ElMessageBox: "readonly",
+  ElNotification: "readonly",
+  ElTree: "readonly",
+};
+
+export default [
+  // 全局配置
+  {
+    // 指定要检查的文件
+    files: ["**/*.js", "**/*.ts", "**/*.vue"],
+    ignores: ["node_modules/**", "dist/**", "build/**"],
+    languageOptions: {
+      ecmaVersion: 2022,
+      sourceType: "module",
+      globals: {
+        ...globals.browser, // 浏览器环境全局变量
+        ...globals.node, // Node.js 环境全局变量
+        ...autoImportGlobals, // 自动导入的 API 函数
+        ...elementPlusComponents, // Element Plus 组件
+        // 全局类型定义，解决 TypeScript 中定义但 ESLint 不识别的问题
+        PageQuery: "readonly",
+        PageResult: "readonly",
+        OptionType: "readonly",
+        ResponseData: "readonly",
+        ExcelResult: "readonly",
+        TagView: "readonly",
+        AppSettings: "readonly",
+        __APP_INFO__: "readonly",
+      },
+      parser: parserTypeScript,
+      parserOptions: {
+        sourceType: "module",
+      },
+    },
+    rules: {
+      // 全局规则
+      "no-unused-vars": [
+        "error",
+        {
+          vars: "all",
+          args: "after-used",
+          ignoreRestSiblings: true,
+          argsIgnorePattern: "^_", // 忽略以下划线开头的参数
+          varsIgnorePattern: "^[A-Z][A-Z0-9_]*$", // 忽略全大写的常量/枚举
+        },
+      ],
+      // 禁用未定义变量检查，TypeScript 已处理类型检查
+      "no-undef": "off",
+    },
+  },
+
+  // 基础 JavaScript 配置
+  eslint.configs.recommended,
+
+  // Vue 配置
+  {
+    files: ["**/*.vue"],
+    plugins: {
+      vue: pluginVue,
+    },
+    languageOptions: {
+      parser: vueParser,
+      parserOptions: {
+        ecmaVersion: 2022,
+        sourceType: "module",
+        parser: parserTypeScript,
+      },
+    },
+    processor: pluginVue.processors[".vue"],
+    rules: {
+      "vue/multi-word-component-names": "off",
+      "vue/no-v-html": "off",
+      "vue/require-default-prop": "off",
+      "vue/html-self-closing": [
+        "error",
+        {
+          html: {
+            void: "always",
+            normal: "never",
+            component: "always",
+          },
+        },
+      ],
+      "vue/no-unused-vars": "off",
+    },
+  },
+
+  // TypeScript 配置
+  {
+    files: ["**/*.ts", "**/*.tsx", "**/*.vue"],
+    plugins: {
+      "@typescript-eslint": pluginTypeScript,
+    },
+    rules: {
+      "@typescript-eslint/no-explicit-any": "off",
+      "@typescript-eslint/no-empty-function": "off",
+      "@typescript-eslint/no-empty-object-type": "off",
+      "@typescript-eslint/ban-ts-comment": "off",
+      "@typescript-eslint/no-non-null-assertion": "off",
+      "@typescript-eslint/no-unused-vars": [
+        "error",
+        {
+          vars: "all",
+          args: "after-used",
+          ignoreRestSiblings: true,
+          argsIgnorePattern: "^_", // 忽略以下划线开头的参数
+          varsIgnorePattern: "^[A-Z][A-Z0-9_]*$", // 忽略全大写的常量/枚举
+        },
+      ],
+    },
+  },
+
+  // CURD 组件配置
+  {
+    files: ["**/components/CURD/**/*.{ts,vue}"],
+    rules: {
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": "off",
+    },
+  },
+
+  // Prettier 集成
+  {
+    rules: {
+      ...configPrettier.rules,
+    },
+  },
+];
diff --git a/package.json b/package.json
index 715b1112..3d05da98 100644
--- a/package.json
+++ b/package.json
@@ -10,10 +10,11 @@
     "preview": "vite preview",
     "build-only": "vite build",
     "type-check": "vue-tsc --noEmit",
-    "lint:eslint": "eslint --cache \"src/**/*.{vue,ts}\" --fix",
+    "lint:eslint": "eslint --cache \"src/**/*.{vue,ts,js}\" --fix",
     "lint:prettier": "prettier --write \"**/*.{js,cjs,ts,json,css,scss,vue,html,md}\"",
     "lint:stylelint": "stylelint --cache \"**/*.{css,scss,vue}\" --fix",
     "lint:lint-staged": "lint-staged",
+    "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:stylelint",
     "preinstall": "npx only-allow pnpm",
     "prepare": "husky",
     "commit": "git-cz"
diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 8e8e4d26..85d45867 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -124,7 +124,6 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, onMounted, onBeforeUnmount } from "vue";
 import router from "@/router";
 import { usePermissionStore } from "@/store";
 import { isExternal } from "@/utils";
@@ -304,7 +303,9 @@ function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
         name: typeof route.name === "string" ? route.name : undefined,
         icon: route.meta.icon,
         redirect: typeof route.redirect === "string" ? route.redirect : undefined,
-        params: route.meta.params ? JSON.parse(JSON.stringify(toRaw(route.meta.params))) : undefined
+        params: route.meta.params
+          ? JSON.parse(JSON.stringify(toRaw(route.meta.params)))
+          : undefined,
       });
     }
   });
diff --git a/src/hooks/websocket/core/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
index a3874ff6..d96c36eb 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -242,7 +242,7 @@ export function useStomp(options: UseStompOptions = {}) {
    * @param callback 接收到消息时的回调函数
    * @returns 返回订阅 id，用于后续取消订阅
    */
-  const subscribe = (destination: string, callback: (message: IMessage) => void): string => {
+  const subscribe = (destination: string, callback: (_message: IMessage) => void): string => {
     if (!client.value) {
       return "";
     }
diff --git a/src/hooks/websocket/services/useDictSync.ts b/src/hooks/websocket/services/useDictSync.ts
index d89f867f..d5546a3d 100644
--- a/src/hooks/websocket/services/useDictSync.ts
+++ b/src/hooks/websocket/services/useDictSync.ts
@@ -10,7 +10,7 @@ export interface DictMessage {
 }
 
 // 字典事件回调类型
-export type DictMessageCallback = (message: DictMessage) => void;
+export type DictMessageCallback = (_message: DictMessage) => void;
 
 // 全局单例实例
 let instance: ReturnType<typeof createDictSyncHook> | null = null;
diff --git a/src/types/auto-imports.d.ts b/src/types/auto-imports.d.ts
index f4a814da..20b192ea 100644
--- a/src/types/auto-imports.d.ts
+++ b/src/types/auto-imports.d.ts
@@ -1,4 +1,3 @@
-/* eslint-disable */
 /* prettier-ignore */
 // @ts-nocheck
 // noinspection JSUnusedGlobalSymbols
@@ -326,54 +325,26 @@ declare module "vue" {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<(typeof import("vue"))["EffectScope"]>;
-    readonly ElMessage: UnwrapRef<
-      (typeof import("element-plus/es"))["ElMessage"]
-    >;
-    readonly ElMessageBox: UnwrapRef<
-      (typeof import("element-plus/es"))["ElMessageBox"]
-    >;
-    readonly acceptHMRUpdate: UnwrapRef<
-      (typeof import("pinia"))["acceptHMRUpdate"]
-    >;
-    readonly asyncComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["asyncComputed"]
-    >;
-    readonly autoResetRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["autoResetRef"]
-    >;
+    readonly ElMessage: UnwrapRef<(typeof import("element-plus/es"))["ElMessage"]>;
+    readonly ElMessageBox: UnwrapRef<(typeof import("element-plus/es"))["ElMessageBox"]>;
+    readonly acceptHMRUpdate: UnwrapRef<(typeof import("pinia"))["acceptHMRUpdate"]>;
+    readonly asyncComputed: UnwrapRef<(typeof import("@vueuse/core"))["asyncComputed"]>;
+    readonly autoResetRef: UnwrapRef<(typeof import("@vueuse/core"))["autoResetRef"]>;
     readonly computed: UnwrapRef<(typeof import("vue"))["computed"]>;
-    readonly computedAsync: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedAsync"]
-    >;
-    readonly computedEager: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedEager"]
-    >;
-    readonly computedInject: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedInject"]
-    >;
-    readonly computedWithControl: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedWithControl"]
-    >;
-    readonly controlledComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["controlledComputed"]
-    >;
-    readonly controlledRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["controlledRef"]
-    >;
+    readonly computedAsync: UnwrapRef<(typeof import("@vueuse/core"))["computedAsync"]>;
+    readonly computedEager: UnwrapRef<(typeof import("@vueuse/core"))["computedEager"]>;
+    readonly computedInject: UnwrapRef<(typeof import("@vueuse/core"))["computedInject"]>;
+    readonly computedWithControl: UnwrapRef<(typeof import("@vueuse/core"))["computedWithControl"]>;
+    readonly controlledComputed: UnwrapRef<(typeof import("@vueuse/core"))["controlledComputed"]>;
+    readonly controlledRef: UnwrapRef<(typeof import("@vueuse/core"))["controlledRef"]>;
     readonly createApp: UnwrapRef<(typeof import("vue"))["createApp"]>;
-    readonly createEventHook: UnwrapRef<
-      (typeof import("@vueuse/core"))["createEventHook"]
-    >;
-    readonly createGlobalState: UnwrapRef<
-      (typeof import("@vueuse/core"))["createGlobalState"]
-    >;
+    readonly createEventHook: UnwrapRef<(typeof import("@vueuse/core"))["createEventHook"]>;
+    readonly createGlobalState: UnwrapRef<(typeof import("@vueuse/core"))["createGlobalState"]>;
     readonly createInjectionState: UnwrapRef<
       (typeof import("@vueuse/core"))["createInjectionState"]
     >;
     readonly createPinia: UnwrapRef<(typeof import("pinia"))["createPinia"]>;
-    readonly createReactiveFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["createReactiveFn"]
-    >;
+    readonly createReactiveFn: UnwrapRef<(typeof import("@vueuse/core"))["createReactiveFn"]>;
     readonly createReusableTemplate: UnwrapRef<
       (typeof import("@vueuse/core"))["createReusableTemplate"]
     >;
@@ -383,670 +354,304 @@ declare module "vue" {
     readonly createTemplatePromise: UnwrapRef<
       (typeof import("@vueuse/core"))["createTemplatePromise"]
     >;
-    readonly createUnrefFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["createUnrefFn"]
-    >;
+    readonly createUnrefFn: UnwrapRef<(typeof import("@vueuse/core"))["createUnrefFn"]>;
     readonly customRef: UnwrapRef<(typeof import("vue"))["customRef"]>;
-    readonly debouncedRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["debouncedRef"]
-    >;
-    readonly debouncedWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["debouncedWatch"]
-    >;
-    readonly defineAsyncComponent: UnwrapRef<
-      (typeof import("vue"))["defineAsyncComponent"]
-    >;
-    readonly defineComponent: UnwrapRef<
-      (typeof import("vue"))["defineComponent"]
-    >;
+    readonly debouncedRef: UnwrapRef<(typeof import("@vueuse/core"))["debouncedRef"]>;
+    readonly debouncedWatch: UnwrapRef<(typeof import("@vueuse/core"))["debouncedWatch"]>;
+    readonly defineAsyncComponent: UnwrapRef<(typeof import("vue"))["defineAsyncComponent"]>;
+    readonly defineComponent: UnwrapRef<(typeof import("vue"))["defineComponent"]>;
     readonly defineStore: UnwrapRef<(typeof import("pinia"))["defineStore"]>;
-    readonly eagerComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["eagerComputed"]
-    >;
+    readonly eagerComputed: UnwrapRef<(typeof import("@vueuse/core"))["eagerComputed"]>;
     readonly effectScope: UnwrapRef<(typeof import("vue"))["effectScope"]>;
     readonly extendRef: UnwrapRef<(typeof import("@vueuse/core"))["extendRef"]>;
-    readonly getActivePinia: UnwrapRef<
-      (typeof import("pinia"))["getActivePinia"]
-    >;
-    readonly getCurrentInstance: UnwrapRef<
-      (typeof import("vue"))["getCurrentInstance"]
-    >;
-    readonly getCurrentScope: UnwrapRef<
-      (typeof import("vue"))["getCurrentScope"]
-    >;
+    readonly getActivePinia: UnwrapRef<(typeof import("pinia"))["getActivePinia"]>;
+    readonly getCurrentInstance: UnwrapRef<(typeof import("vue"))["getCurrentInstance"]>;
+    readonly getCurrentScope: UnwrapRef<(typeof import("vue"))["getCurrentScope"]>;
     readonly h: UnwrapRef<(typeof import("vue"))["h"]>;
-    readonly ignorableWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["ignorableWatch"]
-    >;
+    readonly ignorableWatch: UnwrapRef<(typeof import("@vueuse/core"))["ignorableWatch"]>;
     readonly inject: UnwrapRef<(typeof import("vue"))["inject"]>;
-    readonly injectLocal: UnwrapRef<
-      (typeof import("@vueuse/core"))["injectLocal"]
-    >;
+    readonly injectLocal: UnwrapRef<(typeof import("@vueuse/core"))["injectLocal"]>;
     readonly isDefined: UnwrapRef<(typeof import("@vueuse/core"))["isDefined"]>;
     readonly isProxy: UnwrapRef<(typeof import("vue"))["isProxy"]>;
     readonly isReactive: UnwrapRef<(typeof import("vue"))["isReactive"]>;
     readonly isReadonly: UnwrapRef<(typeof import("vue"))["isReadonly"]>;
     readonly isRef: UnwrapRef<(typeof import("vue"))["isRef"]>;
-    readonly makeDestructurable: UnwrapRef<
-      (typeof import("@vueuse/core"))["makeDestructurable"]
-    >;
+    readonly makeDestructurable: UnwrapRef<(typeof import("@vueuse/core"))["makeDestructurable"]>;
     readonly mapActions: UnwrapRef<(typeof import("pinia"))["mapActions"]>;
     readonly mapGetters: UnwrapRef<(typeof import("pinia"))["mapGetters"]>;
     readonly mapState: UnwrapRef<(typeof import("pinia"))["mapState"]>;
     readonly mapStores: UnwrapRef<(typeof import("pinia"))["mapStores"]>;
-    readonly mapWritableState: UnwrapRef<
-      (typeof import("pinia"))["mapWritableState"]
-    >;
+    readonly mapWritableState: UnwrapRef<(typeof import("pinia"))["mapWritableState"]>;
     readonly markRaw: UnwrapRef<(typeof import("vue"))["markRaw"]>;
     readonly nextTick: UnwrapRef<(typeof import("vue"))["nextTick"]>;
     readonly onActivated: UnwrapRef<(typeof import("vue"))["onActivated"]>;
     readonly onBeforeMount: UnwrapRef<(typeof import("vue"))["onBeforeMount"]>;
-    readonly onBeforeRouteLeave: UnwrapRef<
-      (typeof import("vue-router"))["onBeforeRouteLeave"]
-    >;
-    readonly onBeforeRouteUpdate: UnwrapRef<
-      (typeof import("vue-router"))["onBeforeRouteUpdate"]
-    >;
-    readonly onBeforeUnmount: UnwrapRef<
-      (typeof import("vue"))["onBeforeUnmount"]
-    >;
-    readonly onBeforeUpdate: UnwrapRef<
-      (typeof import("vue"))["onBeforeUpdate"]
-    >;
-    readonly onClickOutside: UnwrapRef<
-      (typeof import("@vueuse/core"))["onClickOutside"]
-    >;
+    readonly onBeforeRouteLeave: UnwrapRef<(typeof import("vue-router"))["onBeforeRouteLeave"]>;
+    readonly onBeforeRouteUpdate: UnwrapRef<(typeof import("vue-router"))["onBeforeRouteUpdate"]>;
+    readonly onBeforeUnmount: UnwrapRef<(typeof import("vue"))["onBeforeUnmount"]>;
+    readonly onBeforeUpdate: UnwrapRef<(typeof import("vue"))["onBeforeUpdate"]>;
+    readonly onClickOutside: UnwrapRef<(typeof import("@vueuse/core"))["onClickOutside"]>;
     readonly onDeactivated: UnwrapRef<(typeof import("vue"))["onDeactivated"]>;
-    readonly onErrorCaptured: UnwrapRef<
-      (typeof import("vue"))["onErrorCaptured"]
-    >;
-    readonly onKeyStroke: UnwrapRef<
-      (typeof import("@vueuse/core"))["onKeyStroke"]
-    >;
-    readonly onLongPress: UnwrapRef<
-      (typeof import("@vueuse/core"))["onLongPress"]
-    >;
+    readonly onErrorCaptured: UnwrapRef<(typeof import("vue"))["onErrorCaptured"]>;
+    readonly onKeyStroke: UnwrapRef<(typeof import("@vueuse/core"))["onKeyStroke"]>;
+    readonly onLongPress: UnwrapRef<(typeof import("@vueuse/core"))["onLongPress"]>;
     readonly onMounted: UnwrapRef<(typeof import("vue"))["onMounted"]>;
-    readonly onRenderTracked: UnwrapRef<
-      (typeof import("vue"))["onRenderTracked"]
-    >;
-    readonly onRenderTriggered: UnwrapRef<
-      (typeof import("vue"))["onRenderTriggered"]
-    >;
-    readonly onScopeDispose: UnwrapRef<
-      (typeof import("vue"))["onScopeDispose"]
-    >;
-    readonly onServerPrefetch: UnwrapRef<
-      (typeof import("vue"))["onServerPrefetch"]
-    >;
-    readonly onStartTyping: UnwrapRef<
-      (typeof import("@vueuse/core"))["onStartTyping"]
-    >;
+    readonly onRenderTracked: UnwrapRef<(typeof import("vue"))["onRenderTracked"]>;
+    readonly onRenderTriggered: UnwrapRef<(typeof import("vue"))["onRenderTriggered"]>;
+    readonly onScopeDispose: UnwrapRef<(typeof import("vue"))["onScopeDispose"]>;
+    readonly onServerPrefetch: UnwrapRef<(typeof import("vue"))["onServerPrefetch"]>;
+    readonly onStartTyping: UnwrapRef<(typeof import("@vueuse/core"))["onStartTyping"]>;
     readonly onUnmounted: UnwrapRef<(typeof import("vue"))["onUnmounted"]>;
     readonly onUpdated: UnwrapRef<(typeof import("vue"))["onUpdated"]>;
-    readonly pausableWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["pausableWatch"]
-    >;
+    readonly pausableWatch: UnwrapRef<(typeof import("@vueuse/core"))["pausableWatch"]>;
     readonly provide: UnwrapRef<(typeof import("vue"))["provide"]>;
-    readonly provideLocal: UnwrapRef<
-      (typeof import("@vueuse/core"))["provideLocal"]
-    >;
+    readonly provideLocal: UnwrapRef<(typeof import("@vueuse/core"))["provideLocal"]>;
     readonly reactify: UnwrapRef<(typeof import("@vueuse/core"))["reactify"]>;
-    readonly reactifyObject: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactifyObject"]
-    >;
+    readonly reactifyObject: UnwrapRef<(typeof import("@vueuse/core"))["reactifyObject"]>;
     readonly reactive: UnwrapRef<(typeof import("vue"))["reactive"]>;
-    readonly reactiveComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactiveComputed"]
-    >;
-    readonly reactiveOmit: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactiveOmit"]
-    >;
-    readonly reactivePick: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactivePick"]
-    >;
+    readonly reactiveComputed: UnwrapRef<(typeof import("@vueuse/core"))["reactiveComputed"]>;
+    readonly reactiveOmit: UnwrapRef<(typeof import("@vueuse/core"))["reactiveOmit"]>;
+    readonly reactivePick: UnwrapRef<(typeof import("@vueuse/core"))["reactivePick"]>;
     readonly readonly: UnwrapRef<(typeof import("vue"))["readonly"]>;
     readonly ref: UnwrapRef<(typeof import("vue"))["ref"]>;
-    readonly refAutoReset: UnwrapRef<
-      (typeof import("@vueuse/core"))["refAutoReset"]
-    >;
-    readonly refDebounced: UnwrapRef<
-      (typeof import("@vueuse/core"))["refDebounced"]
-    >;
-    readonly refDefault: UnwrapRef<
-      (typeof import("@vueuse/core"))["refDefault"]
-    >;
-    readonly refThrottled: UnwrapRef<
-      (typeof import("@vueuse/core"))["refThrottled"]
-    >;
-    readonly refWithControl: UnwrapRef<
-      (typeof import("@vueuse/core"))["refWithControl"]
-    >;
-    readonly resolveComponent: UnwrapRef<
-      (typeof import("vue"))["resolveComponent"]
-    >;
-    readonly resolveRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["resolveRef"]
-    >;
-    readonly resolveUnref: UnwrapRef<
-      (typeof import("@vueuse/core"))["resolveUnref"]
-    >;
-    readonly setActivePinia: UnwrapRef<
-      (typeof import("pinia"))["setActivePinia"]
-    >;
-    readonly setMapStoreSuffix: UnwrapRef<
-      (typeof import("pinia"))["setMapStoreSuffix"]
-    >;
-    readonly shallowReactive: UnwrapRef<
-      (typeof import("vue"))["shallowReactive"]
-    >;
-    readonly shallowReadonly: UnwrapRef<
-      (typeof import("vue"))["shallowReadonly"]
-    >;
+    readonly refAutoReset: UnwrapRef<(typeof import("@vueuse/core"))["refAutoReset"]>;
+    readonly refDebounced: UnwrapRef<(typeof import("@vueuse/core"))["refDebounced"]>;
+    readonly refDefault: UnwrapRef<(typeof import("@vueuse/core"))["refDefault"]>;
+    readonly refThrottled: UnwrapRef<(typeof import("@vueuse/core"))["refThrottled"]>;
+    readonly refWithControl: UnwrapRef<(typeof import("@vueuse/core"))["refWithControl"]>;
+    readonly resolveComponent: UnwrapRef<(typeof import("vue"))["resolveComponent"]>;
+    readonly resolveRef: UnwrapRef<(typeof import("@vueuse/core"))["resolveRef"]>;
+    readonly resolveUnref: UnwrapRef<(typeof import("@vueuse/core"))["resolveUnref"]>;
+    readonly setActivePinia: UnwrapRef<(typeof import("pinia"))["setActivePinia"]>;
+    readonly setMapStoreSuffix: UnwrapRef<(typeof import("pinia"))["setMapStoreSuffix"]>;
+    readonly shallowReactive: UnwrapRef<(typeof import("vue"))["shallowReactive"]>;
+    readonly shallowReadonly: UnwrapRef<(typeof import("vue"))["shallowReadonly"]>;
     readonly shallowRef: UnwrapRef<(typeof import("vue"))["shallowRef"]>;
     readonly storeToRefs: UnwrapRef<(typeof import("pinia"))["storeToRefs"]>;
     readonly syncRef: UnwrapRef<(typeof import("@vueuse/core"))["syncRef"]>;
     readonly syncRefs: UnwrapRef<(typeof import("@vueuse/core"))["syncRefs"]>;
-    readonly templateRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["templateRef"]
-    >;
-    readonly throttledRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["throttledRef"]
-    >;
-    readonly throttledWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["throttledWatch"]
-    >;
+    readonly templateRef: UnwrapRef<(typeof import("@vueuse/core"))["templateRef"]>;
+    readonly throttledRef: UnwrapRef<(typeof import("@vueuse/core"))["throttledRef"]>;
+    readonly throttledWatch: UnwrapRef<(typeof import("@vueuse/core"))["throttledWatch"]>;
     readonly toRaw: UnwrapRef<(typeof import("vue"))["toRaw"]>;
-    readonly toReactive: UnwrapRef<
-      (typeof import("@vueuse/core"))["toReactive"]
-    >;
+    readonly toReactive: UnwrapRef<(typeof import("@vueuse/core"))["toReactive"]>;
     readonly toRef: UnwrapRef<(typeof import("vue"))["toRef"]>;
     readonly toRefs: UnwrapRef<(typeof import("vue"))["toRefs"]>;
     readonly toValue: UnwrapRef<(typeof import("vue"))["toValue"]>;
     readonly triggerRef: UnwrapRef<(typeof import("vue"))["triggerRef"]>;
-    readonly tryOnBeforeMount: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnBeforeMount"]
-    >;
-    readonly tryOnBeforeUnmount: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnBeforeUnmount"]
-    >;
-    readonly tryOnMounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnMounted"]
-    >;
-    readonly tryOnScopeDispose: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnScopeDispose"]
-    >;
-    readonly tryOnUnmounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnUnmounted"]
-    >;
+    readonly tryOnBeforeMount: UnwrapRef<(typeof import("@vueuse/core"))["tryOnBeforeMount"]>;
+    readonly tryOnBeforeUnmount: UnwrapRef<(typeof import("@vueuse/core"))["tryOnBeforeUnmount"]>;
+    readonly tryOnMounted: UnwrapRef<(typeof import("@vueuse/core"))["tryOnMounted"]>;
+    readonly tryOnScopeDispose: UnwrapRef<(typeof import("@vueuse/core"))["tryOnScopeDispose"]>;
+    readonly tryOnUnmounted: UnwrapRef<(typeof import("@vueuse/core"))["tryOnUnmounted"]>;
     readonly unref: UnwrapRef<(typeof import("vue"))["unref"]>;
-    readonly unrefElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["unrefElement"]
-    >;
+    readonly unrefElement: UnwrapRef<(typeof import("@vueuse/core"))["unrefElement"]>;
     readonly until: UnwrapRef<(typeof import("@vueuse/core"))["until"]>;
-    readonly useActiveElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useActiveElement"]
-    >;
-    readonly useAnimate: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAnimate"]
-    >;
-    readonly useArrayDifference: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayDifference"]
-    >;
-    readonly useArrayEvery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayEvery"]
-    >;
-    readonly useArrayFilter: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFilter"]
-    >;
-    readonly useArrayFind: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFind"]
-    >;
-    readonly useArrayFindIndex: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFindIndex"]
-    >;
-    readonly useArrayFindLast: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFindLast"]
-    >;
-    readonly useArrayIncludes: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayIncludes"]
-    >;
-    readonly useArrayJoin: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayJoin"]
-    >;
-    readonly useArrayMap: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayMap"]
-    >;
-    readonly useArrayReduce: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayReduce"]
-    >;
-    readonly useArraySome: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArraySome"]
-    >;
-    readonly useArrayUnique: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayUnique"]
-    >;
-    readonly useAsyncQueue: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAsyncQueue"]
-    >;
-    readonly useAsyncState: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAsyncState"]
-    >;
+    readonly useActiveElement: UnwrapRef<(typeof import("@vueuse/core"))["useActiveElement"]>;
+    readonly useAnimate: UnwrapRef<(typeof import("@vueuse/core"))["useAnimate"]>;
+    readonly useArrayDifference: UnwrapRef<(typeof import("@vueuse/core"))["useArrayDifference"]>;
+    readonly useArrayEvery: UnwrapRef<(typeof import("@vueuse/core"))["useArrayEvery"]>;
+    readonly useArrayFilter: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFilter"]>;
+    readonly useArrayFind: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFind"]>;
+    readonly useArrayFindIndex: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFindIndex"]>;
+    readonly useArrayFindLast: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFindLast"]>;
+    readonly useArrayIncludes: UnwrapRef<(typeof import("@vueuse/core"))["useArrayIncludes"]>;
+    readonly useArrayJoin: UnwrapRef<(typeof import("@vueuse/core"))["useArrayJoin"]>;
+    readonly useArrayMap: UnwrapRef<(typeof import("@vueuse/core"))["useArrayMap"]>;
+    readonly useArrayReduce: UnwrapRef<(typeof import("@vueuse/core"))["useArrayReduce"]>;
+    readonly useArraySome: UnwrapRef<(typeof import("@vueuse/core"))["useArraySome"]>;
+    readonly useArrayUnique: UnwrapRef<(typeof import("@vueuse/core"))["useArrayUnique"]>;
+    readonly useAsyncQueue: UnwrapRef<(typeof import("@vueuse/core"))["useAsyncQueue"]>;
+    readonly useAsyncState: UnwrapRef<(typeof import("@vueuse/core"))["useAsyncState"]>;
     readonly useAttrs: UnwrapRef<(typeof import("vue"))["useAttrs"]>;
     readonly useBase64: UnwrapRef<(typeof import("@vueuse/core"))["useBase64"]>;
-    readonly useBattery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBattery"]
-    >;
-    readonly useBluetooth: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBluetooth"]
-    >;
-    readonly useBreakpoints: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBreakpoints"]
-    >;
-    readonly useBroadcastChannel: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBroadcastChannel"]
-    >;
-    readonly useBrowserLocation: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBrowserLocation"]
-    >;
+    readonly useBattery: UnwrapRef<(typeof import("@vueuse/core"))["useBattery"]>;
+    readonly useBluetooth: UnwrapRef<(typeof import("@vueuse/core"))["useBluetooth"]>;
+    readonly useBreakpoints: UnwrapRef<(typeof import("@vueuse/core"))["useBreakpoints"]>;
+    readonly useBroadcastChannel: UnwrapRef<(typeof import("@vueuse/core"))["useBroadcastChannel"]>;
+    readonly useBrowserLocation: UnwrapRef<(typeof import("@vueuse/core"))["useBrowserLocation"]>;
     readonly useCached: UnwrapRef<(typeof import("@vueuse/core"))["useCached"]>;
-    readonly useClipboard: UnwrapRef<
-      (typeof import("@vueuse/core"))["useClipboard"]
-    >;
-    readonly useClipboardItems: UnwrapRef<
-      (typeof import("@vueuse/core"))["useClipboardItems"]
-    >;
+    readonly useClipboard: UnwrapRef<(typeof import("@vueuse/core"))["useClipboard"]>;
+    readonly useClipboardItems: UnwrapRef<(typeof import("@vueuse/core"))["useClipboardItems"]>;
     readonly useCloned: UnwrapRef<(typeof import("@vueuse/core"))["useCloned"]>;
-    readonly useColorMode: UnwrapRef<
-      (typeof import("@vueuse/core"))["useColorMode"]
-    >;
-    readonly useConfirmDialog: UnwrapRef<
-      (typeof import("@vueuse/core"))["useConfirmDialog"]
-    >;
-    readonly useCounter: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCounter"]
-    >;
+    readonly useColorMode: UnwrapRef<(typeof import("@vueuse/core"))["useColorMode"]>;
+    readonly useConfirmDialog: UnwrapRef<(typeof import("@vueuse/core"))["useConfirmDialog"]>;
+    readonly useCounter: UnwrapRef<(typeof import("@vueuse/core"))["useCounter"]>;
     readonly useCssModule: UnwrapRef<(typeof import("vue"))["useCssModule"]>;
     readonly useCssVar: UnwrapRef<(typeof import("@vueuse/core"))["useCssVar"]>;
     readonly useCssVars: UnwrapRef<(typeof import("vue"))["useCssVars"]>;
-    readonly useCurrentElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCurrentElement"]
-    >;
-    readonly useCycleList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCycleList"]
-    >;
+    readonly useCurrentElement: UnwrapRef<(typeof import("@vueuse/core"))["useCurrentElement"]>;
+    readonly useCycleList: UnwrapRef<(typeof import("@vueuse/core"))["useCycleList"]>;
     readonly useDark: UnwrapRef<(typeof import("@vueuse/core"))["useDark"]>;
-    readonly useDateFormat: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDateFormat"]
-    >;
-    readonly useDebounce: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDebounce"]
-    >;
-    readonly useDebounceFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDebounceFn"]
-    >;
+    readonly useDateFormat: UnwrapRef<(typeof import("@vueuse/core"))["useDateFormat"]>;
+    readonly useDebounce: UnwrapRef<(typeof import("@vueuse/core"))["useDebounce"]>;
+    readonly useDebounceFn: UnwrapRef<(typeof import("@vueuse/core"))["useDebounceFn"]>;
     readonly useDebouncedRefHistory: UnwrapRef<
       (typeof import("@vueuse/core"))["useDebouncedRefHistory"]
     >;
-    readonly useDeviceMotion: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDeviceMotion"]
-    >;
+    readonly useDeviceMotion: UnwrapRef<(typeof import("@vueuse/core"))["useDeviceMotion"]>;
     readonly useDeviceOrientation: UnwrapRef<
       (typeof import("@vueuse/core"))["useDeviceOrientation"]
     >;
-    readonly useDevicePixelRatio: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDevicePixelRatio"]
-    >;
-    readonly useDevicesList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDevicesList"]
-    >;
-    readonly useDisplayMedia: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDisplayMedia"]
-    >;
+    readonly useDevicePixelRatio: UnwrapRef<(typeof import("@vueuse/core"))["useDevicePixelRatio"]>;
+    readonly useDevicesList: UnwrapRef<(typeof import("@vueuse/core"))["useDevicesList"]>;
+    readonly useDisplayMedia: UnwrapRef<(typeof import("@vueuse/core"))["useDisplayMedia"]>;
     readonly useDocumentVisibility: UnwrapRef<
       (typeof import("@vueuse/core"))["useDocumentVisibility"]
     >;
-    readonly useDraggable: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDraggable"]
-    >;
-    readonly useDropZone: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDropZone"]
-    >;
-    readonly useElementBounding: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementBounding"]
-    >;
-    readonly useElementByPoint: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementByPoint"]
-    >;
-    readonly useElementHover: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementHover"]
-    >;
-    readonly useElementSize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementSize"]
-    >;
+    readonly useDraggable: UnwrapRef<(typeof import("@vueuse/core"))["useDraggable"]>;
+    readonly useDropZone: UnwrapRef<(typeof import("@vueuse/core"))["useDropZone"]>;
+    readonly useElementBounding: UnwrapRef<(typeof import("@vueuse/core"))["useElementBounding"]>;
+    readonly useElementByPoint: UnwrapRef<(typeof import("@vueuse/core"))["useElementByPoint"]>;
+    readonly useElementHover: UnwrapRef<(typeof import("@vueuse/core"))["useElementHover"]>;
+    readonly useElementSize: UnwrapRef<(typeof import("@vueuse/core"))["useElementSize"]>;
     readonly useElementVisibility: UnwrapRef<
       (typeof import("@vueuse/core"))["useElementVisibility"]
     >;
-    readonly useEventBus: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventBus"]
-    >;
-    readonly useEventListener: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventListener"]
-    >;
-    readonly useEventSource: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventSource"]
-    >;
-    readonly useEyeDropper: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEyeDropper"]
-    >;
-    readonly useFavicon: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFavicon"]
-    >;
+    readonly useEventBus: UnwrapRef<(typeof import("@vueuse/core"))["useEventBus"]>;
+    readonly useEventListener: UnwrapRef<(typeof import("@vueuse/core"))["useEventListener"]>;
+    readonly useEventSource: UnwrapRef<(typeof import("@vueuse/core"))["useEventSource"]>;
+    readonly useEyeDropper: UnwrapRef<(typeof import("@vueuse/core"))["useEyeDropper"]>;
+    readonly useFavicon: UnwrapRef<(typeof import("@vueuse/core"))["useFavicon"]>;
     readonly useFetch: UnwrapRef<(typeof import("@vueuse/core"))["useFetch"]>;
-    readonly useFileDialog: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFileDialog"]
-    >;
-    readonly useFileSystemAccess: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFileSystemAccess"]
-    >;
+    readonly useFileDialog: UnwrapRef<(typeof import("@vueuse/core"))["useFileDialog"]>;
+    readonly useFileSystemAccess: UnwrapRef<(typeof import("@vueuse/core"))["useFileSystemAccess"]>;
     readonly useFocus: UnwrapRef<(typeof import("@vueuse/core"))["useFocus"]>;
-    readonly useFocusWithin: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFocusWithin"]
-    >;
+    readonly useFocusWithin: UnwrapRef<(typeof import("@vueuse/core"))["useFocusWithin"]>;
     readonly useFps: UnwrapRef<(typeof import("@vueuse/core"))["useFps"]>;
-    readonly useFullscreen: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFullscreen"]
-    >;
-    readonly useGamepad: UnwrapRef<
-      (typeof import("@vueuse/core"))["useGamepad"]
-    >;
-    readonly useGeolocation: UnwrapRef<
-      (typeof import("@vueuse/core"))["useGeolocation"]
-    >;
+    readonly useFullscreen: UnwrapRef<(typeof import("@vueuse/core"))["useFullscreen"]>;
+    readonly useGamepad: UnwrapRef<(typeof import("@vueuse/core"))["useGamepad"]>;
+    readonly useGeolocation: UnwrapRef<(typeof import("@vueuse/core"))["useGeolocation"]>;
     readonly useI18n: UnwrapRef<(typeof import("vue-i18n"))["useI18n"]>;
     readonly useIdle: UnwrapRef<(typeof import("@vueuse/core"))["useIdle"]>;
     readonly useImage: UnwrapRef<(typeof import("@vueuse/core"))["useImage"]>;
-    readonly useInfiniteScroll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useInfiniteScroll"]
-    >;
+    readonly useInfiniteScroll: UnwrapRef<(typeof import("@vueuse/core"))["useInfiniteScroll"]>;
     readonly useIntersectionObserver: UnwrapRef<
       (typeof import("@vueuse/core"))["useIntersectionObserver"]
     >;
-    readonly useInterval: UnwrapRef<
-      (typeof import("@vueuse/core"))["useInterval"]
-    >;
-    readonly useIntervalFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useIntervalFn"]
-    >;
-    readonly useKeyModifier: UnwrapRef<
-      (typeof import("@vueuse/core"))["useKeyModifier"]
-    >;
-    readonly useLastChanged: UnwrapRef<
-      (typeof import("@vueuse/core"))["useLastChanged"]
-    >;
+    readonly useInterval: UnwrapRef<(typeof import("@vueuse/core"))["useInterval"]>;
+    readonly useIntervalFn: UnwrapRef<(typeof import("@vueuse/core"))["useIntervalFn"]>;
+    readonly useKeyModifier: UnwrapRef<(typeof import("@vueuse/core"))["useKeyModifier"]>;
+    readonly useLastChanged: UnwrapRef<(typeof import("@vueuse/core"))["useLastChanged"]>;
     readonly useLink: UnwrapRef<(typeof import("vue-router"))["useLink"]>;
-    readonly useLocalStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useLocalStorage"]
-    >;
-    readonly useMagicKeys: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMagicKeys"]
-    >;
-    readonly useManualRefHistory: UnwrapRef<
-      (typeof import("@vueuse/core"))["useManualRefHistory"]
-    >;
-    readonly useMediaControls: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMediaControls"]
-    >;
-    readonly useMediaQuery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMediaQuery"]
-    >;
-    readonly useMemoize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMemoize"]
-    >;
+    readonly useLocalStorage: UnwrapRef<(typeof import("@vueuse/core"))["useLocalStorage"]>;
+    readonly useMagicKeys: UnwrapRef<(typeof import("@vueuse/core"))["useMagicKeys"]>;
+    readonly useManualRefHistory: UnwrapRef<(typeof import("@vueuse/core"))["useManualRefHistory"]>;
+    readonly useMediaControls: UnwrapRef<(typeof import("@vueuse/core"))["useMediaControls"]>;
+    readonly useMediaQuery: UnwrapRef<(typeof import("@vueuse/core"))["useMediaQuery"]>;
+    readonly useMemoize: UnwrapRef<(typeof import("@vueuse/core"))["useMemoize"]>;
     readonly useMemory: UnwrapRef<(typeof import("@vueuse/core"))["useMemory"]>;
-    readonly useMounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMounted"]
-    >;
+    readonly useMounted: UnwrapRef<(typeof import("@vueuse/core"))["useMounted"]>;
     readonly useMouse: UnwrapRef<(typeof import("@vueuse/core"))["useMouse"]>;
-    readonly useMouseInElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMouseInElement"]
-    >;
-    readonly useMousePressed: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMousePressed"]
-    >;
-    readonly useMutationObserver: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMutationObserver"]
-    >;
+    readonly useMouseInElement: UnwrapRef<(typeof import("@vueuse/core"))["useMouseInElement"]>;
+    readonly useMousePressed: UnwrapRef<(typeof import("@vueuse/core"))["useMousePressed"]>;
+    readonly useMutationObserver: UnwrapRef<(typeof import("@vueuse/core"))["useMutationObserver"]>;
     readonly useNavigatorLanguage: UnwrapRef<
       (typeof import("@vueuse/core"))["useNavigatorLanguage"]
     >;
-    readonly useNetwork: UnwrapRef<
-      (typeof import("@vueuse/core"))["useNetwork"]
-    >;
+    readonly useNetwork: UnwrapRef<(typeof import("@vueuse/core"))["useNetwork"]>;
     readonly useNow: UnwrapRef<(typeof import("@vueuse/core"))["useNow"]>;
-    readonly useObjectUrl: UnwrapRef<
-      (typeof import("@vueuse/core"))["useObjectUrl"]
-    >;
-    readonly useOffsetPagination: UnwrapRef<
-      (typeof import("@vueuse/core"))["useOffsetPagination"]
-    >;
+    readonly useObjectUrl: UnwrapRef<(typeof import("@vueuse/core"))["useObjectUrl"]>;
+    readonly useOffsetPagination: UnwrapRef<(typeof import("@vueuse/core"))["useOffsetPagination"]>;
     readonly useOnline: UnwrapRef<(typeof import("@vueuse/core"))["useOnline"]>;
-    readonly usePageLeave: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePageLeave"]
-    >;
-    readonly useParallax: UnwrapRef<
-      (typeof import("@vueuse/core"))["useParallax"]
-    >;
-    readonly useParentElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useParentElement"]
-    >;
+    readonly usePageLeave: UnwrapRef<(typeof import("@vueuse/core"))["usePageLeave"]>;
+    readonly useParallax: UnwrapRef<(typeof import("@vueuse/core"))["useParallax"]>;
+    readonly useParentElement: UnwrapRef<(typeof import("@vueuse/core"))["useParentElement"]>;
     readonly usePerformanceObserver: UnwrapRef<
       (typeof import("@vueuse/core"))["usePerformanceObserver"]
     >;
-    readonly usePermission: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePermission"]
-    >;
-    readonly usePointer: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointer"]
-    >;
-    readonly usePointerLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointerLock"]
-    >;
-    readonly usePointerSwipe: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointerSwipe"]
-    >;
+    readonly usePermission: UnwrapRef<(typeof import("@vueuse/core"))["usePermission"]>;
+    readonly usePointer: UnwrapRef<(typeof import("@vueuse/core"))["usePointer"]>;
+    readonly usePointerLock: UnwrapRef<(typeof import("@vueuse/core"))["usePointerLock"]>;
+    readonly usePointerSwipe: UnwrapRef<(typeof import("@vueuse/core"))["usePointerSwipe"]>;
     readonly usePreferredColorScheme: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredColorScheme"]
     >;
     readonly usePreferredContrast: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredContrast"]
     >;
-    readonly usePreferredDark: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePreferredDark"]
-    >;
+    readonly usePreferredDark: UnwrapRef<(typeof import("@vueuse/core"))["usePreferredDark"]>;
     readonly usePreferredLanguages: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredLanguages"]
     >;
     readonly usePreferredReducedMotion: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredReducedMotion"]
     >;
-    readonly usePrevious: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePrevious"]
-    >;
+    readonly usePrevious: UnwrapRef<(typeof import("@vueuse/core"))["usePrevious"]>;
     readonly useRafFn: UnwrapRef<(typeof import("@vueuse/core"))["useRafFn"]>;
-    readonly useRefHistory: UnwrapRef<
-      (typeof import("@vueuse/core"))["useRefHistory"]
-    >;
-    readonly useResizeObserver: UnwrapRef<
-      (typeof import("@vueuse/core"))["useResizeObserver"]
-    >;
+    readonly useRefHistory: UnwrapRef<(typeof import("@vueuse/core"))["useRefHistory"]>;
+    readonly useResizeObserver: UnwrapRef<(typeof import("@vueuse/core"))["useResizeObserver"]>;
     readonly useRoute: UnwrapRef<(typeof import("vue-router"))["useRoute"]>;
     readonly useRouter: UnwrapRef<(typeof import("vue-router"))["useRouter"]>;
     readonly useScreenOrientation: UnwrapRef<
       (typeof import("@vueuse/core"))["useScreenOrientation"]
     >;
-    readonly useScreenSafeArea: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScreenSafeArea"]
-    >;
-    readonly useScriptTag: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScriptTag"]
-    >;
+    readonly useScreenSafeArea: UnwrapRef<(typeof import("@vueuse/core"))["useScreenSafeArea"]>;
+    readonly useScriptTag: UnwrapRef<(typeof import("@vueuse/core"))["useScriptTag"]>;
     readonly useScroll: UnwrapRef<(typeof import("@vueuse/core"))["useScroll"]>;
-    readonly useScrollLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScrollLock"]
-    >;
-    readonly useSessionStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSessionStorage"]
-    >;
+    readonly useScrollLock: UnwrapRef<(typeof import("@vueuse/core"))["useScrollLock"]>;
+    readonly useSessionStorage: UnwrapRef<(typeof import("@vueuse/core"))["useSessionStorage"]>;
     readonly useShare: UnwrapRef<(typeof import("@vueuse/core"))["useShare"]>;
     readonly useSlots: UnwrapRef<(typeof import("vue"))["useSlots"]>;
     readonly useSorted: UnwrapRef<(typeof import("@vueuse/core"))["useSorted"]>;
     readonly useSpeechRecognition: UnwrapRef<
       (typeof import("@vueuse/core"))["useSpeechRecognition"]
     >;
-    readonly useSpeechSynthesis: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSpeechSynthesis"]
-    >;
-    readonly useStepper: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStepper"]
-    >;
-    readonly useStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStorage"]
-    >;
-    readonly useStorageAsync: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStorageAsync"]
-    >;
-    readonly useStyleTag: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStyleTag"]
-    >;
-    readonly useSupported: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSupported"]
-    >;
+    readonly useSpeechSynthesis: UnwrapRef<(typeof import("@vueuse/core"))["useSpeechSynthesis"]>;
+    readonly useStepper: UnwrapRef<(typeof import("@vueuse/core"))["useStepper"]>;
+    readonly useStorage: UnwrapRef<(typeof import("@vueuse/core"))["useStorage"]>;
+    readonly useStorageAsync: UnwrapRef<(typeof import("@vueuse/core"))["useStorageAsync"]>;
+    readonly useStyleTag: UnwrapRef<(typeof import("@vueuse/core"))["useStyleTag"]>;
+    readonly useSupported: UnwrapRef<(typeof import("@vueuse/core"))["useSupported"]>;
     readonly useSwipe: UnwrapRef<(typeof import("@vueuse/core"))["useSwipe"]>;
-    readonly useTemplateRefsList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTemplateRefsList"]
-    >;
-    readonly useTextDirection: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextDirection"]
-    >;
-    readonly useTextSelection: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextSelection"]
-    >;
-    readonly useTextareaAutosize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextareaAutosize"]
-    >;
-    readonly useThrottle: UnwrapRef<
-      (typeof import("@vueuse/core"))["useThrottle"]
-    >;
-    readonly useThrottleFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useThrottleFn"]
-    >;
+    readonly useTemplateRefsList: UnwrapRef<(typeof import("@vueuse/core"))["useTemplateRefsList"]>;
+    readonly useTextDirection: UnwrapRef<(typeof import("@vueuse/core"))["useTextDirection"]>;
+    readonly useTextSelection: UnwrapRef<(typeof import("@vueuse/core"))["useTextSelection"]>;
+    readonly useTextareaAutosize: UnwrapRef<(typeof import("@vueuse/core"))["useTextareaAutosize"]>;
+    readonly useThrottle: UnwrapRef<(typeof import("@vueuse/core"))["useThrottle"]>;
+    readonly useThrottleFn: UnwrapRef<(typeof import("@vueuse/core"))["useThrottleFn"]>;
     readonly useThrottledRefHistory: UnwrapRef<
       (typeof import("@vueuse/core"))["useThrottledRefHistory"]
     >;
-    readonly useTimeAgo: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeAgo"]
-    >;
-    readonly useTimeout: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeout"]
-    >;
-    readonly useTimeoutFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeoutFn"]
-    >;
-    readonly useTimeoutPoll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeoutPoll"]
-    >;
-    readonly useTimestamp: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimestamp"]
-    >;
+    readonly useTimeAgo: UnwrapRef<(typeof import("@vueuse/core"))["useTimeAgo"]>;
+    readonly useTimeout: UnwrapRef<(typeof import("@vueuse/core"))["useTimeout"]>;
+    readonly useTimeoutFn: UnwrapRef<(typeof import("@vueuse/core"))["useTimeoutFn"]>;
+    readonly useTimeoutPoll: UnwrapRef<(typeof import("@vueuse/core"))["useTimeoutPoll"]>;
+    readonly useTimestamp: UnwrapRef<(typeof import("@vueuse/core"))["useTimestamp"]>;
     readonly useTitle: UnwrapRef<(typeof import("@vueuse/core"))["useTitle"]>;
-    readonly useToNumber: UnwrapRef<
-      (typeof import("@vueuse/core"))["useToNumber"]
-    >;
-    readonly useToString: UnwrapRef<
-      (typeof import("@vueuse/core"))["useToString"]
-    >;
+    readonly useToNumber: UnwrapRef<(typeof import("@vueuse/core"))["useToNumber"]>;
+    readonly useToString: UnwrapRef<(typeof import("@vueuse/core"))["useToString"]>;
     readonly useToggle: UnwrapRef<(typeof import("@vueuse/core"))["useToggle"]>;
-    readonly useTransition: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTransition"]
-    >;
-    readonly useUrlSearchParams: UnwrapRef<
-      (typeof import("@vueuse/core"))["useUrlSearchParams"]
-    >;
-    readonly useUserMedia: UnwrapRef<
-      (typeof import("@vueuse/core"))["useUserMedia"]
-    >;
+    readonly useTransition: UnwrapRef<(typeof import("@vueuse/core"))["useTransition"]>;
+    readonly useUrlSearchParams: UnwrapRef<(typeof import("@vueuse/core"))["useUrlSearchParams"]>;
+    readonly useUserMedia: UnwrapRef<(typeof import("@vueuse/core"))["useUserMedia"]>;
     readonly useVModel: UnwrapRef<(typeof import("@vueuse/core"))["useVModel"]>;
-    readonly useVModels: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVModels"]
-    >;
-    readonly useVibrate: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVibrate"]
-    >;
-    readonly useVirtualList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVirtualList"]
-    >;
-    readonly useWakeLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWakeLock"]
-    >;
-    readonly useWebNotification: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebNotification"]
-    >;
-    readonly useWebSocket: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebSocket"]
-    >;
-    readonly useWebWorker: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebWorker"]
-    >;
-    readonly useWebWorkerFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebWorkerFn"]
-    >;
-    readonly useWindowFocus: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowFocus"]
-    >;
-    readonly useWindowScroll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowScroll"]
-    >;
-    readonly useWindowSize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowSize"]
-    >;
+    readonly useVModels: UnwrapRef<(typeof import("@vueuse/core"))["useVModels"]>;
+    readonly useVibrate: UnwrapRef<(typeof import("@vueuse/core"))["useVibrate"]>;
+    readonly useVirtualList: UnwrapRef<(typeof import("@vueuse/core"))["useVirtualList"]>;
+    readonly useWakeLock: UnwrapRef<(typeof import("@vueuse/core"))["useWakeLock"]>;
+    readonly useWebNotification: UnwrapRef<(typeof import("@vueuse/core"))["useWebNotification"]>;
+    readonly useWebSocket: UnwrapRef<(typeof import("@vueuse/core"))["useWebSocket"]>;
+    readonly useWebWorker: UnwrapRef<(typeof import("@vueuse/core"))["useWebWorker"]>;
+    readonly useWebWorkerFn: UnwrapRef<(typeof import("@vueuse/core"))["useWebWorkerFn"]>;
+    readonly useWindowFocus: UnwrapRef<(typeof import("@vueuse/core"))["useWindowFocus"]>;
+    readonly useWindowScroll: UnwrapRef<(typeof import("@vueuse/core"))["useWindowScroll"]>;
+    readonly useWindowSize: UnwrapRef<(typeof import("@vueuse/core"))["useWindowSize"]>;
     readonly watch: UnwrapRef<(typeof import("vue"))["watch"]>;
-    readonly watchArray: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchArray"]
-    >;
-    readonly watchAtMost: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchAtMost"]
-    >;
-    readonly watchDebounced: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchDebounced"]
-    >;
+    readonly watchArray: UnwrapRef<(typeof import("@vueuse/core"))["watchArray"]>;
+    readonly watchAtMost: UnwrapRef<(typeof import("@vueuse/core"))["watchAtMost"]>;
+    readonly watchDebounced: UnwrapRef<(typeof import("@vueuse/core"))["watchDebounced"]>;
     readonly watchDeep: UnwrapRef<(typeof import("@vueuse/core"))["watchDeep"]>;
     readonly watchEffect: UnwrapRef<(typeof import("vue"))["watchEffect"]>;
-    readonly watchIgnorable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchIgnorable"]
-    >;
-    readonly watchImmediate: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchImmediate"]
-    >;
+    readonly watchIgnorable: UnwrapRef<(typeof import("@vueuse/core"))["watchIgnorable"]>;
+    readonly watchImmediate: UnwrapRef<(typeof import("@vueuse/core"))["watchImmediate"]>;
     readonly watchOnce: UnwrapRef<(typeof import("@vueuse/core"))["watchOnce"]>;
-    readonly watchPausable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchPausable"]
-    >;
-    readonly watchPostEffect: UnwrapRef<
-      (typeof import("vue"))["watchPostEffect"]
-    >;
-    readonly watchSyncEffect: UnwrapRef<
-      (typeof import("vue"))["watchSyncEffect"]
-    >;
-    readonly watchThrottled: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchThrottled"]
-    >;
-    readonly watchTriggerable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchTriggerable"]
-    >;
-    readonly watchWithFilter: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchWithFilter"]
-    >;
+    readonly watchPausable: UnwrapRef<(typeof import("@vueuse/core"))["watchPausable"]>;
+    readonly watchPostEffect: UnwrapRef<(typeof import("vue"))["watchPostEffect"]>;
+    readonly watchSyncEffect: UnwrapRef<(typeof import("vue"))["watchSyncEffect"]>;
+    readonly watchThrottled: UnwrapRef<(typeof import("@vueuse/core"))["watchThrottled"]>;
+    readonly watchTriggerable: UnwrapRef<(typeof import("@vueuse/core"))["watchTriggerable"]>;
+    readonly watchWithFilter: UnwrapRef<(typeof import("@vueuse/core"))["watchWithFilter"]>;
     readonly whenever: UnwrapRef<(typeof import("@vueuse/core"))["whenever"]>;
   }
 }
@@ -1054,54 +659,26 @@ declare module "@vue/runtime-core" {
   interface GlobalComponents {}
   interface ComponentCustomProperties {
     readonly EffectScope: UnwrapRef<(typeof import("vue"))["EffectScope"]>;
-    readonly ElMessage: UnwrapRef<
-      (typeof import("element-plus/es"))["ElMessage"]
-    >;
-    readonly ElMessageBox: UnwrapRef<
-      (typeof import("element-plus/es"))["ElMessageBox"]
-    >;
-    readonly acceptHMRUpdate: UnwrapRef<
-      (typeof import("pinia"))["acceptHMRUpdate"]
-    >;
-    readonly asyncComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["asyncComputed"]
-    >;
-    readonly autoResetRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["autoResetRef"]
-    >;
+    readonly ElMessage: UnwrapRef<(typeof import("element-plus/es"))["ElMessage"]>;
+    readonly ElMessageBox: UnwrapRef<(typeof import("element-plus/es"))["ElMessageBox"]>;
+    readonly acceptHMRUpdate: UnwrapRef<(typeof import("pinia"))["acceptHMRUpdate"]>;
+    readonly asyncComputed: UnwrapRef<(typeof import("@vueuse/core"))["asyncComputed"]>;
+    readonly autoResetRef: UnwrapRef<(typeof import("@vueuse/core"))["autoResetRef"]>;
     readonly computed: UnwrapRef<(typeof import("vue"))["computed"]>;
-    readonly computedAsync: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedAsync"]
-    >;
-    readonly computedEager: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedEager"]
-    >;
-    readonly computedInject: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedInject"]
-    >;
-    readonly computedWithControl: UnwrapRef<
-      (typeof import("@vueuse/core"))["computedWithControl"]
-    >;
-    readonly controlledComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["controlledComputed"]
-    >;
-    readonly controlledRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["controlledRef"]
-    >;
+    readonly computedAsync: UnwrapRef<(typeof import("@vueuse/core"))["computedAsync"]>;
+    readonly computedEager: UnwrapRef<(typeof import("@vueuse/core"))["computedEager"]>;
+    readonly computedInject: UnwrapRef<(typeof import("@vueuse/core"))["computedInject"]>;
+    readonly computedWithControl: UnwrapRef<(typeof import("@vueuse/core"))["computedWithControl"]>;
+    readonly controlledComputed: UnwrapRef<(typeof import("@vueuse/core"))["controlledComputed"]>;
+    readonly controlledRef: UnwrapRef<(typeof import("@vueuse/core"))["controlledRef"]>;
     readonly createApp: UnwrapRef<(typeof import("vue"))["createApp"]>;
-    readonly createEventHook: UnwrapRef<
-      (typeof import("@vueuse/core"))["createEventHook"]
-    >;
-    readonly createGlobalState: UnwrapRef<
-      (typeof import("@vueuse/core"))["createGlobalState"]
-    >;
+    readonly createEventHook: UnwrapRef<(typeof import("@vueuse/core"))["createEventHook"]>;
+    readonly createGlobalState: UnwrapRef<(typeof import("@vueuse/core"))["createGlobalState"]>;
     readonly createInjectionState: UnwrapRef<
       (typeof import("@vueuse/core"))["createInjectionState"]
     >;
     readonly createPinia: UnwrapRef<(typeof import("pinia"))["createPinia"]>;
-    readonly createReactiveFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["createReactiveFn"]
-    >;
+    readonly createReactiveFn: UnwrapRef<(typeof import("@vueuse/core"))["createReactiveFn"]>;
     readonly createReusableTemplate: UnwrapRef<
       (typeof import("@vueuse/core"))["createReusableTemplate"]
     >;
@@ -1111,670 +688,304 @@ declare module "@vue/runtime-core" {
     readonly createTemplatePromise: UnwrapRef<
       (typeof import("@vueuse/core"))["createTemplatePromise"]
     >;
-    readonly createUnrefFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["createUnrefFn"]
-    >;
+    readonly createUnrefFn: UnwrapRef<(typeof import("@vueuse/core"))["createUnrefFn"]>;
     readonly customRef: UnwrapRef<(typeof import("vue"))["customRef"]>;
-    readonly debouncedRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["debouncedRef"]
-    >;
-    readonly debouncedWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["debouncedWatch"]
-    >;
-    readonly defineAsyncComponent: UnwrapRef<
-      (typeof import("vue"))["defineAsyncComponent"]
-    >;
-    readonly defineComponent: UnwrapRef<
-      (typeof import("vue"))["defineComponent"]
-    >;
+    readonly debouncedRef: UnwrapRef<(typeof import("@vueuse/core"))["debouncedRef"]>;
+    readonly debouncedWatch: UnwrapRef<(typeof import("@vueuse/core"))["debouncedWatch"]>;
+    readonly defineAsyncComponent: UnwrapRef<(typeof import("vue"))["defineAsyncComponent"]>;
+    readonly defineComponent: UnwrapRef<(typeof import("vue"))["defineComponent"]>;
     readonly defineStore: UnwrapRef<(typeof import("pinia"))["defineStore"]>;
-    readonly eagerComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["eagerComputed"]
-    >;
+    readonly eagerComputed: UnwrapRef<(typeof import("@vueuse/core"))["eagerComputed"]>;
     readonly effectScope: UnwrapRef<(typeof import("vue"))["effectScope"]>;
     readonly extendRef: UnwrapRef<(typeof import("@vueuse/core"))["extendRef"]>;
-    readonly getActivePinia: UnwrapRef<
-      (typeof import("pinia"))["getActivePinia"]
-    >;
-    readonly getCurrentInstance: UnwrapRef<
-      (typeof import("vue"))["getCurrentInstance"]
-    >;
-    readonly getCurrentScope: UnwrapRef<
-      (typeof import("vue"))["getCurrentScope"]
-    >;
+    readonly getActivePinia: UnwrapRef<(typeof import("pinia"))["getActivePinia"]>;
+    readonly getCurrentInstance: UnwrapRef<(typeof import("vue"))["getCurrentInstance"]>;
+    readonly getCurrentScope: UnwrapRef<(typeof import("vue"))["getCurrentScope"]>;
     readonly h: UnwrapRef<(typeof import("vue"))["h"]>;
-    readonly ignorableWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["ignorableWatch"]
-    >;
+    readonly ignorableWatch: UnwrapRef<(typeof import("@vueuse/core"))["ignorableWatch"]>;
     readonly inject: UnwrapRef<(typeof import("vue"))["inject"]>;
-    readonly injectLocal: UnwrapRef<
-      (typeof import("@vueuse/core"))["injectLocal"]
-    >;
+    readonly injectLocal: UnwrapRef<(typeof import("@vueuse/core"))["injectLocal"]>;
     readonly isDefined: UnwrapRef<(typeof import("@vueuse/core"))["isDefined"]>;
     readonly isProxy: UnwrapRef<(typeof import("vue"))["isProxy"]>;
     readonly isReactive: UnwrapRef<(typeof import("vue"))["isReactive"]>;
     readonly isReadonly: UnwrapRef<(typeof import("vue"))["isReadonly"]>;
     readonly isRef: UnwrapRef<(typeof import("vue"))["isRef"]>;
-    readonly makeDestructurable: UnwrapRef<
-      (typeof import("@vueuse/core"))["makeDestructurable"]
-    >;
+    readonly makeDestructurable: UnwrapRef<(typeof import("@vueuse/core"))["makeDestructurable"]>;
     readonly mapActions: UnwrapRef<(typeof import("pinia"))["mapActions"]>;
     readonly mapGetters: UnwrapRef<(typeof import("pinia"))["mapGetters"]>;
     readonly mapState: UnwrapRef<(typeof import("pinia"))["mapState"]>;
     readonly mapStores: UnwrapRef<(typeof import("pinia"))["mapStores"]>;
-    readonly mapWritableState: UnwrapRef<
-      (typeof import("pinia"))["mapWritableState"]
-    >;
+    readonly mapWritableState: UnwrapRef<(typeof import("pinia"))["mapWritableState"]>;
     readonly markRaw: UnwrapRef<(typeof import("vue"))["markRaw"]>;
     readonly nextTick: UnwrapRef<(typeof import("vue"))["nextTick"]>;
     readonly onActivated: UnwrapRef<(typeof import("vue"))["onActivated"]>;
     readonly onBeforeMount: UnwrapRef<(typeof import("vue"))["onBeforeMount"]>;
-    readonly onBeforeRouteLeave: UnwrapRef<
-      (typeof import("vue-router"))["onBeforeRouteLeave"]
-    >;
-    readonly onBeforeRouteUpdate: UnwrapRef<
-      (typeof import("vue-router"))["onBeforeRouteUpdate"]
-    >;
-    readonly onBeforeUnmount: UnwrapRef<
-      (typeof import("vue"))["onBeforeUnmount"]
-    >;
-    readonly onBeforeUpdate: UnwrapRef<
-      (typeof import("vue"))["onBeforeUpdate"]
-    >;
-    readonly onClickOutside: UnwrapRef<
-      (typeof import("@vueuse/core"))["onClickOutside"]
-    >;
+    readonly onBeforeRouteLeave: UnwrapRef<(typeof import("vue-router"))["onBeforeRouteLeave"]>;
+    readonly onBeforeRouteUpdate: UnwrapRef<(typeof import("vue-router"))["onBeforeRouteUpdate"]>;
+    readonly onBeforeUnmount: UnwrapRef<(typeof import("vue"))["onBeforeUnmount"]>;
+    readonly onBeforeUpdate: UnwrapRef<(typeof import("vue"))["onBeforeUpdate"]>;
+    readonly onClickOutside: UnwrapRef<(typeof import("@vueuse/core"))["onClickOutside"]>;
     readonly onDeactivated: UnwrapRef<(typeof import("vue"))["onDeactivated"]>;
-    readonly onErrorCaptured: UnwrapRef<
-      (typeof import("vue"))["onErrorCaptured"]
-    >;
-    readonly onKeyStroke: UnwrapRef<
-      (typeof import("@vueuse/core"))["onKeyStroke"]
-    >;
-    readonly onLongPress: UnwrapRef<
-      (typeof import("@vueuse/core"))["onLongPress"]
-    >;
+    readonly onErrorCaptured: UnwrapRef<(typeof import("vue"))["onErrorCaptured"]>;
+    readonly onKeyStroke: UnwrapRef<(typeof import("@vueuse/core"))["onKeyStroke"]>;
+    readonly onLongPress: UnwrapRef<(typeof import("@vueuse/core"))["onLongPress"]>;
     readonly onMounted: UnwrapRef<(typeof import("vue"))["onMounted"]>;
-    readonly onRenderTracked: UnwrapRef<
-      (typeof import("vue"))["onRenderTracked"]
-    >;
-    readonly onRenderTriggered: UnwrapRef<
-      (typeof import("vue"))["onRenderTriggered"]
-    >;
-    readonly onScopeDispose: UnwrapRef<
-      (typeof import("vue"))["onScopeDispose"]
-    >;
-    readonly onServerPrefetch: UnwrapRef<
-      (typeof import("vue"))["onServerPrefetch"]
-    >;
-    readonly onStartTyping: UnwrapRef<
-      (typeof import("@vueuse/core"))["onStartTyping"]
-    >;
+    readonly onRenderTracked: UnwrapRef<(typeof import("vue"))["onRenderTracked"]>;
+    readonly onRenderTriggered: UnwrapRef<(typeof import("vue"))["onRenderTriggered"]>;
+    readonly onScopeDispose: UnwrapRef<(typeof import("vue"))["onScopeDispose"]>;
+    readonly onServerPrefetch: UnwrapRef<(typeof import("vue"))["onServerPrefetch"]>;
+    readonly onStartTyping: UnwrapRef<(typeof import("@vueuse/core"))["onStartTyping"]>;
     readonly onUnmounted: UnwrapRef<(typeof import("vue"))["onUnmounted"]>;
     readonly onUpdated: UnwrapRef<(typeof import("vue"))["onUpdated"]>;
-    readonly pausableWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["pausableWatch"]
-    >;
+    readonly pausableWatch: UnwrapRef<(typeof import("@vueuse/core"))["pausableWatch"]>;
     readonly provide: UnwrapRef<(typeof import("vue"))["provide"]>;
-    readonly provideLocal: UnwrapRef<
-      (typeof import("@vueuse/core"))["provideLocal"]
-    >;
+    readonly provideLocal: UnwrapRef<(typeof import("@vueuse/core"))["provideLocal"]>;
     readonly reactify: UnwrapRef<(typeof import("@vueuse/core"))["reactify"]>;
-    readonly reactifyObject: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactifyObject"]
-    >;
+    readonly reactifyObject: UnwrapRef<(typeof import("@vueuse/core"))["reactifyObject"]>;
     readonly reactive: UnwrapRef<(typeof import("vue"))["reactive"]>;
-    readonly reactiveComputed: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactiveComputed"]
-    >;
-    readonly reactiveOmit: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactiveOmit"]
-    >;
-    readonly reactivePick: UnwrapRef<
-      (typeof import("@vueuse/core"))["reactivePick"]
-    >;
+    readonly reactiveComputed: UnwrapRef<(typeof import("@vueuse/core"))["reactiveComputed"]>;
+    readonly reactiveOmit: UnwrapRef<(typeof import("@vueuse/core"))["reactiveOmit"]>;
+    readonly reactivePick: UnwrapRef<(typeof import("@vueuse/core"))["reactivePick"]>;
     readonly readonly: UnwrapRef<(typeof import("vue"))["readonly"]>;
     readonly ref: UnwrapRef<(typeof import("vue"))["ref"]>;
-    readonly refAutoReset: UnwrapRef<
-      (typeof import("@vueuse/core"))["refAutoReset"]
-    >;
-    readonly refDebounced: UnwrapRef<
-      (typeof import("@vueuse/core"))["refDebounced"]
-    >;
-    readonly refDefault: UnwrapRef<
-      (typeof import("@vueuse/core"))["refDefault"]
-    >;
-    readonly refThrottled: UnwrapRef<
-      (typeof import("@vueuse/core"))["refThrottled"]
-    >;
-    readonly refWithControl: UnwrapRef<
-      (typeof import("@vueuse/core"))["refWithControl"]
-    >;
-    readonly resolveComponent: UnwrapRef<
-      (typeof import("vue"))["resolveComponent"]
-    >;
-    readonly resolveRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["resolveRef"]
-    >;
-    readonly resolveUnref: UnwrapRef<
-      (typeof import("@vueuse/core"))["resolveUnref"]
-    >;
-    readonly setActivePinia: UnwrapRef<
-      (typeof import("pinia"))["setActivePinia"]
-    >;
-    readonly setMapStoreSuffix: UnwrapRef<
-      (typeof import("pinia"))["setMapStoreSuffix"]
-    >;
-    readonly shallowReactive: UnwrapRef<
-      (typeof import("vue"))["shallowReactive"]
-    >;
-    readonly shallowReadonly: UnwrapRef<
-      (typeof import("vue"))["shallowReadonly"]
-    >;
+    readonly refAutoReset: UnwrapRef<(typeof import("@vueuse/core"))["refAutoReset"]>;
+    readonly refDebounced: UnwrapRef<(typeof import("@vueuse/core"))["refDebounced"]>;
+    readonly refDefault: UnwrapRef<(typeof import("@vueuse/core"))["refDefault"]>;
+    readonly refThrottled: UnwrapRef<(typeof import("@vueuse/core"))["refThrottled"]>;
+    readonly refWithControl: UnwrapRef<(typeof import("@vueuse/core"))["refWithControl"]>;
+    readonly resolveComponent: UnwrapRef<(typeof import("vue"))["resolveComponent"]>;
+    readonly resolveRef: UnwrapRef<(typeof import("@vueuse/core"))["resolveRef"]>;
+    readonly resolveUnref: UnwrapRef<(typeof import("@vueuse/core"))["resolveUnref"]>;
+    readonly setActivePinia: UnwrapRef<(typeof import("pinia"))["setActivePinia"]>;
+    readonly setMapStoreSuffix: UnwrapRef<(typeof import("pinia"))["setMapStoreSuffix"]>;
+    readonly shallowReactive: UnwrapRef<(typeof import("vue"))["shallowReactive"]>;
+    readonly shallowReadonly: UnwrapRef<(typeof import("vue"))["shallowReadonly"]>;
     readonly shallowRef: UnwrapRef<(typeof import("vue"))["shallowRef"]>;
     readonly storeToRefs: UnwrapRef<(typeof import("pinia"))["storeToRefs"]>;
     readonly syncRef: UnwrapRef<(typeof import("@vueuse/core"))["syncRef"]>;
     readonly syncRefs: UnwrapRef<(typeof import("@vueuse/core"))["syncRefs"]>;
-    readonly templateRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["templateRef"]
-    >;
-    readonly throttledRef: UnwrapRef<
-      (typeof import("@vueuse/core"))["throttledRef"]
-    >;
-    readonly throttledWatch: UnwrapRef<
-      (typeof import("@vueuse/core"))["throttledWatch"]
-    >;
+    readonly templateRef: UnwrapRef<(typeof import("@vueuse/core"))["templateRef"]>;
+    readonly throttledRef: UnwrapRef<(typeof import("@vueuse/core"))["throttledRef"]>;
+    readonly throttledWatch: UnwrapRef<(typeof import("@vueuse/core"))["throttledWatch"]>;
     readonly toRaw: UnwrapRef<(typeof import("vue"))["toRaw"]>;
-    readonly toReactive: UnwrapRef<
-      (typeof import("@vueuse/core"))["toReactive"]
-    >;
+    readonly toReactive: UnwrapRef<(typeof import("@vueuse/core"))["toReactive"]>;
     readonly toRef: UnwrapRef<(typeof import("vue"))["toRef"]>;
     readonly toRefs: UnwrapRef<(typeof import("vue"))["toRefs"]>;
     readonly toValue: UnwrapRef<(typeof import("vue"))["toValue"]>;
     readonly triggerRef: UnwrapRef<(typeof import("vue"))["triggerRef"]>;
-    readonly tryOnBeforeMount: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnBeforeMount"]
-    >;
-    readonly tryOnBeforeUnmount: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnBeforeUnmount"]
-    >;
-    readonly tryOnMounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnMounted"]
-    >;
-    readonly tryOnScopeDispose: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnScopeDispose"]
-    >;
-    readonly tryOnUnmounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["tryOnUnmounted"]
-    >;
+    readonly tryOnBeforeMount: UnwrapRef<(typeof import("@vueuse/core"))["tryOnBeforeMount"]>;
+    readonly tryOnBeforeUnmount: UnwrapRef<(typeof import("@vueuse/core"))["tryOnBeforeUnmount"]>;
+    readonly tryOnMounted: UnwrapRef<(typeof import("@vueuse/core"))["tryOnMounted"]>;
+    readonly tryOnScopeDispose: UnwrapRef<(typeof import("@vueuse/core"))["tryOnScopeDispose"]>;
+    readonly tryOnUnmounted: UnwrapRef<(typeof import("@vueuse/core"))["tryOnUnmounted"]>;
     readonly unref: UnwrapRef<(typeof import("vue"))["unref"]>;
-    readonly unrefElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["unrefElement"]
-    >;
+    readonly unrefElement: UnwrapRef<(typeof import("@vueuse/core"))["unrefElement"]>;
     readonly until: UnwrapRef<(typeof import("@vueuse/core"))["until"]>;
-    readonly useActiveElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useActiveElement"]
-    >;
-    readonly useAnimate: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAnimate"]
-    >;
-    readonly useArrayDifference: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayDifference"]
-    >;
-    readonly useArrayEvery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayEvery"]
-    >;
-    readonly useArrayFilter: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFilter"]
-    >;
-    readonly useArrayFind: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFind"]
-    >;
-    readonly useArrayFindIndex: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFindIndex"]
-    >;
-    readonly useArrayFindLast: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayFindLast"]
-    >;
-    readonly useArrayIncludes: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayIncludes"]
-    >;
-    readonly useArrayJoin: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayJoin"]
-    >;
-    readonly useArrayMap: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayMap"]
-    >;
-    readonly useArrayReduce: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayReduce"]
-    >;
-    readonly useArraySome: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArraySome"]
-    >;
-    readonly useArrayUnique: UnwrapRef<
-      (typeof import("@vueuse/core"))["useArrayUnique"]
-    >;
-    readonly useAsyncQueue: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAsyncQueue"]
-    >;
-    readonly useAsyncState: UnwrapRef<
-      (typeof import("@vueuse/core"))["useAsyncState"]
-    >;
+    readonly useActiveElement: UnwrapRef<(typeof import("@vueuse/core"))["useActiveElement"]>;
+    readonly useAnimate: UnwrapRef<(typeof import("@vueuse/core"))["useAnimate"]>;
+    readonly useArrayDifference: UnwrapRef<(typeof import("@vueuse/core"))["useArrayDifference"]>;
+    readonly useArrayEvery: UnwrapRef<(typeof import("@vueuse/core"))["useArrayEvery"]>;
+    readonly useArrayFilter: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFilter"]>;
+    readonly useArrayFind: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFind"]>;
+    readonly useArrayFindIndex: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFindIndex"]>;
+    readonly useArrayFindLast: UnwrapRef<(typeof import("@vueuse/core"))["useArrayFindLast"]>;
+    readonly useArrayIncludes: UnwrapRef<(typeof import("@vueuse/core"))["useArrayIncludes"]>;
+    readonly useArrayJoin: UnwrapRef<(typeof import("@vueuse/core"))["useArrayJoin"]>;
+    readonly useArrayMap: UnwrapRef<(typeof import("@vueuse/core"))["useArrayMap"]>;
+    readonly useArrayReduce: UnwrapRef<(typeof import("@vueuse/core"))["useArrayReduce"]>;
+    readonly useArraySome: UnwrapRef<(typeof import("@vueuse/core"))["useArraySome"]>;
+    readonly useArrayUnique: UnwrapRef<(typeof import("@vueuse/core"))["useArrayUnique"]>;
+    readonly useAsyncQueue: UnwrapRef<(typeof import("@vueuse/core"))["useAsyncQueue"]>;
+    readonly useAsyncState: UnwrapRef<(typeof import("@vueuse/core"))["useAsyncState"]>;
     readonly useAttrs: UnwrapRef<(typeof import("vue"))["useAttrs"]>;
     readonly useBase64: UnwrapRef<(typeof import("@vueuse/core"))["useBase64"]>;
-    readonly useBattery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBattery"]
-    >;
-    readonly useBluetooth: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBluetooth"]
-    >;
-    readonly useBreakpoints: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBreakpoints"]
-    >;
-    readonly useBroadcastChannel: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBroadcastChannel"]
-    >;
-    readonly useBrowserLocation: UnwrapRef<
-      (typeof import("@vueuse/core"))["useBrowserLocation"]
-    >;
+    readonly useBattery: UnwrapRef<(typeof import("@vueuse/core"))["useBattery"]>;
+    readonly useBluetooth: UnwrapRef<(typeof import("@vueuse/core"))["useBluetooth"]>;
+    readonly useBreakpoints: UnwrapRef<(typeof import("@vueuse/core"))["useBreakpoints"]>;
+    readonly useBroadcastChannel: UnwrapRef<(typeof import("@vueuse/core"))["useBroadcastChannel"]>;
+    readonly useBrowserLocation: UnwrapRef<(typeof import("@vueuse/core"))["useBrowserLocation"]>;
     readonly useCached: UnwrapRef<(typeof import("@vueuse/core"))["useCached"]>;
-    readonly useClipboard: UnwrapRef<
-      (typeof import("@vueuse/core"))["useClipboard"]
-    >;
-    readonly useClipboardItems: UnwrapRef<
-      (typeof import("@vueuse/core"))["useClipboardItems"]
-    >;
+    readonly useClipboard: UnwrapRef<(typeof import("@vueuse/core"))["useClipboard"]>;
+    readonly useClipboardItems: UnwrapRef<(typeof import("@vueuse/core"))["useClipboardItems"]>;
     readonly useCloned: UnwrapRef<(typeof import("@vueuse/core"))["useCloned"]>;
-    readonly useColorMode: UnwrapRef<
-      (typeof import("@vueuse/core"))["useColorMode"]
-    >;
-    readonly useConfirmDialog: UnwrapRef<
-      (typeof import("@vueuse/core"))["useConfirmDialog"]
-    >;
-    readonly useCounter: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCounter"]
-    >;
+    readonly useColorMode: UnwrapRef<(typeof import("@vueuse/core"))["useColorMode"]>;
+    readonly useConfirmDialog: UnwrapRef<(typeof import("@vueuse/core"))["useConfirmDialog"]>;
+    readonly useCounter: UnwrapRef<(typeof import("@vueuse/core"))["useCounter"]>;
     readonly useCssModule: UnwrapRef<(typeof import("vue"))["useCssModule"]>;
     readonly useCssVar: UnwrapRef<(typeof import("@vueuse/core"))["useCssVar"]>;
     readonly useCssVars: UnwrapRef<(typeof import("vue"))["useCssVars"]>;
-    readonly useCurrentElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCurrentElement"]
-    >;
-    readonly useCycleList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useCycleList"]
-    >;
+    readonly useCurrentElement: UnwrapRef<(typeof import("@vueuse/core"))["useCurrentElement"]>;
+    readonly useCycleList: UnwrapRef<(typeof import("@vueuse/core"))["useCycleList"]>;
     readonly useDark: UnwrapRef<(typeof import("@vueuse/core"))["useDark"]>;
-    readonly useDateFormat: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDateFormat"]
-    >;
-    readonly useDebounce: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDebounce"]
-    >;
-    readonly useDebounceFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDebounceFn"]
-    >;
+    readonly useDateFormat: UnwrapRef<(typeof import("@vueuse/core"))["useDateFormat"]>;
+    readonly useDebounce: UnwrapRef<(typeof import("@vueuse/core"))["useDebounce"]>;
+    readonly useDebounceFn: UnwrapRef<(typeof import("@vueuse/core"))["useDebounceFn"]>;
     readonly useDebouncedRefHistory: UnwrapRef<
       (typeof import("@vueuse/core"))["useDebouncedRefHistory"]
     >;
-    readonly useDeviceMotion: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDeviceMotion"]
-    >;
+    readonly useDeviceMotion: UnwrapRef<(typeof import("@vueuse/core"))["useDeviceMotion"]>;
     readonly useDeviceOrientation: UnwrapRef<
       (typeof import("@vueuse/core"))["useDeviceOrientation"]
     >;
-    readonly useDevicePixelRatio: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDevicePixelRatio"]
-    >;
-    readonly useDevicesList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDevicesList"]
-    >;
-    readonly useDisplayMedia: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDisplayMedia"]
-    >;
+    readonly useDevicePixelRatio: UnwrapRef<(typeof import("@vueuse/core"))["useDevicePixelRatio"]>;
+    readonly useDevicesList: UnwrapRef<(typeof import("@vueuse/core"))["useDevicesList"]>;
+    readonly useDisplayMedia: UnwrapRef<(typeof import("@vueuse/core"))["useDisplayMedia"]>;
     readonly useDocumentVisibility: UnwrapRef<
       (typeof import("@vueuse/core"))["useDocumentVisibility"]
     >;
-    readonly useDraggable: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDraggable"]
-    >;
-    readonly useDropZone: UnwrapRef<
-      (typeof import("@vueuse/core"))["useDropZone"]
-    >;
-    readonly useElementBounding: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementBounding"]
-    >;
-    readonly useElementByPoint: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementByPoint"]
-    >;
-    readonly useElementHover: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementHover"]
-    >;
-    readonly useElementSize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useElementSize"]
-    >;
+    readonly useDraggable: UnwrapRef<(typeof import("@vueuse/core"))["useDraggable"]>;
+    readonly useDropZone: UnwrapRef<(typeof import("@vueuse/core"))["useDropZone"]>;
+    readonly useElementBounding: UnwrapRef<(typeof import("@vueuse/core"))["useElementBounding"]>;
+    readonly useElementByPoint: UnwrapRef<(typeof import("@vueuse/core"))["useElementByPoint"]>;
+    readonly useElementHover: UnwrapRef<(typeof import("@vueuse/core"))["useElementHover"]>;
+    readonly useElementSize: UnwrapRef<(typeof import("@vueuse/core"))["useElementSize"]>;
     readonly useElementVisibility: UnwrapRef<
       (typeof import("@vueuse/core"))["useElementVisibility"]
     >;
-    readonly useEventBus: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventBus"]
-    >;
-    readonly useEventListener: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventListener"]
-    >;
-    readonly useEventSource: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEventSource"]
-    >;
-    readonly useEyeDropper: UnwrapRef<
-      (typeof import("@vueuse/core"))["useEyeDropper"]
-    >;
-    readonly useFavicon: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFavicon"]
-    >;
+    readonly useEventBus: UnwrapRef<(typeof import("@vueuse/core"))["useEventBus"]>;
+    readonly useEventListener: UnwrapRef<(typeof import("@vueuse/core"))["useEventListener"]>;
+    readonly useEventSource: UnwrapRef<(typeof import("@vueuse/core"))["useEventSource"]>;
+    readonly useEyeDropper: UnwrapRef<(typeof import("@vueuse/core"))["useEyeDropper"]>;
+    readonly useFavicon: UnwrapRef<(typeof import("@vueuse/core"))["useFavicon"]>;
     readonly useFetch: UnwrapRef<(typeof import("@vueuse/core"))["useFetch"]>;
-    readonly useFileDialog: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFileDialog"]
-    >;
-    readonly useFileSystemAccess: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFileSystemAccess"]
-    >;
+    readonly useFileDialog: UnwrapRef<(typeof import("@vueuse/core"))["useFileDialog"]>;
+    readonly useFileSystemAccess: UnwrapRef<(typeof import("@vueuse/core"))["useFileSystemAccess"]>;
     readonly useFocus: UnwrapRef<(typeof import("@vueuse/core"))["useFocus"]>;
-    readonly useFocusWithin: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFocusWithin"]
-    >;
+    readonly useFocusWithin: UnwrapRef<(typeof import("@vueuse/core"))["useFocusWithin"]>;
     readonly useFps: UnwrapRef<(typeof import("@vueuse/core"))["useFps"]>;
-    readonly useFullscreen: UnwrapRef<
-      (typeof import("@vueuse/core"))["useFullscreen"]
-    >;
-    readonly useGamepad: UnwrapRef<
-      (typeof import("@vueuse/core"))["useGamepad"]
-    >;
-    readonly useGeolocation: UnwrapRef<
-      (typeof import("@vueuse/core"))["useGeolocation"]
-    >;
+    readonly useFullscreen: UnwrapRef<(typeof import("@vueuse/core"))["useFullscreen"]>;
+    readonly useGamepad: UnwrapRef<(typeof import("@vueuse/core"))["useGamepad"]>;
+    readonly useGeolocation: UnwrapRef<(typeof import("@vueuse/core"))["useGeolocation"]>;
     readonly useI18n: UnwrapRef<(typeof import("vue-i18n"))["useI18n"]>;
     readonly useIdle: UnwrapRef<(typeof import("@vueuse/core"))["useIdle"]>;
     readonly useImage: UnwrapRef<(typeof import("@vueuse/core"))["useImage"]>;
-    readonly useInfiniteScroll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useInfiniteScroll"]
-    >;
+    readonly useInfiniteScroll: UnwrapRef<(typeof import("@vueuse/core"))["useInfiniteScroll"]>;
     readonly useIntersectionObserver: UnwrapRef<
       (typeof import("@vueuse/core"))["useIntersectionObserver"]
     >;
-    readonly useInterval: UnwrapRef<
-      (typeof import("@vueuse/core"))["useInterval"]
-    >;
-    readonly useIntervalFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useIntervalFn"]
-    >;
-    readonly useKeyModifier: UnwrapRef<
-      (typeof import("@vueuse/core"))["useKeyModifier"]
-    >;
-    readonly useLastChanged: UnwrapRef<
-      (typeof import("@vueuse/core"))["useLastChanged"]
-    >;
+    readonly useInterval: UnwrapRef<(typeof import("@vueuse/core"))["useInterval"]>;
+    readonly useIntervalFn: UnwrapRef<(typeof import("@vueuse/core"))["useIntervalFn"]>;
+    readonly useKeyModifier: UnwrapRef<(typeof import("@vueuse/core"))["useKeyModifier"]>;
+    readonly useLastChanged: UnwrapRef<(typeof import("@vueuse/core"))["useLastChanged"]>;
     readonly useLink: UnwrapRef<(typeof import("vue-router"))["useLink"]>;
-    readonly useLocalStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useLocalStorage"]
-    >;
-    readonly useMagicKeys: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMagicKeys"]
-    >;
-    readonly useManualRefHistory: UnwrapRef<
-      (typeof import("@vueuse/core"))["useManualRefHistory"]
-    >;
-    readonly useMediaControls: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMediaControls"]
-    >;
-    readonly useMediaQuery: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMediaQuery"]
-    >;
-    readonly useMemoize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMemoize"]
-    >;
+    readonly useLocalStorage: UnwrapRef<(typeof import("@vueuse/core"))["useLocalStorage"]>;
+    readonly useMagicKeys: UnwrapRef<(typeof import("@vueuse/core"))["useMagicKeys"]>;
+    readonly useManualRefHistory: UnwrapRef<(typeof import("@vueuse/core"))["useManualRefHistory"]>;
+    readonly useMediaControls: UnwrapRef<(typeof import("@vueuse/core"))["useMediaControls"]>;
+    readonly useMediaQuery: UnwrapRef<(typeof import("@vueuse/core"))["useMediaQuery"]>;
+    readonly useMemoize: UnwrapRef<(typeof import("@vueuse/core"))["useMemoize"]>;
     readonly useMemory: UnwrapRef<(typeof import("@vueuse/core"))["useMemory"]>;
-    readonly useMounted: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMounted"]
-    >;
+    readonly useMounted: UnwrapRef<(typeof import("@vueuse/core"))["useMounted"]>;
     readonly useMouse: UnwrapRef<(typeof import("@vueuse/core"))["useMouse"]>;
-    readonly useMouseInElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMouseInElement"]
-    >;
-    readonly useMousePressed: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMousePressed"]
-    >;
-    readonly useMutationObserver: UnwrapRef<
-      (typeof import("@vueuse/core"))["useMutationObserver"]
-    >;
+    readonly useMouseInElement: UnwrapRef<(typeof import("@vueuse/core"))["useMouseInElement"]>;
+    readonly useMousePressed: UnwrapRef<(typeof import("@vueuse/core"))["useMousePressed"]>;
+    readonly useMutationObserver: UnwrapRef<(typeof import("@vueuse/core"))["useMutationObserver"]>;
     readonly useNavigatorLanguage: UnwrapRef<
       (typeof import("@vueuse/core"))["useNavigatorLanguage"]
     >;
-    readonly useNetwork: UnwrapRef<
-      (typeof import("@vueuse/core"))["useNetwork"]
-    >;
+    readonly useNetwork: UnwrapRef<(typeof import("@vueuse/core"))["useNetwork"]>;
     readonly useNow: UnwrapRef<(typeof import("@vueuse/core"))["useNow"]>;
-    readonly useObjectUrl: UnwrapRef<
-      (typeof import("@vueuse/core"))["useObjectUrl"]
-    >;
-    readonly useOffsetPagination: UnwrapRef<
-      (typeof import("@vueuse/core"))["useOffsetPagination"]
-    >;
+    readonly useObjectUrl: UnwrapRef<(typeof import("@vueuse/core"))["useObjectUrl"]>;
+    readonly useOffsetPagination: UnwrapRef<(typeof import("@vueuse/core"))["useOffsetPagination"]>;
     readonly useOnline: UnwrapRef<(typeof import("@vueuse/core"))["useOnline"]>;
-    readonly usePageLeave: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePageLeave"]
-    >;
-    readonly useParallax: UnwrapRef<
-      (typeof import("@vueuse/core"))["useParallax"]
-    >;
-    readonly useParentElement: UnwrapRef<
-      (typeof import("@vueuse/core"))["useParentElement"]
-    >;
+    readonly usePageLeave: UnwrapRef<(typeof import("@vueuse/core"))["usePageLeave"]>;
+    readonly useParallax: UnwrapRef<(typeof import("@vueuse/core"))["useParallax"]>;
+    readonly useParentElement: UnwrapRef<(typeof import("@vueuse/core"))["useParentElement"]>;
     readonly usePerformanceObserver: UnwrapRef<
       (typeof import("@vueuse/core"))["usePerformanceObserver"]
     >;
-    readonly usePermission: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePermission"]
-    >;
-    readonly usePointer: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointer"]
-    >;
-    readonly usePointerLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointerLock"]
-    >;
-    readonly usePointerSwipe: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePointerSwipe"]
-    >;
+    readonly usePermission: UnwrapRef<(typeof import("@vueuse/core"))["usePermission"]>;
+    readonly usePointer: UnwrapRef<(typeof import("@vueuse/core"))["usePointer"]>;
+    readonly usePointerLock: UnwrapRef<(typeof import("@vueuse/core"))["usePointerLock"]>;
+    readonly usePointerSwipe: UnwrapRef<(typeof import("@vueuse/core"))["usePointerSwipe"]>;
     readonly usePreferredColorScheme: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredColorScheme"]
     >;
     readonly usePreferredContrast: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredContrast"]
     >;
-    readonly usePreferredDark: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePreferredDark"]
-    >;
+    readonly usePreferredDark: UnwrapRef<(typeof import("@vueuse/core"))["usePreferredDark"]>;
     readonly usePreferredLanguages: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredLanguages"]
     >;
     readonly usePreferredReducedMotion: UnwrapRef<
       (typeof import("@vueuse/core"))["usePreferredReducedMotion"]
     >;
-    readonly usePrevious: UnwrapRef<
-      (typeof import("@vueuse/core"))["usePrevious"]
-    >;
+    readonly usePrevious: UnwrapRef<(typeof import("@vueuse/core"))["usePrevious"]>;
     readonly useRafFn: UnwrapRef<(typeof import("@vueuse/core"))["useRafFn"]>;
-    readonly useRefHistory: UnwrapRef<
-      (typeof import("@vueuse/core"))["useRefHistory"]
-    >;
-    readonly useResizeObserver: UnwrapRef<
-      (typeof import("@vueuse/core"))["useResizeObserver"]
-    >;
+    readonly useRefHistory: UnwrapRef<(typeof import("@vueuse/core"))["useRefHistory"]>;
+    readonly useResizeObserver: UnwrapRef<(typeof import("@vueuse/core"))["useResizeObserver"]>;
     readonly useRoute: UnwrapRef<(typeof import("vue-router"))["useRoute"]>;
     readonly useRouter: UnwrapRef<(typeof import("vue-router"))["useRouter"]>;
     readonly useScreenOrientation: UnwrapRef<
       (typeof import("@vueuse/core"))["useScreenOrientation"]
     >;
-    readonly useScreenSafeArea: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScreenSafeArea"]
-    >;
-    readonly useScriptTag: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScriptTag"]
-    >;
+    readonly useScreenSafeArea: UnwrapRef<(typeof import("@vueuse/core"))["useScreenSafeArea"]>;
+    readonly useScriptTag: UnwrapRef<(typeof import("@vueuse/core"))["useScriptTag"]>;
     readonly useScroll: UnwrapRef<(typeof import("@vueuse/core"))["useScroll"]>;
-    readonly useScrollLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["useScrollLock"]
-    >;
-    readonly useSessionStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSessionStorage"]
-    >;
+    readonly useScrollLock: UnwrapRef<(typeof import("@vueuse/core"))["useScrollLock"]>;
+    readonly useSessionStorage: UnwrapRef<(typeof import("@vueuse/core"))["useSessionStorage"]>;
     readonly useShare: UnwrapRef<(typeof import("@vueuse/core"))["useShare"]>;
     readonly useSlots: UnwrapRef<(typeof import("vue"))["useSlots"]>;
     readonly useSorted: UnwrapRef<(typeof import("@vueuse/core"))["useSorted"]>;
     readonly useSpeechRecognition: UnwrapRef<
       (typeof import("@vueuse/core"))["useSpeechRecognition"]
     >;
-    readonly useSpeechSynthesis: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSpeechSynthesis"]
-    >;
-    readonly useStepper: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStepper"]
-    >;
-    readonly useStorage: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStorage"]
-    >;
-    readonly useStorageAsync: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStorageAsync"]
-    >;
-    readonly useStyleTag: UnwrapRef<
-      (typeof import("@vueuse/core"))["useStyleTag"]
-    >;
-    readonly useSupported: UnwrapRef<
-      (typeof import("@vueuse/core"))["useSupported"]
-    >;
+    readonly useSpeechSynthesis: UnwrapRef<(typeof import("@vueuse/core"))["useSpeechSynthesis"]>;
+    readonly useStepper: UnwrapRef<(typeof import("@vueuse/core"))["useStepper"]>;
+    readonly useStorage: UnwrapRef<(typeof import("@vueuse/core"))["useStorage"]>;
+    readonly useStorageAsync: UnwrapRef<(typeof import("@vueuse/core"))["useStorageAsync"]>;
+    readonly useStyleTag: UnwrapRef<(typeof import("@vueuse/core"))["useStyleTag"]>;
+    readonly useSupported: UnwrapRef<(typeof import("@vueuse/core"))["useSupported"]>;
     readonly useSwipe: UnwrapRef<(typeof import("@vueuse/core"))["useSwipe"]>;
-    readonly useTemplateRefsList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTemplateRefsList"]
-    >;
-    readonly useTextDirection: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextDirection"]
-    >;
-    readonly useTextSelection: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextSelection"]
-    >;
-    readonly useTextareaAutosize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTextareaAutosize"]
-    >;
-    readonly useThrottle: UnwrapRef<
-      (typeof import("@vueuse/core"))["useThrottle"]
-    >;
-    readonly useThrottleFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useThrottleFn"]
-    >;
+    readonly useTemplateRefsList: UnwrapRef<(typeof import("@vueuse/core"))["useTemplateRefsList"]>;
+    readonly useTextDirection: UnwrapRef<(typeof import("@vueuse/core"))["useTextDirection"]>;
+    readonly useTextSelection: UnwrapRef<(typeof import("@vueuse/core"))["useTextSelection"]>;
+    readonly useTextareaAutosize: UnwrapRef<(typeof import("@vueuse/core"))["useTextareaAutosize"]>;
+    readonly useThrottle: UnwrapRef<(typeof import("@vueuse/core"))["useThrottle"]>;
+    readonly useThrottleFn: UnwrapRef<(typeof import("@vueuse/core"))["useThrottleFn"]>;
     readonly useThrottledRefHistory: UnwrapRef<
       (typeof import("@vueuse/core"))["useThrottledRefHistory"]
     >;
-    readonly useTimeAgo: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeAgo"]
-    >;
-    readonly useTimeout: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeout"]
-    >;
-    readonly useTimeoutFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeoutFn"]
-    >;
-    readonly useTimeoutPoll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimeoutPoll"]
-    >;
-    readonly useTimestamp: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTimestamp"]
-    >;
+    readonly useTimeAgo: UnwrapRef<(typeof import("@vueuse/core"))["useTimeAgo"]>;
+    readonly useTimeout: UnwrapRef<(typeof import("@vueuse/core"))["useTimeout"]>;
+    readonly useTimeoutFn: UnwrapRef<(typeof import("@vueuse/core"))["useTimeoutFn"]>;
+    readonly useTimeoutPoll: UnwrapRef<(typeof import("@vueuse/core"))["useTimeoutPoll"]>;
+    readonly useTimestamp: UnwrapRef<(typeof import("@vueuse/core"))["useTimestamp"]>;
     readonly useTitle: UnwrapRef<(typeof import("@vueuse/core"))["useTitle"]>;
-    readonly useToNumber: UnwrapRef<
-      (typeof import("@vueuse/core"))["useToNumber"]
-    >;
-    readonly useToString: UnwrapRef<
-      (typeof import("@vueuse/core"))["useToString"]
-    >;
+    readonly useToNumber: UnwrapRef<(typeof import("@vueuse/core"))["useToNumber"]>;
+    readonly useToString: UnwrapRef<(typeof import("@vueuse/core"))["useToString"]>;
     readonly useToggle: UnwrapRef<(typeof import("@vueuse/core"))["useToggle"]>;
-    readonly useTransition: UnwrapRef<
-      (typeof import("@vueuse/core"))["useTransition"]
-    >;
-    readonly useUrlSearchParams: UnwrapRef<
-      (typeof import("@vueuse/core"))["useUrlSearchParams"]
-    >;
-    readonly useUserMedia: UnwrapRef<
-      (typeof import("@vueuse/core"))["useUserMedia"]
-    >;
+    readonly useTransition: UnwrapRef<(typeof import("@vueuse/core"))["useTransition"]>;
+    readonly useUrlSearchParams: UnwrapRef<(typeof import("@vueuse/core"))["useUrlSearchParams"]>;
+    readonly useUserMedia: UnwrapRef<(typeof import("@vueuse/core"))["useUserMedia"]>;
     readonly useVModel: UnwrapRef<(typeof import("@vueuse/core"))["useVModel"]>;
-    readonly useVModels: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVModels"]
-    >;
-    readonly useVibrate: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVibrate"]
-    >;
-    readonly useVirtualList: UnwrapRef<
-      (typeof import("@vueuse/core"))["useVirtualList"]
-    >;
-    readonly useWakeLock: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWakeLock"]
-    >;
-    readonly useWebNotification: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebNotification"]
-    >;
-    readonly useWebSocket: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebSocket"]
-    >;
-    readonly useWebWorker: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebWorker"]
-    >;
-    readonly useWebWorkerFn: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWebWorkerFn"]
-    >;
-    readonly useWindowFocus: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowFocus"]
-    >;
-    readonly useWindowScroll: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowScroll"]
-    >;
-    readonly useWindowSize: UnwrapRef<
-      (typeof import("@vueuse/core"))["useWindowSize"]
-    >;
+    readonly useVModels: UnwrapRef<(typeof import("@vueuse/core"))["useVModels"]>;
+    readonly useVibrate: UnwrapRef<(typeof import("@vueuse/core"))["useVibrate"]>;
+    readonly useVirtualList: UnwrapRef<(typeof import("@vueuse/core"))["useVirtualList"]>;
+    readonly useWakeLock: UnwrapRef<(typeof import("@vueuse/core"))["useWakeLock"]>;
+    readonly useWebNotification: UnwrapRef<(typeof import("@vueuse/core"))["useWebNotification"]>;
+    readonly useWebSocket: UnwrapRef<(typeof import("@vueuse/core"))["useWebSocket"]>;
+    readonly useWebWorker: UnwrapRef<(typeof import("@vueuse/core"))["useWebWorker"]>;
+    readonly useWebWorkerFn: UnwrapRef<(typeof import("@vueuse/core"))["useWebWorkerFn"]>;
+    readonly useWindowFocus: UnwrapRef<(typeof import("@vueuse/core"))["useWindowFocus"]>;
+    readonly useWindowScroll: UnwrapRef<(typeof import("@vueuse/core"))["useWindowScroll"]>;
+    readonly useWindowSize: UnwrapRef<(typeof import("@vueuse/core"))["useWindowSize"]>;
     readonly watch: UnwrapRef<(typeof import("vue"))["watch"]>;
-    readonly watchArray: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchArray"]
-    >;
-    readonly watchAtMost: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchAtMost"]
-    >;
-    readonly watchDebounced: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchDebounced"]
-    >;
+    readonly watchArray: UnwrapRef<(typeof import("@vueuse/core"))["watchArray"]>;
+    readonly watchAtMost: UnwrapRef<(typeof import("@vueuse/core"))["watchAtMost"]>;
+    readonly watchDebounced: UnwrapRef<(typeof import("@vueuse/core"))["watchDebounced"]>;
     readonly watchDeep: UnwrapRef<(typeof import("@vueuse/core"))["watchDeep"]>;
     readonly watchEffect: UnwrapRef<(typeof import("vue"))["watchEffect"]>;
-    readonly watchIgnorable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchIgnorable"]
-    >;
-    readonly watchImmediate: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchImmediate"]
-    >;
+    readonly watchIgnorable: UnwrapRef<(typeof import("@vueuse/core"))["watchIgnorable"]>;
+    readonly watchImmediate: UnwrapRef<(typeof import("@vueuse/core"))["watchImmediate"]>;
     readonly watchOnce: UnwrapRef<(typeof import("@vueuse/core"))["watchOnce"]>;
-    readonly watchPausable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchPausable"]
-    >;
-    readonly watchPostEffect: UnwrapRef<
-      (typeof import("vue"))["watchPostEffect"]
-    >;
-    readonly watchSyncEffect: UnwrapRef<
-      (typeof import("vue"))["watchSyncEffect"]
-    >;
-    readonly watchThrottled: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchThrottled"]
-    >;
-    readonly watchTriggerable: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchTriggerable"]
-    >;
-    readonly watchWithFilter: UnwrapRef<
-      (typeof import("@vueuse/core"))["watchWithFilter"]
-    >;
+    readonly watchPausable: UnwrapRef<(typeof import("@vueuse/core"))["watchPausable"]>;
+    readonly watchPostEffect: UnwrapRef<(typeof import("vue"))["watchPostEffect"]>;
+    readonly watchSyncEffect: UnwrapRef<(typeof import("vue"))["watchSyncEffect"]>;
+    readonly watchThrottled: UnwrapRef<(typeof import("@vueuse/core"))["watchThrottled"]>;
+    readonly watchTriggerable: UnwrapRef<(typeof import("@vueuse/core"))["watchTriggerable"]>;
+    readonly watchWithFilter: UnwrapRef<(typeof import("@vueuse/core"))["watchWithFilter"]>;
     readonly whenever: UnwrapRef<(typeof import("@vueuse/core"))["whenever"]>;
   }
 }
diff --git a/vite.config.ts b/vite.config.ts
index 19ff4ca1..c305ba97 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -55,7 +55,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       vue(),
       env.VITE_MOCK_DEV_SERVER === "true" ? mockDevServerPlugin() : null,
       UnoCSS(),
-      // 自动导入配置 https://github.com/sxzz/element-plus-best-practices/blob/main/vite.config.ts
+      // API 导入
       AutoImport({
         // 导入 Vue 函数，如：ref, reactive, toRef 等
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
@@ -74,10 +74,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         // dts: "src/types/auto-imports.d.ts",
       }),
       Components({
-        resolvers: [
-          // 导入 Element Plus 组件
-          ElementPlusResolver({ importStyle: "sass" }),
-        ],
+        resolvers: [ElementPlusResolver()],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],
         // 导入组件类型声明文件路径 (false:关闭自动生成)

From f4f79e5495204d2de5ef331d939847282c6a2227 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 9 May 2025 13:59:15 +0800
Subject: [PATCH 362/497] =?UTF-8?q?fix(dict):=20:bug:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BB=84=E4=BB=B6=E7=9A=84=20WebSocket=20?=
 =?UTF-8?q?=E7=9B=91=E5=90=AC=E5=99=A8=EF=BC=8C=E4=BB=A5=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E5=9C=A8=E6=B3=A8=E9=94=80=E7=99=BB=E5=BD=95=E6=9C=9F=E9=97=B4?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E6=97=A0=E6=95=88=E4=BB=A4=E7=89=8C=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Dict/DictLabel.vue | 10 +++-------
 src/components/Dict/index.vue     |  9 ---------
 2 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/components/Dict/DictLabel.vue b/src/components/Dict/DictLabel.vue
index 1ef82bea..c6603470 100644
--- a/src/components/Dict/DictLabel.vue
+++ b/src/components/Dict/DictLabel.vue
@@ -53,18 +53,14 @@ const updateLabelAndTag = async () => {
   tagType.value = newTagType as typeof tagType.value;
 };
 
-watch([() => props.code, () => props.modelValue], updateLabelAndTag);
-
-onMounted(updateLabelAndTag);
-
-// 监听WebSocket字典更新事件，强制刷新标签
+// 初始化或code变化时更新标签和标签样式
 watch(
-  () => dictStore.getDictItems(props.code || ""),
+  [() => props.code, () => props.modelValue],
   async () => {
     if (props.code) {
       await updateLabelAndTag();
     }
   },
-  { deep: true }
+  { immediate: true }
 );
 </script>
diff --git a/src/components/Dict/index.vue b/src/components/Dict/index.vue
index ee5f1136..79d98e4d 100644
--- a/src/components/Dict/index.vue
+++ b/src/components/Dict/index.vue
@@ -120,13 +120,4 @@ onMounted(async () => {
   await dictStore.loadDictItems(props.code);
   options.value = dictStore.getDictItems(props.code);
 });
-
-// 监听字典数据变化，确保WebSocket更新时刷新选项
-watch(
-  () => dictStore.getDictItems(props.code),
-  (newItems) => {
-    options.value = newItems;
-  },
-  { deep: true }
-);
 </script>

From 4f0f37e69618d2ecece6cf01be01f78764043c41 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 9 May 2025 14:05:11 +0800
Subject: [PATCH 363/497] =?UTF-8?q?perf(vite.config.ts):=20:zap:=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=20element-plus=20=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E6=9E=84=E5=BB=BA=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 145 +++++++++++++++++++++++++------------------------
 1 file changed, 73 insertions(+), 72 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index c305ba97..6e244754 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -55,7 +55,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       vue(),
       env.VITE_MOCK_DEV_SERVER === "true" ? mockDevServerPlugin() : null,
       UnoCSS(),
-      // API 导入
+      // API 自动导入
       AutoImport({
         // 导入 Vue 函数，如：ref, reactive, toRef 等
         imports: ["vue", "@vueuse/core", "pinia", "vue-router", "vue-i18n"],
@@ -73,6 +73,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         dts: false,
         // dts: "src/types/auto-imports.d.ts",
       }),
+      // 组件自动导入
       Components({
         resolvers: [ElementPlusResolver()],
         // 指定自定义组件位置(默认:src/components)
@@ -109,77 +110,77 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es",
         "element-plus/es/locale/lang/en",
         "element-plus/es/locale/lang/zh-cn",
-        "element-plus/es/components/alert/style/index",
-        "element-plus/es/components/avatar/style/index",
-        "element-plus/es/components/backtop/style/index",
-        "element-plus/es/components/badge/style/index",
-        "element-plus/es/components/base/style/index",
-        "element-plus/es/components/breadcrumb-item/style/index",
-        "element-plus/es/components/breadcrumb/style/index",
-        "element-plus/es/components/button/style/index",
-        "element-plus/es/components/card/style/index",
-        "element-plus/es/components/cascader/style/index",
-        "element-plus/es/components/checkbox-group/style/index",
-        "element-plus/es/components/checkbox/style/index",
-        "element-plus/es/components/col/style/index",
-        "element-plus/es/components/color-picker/style/index",
-        "element-plus/es/components/config-provider/style/index",
-        "element-plus/es/components/date-picker/style/index",
-        "element-plus/es/components/descriptions-item/style/index",
-        "element-plus/es/components/descriptions/style/index",
-        "element-plus/es/components/dialog/style/index",
-        "element-plus/es/components/divider/style/index",
-        "element-plus/es/components/drawer/style/index",
-        "element-plus/es/components/dropdown-item/style/index",
-        "element-plus/es/components/dropdown-menu/style/index",
-        "element-plus/es/components/dropdown/style/index",
-        "element-plus/es/components/empty/style/index",
-        "element-plus/es/components/form-item/style/index",
-        "element-plus/es/components/form/style/index",
-        "element-plus/es/components/icon/style/index",
-        "element-plus/es/components/image-viewer/style/index",
-        "element-plus/es/components/image/style/index",
-        "element-plus/es/components/input-number/style/index",
-        "element-plus/es/components/input-tag/style/index",
-        "element-plus/es/components/input/style/index",
-        "element-plus/es/components/link/style/index",
-        "element-plus/es/components/loading/style/index",
-        "element-plus/es/components/menu-item/style/index",
-        "element-plus/es/components/menu/style/index",
-        "element-plus/es/components/message-box/style/index",
-        "element-plus/es/components/message/style/index",
-        "element-plus/es/components/notification/style/index",
-        "element-plus/es/components/option/style/index",
-        "element-plus/es/components/pagination/style/index",
-        "element-plus/es/components/popover/style/index",
-        "element-plus/es/components/progress/style/index",
-        "element-plus/es/components/radio-button/style/index",
-        "element-plus/es/components/radio-group/style/index",
-        "element-plus/es/components/radio/style/index",
-        "element-plus/es/components/row/style/index",
-        "element-plus/es/components/scrollbar/style/index",
-        "element-plus/es/components/select/style/index",
-        "element-plus/es/components/skeleton-item/style/index",
-        "element-plus/es/components/skeleton/style/index",
-        "element-plus/es/components/step/style/index",
-        "element-plus/es/components/steps/style/index",
-        "element-plus/es/components/sub-menu/style/index",
-        "element-plus/es/components/switch/style/index",
-        "element-plus/es/components/tab-pane/style/index",
-        "element-plus/es/components/table-column/style/index",
-        "element-plus/es/components/table/style/index",
-        "element-plus/es/components/tabs/style/index",
-        "element-plus/es/components/tag/style/index",
-        "element-plus/es/components/text/style/index",
-        "element-plus/es/components/time-picker/style/index",
-        "element-plus/es/components/time-select/style/index",
-        "element-plus/es/components/timeline-item/style/index",
-        "element-plus/es/components/timeline/style/index",
-        "element-plus/es/components/tooltip/style/index",
-        "element-plus/es/components/tree-select/style/index",
-        "element-plus/es/components/tree/style/index",
-        "element-plus/es/components/upload/style/index",
-        "element-plus/es/components/watermark/style/index",
+        "element-plus/es/components/alert/style/css",
+        "element-plus/es/components/avatar/style/css",
+        "element-plus/es/components/backtop/style/css",
+        "element-plus/es/components/badge/style/css",
+        "element-plus/es/components/base/style/css",
+        "element-plus/es/components/breadcrumb-item/style/css",
+        "element-plus/es/components/breadcrumb/style/css",
+        "element-plus/es/components/button/style/css",
+        "element-plus/es/components/card/style/css",
+        "element-plus/es/components/cascader/style/css",
+        "element-plus/es/components/checkbox-group/style/css",
+        "element-plus/es/components/checkbox/style/css",
+        "element-plus/es/components/col/style/css",
+        "element-plus/es/components/color-picker/style/css",
+        "element-plus/es/components/config-provider/style/css",
+        "element-plus/es/components/date-picker/style/css",
+        "element-plus/es/components/descriptions-item/style/css",
+        "element-plus/es/components/descriptions/style/css",
+        "element-plus/es/components/dialog/style/css",
+        "element-plus/es/components/divider/style/css",
+        "element-plus/es/components/drawer/style/css",
+        "element-plus/es/components/dropdown-item/style/css",
+        "element-plus/es/components/dropdown-menu/style/css",
+        "element-plus/es/components/dropdown/style/css",
+        "element-plus/es/components/empty/style/css",
+        "element-plus/es/components/form-item/style/css",
+        "element-plus/es/components/form/style/css",
+        "element-plus/es/components/icon/style/css",
+        "element-plus/es/components/image-viewer/style/css",
+        "element-plus/es/components/image/style/css",
+        "element-plus/es/components/input-number/style/css",
+        "element-plus/es/components/input-tag/style/css",
+        "element-plus/es/components/input/style/css",
+        "element-plus/es/components/link/style/css",
+        "element-plus/es/components/loading/style/css",
+        "element-plus/es/components/menu-item/style/css",
+        "element-plus/es/components/menu/style/css",
+        "element-plus/es/components/message-box/style/css",
+        "element-plus/es/components/message/style/css",
+        "element-plus/es/components/notification/style/css",
+        "element-plus/es/components/option/style/css",
+        "element-plus/es/components/pagination/style/css",
+        "element-plus/es/components/popover/style/css",
+        "element-plus/es/components/progress/style/css",
+        "element-plus/es/components/radio-button/style/css",
+        "element-plus/es/components/radio-group/style/css",
+        "element-plus/es/components/radio/style/css",
+        "element-plus/es/components/row/style/css",
+        "element-plus/es/components/scrollbar/style/css",
+        "element-plus/es/components/select/style/css",
+        "element-plus/es/components/skeleton-item/style/css",
+        "element-plus/es/components/skeleton/style/css",
+        "element-plus/es/components/step/style/css",
+        "element-plus/es/components/steps/style/css",
+        "element-plus/es/components/sub-menu/style/css",
+        "element-plus/es/components/switch/style/css",
+        "element-plus/es/components/tab-pane/style/css",
+        "element-plus/es/components/table-column/style/css",
+        "element-plus/es/components/table/style/css",
+        "element-plus/es/components/tabs/style/css",
+        "element-plus/es/components/tag/style/css",
+        "element-plus/es/components/text/style/css",
+        "element-plus/es/components/time-picker/style/css",
+        "element-plus/es/components/time-select/style/css",
+        "element-plus/es/components/timeline-item/style/css",
+        "element-plus/es/components/timeline/style/css",
+        "element-plus/es/components/tooltip/style/css",
+        "element-plus/es/components/tree-select/style/css",
+        "element-plus/es/components/tree/style/css",
+        "element-plus/es/components/upload/style/css",
+        "element-plus/es/components/watermark/style/css",
       ],
     },
     // 构建配置

From 7e40e92008f52ea207aacbe11e1d007146c9c642 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9A=E6=97=BA?=
 <9157706+yao-wang123@user.noreply.gitee.com>
Date: Mon, 12 May 2025 15:54:12 +0800
Subject: [PATCH 364/497] =?UTF-8?q?fix:=20:bug:=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E8=AF=AD=E8=A8=80=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E8=A7=A6=E5=8F=91?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index ebc84411..4771f9c2 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
     <h3 text-center m-0 mb-20px>{{ t("login.login") }}</h3>
-    <el-form ref="loginFormRef" :model="loginFormData" :rules="loginRules" size="large">
+    <el-form
+      ref="loginFormRef"
+      :model="loginFormData"
+      :rules="loginRules"
+      size="large"
+      :validate-on-rule-change="false"
+    >
       <!-- 用户名 -->
       <el-form-item prop="username">
         <el-input v-model.trim="loginFormData.username" :placeholder="t('login.username')">

From 968bb70db7c08c95c5bcc2b2b59805232744c3b3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 14 May 2025 23:58:33 +0800
Subject: [PATCH 365/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 3d05da98..e94a3506 100644
--- a/package.json
+++ b/package.json
@@ -52,12 +52,12 @@
     "@wangeditor-next/editor": "^5.6.34",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.8.4",
+    "axios": "^1.9.0",
     "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.9",
+    "element-plus": "^2.9.10",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -69,55 +69,55 @@
     "vue": "^3.5.13",
     "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "^11.1.3",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.5.1"
   },
   "devDependencies": {
-    "@commitlint/cli": "^19.8.0",
-    "@commitlint/config-conventional": "^19.8.0",
-    "@eslint/js": "^9.25.0",
+    "@commitlint/cli": "^19.8.1",
+    "@commitlint/config-conventional": "^19.8.1",
+    "@eslint/js": "^9.26.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.15",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.14.1",
+    "@types/node": "^22.15.18",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.30.1",
-    "@typescript-eslint/parser": "^8.30.1",
-    "@vitejs/plugin-vue": "^5.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.32.1",
+    "@typescript-eslint/parser": "^8.32.1",
+    "@vitejs/plugin-vue": "^5.2.4",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.1",
-    "eslint": "^9.25.0",
-    "eslint-config-prettier": "^10.1.2",
-    "eslint-plugin-prettier": "^5.2.6",
-    "eslint-plugin-vue": "^10.0.0",
+    "eslint": "^9.26.0",
+    "eslint-config-prettier": "^10.1.5",
+    "eslint-plugin-prettier": "^5.4.0",
+    "eslint-plugin-vue": "^10.1.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
-    "lint-staged": "^15.5.1",
+    "lint-staged": "^15.5.2",
     "postcss": "^8.5.3",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.5.3",
-    "sass": "^1.86.3",
-    "stylelint": "^16.18.0",
+    "sass": "^1.88.0",
+    "stylelint": "^16.19.1",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended": "^15.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-prettier": "^5.0.3",
-    "terser": "^5.39.0",
+    "terser": "^5.39.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.30.1",
+    "typescript-eslint": "^8.32.1",
     "unocss": "65.4.3",
-    "unplugin-auto-import": "^19.1.2",
+    "unplugin-auto-import": "^19.2.0",
     "unplugin-vue-components": "^28.5.0",
-    "vite": "^6.3.2",
-    "vite-plugin-mock-dev-server": "^1.8.5",
+    "vite": "^6.3.5",
+    "vite-plugin-mock-dev-server": "^1.8.7",
     "vue-eslint-parser": "^10.1.3",
-    "vue-tsc": "^2.2.8"
+    "vue-tsc": "^2.2.10"
   },
   "engines": {
     "node": ">=18.0.0"

From 859f3e0cc3f0f8165e8bd8a191ba9f09a568cdae Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 15 May 2025 00:22:04 +0800
Subject: [PATCH 366/497] =?UTF-8?q?fix:=20:bug:=20=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=80=A7=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json   |   4 +-
 vite.config.ts | 147 +++++++++++++++++++++++++------------------------
 2 files changed, 77 insertions(+), 74 deletions(-)

diff --git a/package.json b/package.json
index e94a3506..a57448a3 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.28.3",
+  "version": "2.28.4",
   "private": true,
   "type": "module",
   "scripts": {
@@ -114,7 +114,7 @@
     "unocss": "65.4.3",
     "unplugin-auto-import": "^19.2.0",
     "unplugin-vue-components": "^28.5.0",
-    "vite": "^6.3.5",
+    "vite": "6.3.2",
     "vite-plugin-mock-dev-server": "^1.8.7",
     "vue-eslint-parser": "^10.1.3",
     "vue-tsc": "^2.2.10"
diff --git a/vite.config.ts b/vite.config.ts
index 6e244754..d6547df9 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -75,7 +75,10 @@ export default defineConfig(({ mode }: ConfigEnv) => {
       }),
       // 组件自动导入
       Components({
-        resolvers: [ElementPlusResolver()],
+        resolvers: [
+          // 导入 Element Plus 组件
+          ElementPlusResolver({ importStyle: "sass" }),
+        ],
         // 指定自定义组件位置(默认:src/components)
         dirs: ["src/components", "src/**/components"],
         // 导入组件类型声明文件路径 (false:关闭自动生成)
@@ -110,77 +113,77 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         "element-plus/es",
         "element-plus/es/locale/lang/en",
         "element-plus/es/locale/lang/zh-cn",
-        "element-plus/es/components/alert/style/css",
-        "element-plus/es/components/avatar/style/css",
-        "element-plus/es/components/backtop/style/css",
-        "element-plus/es/components/badge/style/css",
-        "element-plus/es/components/base/style/css",
-        "element-plus/es/components/breadcrumb-item/style/css",
-        "element-plus/es/components/breadcrumb/style/css",
-        "element-plus/es/components/button/style/css",
-        "element-plus/es/components/card/style/css",
-        "element-plus/es/components/cascader/style/css",
-        "element-plus/es/components/checkbox-group/style/css",
-        "element-plus/es/components/checkbox/style/css",
-        "element-plus/es/components/col/style/css",
-        "element-plus/es/components/color-picker/style/css",
-        "element-plus/es/components/config-provider/style/css",
-        "element-plus/es/components/date-picker/style/css",
-        "element-plus/es/components/descriptions-item/style/css",
-        "element-plus/es/components/descriptions/style/css",
-        "element-plus/es/components/dialog/style/css",
-        "element-plus/es/components/divider/style/css",
-        "element-plus/es/components/drawer/style/css",
-        "element-plus/es/components/dropdown-item/style/css",
-        "element-plus/es/components/dropdown-menu/style/css",
-        "element-plus/es/components/dropdown/style/css",
-        "element-plus/es/components/empty/style/css",
-        "element-plus/es/components/form-item/style/css",
-        "element-plus/es/components/form/style/css",
-        "element-plus/es/components/icon/style/css",
-        "element-plus/es/components/image-viewer/style/css",
-        "element-plus/es/components/image/style/css",
-        "element-plus/es/components/input-number/style/css",
-        "element-plus/es/components/input-tag/style/css",
-        "element-plus/es/components/input/style/css",
-        "element-plus/es/components/link/style/css",
-        "element-plus/es/components/loading/style/css",
-        "element-plus/es/components/menu-item/style/css",
-        "element-plus/es/components/menu/style/css",
-        "element-plus/es/components/message-box/style/css",
-        "element-plus/es/components/message/style/css",
-        "element-plus/es/components/notification/style/css",
-        "element-plus/es/components/option/style/css",
-        "element-plus/es/components/pagination/style/css",
-        "element-plus/es/components/popover/style/css",
-        "element-plus/es/components/progress/style/css",
-        "element-plus/es/components/radio-button/style/css",
-        "element-plus/es/components/radio-group/style/css",
-        "element-plus/es/components/radio/style/css",
-        "element-plus/es/components/row/style/css",
-        "element-plus/es/components/scrollbar/style/css",
-        "element-plus/es/components/select/style/css",
-        "element-plus/es/components/skeleton-item/style/css",
-        "element-plus/es/components/skeleton/style/css",
-        "element-plus/es/components/step/style/css",
-        "element-plus/es/components/steps/style/css",
-        "element-plus/es/components/sub-menu/style/css",
-        "element-plus/es/components/switch/style/css",
-        "element-plus/es/components/tab-pane/style/css",
-        "element-plus/es/components/table-column/style/css",
-        "element-plus/es/components/table/style/css",
-        "element-plus/es/components/tabs/style/css",
-        "element-plus/es/components/tag/style/css",
-        "element-plus/es/components/text/style/css",
-        "element-plus/es/components/time-picker/style/css",
-        "element-plus/es/components/time-select/style/css",
-        "element-plus/es/components/timeline-item/style/css",
-        "element-plus/es/components/timeline/style/css",
-        "element-plus/es/components/tooltip/style/css",
-        "element-plus/es/components/tree-select/style/css",
-        "element-plus/es/components/tree/style/css",
-        "element-plus/es/components/upload/style/css",
-        "element-plus/es/components/watermark/style/css",
+        "element-plus/es/components/alert/style/index",
+        "element-plus/es/components/avatar/style/index",
+        "element-plus/es/components/backtop/style/index",
+        "element-plus/es/components/badge/style/index",
+        "element-plus/es/components/base/style/index",
+        "element-plus/es/components/breadcrumb-item/style/index",
+        "element-plus/es/components/breadcrumb/style/index",
+        "element-plus/es/components/button/style/index",
+        "element-plus/es/components/card/style/index",
+        "element-plus/es/components/cascader/style/index",
+        "element-plus/es/components/checkbox-group/style/index",
+        "element-plus/es/components/checkbox/style/index",
+        "element-plus/es/components/col/style/index",
+        "element-plus/es/components/color-picker/style/index",
+        "element-plus/es/components/config-provider/style/index",
+        "element-plus/es/components/date-picker/style/index",
+        "element-plus/es/components/descriptions-item/style/index",
+        "element-plus/es/components/descriptions/style/index",
+        "element-plus/es/components/dialog/style/index",
+        "element-plus/es/components/divider/style/index",
+        "element-plus/es/components/drawer/style/index",
+        "element-plus/es/components/dropdown-item/style/index",
+        "element-plus/es/components/dropdown-menu/style/index",
+        "element-plus/es/components/dropdown/style/index",
+        "element-plus/es/components/empty/style/index",
+        "element-plus/es/components/form-item/style/index",
+        "element-plus/es/components/form/style/index",
+        "element-plus/es/components/icon/style/index",
+        "element-plus/es/components/image-viewer/style/index",
+        "element-plus/es/components/image/style/index",
+        "element-plus/es/components/input-number/style/index",
+        "element-plus/es/components/input-tag/style/index",
+        "element-plus/es/components/input/style/index",
+        "element-plus/es/components/link/style/index",
+        "element-plus/es/components/loading/style/index",
+        "element-plus/es/components/menu-item/style/index",
+        "element-plus/es/components/menu/style/index",
+        "element-plus/es/components/message-box/style/index",
+        "element-plus/es/components/message/style/index",
+        "element-plus/es/components/notification/style/index",
+        "element-plus/es/components/option/style/index",
+        "element-plus/es/components/pagination/style/index",
+        "element-plus/es/components/popover/style/index",
+        "element-plus/es/components/progress/style/index",
+        "element-plus/es/components/radio-button/style/index",
+        "element-plus/es/components/radio-group/style/index",
+        "element-plus/es/components/radio/style/index",
+        "element-plus/es/components/row/style/index",
+        "element-plus/es/components/scrollbar/style/index",
+        "element-plus/es/components/select/style/index",
+        "element-plus/es/components/skeleton-item/style/index",
+        "element-plus/es/components/skeleton/style/index",
+        "element-plus/es/components/step/style/index",
+        "element-plus/es/components/steps/style/index",
+        "element-plus/es/components/sub-menu/style/index",
+        "element-plus/es/components/switch/style/index",
+        "element-plus/es/components/tab-pane/style/index",
+        "element-plus/es/components/table-column/style/index",
+        "element-plus/es/components/table/style/index",
+        "element-plus/es/components/tabs/style/index",
+        "element-plus/es/components/tag/style/index",
+        "element-plus/es/components/text/style/index",
+        "element-plus/es/components/time-picker/style/index",
+        "element-plus/es/components/time-select/style/index",
+        "element-plus/es/components/timeline-item/style/index",
+        "element-plus/es/components/timeline/style/index",
+        "element-plus/es/components/tooltip/style/index",
+        "element-plus/es/components/tree-select/style/index",
+        "element-plus/es/components/tree/style/index",
+        "element-plus/es/components/upload/style/index",
+        "element-plus/es/components/watermark/style/index",
       ],
     },
     // 构建配置

From 7e0067be31c535a15dc5a72e269c1e0f37a3e435 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 17 May 2025 15:56:49 +0000
Subject: [PATCH 367/497] update README.md.

Signed-off-by: Ray.Hao <1490493387@qq.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 70cf5dc7..6ff1f482 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
   <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.9-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.10-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>

From 08a396eeb66821b791bc7591bfb8bf54b31381a8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 19 May 2025 12:40:51 +0800
Subject: [PATCH 368/497] =?UTF-8?q?chore:=20:hammer:=20=E6=B3=A8=E9=87=8A?=
 =?UTF-8?q?=E6=96=87=E6=A1=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth.api.ts                                     | 2 +-
 src/lang/package/zh-cn.ts                               | 2 +-
 src/layout/components/NavBar/components/NavbarRight.vue | 4 ++--
 src/main.ts                                             | 2 +-
 src/store/modules/user.store.ts                         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/api/auth.api.ts b/src/api/auth.api.ts
index 35c28cf9..e27d85e0 100644
--- a/src/api/auth.api.ts
+++ b/src/api/auth.api.ts
@@ -32,7 +32,7 @@ const AuthAPI = {
     });
   },
 
-  /** 注销登录接口 */
+  /** 退出登录接口 */
   logout() {
     return request({
       url: `${AUTH_BASE_URL}/logout`,
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index b3313183..c97e2f0d 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -45,7 +45,7 @@ export default {
   // 导航栏国际化
   navbar: {
     dashboard: "首页",
-    logout: "注销登录",
+    logout: "退出登录",
     document: "项目文档",
     gitee: "项目地址",
     profile: "个人中心",
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index b05911aa..0d42bbf9 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -18,7 +18,7 @@
       <NoticeDropdown />
     </template>
 
-    <!-- 用户头像（个人中心、注销登录等） -->
+    <!-- 用户头像（个人中心、退出登录等） -->
     <el-dropdown trigger="click">
       <div class="user-profile">
         <img class="user-profile__avatar" :src="http://github.com/userStore.userInfo.avatar" />
@@ -80,7 +80,7 @@ const navbarRightClass = computed(() => {
 });
 
 /**
- * 注销登录
+ * 退出登录
  */
 function logout() {
   ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
diff --git a/src/main.ts b/src/main.ts
index 0167bf8c..38b64409 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -9,7 +9,7 @@ import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
 import "uno.css";
 
-// 全局引入 animate.css
+// 过渡动画
 import "animate.css";
 
 // 自动为某些默认事件（如 touchstart、wheel 等）添加 { passive: true },提升滚动性能并消除控制台的非被动事件监听警告
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index d4de3587..5e4d8d74 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -94,9 +94,9 @@ export const useUserStore = defineStore("user", () => {
    */
   function clearSessionAndCache() {
     return new Promise<void>((resolve) => {
-      clearToken();
-      usePermissionStoreHook().resetRouter();
       useDictStoreHook().clearDictCache();
+      usePermissionStoreHook().resetRouter();
+      clearToken();
       userInfo.value = {} as UserInfo;
       resolve();
     });

From 4540e3923a79599171c4226d0c6a65c97e14b12b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B6=85=E5=87=A1?= <2508779859@qq.com>
Date: Mon, 19 May 2025 12:55:37 +0800
Subject: [PATCH 369/497] =?UTF-8?q?feat:=20:sparkles:=20pageModal=20?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=B7=BB=E5=8A=A0=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageModal.vue | 100 +++++++++++++++---------------
 1 file changed, 49 insertions(+), 51 deletions(-)

diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index fe1fa5c9..637445cc 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -7,7 +7,6 @@
         v-bind="{ destroyOnClose: true, ...modalConfig.drawer }"
         @close="handleClose"
       >
-        <!-- 表单 -->
         <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
           <el-row :gutter="20">
             <template v-for="item in formItems" :key="item.prop">
@@ -57,7 +56,7 @@
             </template>
           </el-row>
         </el-form>
-        <!-- 弹窗底部操作按钮 -->
+
         <template #footer>
           <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
           <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
@@ -68,60 +67,60 @@
     <template v-else>
       <el-dialog
         v-model="modalVisible"
-        v-bind="{ destroyOnClose: true, ...modalConfig.dialog }"
+        v-bind="{ destroyOnClose: true, alignCenter: true, ...modalConfig.dialog }"
         @close="handleClose"
       >
-        <!-- 表单 -->
         <el-form ref="formRef" v-bind="modalConfig.form" :model="formData" :rules="formRules">
-          <el-row :gutter="20">
-            <template v-for="item in formItems" :key="item.prop">
-              <el-col v-show="!item.hidden" v-bind="item.col">
-                <el-form-item :label="item.label" :prop="item.prop">
-                  <!-- Label -->
-                  <template #label>
-                    <span>
-                      {{ item?.label || "" }}
-                      <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
-                        <QuestionFilled class="w-4 h-4 mx-1" />
-                      </el-tooltip>
-                      <span v-if="modalConfig.colon" class="ml-0.5">:</span>
-                    </span>
-                  </template>
-
-                  <!-- components -->
-                  <template v-if="item.type === 'custom'">
-                    <slot
-                      :name="item.slotName ?? item.prop"
-                      :prop="item.prop"
-                      :form-data="formData"
-                      :attrs="item.attrs"
-                    ></slot>
-                  </template>
-                  <component
-                    :is="componentMap.get(item.type)"
-                    v-else
-                    v-model.trim="formData[item.prop]"
-                    v-bind="{ style: { width: '100%' }, ...item.attrs }"
-                  >
-                    <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
-                      <component
-                        :is="childrenMap.get(item.type)"
-                        v-for="opt in item.options"
-                        :label="opt.label"
-                        :value="opt.value"
-                      ></component>
+          <el-scrollbar max-height="70vh" :view-style="{ overflowX: 'hidden' }">
+            <el-row :gutter="20">
+              <template v-for="item in formItems" :key="item.prop">
+                <el-col v-show="!item.hidden" v-bind="item.col">
+                  <el-form-item :label="item.label" :prop="item.prop">
+                    <template #label>
+                      <span>
+                        {{ item?.label || "" }}
+                        <el-tooltip v-if="item?.tips" v-bind="getTooltipProps(item.tips)">
+                          <QuestionFilled class="w-4 h-4 mx-1" />
+                        </el-tooltip>
+                        <span v-if="modalConfig.colon" class="ml-0.5">:</span>
+                      </span>
                     </template>
 
-                    <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
-                      <slot :name="item.slotName" />
+                    <template v-if="item.type === 'custom'">
+                      <slot
+                        :name="item.slotName ?? item.prop"
+                        :prop="item.prop"
+                        :form-data="formData"
+                        :attrs="item.attrs"
+                      ></slot>
                     </template>
-                  </component>
-                </el-form-item>
-              </el-col>
-            </template>
-          </el-row>
+                    <component
+                      :is="componentMap.get(item.type)"
+                      v-else
+                      v-model.trim="formData[item.prop]"
+                      v-bind="{ style: { width: '100%' }, ...item.attrs }"
+                    >
+                      <template v-if="['select', 'radio', 'checkbox'].includes(item.type)">
+                        <component
+                          :is="childrenMap.get(item.type)"
+                          v-for="opt in item.options"
+                          :label="opt.label"
+                          :value="opt.value"
+                        ></component>
+                      </template>
+
+                      <template v-if="item?.slotName && $slots[item.slotName]" #[item.slotName]>
+                        <slot :name="item.slotName" />
+                      </template>
+                    </component>
+                  </el-form-item>
+                </el-col>
+              </template>
+            </el-row>
+            <slot name="bottom" :form-data="formData"></slot>
+          </el-scrollbar>
         </el-form>
-        <!-- 弹窗底部操作按钮 -->
+
         <template #footer>
           <el-button v-if="!formDisable" type="primary" @click="handleSubmit">确 定</el-button>
           <el-button @click="handleClose">{{ !formDisable ? "取 消" : "关闭" }}</el-button>
@@ -144,7 +143,7 @@ const props = defineProps<{ modalConfig: IModalConfig }>();
 // 自定义事件
 const emit = defineEmits<{ submitClick: []; customSubmit: [queryParams: IObject] }>();
 // 组件映射表
-/* eslint-disable */
+
 const componentMap = new Map<IComponentType, any>([
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
@@ -170,7 +169,6 @@ const childrenMap = new Map<IComponentType, any>([
   ["radio", markRaw(ElRadio)], // @ts-ignore"
   ["checkbox", markRaw(ElCheckbox)],
 ]);
-/* eslint-enable */
 
 const pk = props.modalConfig.pk ?? "id"; // 主键名，用于表单数据处理
 const modalVisible = ref(false); // 弹窗显示状态

From 2a3d2543ee4f086e3089d09e0a08fd3082d9118b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 19 May 2025 14:09:46 +0800
Subject: [PATCH 370/497] =?UTF-8?q?refactor(storage):=20:recycle:=20?=
 =?UTF-8?q?=E7=AE=80=E5=8C=96=E7=BC=93=E5=AD=98=E7=AE=A1=E7=90=86=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E7=BB=9F=E4=B8=80=E4=BD=BF=E7=94=A8Storage?=
 =?UTF-8?q?=E7=B1=BB=E7=9B=B4=E6=8E=A5=E6=93=8D=E4=BD=9Ctoken=E5=92=8C?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/cache-keys.ts                   |  7 ++++
 src/hooks/websocket/core/useStomp.ts          |  7 ++--
 .../websocket/services/useOnlineCount.ts      |  7 ++--
 src/plugins/permission.ts                     |  5 ++-
 src/plugins/permission.ts.bak                 |  0
 src/plugins/websocket.ts                      |  5 ++-
 src/store/modules/user.store.ts               | 16 ++++----
 src/utils/auth.ts                             | 27 --------------
 src/utils/request.ts                          |  7 ++--
 src/utils/storage.ts                          | 37 +++++++++++++++++++
 10 files changed, 71 insertions(+), 47 deletions(-)
 create mode 100644 src/constants/cache-keys.ts
 create mode 100644 src/plugins/permission.ts.bak
 delete mode 100644 src/utils/auth.ts
 create mode 100644 src/utils/storage.ts

diff --git a/src/constants/cache-keys.ts b/src/constants/cache-keys.ts
new file mode 100644
index 00000000..aa44695f
--- /dev/null
+++ b/src/constants/cache-keys.ts
@@ -0,0 +1,7 @@
+/**
+ * 缓存键常量
+ */
+export const ACCESS_TOKEN_KEY = "access_token";
+export const REFRESH_TOKEN_KEY = "refresh_token";
+export const DICT_CACHE_KEY = "dict_cache";
+// 可在此处添加其他缓存键
diff --git a/src/hooks/websocket/core/useStomp.ts b/src/hooks/websocket/core/useStomp.ts
index d96c36eb..5e603041 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/hooks/websocket/core/useStomp.ts
@@ -1,5 +1,6 @@
 import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
-import { getAccessToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 import { ref, watch } from "vue";
 
 export interface UseStompOptions {
@@ -66,7 +67,7 @@ export function useStomp(options: UseStompOptions = {}) {
     }
 
     // 每次连接前重新获取最新令牌，不依赖之前的token值
-    const currentToken = getAccessToken();
+    const currentToken = Storage.get(ACCESS_TOKEN_KEY, "");
 
     // 检查令牌是否为空，如果为空则不进行连接
     if (!currentToken) {
@@ -120,7 +121,7 @@ export function useStomp(options: UseStompOptions = {}) {
           client.value = null;
 
           // 检查当前是否有有效令牌
-          const freshToken = getAccessToken();
+          const freshToken = Storage.get(ACCESS_TOKEN_KEY, "");
           if (freshToken) {
             initializeClient();
             connect();
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/hooks/websocket/services/useOnlineCount.ts
index be81365c..f4d697bf 100644
--- a/src/hooks/websocket/services/useOnlineCount.ts
+++ b/src/hooks/websocket/services/useOnlineCount.ts
@@ -1,7 +1,8 @@
 import { ref, onMounted, onUnmounted, watch } from "vue";
 import { useStomp } from "../core/useStomp";
 import { ElMessage } from "element-plus";
-import { getAccessToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 
 /**
  * 在线用户计数Hook
@@ -99,7 +100,7 @@ export function useOnlineCount() {
     }
 
     // 检查是否有可用的令牌
-    const hasToken = !!getAccessToken();
+    const hasToken = !!Storage.get(ACCESS_TOKEN_KEY, "");
     if (!hasToken) {
       console.log("没有检测到有效令牌，不尝试WebSocket连接");
       return;
@@ -121,7 +122,7 @@ export function useOnlineCount() {
         closeWebSocket();
         setTimeout(() => {
           // 再次检查令牌有效性
-          if (getAccessToken()) {
+          if (Storage.get(ACCESS_TOKEN_KEY, "")) {
             initWebSocket();
           } else {
             console.log("令牌无效，放弃重连");
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 8f5a07d1..f9bff189 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,6 +1,7 @@
 import type { NavigationGuardNext, RouteLocationNormalized, RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
-import { getAccessToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 
@@ -11,7 +12,7 @@ export function setupPermission() {
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
 
-    const isLogin = !!getAccessToken(); // 判断是否登录
+    const isLogin = !!Storage.get(ACCESS_TOKEN_KEY, ""); // 判断是否登录
     if (isLogin) {
       if (to.path === "/login") {
         // 已登录，访问登录页，跳转到首页
diff --git a/src/plugins/permission.ts.bak b/src/plugins/permission.ts.bak
new file mode 100644
index 00000000..e69de29b
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index 84745950..1c2ad754 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,5 +1,6 @@
 import { useDictSync } from "@/hooks/websocket/services/useDictSync";
-import { getAccessToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 
 // 用于防止重复初始化的状态标记
 let isInitialized = false;
@@ -24,7 +25,7 @@ export function setupWebSocket() {
   }
 
   // 检查token是否存在
-  const token = getAccessToken();
+  const token = Storage.get(ACCESS_TOKEN_KEY, "");
   if (!token) {
     console.warn(
       "[WebSocketPlugin] 未找到访问令牌，WebSocket初始化已跳过。用户登录后将自动重新连接。"
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 5e4d8d74..a8ec019e 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -5,7 +5,8 @@ import { useDictStoreHook } from "@/store/modules/dict.store";
 import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import UserAPI, { type UserInfo } from "@/api/system/user.api";
 
-import { setAccessToken, setRefreshToken, getRefreshToken, clearToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY } from "@/constants/cache-keys";
 
 export const useUserStore = defineStore("user", () => {
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
@@ -21,8 +22,8 @@ export const useUserStore = defineStore("user", () => {
       AuthAPI.login(LoginFormData)
         .then((data) => {
           const { accessToken, refreshToken } = data;
-          setAccessToken(accessToken); // eyJhbGciOiJIUzI1NiJ9.xxx.xxx
-          setRefreshToken(refreshToken);
+          Storage.set(ACCESS_TOKEN_KEY, accessToken);
+          Storage.set(REFRESH_TOKEN_KEY, refreshToken);
           resolve();
         })
         .catch((error) => {
@@ -73,13 +74,13 @@ export const useUserStore = defineStore("user", () => {
    * 刷新 token
    */
   function refreshToken() {
-    const refreshToken = getRefreshToken();
+    const refreshToken = Storage.get(REFRESH_TOKEN_KEY, "");
     return new Promise<void>((resolve, reject) => {
       AuthAPI.refreshToken(refreshToken)
         .then((data) => {
           const { accessToken, refreshToken } = data;
-          setAccessToken(accessToken);
-          setRefreshToken(refreshToken);
+          Storage.set(ACCESS_TOKEN_KEY, accessToken);
+          Storage.set(REFRESH_TOKEN_KEY, refreshToken);
           resolve();
         })
         .catch((error) => {
@@ -96,7 +97,8 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve) => {
       useDictStoreHook().clearDictCache();
       usePermissionStoreHook().resetRouter();
-      clearToken();
+      Storage.remove(ACCESS_TOKEN_KEY);
+      Storage.remove(REFRESH_TOKEN_KEY);
       userInfo.value = {} as UserInfo;
       resolve();
     });
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
deleted file mode 100644
index cfbedf84..00000000
--- a/src/utils/auth.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-// 访问 token 缓存的 key
-const ACCESS_TOKEN_KEY = "access_token";
-// 刷新 token 缓存的 key
-const REFRESH_TOKEN_KEY = "refresh_token";
-
-function getAccessToken(): string {
-  return localStorage.getItem(ACCESS_TOKEN_KEY) || "";
-}
-
-function setAccessToken(token: string) {
-  localStorage.setItem(ACCESS_TOKEN_KEY, token);
-}
-
-function getRefreshToken(): string {
-  return localStorage.getItem(REFRESH_TOKEN_KEY) || "";
-}
-
-function setRefreshToken(token: string) {
-  localStorage.setItem(REFRESH_TOKEN_KEY, token);
-}
-
-function clearToken() {
-  localStorage.removeItem(ACCESS_TOKEN_KEY);
-  localStorage.removeItem(REFRESH_TOKEN_KEY);
-}
-
-export { getAccessToken, setAccessToken, clearToken, getRefreshToken, setRefreshToken };
diff --git a/src/utils/request.ts b/src/utils/request.ts
index c3bd61f9..7a67789b 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -2,7 +2,8 @@ import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axio
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user.store";
 import { ResultEnum } from "@/enums/api/result.enum";
-import { getAccessToken } from "@/utils/auth";
+import { Storage } from "@/utils/storage";
+import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 import router from "@/router";
 
 // 创建 axios 实例
@@ -15,7 +16,7 @@ const service = axios.create({
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    const accessToken = getAccessToken();
+    const accessToken = Storage.get(ACCESS_TOKEN_KEY, "");
     // 如果 Authorization 设置为 no-auth，则不携带 Token
     if (config.headers.Authorization !== "no-auth" && accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
@@ -69,7 +70,7 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
   return new Promise((resolve) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      config.headers.Authorization = `Bearer ${getAccessToken()}`;
+      config.headers.Authorization = `Bearer ${Storage.get(ACCESS_TOKEN_KEY, "")}`;
       resolve(service(config));
     };
     waitingQueue.push(retryRequest);
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
new file mode 100644
index 00000000..8c6bef24
--- /dev/null
+++ b/src/utils/storage.ts
@@ -0,0 +1,37 @@
+/**
+ * 存储工具类
+ * 提供localStorage和sessionStorage操作方法
+ */
+export class Storage {
+  /**
+   * localStorage 存储
+   */
+  static set(key: string, value: any): void {
+    localStorage.setItem(key, JSON.stringify(value));
+  }
+
+  static get<T>(key: string, defaultValue?: T): T {
+    const value = localStorage.getItem(key);
+    return value ? JSON.parse(value) : defaultValue;
+  }
+
+  static remove(key: string): void {
+    localStorage.removeItem(key);
+  }
+
+  /**
+   * sessionStorage 存储
+   */
+  static sessionSet(key: string, value: any): void {
+    sessionStorage.setItem(key, JSON.stringify(value));
+  }
+
+  static sessionGet<T>(key: string, defaultValue?: T): T {
+    const value = sessionStorage.getItem(key);
+    return value ? JSON.parse(value) : defaultValue;
+  }
+
+  static sessionRemove(key: string): void {
+    sessionStorage.removeItem(key);
+  }
+}

From 7df7e1f47b735b0f3d94f21ae6bfc2ecc6b902f1 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 20 May 2025 10:34:44 +0800
Subject: [PATCH 371/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=20ROLE=5FROOT=20=E5=B8=B8=E9=87=8F=E5=88=B0=20constan?=
 =?UTF-8?q?ts=20=E7=9B=AE=E5=BD=95=E5=B9=B6=E5=85=A8=E5=B1=80=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/NoticeDropdown/index.vue       |  2 +-
 src/composables/index.ts                      | 11 +++++
 .../services => composables}/useDictSync.ts   |  6 +--
 .../useOnlineCount.ts                         |  4 +-
 .../core => composables}/useStomp.ts          | 45 ++++++++++---------
 src/constants/index.ts                        |  1 +
 src/directive/permission/index.ts             |  5 ++-
 src/hooks/index.ts                            |  7 ---
 src/hooks/websocket/index.ts                  | 11 -----
 src/plugins/permission.ts                     |  3 +-
 src/plugins/permission.ts.bak                 |  0
 src/plugins/websocket.ts                      |  2 +-
 src/store/modules/permission.store.ts         |  6 ++-
 src/views/dashboard/index.vue                 |  2 +-
 src/views/demo/dict-sync.vue                  |  2 +-
 src/views/demo/websocket.vue                  | 20 ++++-----
 16 files changed, 63 insertions(+), 64 deletions(-)
 create mode 100644 src/composables/index.ts
 rename src/{hooks/websocket/services => composables}/useDictSync.ts (97%)
 rename src/{hooks/websocket/services => composables}/useOnlineCount.ts (98%)
 rename src/{hooks/websocket/core => composables}/useStomp.ts (90%)
 create mode 100644 src/constants/index.ts
 delete mode 100644 src/hooks/index.ts
 delete mode 100644 src/hooks/websocket/index.ts
 delete mode 100644 src/plugins/permission.ts.bak

diff --git a/src/components/NoticeDropdown/index.vue b/src/components/NoticeDropdown/index.vue
index 0333ed88..541524fe 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/NoticeDropdown/index.vue
@@ -94,7 +94,7 @@ const noticeList = ref<NoticePageVO[]>([]);
 const noticeDialogVisible = ref(false);
 const noticeDetail = ref<NoticeDetailVO | null>(null);
 
-import { useStomp } from "@/hooks/websocket/core/useStomp";
+import { useStomp } from "@/composables/useStomp";
 const { subscribe, unsubscribe, isConnected } = useStomp();
 
 watch(
diff --git a/src/composables/index.ts b/src/composables/index.ts
new file mode 100644
index 00000000..c848f9ef
--- /dev/null
+++ b/src/composables/index.ts
@@ -0,0 +1,11 @@
+/**
+ * 全局组合式函数入口文件
+ * 导出所有可用的组合式函数
+ */
+
+// 导出核心组合式函数
+export { useStomp } from "./useStomp";
+
+// 导出业务服务组合式函数
+export { useDictSync } from "./useDictSync";
+export { useOnlineCount } from "./useOnlineCount";
diff --git a/src/hooks/websocket/services/useDictSync.ts b/src/composables/useDictSync.ts
similarity index 97%
rename from src/hooks/websocket/services/useDictSync.ts
rename to src/composables/useDictSync.ts
index d5546a3d..bf7f3c7e 100644
--- a/src/hooks/websocket/services/useDictSync.ts
+++ b/src/composables/useDictSync.ts
@@ -1,5 +1,5 @@
 import { useDictStoreHook } from "@/store/modules/dict.store";
-import { useStomp } from "../core/useStomp";
+import { useStomp } from "./useStomp";
 import { IMessage } from "@stomp/stompjs";
 import { ref } from "vue";
 
@@ -16,7 +16,7 @@ export type DictMessageCallback = (_message: DictMessage) => void;
 let instance: ReturnType<typeof createDictSyncHook> | null = null;
 
 /**
- * 创建字典同步Hook
+ * 创建字典同步组合式函数
  * 负责监听后端字典变更并同步到前端
  */
 function createDictSyncHook() {
@@ -186,7 +186,7 @@ function createDictSyncHook() {
 }
 
 /**
- * 字典同步Hook
+ * 字典同步组合式函数
  * 用于监听后端字典变更并同步到前端
  */
 export function useDictSync() {
diff --git a/src/hooks/websocket/services/useOnlineCount.ts b/src/composables/useOnlineCount.ts
similarity index 98%
rename from src/hooks/websocket/services/useOnlineCount.ts
rename to src/composables/useOnlineCount.ts
index f4d697bf..fac73274 100644
--- a/src/hooks/websocket/services/useOnlineCount.ts
+++ b/src/composables/useOnlineCount.ts
@@ -1,11 +1,11 @@
 import { ref, onMounted, onUnmounted, watch } from "vue";
-import { useStomp } from "../core/useStomp";
+import { useStomp } from "./useStomp";
 import { ElMessage } from "element-plus";
 import { Storage } from "@/utils/storage";
 import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 
 /**
- * 在线用户计数Hook
+ * 在线用户计数组合式函数
  * 用于订阅后端推送的在线用户数量变化
  */
 export function useOnlineCount() {
diff --git a/src/hooks/websocket/core/useStomp.ts b/src/composables/useStomp.ts
similarity index 90%
rename from src/hooks/websocket/core/useStomp.ts
rename to src/composables/useStomp.ts
index 5e603041..2e507461 100644
--- a/src/hooks/websocket/core/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -23,7 +23,7 @@ export interface UseStompOptions {
 }
 
 /**
- * STOMP WebSocket连接Hook
+ * STOMP WebSocket连接组合式函数
  * 用于管理WebSocket连接的建立、断开、重连和消息订阅
  */
 export function useStomp(options: UseStompOptions = {}) {
@@ -244,70 +244,73 @@ export function useStomp(options: UseStompOptions = {}) {
    * @returns 返回订阅 id，用于后续取消订阅
    */
   const subscribe = (destination: string, callback: (_message: IMessage) => void): string => {
-    if (!client.value) {
-      return "";
-    }
-
-    if (!client.value.connected) {
+    if (!client.value || !client.value.connected) {
+      console.warn(`尝试订阅 ${destination} 失败: 客户端未连接`);
       return "";
     }
 
     try {
       const subscription = client.value.subscribe(destination, callback);
-      subscriptions.set(subscription.id, subscription);
-      console.log(`订阅成功: ${destination}, ID: ${subscription.id}`);
-      return subscription.id;
+      const subscriptionId = subscription.id;
+      subscriptions.set(subscriptionId, subscription);
+      console.log(`订阅成功: ${destination}, ID: ${subscriptionId}`);
+      return subscriptionId;
     } catch (error) {
-      console.error(`订阅失败(${destination}):`, error);
+      console.error(`订阅 ${destination} 失败:`, error);
       return "";
     }
   };
 
   /**
-   * 取消指定订阅
-   * @param subscriptionId 要取消的订阅 id
+   * 取消订阅
+   * @param subscriptionId 订阅 id
    */
   const unsubscribe = (subscriptionId: string) => {
     const subscription = subscriptions.get(subscriptionId);
     if (subscription) {
       subscription.unsubscribe();
       subscriptions.delete(subscriptionId);
+      console.log(`已取消订阅: ${subscriptionId}`);
     }
   };
 
   /**
-   * 主动断开连接（如果未连接则不执行）
+   * 断开WebSocket连接
    */
   const disconnect = () => {
-    if (client.value && !(client.value.connected || client.value.active)) {
-      console.log("Already disconnected, skipping disconnect() call.");
-      return;
+    if (client.value && client.value.connected) {
+      // 清除所有订阅
+      for (const [id, subscription] of subscriptions.entries()) {
+        subscription.unsubscribe();
+        subscriptions.delete(id);
+      }
+
+      // 断开连接
+      client.value.deactivate();
+      console.log("WebSocket连接已断开");
     }
 
-    // 清除所有计时器
+    // 清除重连计时器
     if (reconnectTimer) {
       clearTimeout(reconnectTimer);
       reconnectTimer = null;
     }
 
+    // 清除连接超时计时器
     if (connectionTimeoutTimer) {
       clearTimeout(connectionTimeoutTimer);
       connectionTimeoutTimer = null;
     }
 
-    client.value?.deactivate();
     isConnected.value = false;
     reconnectCount.value = 0;
   };
 
   return {
-    client,
     isConnected,
-    reconnectCount,
     connect,
     subscribe,
     unsubscribe,
     disconnect,
-    brokerURL,
   };
 }
diff --git a/src/constants/index.ts b/src/constants/index.ts
new file mode 100644
index 00000000..83e52a3c
--- /dev/null
+++ b/src/constants/index.ts
@@ -0,0 +1 @@
+export const ROLE_ROOT = "ROOT";
diff --git a/src/directive/permission/index.ts b/src/directive/permission/index.ts
index 2683d22e..b2d856a4 100644
--- a/src/directive/permission/index.ts
+++ b/src/directive/permission/index.ts
@@ -1,6 +1,7 @@
 import type { Directive, DirectiveBinding } from "vue";
 
 import { useUserStore } from "@/store";
+import { ROLE_ROOT } from "@/constants";
 
 /**
  * 按钮权限
@@ -18,8 +19,8 @@ export const hasPerm: Directive = {
 
     const { roles, perms } = useUserStore().userInfo;
 
-    // 超级管理员拥有所有权限，如果是”*:*:*”权限标识，则不需要进行权限校验
-    if (roles.includes("ROOT") || requiredPerms.includes("*:*:*")) {
+    // 超级管理员拥有所有权限，如果是"*:*:*"权限标识，则不需要进行权限校验
+    if (roles.includes(ROLE_ROOT) || requiredPerms.includes("*:*:*")) {
       return;
     }
 
diff --git a/src/hooks/index.ts b/src/hooks/index.ts
deleted file mode 100644
index abab537d..00000000
--- a/src/hooks/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * 全局Hooks入口文件
- * 导出所有可用的Hooks
- */
-
-// 导出WebSocket相关Hook
-export * from "./websocket";
diff --git a/src/hooks/websocket/index.ts b/src/hooks/websocket/index.ts
deleted file mode 100644
index 3d44e748..00000000
--- a/src/hooks/websocket/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/**
- * WebSocket相关Hook入口文件
- * 统一导出所有WebSocket相关Hook
- */
-
-// 核心基础Hook
-export { useStomp } from "./core/useStomp";
-
-// 业务服务Hook
-export { useOnlineCount } from "./services/useOnlineCount";
-export { useDictSync } from "./services/useDictSync";
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index f9bff189..4d934fcc 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -4,6 +4,7 @@ import { Storage } from "@/utils/storage";
 import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
+import { ROLE_ROOT } from "@/constants";
 
 export function setupPermission() {
   // 白名单路由
@@ -78,7 +79,7 @@ export function hasAuth(value: string | string[], type: "button" | "role" = "but
   const { roles, perms } = useUserStore().userInfo;
 
   // 超级管理员 拥有所有权限
-  if (type === "button" && roles.includes("ROOT")) {
+  if (type === "button" && roles.includes(ROLE_ROOT)) {
     return true;
   }
 
diff --git a/src/plugins/permission.ts.bak b/src/plugins/permission.ts.bak
deleted file mode 100644
index e69de29b..00000000
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index 1c2ad754..a2a6f78c 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,4 +1,4 @@
-import { useDictSync } from "@/hooks/websocket/services/useDictSync";
+import { useDictSync } from "@/composables/useDictSync";
 import { Storage } from "@/utils/storage";
 import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
 
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index db1ca5f6..647d3e75 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -103,8 +103,12 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
 
   return parsedRoutes;
 };
+
 /**
- * 在组件外使用 Pinia store 实例 @see https://pinia.vuejs.org/core-concepts/outside-component-usage.html
+ * 导出此hook函数用于在非组件环境(如其他store、工具函数等)中获取权限store实例
+ *
+ * 在组件中可直接使用usePermissionStore()，但在组件外部需要传入store实例
+ * 此函数简化了这个过程，避免每次都手动传入store参数
  */
 export function usePermissionStoreHook() {
   return usePermissionStore(store);
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 125c0dd6..4fd0323a 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -359,7 +359,7 @@ import { useUserStore } from "@/store/modules/user.store";
 import { formatGrowthRate } from "@/utils";
 import { useTransition, useDateFormat } from "@vueuse/core";
 import { Connection, Failed } from "@element-plus/icons-vue";
-import { useOnlineCount } from "@/hooks/websocket/services/useOnlineCount";
+import { useOnlineCount } from "@/composables/useOnlineCount";
 
 // 在线用户数量组件相关
 const { onlineUserCount, lastUpdateTime, isConnected } = useOnlineCount();
diff --git a/src/views/demo/dict-sync.vue b/src/views/demo/dict-sync.vue
index 6e10da0a..31bc55b8 100644
--- a/src/views/demo/dict-sync.vue
+++ b/src/views/demo/dict-sync.vue
@@ -142,7 +142,7 @@
 import { useDictStoreHook } from "@/store/modules/dict.store";
 import { useDateFormat } from "@vueuse/core";
 import DictAPI, { DictItemForm } from "@/api/system/dict.api";
-import { useDictSync, DictMessage } from "@/hooks/websocket/services/useDictSync";
+import { useDictSync, DictMessage } from "@/composables/useDictSync";
 
 // 性别字典编码
 const DICT_CODE = "gender";
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 32ddaaf8..bf40b163 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script setup lang="ts">
-import { useStomp } from "@/hooks/websocket/core/useStomp";
+import { useStomp } from "@/composables/useStomp";
 import { useUserStoreHook } from "@/store/modules/user.store";
 
 const userStore = useUserStoreHook();
@@ -117,7 +117,7 @@ const queneMessage = ref("Hi, " + userStore.userInfo.username + " 这里是点
 const receiver = ref("root");
 
 // 调用 useStomp hook，默认使用 socketEndpoint 和 token（此处用 getAccessToken()）
-const { isConnected, connect, subscribe, disconnect, client } = useStomp({
+const { isConnected, connect, subscribe, disconnect } = useStomp({
   debug: true,
 });
 
@@ -166,11 +166,9 @@ function disconnectWebSocket() {
 
 // 发送广播消息
 function sendToAll() {
-  if (client.value && client.value.connected) {
-    client.value.publish({
-      destination: "/topic/notice",
-      body: topicMessage.value,
-    });
+  if (isConnected.value) {
+    // 直接使用订阅模式处理广播消息
+    subscribe("/app/broadcast", () => {});
     messages.value.push({
       sender: userStore.userInfo.username,
       content: topicMessage.value,
@@ -180,11 +178,9 @@ function sendToAll() {
 
 // 发送点对点消息
 function sendToUser() {
-  if (client.value && client.value.connected) {
-    client.value.publish({
-      destination: "/app/sendToUser/" + receiver.value,
-      body: queneMessage.value,
-    });
+  if (isConnected.value) {
+    // 使用订阅模式处理点对点消息
+    subscribe(`/app/sendToUser/${receiver.value}`, () => {});
     messages.value.push({
       sender: userStore.userInfo.username,
       content: queneMessage.value,

From f462f4c9ed8b90dd73c9d738436788097cb734b8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 20 May 2025 11:11:22 +0800
Subject: [PATCH 372/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20Sto?=
 =?UTF-8?q?rage=20=E5=B7=A5=E5=85=B7=E7=B1=BB=E5=A4=84=E7=90=86=E9=9D=9E?=
 =?UTF-8?q?=20JSON=20=E6=A0=BC=E5=BC=8F=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/storage.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 8c6bef24..25bf6f30 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -12,7 +12,14 @@ export class Storage {
 
   static get<T>(key: string, defaultValue?: T): T {
     const value = localStorage.getItem(key);
-    return value ? JSON.parse(value) : defaultValue;
+    if (!value) return defaultValue as T;
+
+    try {
+      return JSON.parse(value);
+    } catch {
+      // 如果解析失败，返回原始字符串
+      return value as unknown as T;
+    }
   }
 
   static remove(key: string): void {
@@ -28,7 +35,14 @@ export class Storage {
 
   static sessionGet<T>(key: string, defaultValue?: T): T {
     const value = sessionStorage.getItem(key);
-    return value ? JSON.parse(value) : defaultValue;
+    if (!value) return defaultValue as T;
+
+    try {
+      return JSON.parse(value);
+    } catch {
+      // 如果解析失败，返回原始字符串
+      return value as unknown as T;
+    }
   }
 
   static sessionRemove(key: string): void {

From 94509a577cac978c79349ecfd07ad04b12531bb3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 20 May 2025 16:18:57 +0800
Subject: [PATCH 373/497] =?UTF-8?q?refactor:=20:recycle:=20=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=80=9A=E7=9F=A5=E7=BB=84=E4=BB=B6=E9=87=8D=E5=91=BD?=
 =?UTF-8?q?=E5=90=8D=E5=92=8C=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/icons/bell.svg                     |  1 +
 .../index.vue                                 | 68 ++++---------------
 .../NavBar/components/NavbarRight.vue         |  2 +-
 src/types/components.d.ts                     |  2 +-
 4 files changed, 17 insertions(+), 56 deletions(-)
 create mode 100644 src/assets/icons/bell.svg
 rename src/components/{NoticeDropdown => Notification}/index.vue (78%)

diff --git a/src/assets/icons/bell.svg b/src/assets/icons/bell.svg
new file mode 100644
index 00000000..262d0ac0
--- /dev/null
+++ b/src/assets/icons/bell.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor"><path d="M5 18H19V11.0314C19 7.14806 15.866 4 12 4C8.13401 4 5 7.14806 5 11.0314V18ZM12 2C16.9706 2 21 6.04348 21 11.0314V20H3V11.0314C3 6.04348 7.02944 2 12 2ZM9.5 21H14.5C14.5 22.3807 13.3807 23.5 12 23.5C10.6193 23.5 9.5 22.3807 9.5 21Z"></path></svg>
\ No newline at end of file
diff --git a/src/components/NoticeDropdown/index.vue b/src/components/Notification/index.vue
similarity index 78%
rename from src/components/NoticeDropdown/index.vue
rename to src/components/Notification/index.vue
index 541524fe..39af1cff 100644
--- a/src/components/NoticeDropdown/index.vue
+++ b/src/components/Notification/index.vue
@@ -1,27 +1,21 @@
 <template>
-  <div class="notice">
-    <el-dropdown class="h-full items-center justify-center" trigger="click">
+  <div class="notification">
+    <el-dropdown class="h-full flex-center" trigger="click">
       <el-badge v-if="noticeList.length > 0" :offset="[0, 15]" :value="noticeList.length" :max="99">
-        <el-icon>
-          <Bell />
-        </el-icon>
+        <div class="i-svg:bell" />
       </el-badge>
 
-      <div v-else>
-        <el-icon>
-          <Bell />
-        </el-icon>
-      </div>
+      <div v-else class="i-svg:bell" />
 
       <template #dropdown>
         <div class="p-5">
           <template v-if="noticeList.length > 0">
-            <div v-for="(item, index) in noticeList" :key="index" class="w500px py-3">
+            <div v-for="(item, index) in noticeList" :key="index" class="w-500px py-3">
               <div class="flex-y-center">
                 <DictLabel v-model="item.type" code="notice_type" size="small" />
                 <el-text
                   size="small"
-                  class="w200px cursor-pointer !ml-2 !flex-1"
+                  class="w-200px cursor-pointer !ml-2 !flex-1"
                   truncated
                   @click="handleReadNotice(item.id)"
                 >
@@ -52,7 +46,7 @@
             </div>
           </template>
           <template v-else>
-            <div class="flex-center h150px w350px">
+            <div class="flex-center h-150px w-350px">
               <el-empty :image-size="50" description="暂无消息" />
             </div>
           </template>
@@ -64,21 +58,21 @@
       v-model="noticeDialogVisible"
       :title="noticeDetail?.title ?? '通知详情'"
       width="800px"
-      custom-class="notice-detail"
+      custom-class="notification-detail"
     >
-      <div v-if="noticeDetail" class="notice-detail__wrapper">
-        <div class="notice-detail__meta">
-          <span>
+      <div v-if="noticeDetail" class="p-x-20px">
+        <div class="flex-y-center mb-16px text-13px text-color-secondary">
+          <span class="flex-y-center">
             <el-icon><User /></el-icon>
             {{ noticeDetail.publisherName }}
           </span>
-          <span class="ml-2">
+          <span class="ml-2 flex-y-center">
             <el-icon><Timer /></el-icon>
             {{ noticeDetail.publishTime }}
           </span>
         </div>
 
-        <div class="notice-detail__content">
+        <div class="max-h-60vh pt-16px mb-24px overflow-y-auto border-t border-solid border-color">
           <div v-html="noticeDetail.content"></div>
         </div>
       </div>
@@ -169,7 +163,7 @@ onBeforeUnmount(() => {
 </script>
 
 <style lang="scss" scoped>
-.notice {
+.notification {
   :deep(.el-badge) {
     display: flex;
     align-items: center;
@@ -177,39 +171,5 @@ onBeforeUnmount(() => {
     width: 100%;
     height: 100%;
   }
-
-  .notice-detail {
-    &__wrapper {
-      padding: 0 20px;
-    }
-
-    &__meta {
-      display: flex;
-      align-items: center;
-      margin-bottom: 16px;
-      font-size: 13px;
-      color: var(--el-text-color-secondary);
-    }
-
-    &__publisher {
-      margin-right: 24px;
-
-      i {
-        margin-right: 4px;
-      }
-    }
-
-    &__content {
-      max-height: 60vh;
-      padding-top: 16px;
-      margin-bottom: 24px;
-      overflow-y: auto;
-      border-top: 1px solid var(--el-border-color);
-
-      &::-webkit-scrollbar {
-        width: 6px;
-      }
-    }
-  }
 }
 </style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 0d42bbf9..2326d553 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -15,7 +15,7 @@
       <LangSelect />
 
       <!-- 通知下拉 -->
-      <NoticeDropdown />
+      <Notification />
     </template>
 
     <!-- 用户头像（个人中心、退出登录等） -->
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 6347a7f0..22494383 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -73,7 +73,7 @@ declare module "vue" {
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
     MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
-    NoticeDropdown: (typeof import("./../components/Notice/NoticeDropdown.vue"))["default"];
+    Notification: (typeof import("./../components/Notification/index.vue"))["default"];
     LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];

From 1914657ce1937b661403ea5fa9fff95a61e6c2d2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 20 May 2025 16:24:17 +0800
Subject: [PATCH 374/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/login-bg.svg | 158 +++++++++++++++++++--------------
 src/views/login/index.vue      |  27 ++++--
 2 files changed, 113 insertions(+), 72 deletions(-)

diff --git a/src/assets/images/login-bg.svg b/src/assets/images/login-bg.svg
index a0fbc13f..1dc42f98 100644
--- a/src/assets/images/login-bg.svg
+++ b/src/assets/images/login-bg.svg
@@ -1,71 +1,95 @@
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="100%" height="100%" viewBox="0 0 1400 800">
-  <style>
-    :root {
-      --blue: rgba(64, 158, 255, 0.08);
-      --grey: rgba(144, 147, 153, 0.05);
-      --orange: rgba(230, 162, 60, 0.06);
-      --green: rgba(144, 238, 144, 0.06);
-    }
-
-    @media (prefers-color-scheme: dark) {
-      :root {
-        --blue: rgba(64, 158, 255, 0.04);
-        --grey: rgba(144, 147, 153, 0.03);
-        --orange: rgba(230, 162, 60, 0.04);
-        --green: rgba(144, 238, 144, 0.04);
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="100%" height="100%" viewBox="0 0 1400 800">
+  <defs>
+    <style>
+      @media (prefers-color-scheme: dark) {
+        #bg-rect { fill: #101a29; }
+        #blueGlow-rect { fill: url(#blueGlowDark); }
+        #blueGlow2-rect { fill: url(#blueGlow2Dark); }
+        #purpleGlow-rect { fill: url(#purpleGlowDark); }
+        #pinkGlow-rect { fill: url(#pinkGlowDark); }
+        #pinkPurpleGlow-rect { fill: url(#pinkPurpleGlowDark); }
       }
-    }
-  </style>
-
-  <!-- 左侧波浪 -->
-  <path d="M-50 550 Q200 500 450 550 T950 530"
-        fill="none"
-        stroke="#409EFF"
-        stroke-width="1.5"
-        stroke-opacity="0.05"
-        stroke-linecap="round">
-  </path>
-
-  <!-- 右侧波浪 -->
-  <path d="M450 650 Q800 620 1150 660 T1550 630"
-        fill="none"
-        stroke="#909399"
-        stroke-width="1"
-        stroke-opacity="0.03"
-        stroke-linecap="round">
-  </path>
-
-  <!-- 右下方圆形 -->
-  <circle cx="950" cy="400" r="70" 
-          fill="var(--blue)" 
-          stroke="#409EFF" 
-          stroke-width="1" 
-          stroke-opacity="0.05">
-  </circle>
-
-  <!-- 左上方半球形  -->
-  <g transform="rotate(-10, 300, 180)">
-    <path d="M 180 180 A 120 120 0 1 1 420 180 Q420 195 405 195 L 310 195 L 195 195 Q180 195 180 180" 
-          fill="var(--orange)" 
-          stroke="#E6A23C" 
-          stroke-width="1" 
-          stroke-opacity="0.05">
-    </path>
-  </g>
+    </style>
 
-  <!-- 左下方三角形 -->
-  <path d="M300 600 L380 520 L420 650 Z" 
-        fill="var(--green)" 
-        stroke="#909399" 
-        stroke-width="1" 
-        stroke-opacity="0.04">
-  </path>
+    <!-- 亮色主题渐变 -->
+    <linearGradient id="bgGradient" x1="0%" y1="0%" x2="0%" y2="100%">
+      <stop offset="0%" stop-color="#f7fbfe" />
+      <stop offset="100%" stop-color="#f2f7fc" />
+    </linearGradient>
+    
+    <!-- 主蓝白光晕 - 中间区域 -->
+    <radialGradient id="blueGlow" cx="50%" cy="40%" r="60%" fx="50%" fy="40%">
+      <stop offset="0%" stop-color="#eef7fd" stop-opacity="0.6" />
+      <stop offset="100%" stop-color="#eef7fd" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 左上角蓝白光晕 - 增强优雅感 -->
+    <radialGradient id="blueGlow2" cx="12%" cy="12%" r="45%" fx="12%" fy="12%">
+      <stop offset="0%" stop-color="#e0f2fe" stop-opacity="0.75" />
+      <stop offset="40%" stop-color="#e9f5fd" stop-opacity="0.5" />
+      <stop offset="100%" stop-color="#e9f5fd" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 右上角紫色光晕 - 保留但更淡 -->
+    <radialGradient id="purpleGlow" cx="85%" cy="20%" r="50%" fx="85%" fy="20%">
+      <stop offset="0%" stop-color="#f5f0fa" stop-opacity="0.6" />
+      <stop offset="100%" stop-color="#f5f0fa" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 左下角粉色光晕 - 保留但更淡 -->
+    <radialGradient id="pinkGlow" cx="15%" cy="80%" r="45%" fx="15%" fy="80%">
+      <stop offset="0%" stop-color="#fdf1f5" stop-opacity="0.55" />
+      <stop offset="100%" stop-color="#fdf1f5" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 右下角粉紫色光晕 - 增强效果 -->
+    <radialGradient id="pinkPurpleGlow" cx="88%" cy="78%" r="50%" fx="88%" fy="78%">
+      <stop offset="0%" stop-color="#f9eaf8" stop-opacity="0.7" />
+      <stop offset="35%" stop-color="#f8f0f8" stop-opacity="0.5" />
+      <stop offset="100%" stop-color="#f8f2f8" stop-opacity="0" />
+    </radialGradient>
 
-  <!-- 旋转方块 -->
- <rect x="1000" y="420" rx="10" ry="10" width="60" height="60" fill="rgba(169, 174, 184, 0.1)" stroke="rgba(169, 174, 184, 0.2)" stroke-width="1" opacity="0.5">
-    <animateTransform attributeType="XML" attributeName="transform"
-                      begin="0s" dur="30s" type="rotate"
-                      from="0 1450 550" to="360 1450 550"
-                      repeatCount="indefinite"/>
-  </rect>
+    <!-- 暗色主题渐变 -->
+    <radialGradient id="blueGlowDark" cx="50%" cy="40%" r="60%" fx="50%" fy="40%">
+      <stop offset="0%" stop-color="#1c314e" stop-opacity="0.7" />
+      <stop offset="100%" stop-color="#1a2d47" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 左上角蓝白光晕 - 暗色模式 -->
+    <radialGradient id="blueGlow2Dark" cx="12%" cy="12%" r="45%" fx="12%" fy="12%">
+      <stop offset="0%" stop-color="#1e3554" stop-opacity="0.8" />
+      <stop offset="40%" stop-color="#172b45" stop-opacity="0.5" />
+      <stop offset="100%" stop-color="#172b45" stop-opacity="0" />
+    </radialGradient>
+    
+    <radialGradient id="purpleGlowDark" cx="85%" cy="20%" r="50%" fx="85%" fy="20%">
+      <stop offset="0%" stop-color="#2a243a" stop-opacity="0.65" />
+      <stop offset="100%" stop-color="#292236" stop-opacity="0" />
+    </radialGradient>
+    
+    <radialGradient id="pinkGlowDark" cx="15%" cy="80%" r="45%" fx="15%" fy="80%">
+      <stop offset="0%" stop-color="#2f1c27" stop-opacity="0.55" />
+      <stop offset="100%" stop-color="#2d1a24" stop-opacity="0" />
+    </radialGradient>
+    
+    <!-- 右下角粉紫色光晕 - 暗色模式 -->
+    <radialGradient id="pinkPurpleGlowDark" cx="88%" cy="78%" r="50%" fx="88%" fy="78%">
+      <stop offset="0%" stop-color="#2e2335" stop-opacity="0.8" />
+      <stop offset="35%" stop-color="#2a202d" stop-opacity="0.5" />
+      <stop offset="100%" stop-color="#2a202d" stop-opacity="0" />
+    </radialGradient>
+  </defs>
+  
+  <!-- 背景层 -->
+  <rect id="bg-rect" width="100%" height="100%" fill="url(#bgGradient)" />
+  
+  <!-- 渐变光晕层 - 中间主要是蓝白色系 -->
+  <rect id="blueGlow-rect" width="100%" height="100%" fill="url(#blueGlow)" />
+  <rect id="blueGlow2-rect" width="100%" height="100%" fill="url(#blueGlow2)" />
+  
+  <!-- 边缘保留淡粉紫色 -->
+  <rect id="purpleGlow-rect" width="100%" height="100%" fill="url(#purpleGlow)" />
+  <rect id="pinkGlow-rect" width="100%" height="100%" fill="url(#pinkGlow)" />
+  <rect id="pinkPurpleGlow-rect" width="100%" height="100%" fill="url(#pinkPurpleGlow)" />
 </svg>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index f8db7a56..fdb0a55d 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,13 +1,13 @@
 <template>
   <div class="wh-full flex-center flex-col login">
-    <!-- 右侧切换主题、语言按钮 -->
-    <div class="flex flex-col gap-4px fixed top-40px right-40px text-lg">
-      <el-tooltip :content="t('login.themeToggle')" placement="left">
+    <!-- 右侧切换主题、语言按钮  -->
+    <div class="fixed flex-center gap-8px text-lg responsive-toggles">
+      <el-tooltip :content="t('login.themeToggle')" placement="bottom">
         <CommonWrapper>
           <DarkModeSwitch />
         </CommonWrapper>
       </el-tooltip>
-      <el-tooltip :content="t('login.languageToggle')" placement="left">
+      <el-tooltip :content="t('login.languageToggle')" placement="bottom">
         <CommonWrapper>
           <LangSelect size="text-20px" />
         </CommonWrapper>
@@ -16,7 +16,7 @@
     <!-- 登录页主体 -->
     <div flex-1 flex-center>
       <div
-        class="p-4xl h-full w-full sm:w-450px border-rd-10px sm:h-680px shadow-[var(--el-box-shadow-light)] backdrop-blur-3px"
+        class="p-4xl w-full h-auto sm:w-450px border-rd-10px sm:h-680px shadow-[var(--el-box-shadow-light)] backdrop-blur-3px"
       >
         <div w-full flex flex-col items-center>
           <!-- logo -->
@@ -68,6 +68,23 @@ const formComponents = {
   background-size: cover;
 }
 
+.responsive-toggles {
+  top: 10px;
+  right: 10px;
+  z-index: 10;
+
+  @media (max-width: 480px) {
+    top: 10px;
+    right: auto;
+    left: 10px;
+  }
+
+  @media (min-width: 640px) {
+    top: 40px;
+    right: 40px;
+  }
+}
+
 /* fade-slide */
 .fade-slide-leave-active,
 .fade-slide-enter-active {

From 1e584e9bc5079b2e067159f75041fe0eb882083d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 20 May 2025 23:14:31 +0800
Subject: [PATCH 375/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E8=B7=AF=E7=94=B1=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 .../Sidebar/components/SidebarMixTopMenu.vue  | 12 ++++++++--
 src/layout/index.vue                          |  6 ++---
 src/plugins/permission.ts                     |  5 ++--
 src/store/modules/permission.store.ts         | 24 +++++++++----------
 src/types/websocket.ts                        | 15 ------------
 6 files changed, 29 insertions(+), 35 deletions(-)
 delete mode 100644 src/types/websocket.ts

diff --git a/package.json b/package.json
index a57448a3..4925a998 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.28.4",
+  "version": "2.29.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 7f0f4154..2fd657d1 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -78,10 +78,18 @@ appStore.activeTopMenu(activeTopMenuPath);
  */
 const handleMenuSelect = (routePath: string) => {
   appStore.activeTopMenu(routePath); // 设置激活的顶部菜单
-  permissionStore.setMixedLayoutLeftRoutes(routePath); // 更新左侧菜单
-  navigateToFirstLeftMenu(permissionStore.mixedLayoutLeftRoutes); // 跳转到左侧第一个菜单
+  activateFirstLevelMenu(routePath); // 激活一级菜单并设置左侧二级菜单
 };
 
+/**
+ * 激活一级菜单并设置左侧二级菜单
+ * @param routePath 点击的菜单路径
+ */
+function activateFirstLevelMenu(routePath: string) {
+  permissionStore.updateSideMenu(routePath); // 更新左侧菜单
+  navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+}
+
 /**
  * 跳转到左侧第一个可访问的菜单
  * @param menus 左侧菜单列表
diff --git a/src/layout/index.vue b/src/layout/index.vue
index 4ac10c6f..9227afc8 100644
--- a/src/layout/index.vue
+++ b/src/layout/index.vue
@@ -11,7 +11,7 @@
       <!-- 左侧菜单栏 -->
       <div class="layout__sidebar--left">
         <el-scrollbar>
-          <SidebarMenu :data="mixedLayoutLeftRoutes" :base-path="activeTopMenuPath" />
+          <SidebarMenu :data="sideMenuRoutes" :base-path="activeTopMenuPath" />
         </el-scrollbar>
         <!-- 侧边栏切换按钮 -->
         <div class="layout__sidebar-toggle">
@@ -72,13 +72,13 @@ const isSidebarOpen = computed(() => appStore.sidebar.opened); // 侧边栏是
 const isShowTagsView = computed(() => settingsStore.tagsView); // 是否显示标签视图
 const layout = computed(() => settingsStore.layout); // 当前布局模式（left、top、mix）
 const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活路径
-const mixedLayoutLeftRoutes = computed(() => permissionStore.mixedLayoutLeftRoutes); // 混合布局左侧菜单路由
+const sideMenuRoutes = computed(() => permissionStore.sideMenuRoutes); // 混合布局左侧菜单路由
 
 // 监听顶部菜单激活路径变化，更新混合布局左侧菜单路由
 watch(
   () => activeTopMenuPath.value,
   (newVal: string) => {
-    permissionStore.setMixedLayoutLeftRoutes(newVal);
+    permissionStore.updateSideMenu(newVal);
   },
   { deep: true, immediate: true }
 );
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 4d934fcc..254bf993 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -16,12 +16,13 @@ export function setupPermission() {
     const isLogin = !!Storage.get(ACCESS_TOKEN_KEY, ""); // 判断是否登录
     if (isLogin) {
       if (to.path === "/login") {
-        // 已登录，访问登录页，跳转到首页
+        // 已登录，跳转到首页
         next({ path: "/" });
       } else {
+        // 未登录
         const permissionStore = usePermissionStore();
         // 判断路由是否加载完成
-        if (permissionStore.isRoutesLoaded) {
+        if (permissionStore.routesLoaded) {
           if (to.matched.length === 0) {
             // 路由未匹配，跳转到404
             next("/404");
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index 647d3e75..d08fce91 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -8,12 +8,12 @@ const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
-  // 储所有路由，包括静态路由和动态路由
+  // 存储所有路由，包括静态路由和动态路由
   const routes = ref<RouteRecordRaw[]>([]);
   // 混合模式左侧菜单路由
-  const mixedLayoutLeftRoutes = ref<RouteRecordRaw[]>([]);
+  const sideMenuRoutes = ref<RouteRecordRaw[]>([]);
   // 路由是否加载完成
-  const isRoutesLoaded = ref(false);
+  const routesLoaded = ref(false);
 
   /**
    * 获取后台动态路由数据，解析并注册到全局路由
@@ -26,7 +26,7 @@ export const usePermissionStore = defineStore("permission", () => {
         .then((data) => {
           const dynamicRoutes = parseDynamicRoutes(data);
           routes.value = [...constantRoutes, ...dynamicRoutes];
-          isRoutesLoaded.value = true;
+          routesLoaded.value = true;
           resolve(dynamicRoutes);
         })
         .catch((error) => {
@@ -36,14 +36,14 @@ export const usePermissionStore = defineStore("permission", () => {
   }
 
   /**
-   * 根据父菜单路径设置混合模式左侧菜单
+   * 根据父菜单路径设置侧边菜单
    *
    * @param parentPath 父菜单的路径，用于查找对应的菜单项
    */
-  const setMixedLayoutLeftRoutes = (parentPath: string) => {
+  const updateSideMenu = (parentPath: string) => {
     const matchedItem = routes.value.find((item) => item.path === parentPath);
     if (matchedItem && matchedItem.children) {
-      mixedLayoutLeftRoutes.value = matchedItem.children;
+      sideMenuRoutes.value = matchedItem.children;
     }
   };
 
@@ -60,16 +60,16 @@ export const usePermissionStore = defineStore("permission", () => {
 
     // 清空本地存储的路由和菜单数据
     routes.value = [];
-    mixedLayoutLeftRoutes.value = [];
-    isRoutesLoaded.value = false;
+    sideMenuRoutes.value = [];
+    routesLoaded.value = false;
   };
 
   return {
     routes,
-    mixedLayoutLeftRoutes,
-    isRoutesLoaded,
+    sideMenuRoutes,
+    routesLoaded,
     generateRoutes,
-    setMixedLayoutLeftRoutes,
+    updateSideMenu,
     resetRouter,
   };
 });
diff --git a/src/types/websocket.ts b/src/types/websocket.ts
deleted file mode 100644
index 30b56a2d..00000000
--- a/src/types/websocket.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/**
- * WebSocket相关类型定义
- */
-
-/**
- * 字典WebSocket事件类型
- */
-export interface DictWebSocketEvent {
-  /** 事件类型：更新或删除 */
-  type: "DICT_UPDATED" | "DICT_DELETED";
-  /** 字典编码 */
-  dictCode: string;
-  /** 时间戳 */
-  timestamp: number;
-}

From aee9443fe0a496fb872215b40e7fc3f60b41da47 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 21 May 2025 08:20:53 +0800
Subject: [PATCH 376/497] =?UTF-8?q?fix:=20:bug:=20=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=83=8C=E6=99=AF=E5=92=8C=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=9B=BE?=
 =?UTF-8?q?=E6=A0=87=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavBar/components/NavbarRight.vue   | 10 +++++-----
 src/views/login/index.vue                          | 14 ++++++++++++++
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index 2326d553..ba00392f 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -143,12 +143,12 @@ function logout() {
 .layout-top .navbar__right--white > *,
 .layout-mix .navbar__right--white > * {
   color: #fff;
+}
 
-  // 强制所有svg图标为白色（包括通知图标）
-  :deep(svg) {
-    color: #fff;
-    fill: #fff;
-  }
+// 添加更强力的选择器，确保能影响到深层嵌套的图标
+.layout-top .navbar__right--white :deep([class^="i-svg:"]),
+.layout-mix .navbar__right--white :deep([class^="i-svg:"]) {
+  color: #fff !important;
 }
 
 .dark .navbar__right > *:hover {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index fdb0a55d..a9a1c17e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -64,7 +64,21 @@ const formComponents = {
 
 <style lang="scss" scoped>
 .login {
+  position: relative;
+  z-index: 1;
+}
+
+// 添加伪元素作为背景层
+.login::before {
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: -1;
+  width: 100%;
+  height: 100%;
+  content: "";
   background: url("http://github.com/@/assets/images/login-bg.svg");
+  background-position: center center;
   background-size: cover;
 }
 

From 050d81fcdc338d9f9f89f1780210077b320aafd2 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Wed, 21 May 2025 13:40:41 +0800
Subject: [PATCH 377/497] =?UTF-8?q?style:=20:lipstick:=20(WangEditor)?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9A=97=E9=BB=91=E6=A8=A1=E5=BC=8F=E5=B9=B6?=
 =?UTF-8?q?=E6=9B=BF=E6=8D=A2=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 variables.scss 中添加 WangEditor 相关的 CSS 变量定义
---
 src/components/WangEditor/index.vue |  6 +++---
 src/styles/variables.scss           | 23 +++++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index fe8f8931..8b704c11 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -6,16 +6,16 @@
  * 项目地址：https://gitee.com/youlaiorg/vue3-element-admin
  *
  * 在使用时，请保留此注释，感谢您对开源的支持！
- -->
+-->
 
 <template>
-  <div style="z-index: 999; border: 1px solid #ccc">
+  <div style="z-index: 999; border: 1px solid var(--el-border-color)">
     <!-- 工具栏 -->
     <Toolbar
       :editor="editorRef"
       mode="simple"
       :default-config="toolbarConfig"
-      style="border-bottom: 1px solid #ccc"
+      style="border-bottom: 1px solid var(--el-border-color)"
     />
     <!-- 编辑器 -->
     <Editor
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 7987c80f..d96c9585 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -54,6 +54,29 @@ html.dark {
   --menu-hover: rgb(0 0 0 / 20%);
   --sidebar-logo-background: rgb(0 0 0 / 20%);
   --sidebar-logo-text-color: #fff;
+
+  /** WangEditor Dark */
+  /* Textarea - css vars */
+  --w-e-textarea-bg-color: var(--el-bg-color); /* 深色背景 */
+  --w-e-textarea-color: var(--el-text-color-primary); /* 浅色文字 */
+  --w-e-textarea-border-color: var(--el-border-color); /* 较深的边框颜色 */
+  --w-e-textarea-slight-border-color: var(--el-border-color-lighter); /* 更淡一些的边框颜色 */
+  --w-e-textarea-slight-color: var(--el-text-color-secondary); /* 浅灰色，用于不那么重要的元素 */
+  --w-e-textarea-slight-bg-color: var(--el-bg-color-overlay); /* 稍微亮一点的背景色 */
+  --w-e-textarea-selected-border-color: var(--el-color-info-light-5); /* 选中元素时的高亮边框 */
+  --w-e-textarea-handler-bg-color: var(--el-color-primary); /* 工具按钮或交互元素的背景色 */
+
+  /* Toolbar - css vars */
+  --w-e-toolbar-color: var(--el-text-color-regular); /* 工具栏文字颜色 */
+  --w-e-toolbar-bg-color: var(--el-bg-color); /* 工具栏背景颜色 */
+  --w-e-toolbar-active-color: var(--el-text-color-primary); /* 当前激活项的文字颜色 */
+  --w-e-toolbar-active-bg-color: var(--el-fill-color-light); /* 当前激活项的背景颜色 */
+  --w-e-toolbar-disabled-color: var(--el-text-color-secondary); /* 禁用项的颜色 */
+  --w-e-toolbar-border-color: var(--el-border-color-base); /* 工具栏边框颜色 */
+
+  /*  Modal - css vars */
+  --w-e-modal-button-bg-color: var(--el-bg-color-light-3); /* 弹出框按钮背景色 */
+  --w-e-modal-button-border-color: var(--el-border-color-light); /* 弹出框按钮边框颜色 */
 }
 
 $menu-background: var(--menu-background); // 菜单背景色

From 239401c18f9fdbe68346bf94363cecc4a180bc30 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Wed, 21 May 2025 13:41:58 +0800
Subject: [PATCH 378/497] =?UTF-8?q?style:=20:lipstick:=20(element-plus)?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20`Element=20Plus`=20=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 element-plus.scss 文件，统一设置 Element Plus 组件样式
---
 src/styles/element-plus.scss | 47 ++++++++++++++++++++++++++++++++++++
 src/styles/index.scss        |  9 +------
 2 files changed, 48 insertions(+), 8 deletions(-)
 create mode 100644 src/styles/element-plus.scss

diff --git a/src/styles/element-plus.scss b/src/styles/element-plus.scss
new file mode 100644
index 00000000..79361e5f
--- /dev/null
+++ b/src/styles/element-plus.scss
@@ -0,0 +1,47 @@
+$border: 1px solid var(--el-border-color-light);
+
+/* el-dialog */
+.el-dialog {
+  padding: 0 !important;
+
+  .el-dialog__header {
+    padding: 15px 20px;
+    margin: 0;
+    border-bottom: $border;
+  }
+
+  .el-dialog__body {
+    padding: 20px;
+  }
+
+  .el-dialog__footer {
+    padding: 15px;
+    border-top: $border;
+  }
+}
+
+/** el-drawer */
+.el-drawer {
+  .el-drawer__header {
+    padding: 15px 20px;
+    margin: 0;
+    color: inherit;
+    border-bottom: $border;
+  }
+
+  .el-drawer__body {
+    padding: 20px;
+  }
+
+  .el-drawer__footer {
+    padding: 15px;
+    border-top: $border;
+  }
+}
+
+// 抽屉和对话框底部按钮区域
+.dialog-footer {
+  display: flex;
+  gap: 8px;
+  justify-content: flex-end;
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 99d7f3b6..22a4d9e8 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,4 +1,5 @@
 @use "./reset";
+@use "./element-plus";
 
 .app-container {
   padding: 15px;
@@ -54,11 +55,3 @@
     margin-top: 16px;
   }
 }
-
-// 抽屉和对话框底部按钮区域
-.dialog-footer {
-  display: flex;
-  gap: 8px;
-  justify-content: flex-end;
-  padding-top: 16px;
-}

From 5c7d14bd0d312df6fe2185e8d4e5da907c203a8d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Wed, 21 May 2025 13:45:57 +0800
Subject: [PATCH 379/497] =?UTF-8?q?feat:=20:sparkles:=20(system/dict)?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E5=85=B8=E7=AE=A1=E7=90=86=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 改进字典标签类型选择功能，支持清空选项

BREAKING CHANGE: - 优化字典项页面布局和样式，使其统一
---
 src/api/system/dict.api.ts          |   2 +-
 src/views/system/dict/dict-item.vue | 147 ++++++++++++++++------------
 src/views/system/dict/index.vue     |  40 ++++----
 3 files changed, 106 insertions(+), 83 deletions(-)

diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index 2c2d9f86..b148e0a4 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -296,7 +296,7 @@ export interface DictItemForm {
   /**
    * 标签类型
    */
-  tagType?: "success" | "warning" | "info" | "primary" | "danger" | undefined;
+  tagType?: "success" | "warning" | "info" | "primary" | "danger" | "";
 }
 
 /**
diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index dea401e0..43f2eced 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -1,38 +1,37 @@
 <!-- 字典项 -->
 <template>
   <div class="app-container">
-    <div class="search-bar mt-5">
+    <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true">
-        <el-row :gutter="22">
-          <el-col :span="24" :md="12" :lg="6">
-            <el-form-item label="关键字" prop="keywords">
-              <el-input
-                v-model="queryParams.keywords"
-                placeholder="字典标签/字典值"
-                clearable
-                @keyup.enter="handleQuery"
-              />
-            </el-form-item>
-          </el-col>
-
-          <div class="search-form-btn-box">
-            <div class="search-form-btn-box-item">
-              <el-form-item>
-                <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
-                <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
-              </el-form-item>
-            </div>
-          </div>
-        </el-row>
+        <el-form-item label="关键字" prop="keywords">
+          <el-input
+            v-model="queryParams.keywords"
+            placeholder="字典标签/字典值"
+            clearable
+            @keyup.enter="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item class="search-buttons">
+          <el-button type="primary" icon="search" @click="handleQuery">搜索</el-button>
+          <el-button icon="refresh" @click="handleResetQuery">重置</el-button>
+        </el-form-item>
       </el-form>
     </div>
 
-    <el-card shadow="never">
-      <div class="mb-[10px]">
-        <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
-        <el-button type="danger" :disabled="ids.length === 0" icon="delete" @click="handleDelete()">
-          删除
-        </el-button>
+    <el-card shadow="never" class="data-table">
+      <div class="data-table__toolbar">
+        <div class="data-table__toolbar--actions">
+          <el-button type="success" icon="plus" @click="handleOpenDialog()">新增</el-button>
+          <el-button
+            type="danger"
+            :disabled="ids.length === 0"
+            icon="delete"
+            @click="handleDelete()"
+          >
+            删除
+          </el-button>
+        </div>
       </div>
 
       <el-table
@@ -91,40 +90,57 @@
     <el-dialog
       v-model="dialog.visible"
       :title="dialog.title"
-      width="820px"
+      width="600px"
       @close="handleCloseDialog"
     >
       <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="100px">
-        <el-card shadow="never">
-          <el-form-item label="字典项标签" prop="label">
-            <el-input v-model="formData.label" placeholder="请输入字典标签" />
-          </el-form-item>
-          <el-form-item label="字典项值" prop="value">
-            <el-input v-model="formData.value" placeholder="请输入字典值" />
-          </el-form-item>
-          <el-form-item label="状态">
-            <el-radio-group v-model="formData.status">
-              <el-radio :value="1">启用</el-radio>
-              <el-radio :value="0">禁用</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="排序">
-            <el-input-number v-model="formData.sort" controls-position="right" />
-          </el-form-item>
-          <el-form-item label="标签类型">
-            <el-tag v-if="formData.tagType" :type="formData.tagType" class="mr-2">
-              {{ formData.label }}
-            </el-tag>
-            <el-radio-group v-model="formData.tagType">
-              <el-radio value="success" border size="small">success</el-radio>
-              <el-radio value="warning" border size="small">warning</el-radio>
-              <el-radio value="info" border size="small">info</el-radio>
-              <el-radio value="primary" border size="small">primary</el-radio>
-              <el-radio value="danger" border size="small">danger</el-radio>
-              <el-radio value="" border size="small">清空</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-card>
+        <el-form-item label="字典项标签" prop="label">
+          <el-input v-model="formData.label" placeholder="请输入字典标签" />
+        </el-form-item>
+        <el-form-item label="字典项值" prop="value">
+          <el-input v-model="formData.value" placeholder="请输入字典值" />
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-radio-group v-model="formData.status">
+            <el-radio :value="1">启用</el-radio>
+            <el-radio :value="0">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="排序">
+          <el-input-number v-model="formData.sort" controls-position="right" />
+        </el-form-item>
+        <el-form-item>
+          <template #label>
+            <div class="flex-y-center">
+              标签类型
+              <el-tooltip>
+                <template #content>回显样式，为空时则显示 '文本'</template>
+                <el-icon class="ml-1 cursor-pointer">
+                  <QuestionFilled />
+                </el-icon>
+              </el-tooltip>
+            </div>
+          </template>
+          <el-select
+            v-model="formData.tagType"
+            placeholder="请选择标签类型"
+            clearable
+            @clear="formData.tagType = ''"
+          >
+            <template #label="{ value }">
+              <el-tag v-if="value" :type="value">
+                {{ formData.label ? formData.label : "字典标签" }}
+              </el-tag>
+            </template>
+            <!-- <el-option label="默认文本" value="" /> -->
+            <el-option v-for="type in tagType" :key="type" :label="type" :value="type">
+              <div flex-y-center gap-10px>
+                <el-tag :type="type">{{ formData.label ?? "字典标签" }}</el-tag>
+                <span>{{ type }}</span>
+              </div>
+            </el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
 
       <template #footer>
@@ -138,6 +154,7 @@
 </template>
 
 <script setup lang="ts">
+import type { TagProps } from "element-plus";
 import DictAPI, { DictItemPageQuery, DictItemPageVO, DictItemForm } from "@/api/system/dict.api";
 
 const route = useRoute();
@@ -165,11 +182,15 @@ const dialog = reactive({
 
 const formData = reactive<DictItemForm>({});
 
+// 标签类型
+const tagType: TagProps["type"][] = ["primary", "success", "info", "warning", "danger"];
+
 const computedRules = computed(() => {
   const rules: Partial<Record<string, any>> = {
     value: [{ required: true, message: "请输入字典值", trigger: "blur" }],
     label: [{ required: true, message: "请输入字典标签", trigger: "blur" }],
   };
+
   return rules;
 });
 
@@ -222,6 +243,7 @@ function handleSubmitClick() {
     if (isValid) {
       loading.value = true;
       const id = formData.id;
+
       formData.dictCode = dictCode.value;
       if (id) {
         DictAPI.updateDictItem(dictCode.value, id, formData)
@@ -246,14 +268,15 @@ function handleSubmitClick() {
 
 // 关闭弹窗
 function handleCloseDialog() {
-  dialog.visible = false;
-
   dataFormRef.value.resetFields();
   dataFormRef.value.clearValidate();
 
   formData.id = undefined;
   formData.sort = 1;
   formData.status = 1;
+  formData.tagType = "";
+
+  dialog.visible = false;
 }
 /**
  * 删除字典
@@ -262,8 +285,10 @@ function handleCloseDialog() {
  */
 function handleDelete(id?: number) {
   const itemIds = [id || ids.value].join(",");
+
   if (!itemIds) {
     ElMessage.warning("请勾选删除项");
+
     return;
   }
   ElMessageBox.confirm("确认删除已选中的数据项?", "警告", {
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 4ada8af8..fa2c3844 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -100,27 +100,25 @@
       width="500px"
       @close="handleCloseDialog"
     >
-      <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="100px">
-        <el-card shadow="never">
-          <el-form-item label="字典名称" prop="name">
-            <el-input v-model="formData.name" placeholder="请输入字典名称" />
-          </el-form-item>
-
-          <el-form-item label="字典编码" prop="dictCode">
-            <el-input v-model="formData.dictCode" placeholder="请输入字典编码" />
-          </el-form-item>
-
-          <el-form-item label="状态">
-            <el-radio-group v-model="formData.status">
-              <el-radio :value="1">启用</el-radio>
-              <el-radio :value="0">禁用</el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-form-item label="备注">
-            <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
-          </el-form-item>
-        </el-card>
+      <el-form ref="dataFormRef" :model="formData" :rules="computedRules" label-width="80px">
+        <el-form-item label="字典名称" prop="name">
+          <el-input v-model="formData.name" placeholder="请输入字典名称" />
+        </el-form-item>
+
+        <el-form-item label="字典编码" prop="dictCode">
+          <el-input v-model="formData.dictCode" placeholder="请输入字典编码" />
+        </el-form-item>
+
+        <el-form-item label="状态">
+          <el-radio-group v-model="formData.status">
+            <el-radio :value="1">启用</el-radio>
+            <el-radio :value="0">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+
+        <el-form-item label="备注">
+          <el-input v-model="formData.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
       </el-form>
 
       <template #footer>

From 521ba98d6a98f2f5bec208333da7598248ed3a09 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 21 May 2025 17:40:14 +0800
Subject: [PATCH 380/497] =?UTF-8?q?feat:=20:sparkles:=20=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E8=AE=B0=E4=BD=8F=E6=88=91=E5=8A=9F=E8=83=BD=E5=B9=B6=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A4=E8=AF=81=E9=80=BB=E8=BE=91=E4=B8=BA=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E7=9A=84Auth=E5=B7=A5=E5=85=B7=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useStomp.ts                   |  8 +-
 src/constants/cache-keys.ts                   |  1 +
 .../NavBar/components/NavbarRight.vue         | 15 +---
 src/plugins/permission.ts                     | 13 +--
 src/plugins/websocket.ts                      |  8 +-
 src/store/modules/permission.store.ts         | 13 +--
 src/store/modules/user.store.ts               | 81 ++++++++++-------
 src/utils/auth.ts                             | 86 +++++++++++++++++++
 src/utils/request.ts                          | 10 +--
 src/views/login/components/Login.vue          | 10 ++-
 src/views/login/index.vue                     | 22 +++--
 11 files changed, 194 insertions(+), 73 deletions(-)
 create mode 100644 src/utils/auth.ts

diff --git a/src/composables/useStomp.ts b/src/composables/useStomp.ts
index 2e507461..98f5b13c 100644
--- a/src/composables/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -1,7 +1,5 @@
 import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
-import { ref, watch } from "vue";
+import { Auth } from "@/utils/auth";
 
 export interface UseStompOptions {
   /** WebSocket 地址，不传时使用 VITE_APP_WS_ENDPOINT 环境变量 */
@@ -67,7 +65,7 @@ export function useStomp(options: UseStompOptions = {}) {
     }
 
     // 每次连接前重新获取最新令牌，不依赖之前的token值
-    const currentToken = Storage.get(ACCESS_TOKEN_KEY, "");
+    const currentToken = Auth.getAccessToken();
 
     // 检查令牌是否为空，如果为空则不进行连接
     if (!currentToken) {
@@ -121,7 +119,7 @@ export function useStomp(options: UseStompOptions = {}) {
           client.value = null;
 
           // 检查当前是否有有效令牌
-          const freshToken = Storage.get(ACCESS_TOKEN_KEY, "");
+          const freshToken = Auth.getAccessToken();
           if (freshToken) {
             initializeClient();
             connect();
diff --git a/src/constants/cache-keys.ts b/src/constants/cache-keys.ts
index aa44695f..e1355933 100644
--- a/src/constants/cache-keys.ts
+++ b/src/constants/cache-keys.ts
@@ -4,4 +4,5 @@
 export const ACCESS_TOKEN_KEY = "access_token";
 export const REFRESH_TOKEN_KEY = "refresh_token";
 export const DICT_CACHE_KEY = "dict_cache";
+export const REMEMBER_ME_KEY = "remember_me";
 // 可在此处添加其他缓存键
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
index ba00392f..596277c9 100644
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ b/src/layout/components/NavBar/components/NavbarRight.vue
@@ -46,14 +46,13 @@
 const { t } = useI18n();
 import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/settings/device.enum";
-import { useAppStore, useSettingsStore, useUserStore, useTagsViewStore } from "@/store";
+import { useAppStore, useSettingsStore, useUserStore } from "@/store";
 
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
 const userStore = useUserStore();
-const tagsViewStore = useTagsViewStore();
 
 const route = useRoute();
 const router = useRouter();
@@ -89,14 +88,9 @@ function logout() {
     type: "warning",
     lockScroll: false,
   }).then(() => {
-    userStore
-      .logout()
-      .then(() => {
-        tagsViewStore.delAllViews();
-      })
-      .then(() => {
-        router.push(`/login?redirect=${route.fullPath}`);
-      });
+    userStore.logout().then(() => {
+      router.push(`/login?redirect=${route.fullPath}`);
+    });
   });
 }
 </script>
@@ -145,7 +139,6 @@ function logout() {
   color: #fff;
 }
 
-// 添加更强力的选择器，确保能影响到深层嵌套的图标
 .layout-top .navbar__right--white :deep([class^="i-svg:"]),
 .layout-mix .navbar__right--white :deep([class^="i-svg:"]) {
   color: #fff !important;
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 254bf993..dbce0a03 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,7 +1,6 @@
 import type { NavigationGuardNext, RouteLocationNormalized, RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
+import { Auth } from "@/utils/auth";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 import { ROLE_ROOT } from "@/constants";
@@ -12,15 +11,19 @@ export function setupPermission() {
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
+    console.log("to.path", to.path);
 
-    const isLogin = !!Storage.get(ACCESS_TOKEN_KEY, ""); // 判断是否登录
+    const isLogin = Auth.isLoggedIn();
+    console.log("isLogin", isLogin);
     if (isLogin) {
+      console.log("to.path", to.path);
       if (to.path === "/login") {
-        // 已登录，跳转到首页
+        // 如果已登录，跳转到首页
         next({ path: "/" });
       } else {
         // 未登录
         const permissionStore = usePermissionStore();
+        console.log("permissionStore.routesLoaded", permissionStore.routesLoaded);
         // 判断路由是否加载完成
         if (permissionStore.routesLoaded) {
           if (to.matched.length === 0) {
@@ -43,7 +46,7 @@ export function setupPermission() {
           } catch (error) {
             console.error(error);
             // 路由加载失败，重置 token 并重定向到登录页
-            await useUserStore().clearSessionAndCache();
+            await useUserStore().resetAllState();
             redirectToLogin(to, next);
             NProgress.done();
           }
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index a2a6f78c..edbdb290 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,6 +1,5 @@
 import { useDictSync } from "@/composables/useDictSync";
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
+import { Auth } from "@/utils/auth";
 
 // 用于防止重复初始化的状态标记
 let isInitialized = false;
@@ -24,9 +23,8 @@ export function setupWebSocket() {
     return;
   }
 
-  // 检查token是否存在
-  const token = Storage.get(ACCESS_TOKEN_KEY, "");
-  if (!token) {
+  // 检查是否已登录
+  if (!Auth.isLoggedIn()) {
     console.warn(
       "[WebSocketPlugin] 未找到访问令牌，WebSocket初始化已跳过。用户登录后将自动重新连接。"
     );
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index d08fce91..968eb08a 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -51,15 +51,18 @@ export const usePermissionStore = defineStore("permission", () => {
    * 重置路由
    */
   const resetRouter = () => {
-    //  从 router 实例中移除动态路由
+    // 创建常量路由名称集合，用于O(1)时间复杂度的查找
+    const constantRouteNames = new Set(constantRoutes.map((route) => route.name).filter(Boolean));
+
+    // 从 router 实例中移除动态路由
     routes.value.forEach((route) => {
-      if (route.name && !constantRoutes.find((r) => r.name === route.name)) {
+      if (route.name && !constantRouteNames.has(route.name)) {
         router.removeRoute(route.name);
       }
     });
 
-    // 清空本地存储的路由和菜单数据
-    routes.value = [];
+    // 重置为仅包含常量路由
+    routes.value = [...constantRoutes];
     sideMenuRoutes.value = [];
     routesLoaded.value = false;
   };
@@ -78,7 +81,7 @@ export const usePermissionStore = defineStore("permission", () => {
  * 解析后端返回的路由数据并转换为 Vue Router 兼容的路由配置
  *
  * @param rawRoutes 后端返回的原始路由数据
- * @returns 解析后的路由配置数组
+ * @returns 解析后的路由集合
  */
 const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
   const parsedRoutes: RouteRecordRaw[] = [];
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index a8ec019e..4d96ae49 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -1,15 +1,17 @@
 import { store } from "@/store";
-import { usePermissionStoreHook } from "@/store/modules/permission.store";
-import { useDictStoreHook } from "@/store/modules/dict.store";
 
 import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import UserAPI, { type UserInfo } from "@/api/system/user.api";
 
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY } from "@/constants/cache-keys";
+import { Auth } from "@/utils/auth";
+import { usePermissionStoreHook } from "@/store/modules/permission.store";
+import { useDictStoreHook } from "@/store/modules/dict.store";
+import { useTagsViewStore } from "@/store";
 
 export const useUserStore = defineStore("user", () => {
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
+  // 记住我状态
+  const rememberMe = ref(Auth.getRememberMe());
 
   /**
    * 登录
@@ -22,8 +24,9 @@ export const useUserStore = defineStore("user", () => {
       AuthAPI.login(LoginFormData)
         .then((data) => {
           const { accessToken, refreshToken } = data;
-          Storage.set(ACCESS_TOKEN_KEY, accessToken);
-          Storage.set(REFRESH_TOKEN_KEY, refreshToken);
+          // 保存记住我状态和token
+          rememberMe.value = LoginFormData.rememberMe;
+          Auth.setTokens(accessToken, refreshToken, rememberMe.value);
           resolve();
         })
         .catch((error) => {
@@ -61,7 +64,8 @@ export const useUserStore = defineStore("user", () => {
     return new Promise<void>((resolve, reject) => {
       AuthAPI.logout()
         .then(() => {
-          clearSessionAndCache();
+          // 重置所有系统状态
+          resetAllState();
           resolve();
         })
         .catch((error) => {
@@ -70,17 +74,49 @@ export const useUserStore = defineStore("user", () => {
     });
   }
 
+  /**
+   * 重置所有系统状态
+   * 统一处理所有清理工作，包括用户凭证、路由、缓存等
+   */
+  function resetAllState() {
+    // 1. 重置用户状态
+    resetUserState();
+
+    // 2. 重置其他模块状态
+    // 重置路由
+    usePermissionStoreHook().resetRouter();
+    // 清除字典缓存
+    useDictStoreHook().clearDictCache();
+    // 清除标签视图
+    useTagsViewStore().delAllViews();
+
+    return Promise.resolve();
+  }
+
+  /**
+   * 重置用户状态
+   * 仅处理用户模块内的状态
+   */
+  function resetUserState() {
+    // 清除用户凭证
+    Auth.clearAuth();
+    // 重置用户信息
+    userInfo.value = {} as UserInfo;
+  }
+
   /**
    * 刷新 token
    */
   function refreshToken() {
-    const refreshToken = Storage.get(REFRESH_TOKEN_KEY, "");
+    // 获取刷新令牌
+    const refreshToken = Auth.getRefreshToken();
+
     return new Promise<void>((resolve, reject) => {
       AuthAPI.refreshToken(refreshToken)
         .then((data) => {
-          const { accessToken, refreshToken } = data;
-          Storage.set(ACCESS_TOKEN_KEY, accessToken);
-          Storage.set(REFRESH_TOKEN_KEY, refreshToken);
+          const { accessToken, refreshToken: newRefreshToken } = data;
+          // 更新令牌，保持当前记住我状态
+          Auth.setTokens(accessToken, newRefreshToken, Auth.getRememberMe());
           resolve();
         })
         .catch((error) => {
@@ -90,34 +126,21 @@ export const useUserStore = defineStore("user", () => {
     });
   }
 
-  /**
-   * 清除用户会话和缓存
-   */
-  function clearSessionAndCache() {
-    return new Promise<void>((resolve) => {
-      useDictStoreHook().clearDictCache();
-      usePermissionStoreHook().resetRouter();
-      Storage.remove(ACCESS_TOKEN_KEY);
-      Storage.remove(REFRESH_TOKEN_KEY);
-      userInfo.value = {} as UserInfo;
-      resolve();
-    });
-  }
-
   return {
     userInfo,
+    rememberMe,
     getUserInfo,
     login,
     logout,
-    clearSessionAndCache,
+    resetAllState,
+    resetUserState,
     refreshToken,
   };
 });
 
 /**
- * 用于在组件外部（如在Pinia Store 中）使用 Pinia 提供的 store 实例。
- * 官方文档解释了如何在组件外部使用 Pinia Store：
- * https://pinia.vuejs.org/core-concepts/outside-component-usage.html#using-a-store-outside-of-a-component
+ * 在组件外部使用UserStore的钩子函数
+ * @see https://pinia.vuejs.org/core-concepts/outside-component-usage.html
  */
 export function useUserStoreHook() {
   return useUserStore(store);
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
new file mode 100644
index 00000000..869ea836
--- /dev/null
+++ b/src/utils/auth.ts
@@ -0,0 +1,86 @@
+import { Storage } from "./storage";
+import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY, REMEMBER_ME_KEY } from "@/constants/cache-keys";
+
+/**
+ * 身份验证工具类
+ * 集中管理所有与认证相关的功能，包括：
+ * - 登录状态判断
+ * - Token 的存取
+ * - 记住我功能的状态管理
+ */
+export class Auth {
+  /**
+   * 判断用户是否已登录
+   * @returns 是否已登录
+   */
+  static isLoggedIn(): boolean {
+    return !!Auth.getAccessToken();
+  }
+
+  /**
+   * 获取当前有效的访问令牌
+   * 会根据"记住我"状态从适当的存储位置获取
+   * @returns 当前有效的访问令牌
+   */
+  static getAccessToken(): string {
+    const isRememberMe = Storage.get<boolean>(REMEMBER_ME_KEY, false);
+    // 根据"记住我"状态决定从哪个存储位置获取token
+    return isRememberMe
+      ? Storage.get(ACCESS_TOKEN_KEY, "")
+      : Storage.sessionGet(ACCESS_TOKEN_KEY, "");
+  }
+
+  /**
+   * 获取刷新令牌
+   * @returns 当前有效的刷新令牌
+   */
+  static getRefreshToken(): string {
+    const isRememberMe = Storage.get<boolean>(REMEMBER_ME_KEY, false);
+    return isRememberMe
+      ? Storage.get(REFRESH_TOKEN_KEY, "")
+      : Storage.sessionGet(REFRESH_TOKEN_KEY, "");
+  }
+
+  /**
+   * 设置访问令牌和刷新令牌
+   * @param accessToken 访问令牌
+   * @param refreshToken 刷新令牌
+   * @param rememberMe 是否记住我
+   */
+  static setTokens(accessToken: string, refreshToken: string, rememberMe: boolean): void {
+    // 保存"记住我"状态
+    Storage.set(REMEMBER_ME_KEY, rememberMe);
+
+    if (rememberMe) {
+      // 使用localStorage长期保存
+      Storage.set(ACCESS_TOKEN_KEY, accessToken);
+      Storage.set(REFRESH_TOKEN_KEY, refreshToken);
+    } else {
+      // 使用sessionStorage临时保存
+      Storage.sessionSet(ACCESS_TOKEN_KEY, accessToken);
+      Storage.sessionSet(REFRESH_TOKEN_KEY, refreshToken);
+      // 清除localStorage中可能存在的token
+      Storage.remove(ACCESS_TOKEN_KEY);
+      Storage.remove(REFRESH_TOKEN_KEY);
+    }
+  }
+
+  /**
+   * 清除所有身份验证相关的数据
+   */
+  static clearAuth(): void {
+    Storage.remove(ACCESS_TOKEN_KEY);
+    Storage.remove(REFRESH_TOKEN_KEY);
+    Storage.sessionRemove(ACCESS_TOKEN_KEY);
+    Storage.sessionRemove(REFRESH_TOKEN_KEY);
+    // 不清除记住我设置，保留用户偏好
+  }
+
+  /**
+   * 获取"记住我"状态
+   * @returns 是否记住我
+   */
+  static getRememberMe(): boolean {
+    return Storage.get<boolean>(REMEMBER_ME_KEY, false);
+  }
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 7a67789b..15bf8860 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -2,8 +2,7 @@ import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axio
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user.store";
 import { ResultEnum } from "@/enums/api/result.enum";
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
+import { Auth } from "@/utils/auth";
 import router from "@/router";
 
 // 创建 axios 实例
@@ -13,10 +12,11 @@ const service = axios.create({
   headers: { "Content-Type": "application/json;charset=utf-8" },
   paramsSerializer: (params) => qs.stringify(params),
 });
+
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    const accessToken = Storage.get(ACCESS_TOKEN_KEY, "");
+    const accessToken = Auth.getAccessToken();
     // 如果 Authorization 设置为 no-auth，则不携带 Token
     if (config.headers.Authorization !== "no-auth" && accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
@@ -70,7 +70,7 @@ async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
   return new Promise((resolve) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      config.headers.Authorization = `Bearer ${Storage.get(ACCESS_TOKEN_KEY, "")}`;
+      config.headers.Authorization = `Bearer ${Auth.getAccessToken()}`;
       resolve(service(config));
     };
     waitingQueue.push(retryRequest);
@@ -101,6 +101,6 @@ async function handleSessionExpired() {
     message: "您的会话已过期，请重新登录",
     type: "info",
   });
-  await useUserStoreHook().clearSessionAndCache();
+  await useUserStoreHook().resetAllState();
   router.push("/login");
 }
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 4771f9c2..24283388 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -113,6 +113,7 @@ import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import router from "@/router";
 import { useUserStore } from "@/store";
 import CommonWrapper from "@/components/CommonWrapper/index.vue";
+import { Auth } from "@/utils/auth";
 
 const { t } = useI18n();
 const userStore = useUserStore();
@@ -124,13 +125,14 @@ const loginFormRef = ref<FormInstance>();
 const loading = ref(false); // 按钮 loading 状态
 const isCapsLock = ref(false); // 是否大写锁定
 const captchaBase64 = ref(); // 验证码图片Base64字符串
+const rememberMe = Auth.getRememberMe();
 
 const loginFormData = ref<LoginFormData>({
   username: "admin",
   password: "123456",
   captchaKey: "",
   captchaCode: "",
-  rememberMe: false,
+  rememberMe: rememberMe,
 });
 
 const loginRules = computed(() => {
@@ -195,9 +197,11 @@ async function handleLoginSubmit() {
     const redirect = resolveRedirectTarget(route.query);
     await router.push(redirect);
 
-    // TODO 5. 判断用户是否点击了记住我？采用明文保存或使用jsencrypt库？
+    // 5. 记住我功能已实现，根据用户选择决定token的存储方式:
+    // - 选中"记住我": token存储在localStorage中，浏览器关闭后仍然有效
+    // - 未选中"记住我": token存储在sessionStorage中，浏览器关闭后失效
   } catch (error) {
-    // 5. 统一错误处理
+    // 6. 统一错误处理
     getCaptcha(); // 刷新验证码
     console.error("登录失败:", error);
   } finally {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index a9a1c17e..40f01c19 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="wh-full flex-center flex-col login">
+  <div class="login-container">
     <!-- 右侧切换主题、语言按钮  -->
-    <div class="fixed flex-center gap-8px text-lg responsive-toggles">
+    <div class="action-bar">
       <el-tooltip :content="t('login.themeToggle')" placement="bottom">
         <CommonWrapper>
           <DarkModeSwitch />
@@ -63,13 +63,19 @@ const formComponents = {
 </script>
 
 <style lang="scss" scoped>
-.login {
+.login-container {
   position: relative;
   z-index: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 100%;
 }
 
 // 添加伪元素作为背景层
-.login::before {
+.login-container::before {
   position: fixed;
   top: 0;
   left: 0;
@@ -82,10 +88,16 @@ const formComponents = {
   background-size: cover;
 }
 
-.responsive-toggles {
+.action-bar {
+  position: fixed;
   top: 10px;
   right: 10px;
   z-index: 10;
+  display: flex;
+  gap: 8px;
+  align-items: center;
+  justify-content: center;
+  font-size: 1.125rem;
 
   @media (max-width: 480px) {
     top: 10px;

From a2f5db6af3f833379ea2fd433430524f7fe9e8ef Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 21 May 2025 18:16:33 +0800
Subject: [PATCH 381/497] =?UTF-8?q?fix:=20:bug:=20=E5=9C=A8=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8=E5=88=B7=E6=96=B0=E4=BB=A4=E7=89=8CAPI=E5=89=8D?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E4=BB=A4=E7=89=8C=E6=9C=89=E6=95=88=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.store.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 4d96ae49..4f0944ae 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -108,9 +108,12 @@ export const useUserStore = defineStore("user", () => {
    * 刷新 token
    */
   function refreshToken() {
-    // 获取刷新令牌
     const refreshToken = Auth.getRefreshToken();
 
+    if (!refreshToken) {
+      return Promise.reject(new Error("没有有效的刷新令牌"));
+    }
+
     return new Promise<void>((resolve, reject) => {
       AuthAPI.refreshToken(refreshToken)
         .then((data) => {

From 45533c6de268c09db92524c528f4907e6569490a Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 21 May 2025 18:25:53 +0800
Subject: [PATCH 382/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/login-bg.svg | 76 ++++++++++++----------------------
 1 file changed, 27 insertions(+), 49 deletions(-)

diff --git a/src/assets/images/login-bg.svg b/src/assets/images/login-bg.svg
index 1dc42f98..70f391f6 100644
--- a/src/assets/images/login-bg.svg
+++ b/src/assets/images/login-bg.svg
@@ -6,77 +6,55 @@
         #bg-rect { fill: #101a29; }
         #blueGlow-rect { fill: url(#blueGlowDark); }
         #blueGlow2-rect { fill: url(#blueGlow2Dark); }
-        #purpleGlow-rect { fill: url(#purpleGlowDark); }
-        #pinkGlow-rect { fill: url(#pinkGlowDark); }
         #pinkPurpleGlow-rect { fill: url(#pinkPurpleGlowDark); }
       }
     </style>
 
     <!-- 亮色主题渐变 -->
     <linearGradient id="bgGradient" x1="0%" y1="0%" x2="0%" y2="100%">
-      <stop offset="0%" stop-color="#f7fbfe" />
-      <stop offset="100%" stop-color="#f2f7fc" />
+      <stop offset="0%" stop-color="#f9fcff" />
+      <stop offset="100%" stop-color="#f5f9fd" />
     </linearGradient>
     
-    <!-- 主蓝白光晕 - 中间区域 -->
-    <radialGradient id="blueGlow" cx="50%" cy="40%" r="60%" fx="50%" fy="40%">
-      <stop offset="0%" stop-color="#eef7fd" stop-opacity="0.6" />
+    <!-- 中间区域淡蓝白光晕 -->
+    <radialGradient id="blueGlow" cx="50%" cy="50%" r="70%" fx="50%" fy="50%">
+      <stop offset="0%" stop-color="#ffffff" stop-opacity="0.9" />
+      <stop offset="50%" stop-color="#f0f8ff" stop-opacity="0.5" />
       <stop offset="100%" stop-color="#eef7fd" stop-opacity="0" />
     </radialGradient>
     
-    <!-- 左上角蓝白光晕 - 增强优雅感 -->
-    <radialGradient id="blueGlow2" cx="12%" cy="12%" r="45%" fx="12%" fy="12%">
-      <stop offset="0%" stop-color="#e0f2fe" stop-opacity="0.75" />
-      <stop offset="40%" stop-color="#e9f5fd" stop-opacity="0.5" />
+    <!-- 左上角蓝白光晕  -->
+    <radialGradient id="blueGlow2" cx="15%" cy="15%" r="40%" fx="15%" fy="15%">
+      <stop offset="0%" stop-color="#d9efff" stop-opacity="0.85" />
+      <stop offset="40%" stop-color="#e5f4fd" stop-opacity="0.6" />
       <stop offset="100%" stop-color="#e9f5fd" stop-opacity="0" />
     </radialGradient>
     
-    <!-- 右上角紫色光晕 - 保留但更淡 -->
-    <radialGradient id="purpleGlow" cx="85%" cy="20%" r="50%" fx="85%" fy="20%">
-      <stop offset="0%" stop-color="#f5f0fa" stop-opacity="0.6" />
-      <stop offset="100%" stop-color="#f5f0fa" stop-opacity="0" />
-    </radialGradient>
-    
-    <!-- 左下角粉色光晕 - 保留但更淡 -->
-    <radialGradient id="pinkGlow" cx="15%" cy="80%" r="45%" fx="15%" fy="80%">
-      <stop offset="0%" stop-color="#fdf1f5" stop-opacity="0.55" />
-      <stop offset="100%" stop-color="#fdf1f5" stop-opacity="0" />
-    </radialGradient>
-    
-    <!-- 右下角粉紫色光晕 - 增强效果 -->
-    <radialGradient id="pinkPurpleGlow" cx="88%" cy="78%" r="50%" fx="88%" fy="78%">
-      <stop offset="0%" stop-color="#f9eaf8" stop-opacity="0.7" />
-      <stop offset="35%" stop-color="#f8f0f8" stop-opacity="0.5" />
+    <!-- 右下角粉紫色光晕  -->
+    <radialGradient id="pinkPurpleGlow" cx="85%" cy="85%" r="40%" fx="85%" fy="85%">
+      <stop offset="0%" stop-color="#f7e6f9" stop-opacity="0.8" />
+      <stop offset="35%" stop-color="#f9edf8" stop-opacity="0.6" />
       <stop offset="100%" stop-color="#f8f2f8" stop-opacity="0" />
     </radialGradient>
 
     <!-- 暗色主题渐变 -->
-    <radialGradient id="blueGlowDark" cx="50%" cy="40%" r="60%" fx="50%" fy="40%">
-      <stop offset="0%" stop-color="#1c314e" stop-opacity="0.7" />
+    <radialGradient id="blueGlowDark" cx="50%" cy="50%" r="70%" fx="50%" fy="50%">
+      <stop offset="0%" stop-color="#1e3a5e" stop-opacity="0.6" />
+      <stop offset="50%" stop-color="#1c314e" stop-opacity="0.3" />
       <stop offset="100%" stop-color="#1a2d47" stop-opacity="0" />
     </radialGradient>
     
     <!-- 左上角蓝白光晕 - 暗色模式 -->
-    <radialGradient id="blueGlow2Dark" cx="12%" cy="12%" r="45%" fx="12%" fy="12%">
-      <stop offset="0%" stop-color="#1e3554" stop-opacity="0.8" />
-      <stop offset="40%" stop-color="#172b45" stop-opacity="0.5" />
+    <radialGradient id="blueGlow2Dark" cx="15%" cy="15%" r="40%" fx="15%" fy="15%">
+      <stop offset="0%" stop-color="#1e3858" stop-opacity="0.85" />
+      <stop offset="40%" stop-color="#1a304f" stop-opacity="0.6" />
       <stop offset="100%" stop-color="#172b45" stop-opacity="0" />
     </radialGradient>
     
-    <radialGradient id="purpleGlowDark" cx="85%" cy="20%" r="50%" fx="85%" fy="20%">
-      <stop offset="0%" stop-color="#2a243a" stop-opacity="0.65" />
-      <stop offset="100%" stop-color="#292236" stop-opacity="0" />
-    </radialGradient>
-    
-    <radialGradient id="pinkGlowDark" cx="15%" cy="80%" r="45%" fx="15%" fy="80%">
-      <stop offset="0%" stop-color="#2f1c27" stop-opacity="0.55" />
-      <stop offset="100%" stop-color="#2d1a24" stop-opacity="0" />
-    </radialGradient>
-    
     <!-- 右下角粉紫色光晕 - 暗色模式 -->
-    <radialGradient id="pinkPurpleGlowDark" cx="88%" cy="78%" r="50%" fx="88%" fy="78%">
-      <stop offset="0%" stop-color="#2e2335" stop-opacity="0.8" />
-      <stop offset="35%" stop-color="#2a202d" stop-opacity="0.5" />
+    <radialGradient id="pinkPurpleGlowDark" cx="85%" cy="85%" r="40%" fx="85%" fy="85%">
+      <stop offset="0%" stop-color="#2e2335" stop-opacity="0.85" />
+      <stop offset="35%" stop-color="#2a2035" stop-opacity="0.6" />
       <stop offset="100%" stop-color="#2a202d" stop-opacity="0" />
     </radialGradient>
   </defs>
@@ -84,12 +62,12 @@
   <!-- 背景层 -->
   <rect id="bg-rect" width="100%" height="100%" fill="url(#bgGradient)" />
   
-  <!-- 渐变光晕层 - 中间主要是蓝白色系 -->
+  <!-- 中间淡蓝白光晕 -->
   <rect id="blueGlow-rect" width="100%" height="100%" fill="url(#blueGlow)" />
+  
+  <!-- 左上蓝白光晕 -->
   <rect id="blueGlow2-rect" width="100%" height="100%" fill="url(#blueGlow2)" />
   
-  <!-- 边缘保留淡粉紫色 -->
-  <rect id="purpleGlow-rect" width="100%" height="100%" fill="url(#purpleGlow)" />
-  <rect id="pinkGlow-rect" width="100%" height="100%" fill="url(#pinkGlow)" />
+  <!-- 右下粉紫光晕 -->
   <rect id="pinkPurpleGlow-rect" width="100%" height="100%" fill="url(#pinkPurpleGlow)" />
 </svg>

From a9a18ee28744fb606b4af5e3677acb985c3e7d40 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 21 May 2025 22:51:40 +0800
Subject: [PATCH 383/497] chore: :hammer: bump version to 2.29.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4925a998..c32273ca 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.29.0",
+  "version": "2.29.1",
   "private": true,
   "type": "module",
   "scripts": {

From e90775fae95f880a425f4bcaa89b8f96506253cf Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 22 May 2025 14:29:45 +0800
Subject: [PATCH 384/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=20console.log=20=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/permission.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index dbce0a03..162c49f2 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -14,16 +14,13 @@ export function setupPermission() {
     console.log("to.path", to.path);
 
     const isLogin = Auth.isLoggedIn();
-    console.log("isLogin", isLogin);
     if (isLogin) {
-      console.log("to.path", to.path);
       if (to.path === "/login") {
         // 如果已登录，跳转到首页
         next({ path: "/" });
       } else {
         // 未登录
         const permissionStore = usePermissionStore();
-        console.log("permissionStore.routesLoaded", permissionStore.routesLoaded);
         // 判断路由是否加载完成
         if (permissionStore.routesLoaded) {
           if (to.matched.length === 0) {
@@ -39,7 +36,7 @@ export function setupPermission() {
           }
         } else {
           try {
-            // 生成动态路由
+            // 生成路由
             const dynamicRoutes = await permissionStore.generateRoutes();
             dynamicRoutes.forEach((route: RouteRecordRaw) => router.addRoute(route));
             next({ ...to, replace: true });

From 54b2164d251db75cbabebb5423e878c5c610b307 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 22 May 2025 14:33:28 +0800
Subject: [PATCH 385/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BC=98=E5=8C=96=E5=AF=BC=E8=88=AA=E6=A0=8F=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Notification/index.vue         | 162 ++++++++--------
 src/components/SizeSelect/index.vue           |   4 +-
 .../NavBar/components/NavbarActions.vue       | 178 ++++++++++++++++++
 .../NavBar/components/NavbarRight.vue         | 150 ---------------
 src/layout/components/NavBar/index.vue        |  21 ++-
 src/layout/components/Sidebar/index.vue       |   8 +-
 src/types/components.d.ts                     |   3 +-
 src/views/login/components/Login.vue          |  16 +-
 8 files changed, 284 insertions(+), 258 deletions(-)
 create mode 100644 src/layout/components/NavBar/components/NavbarActions.vue
 delete mode 100644 src/layout/components/NavBar/components/NavbarRight.vue

diff --git a/src/components/Notification/index.vue b/src/components/Notification/index.vue
index 39af1cff..49f636cd 100644
--- a/src/components/Notification/index.vue
+++ b/src/components/Notification/index.vue
@@ -1,83 +1,81 @@
 <template>
-  <div class="notification">
-    <el-dropdown class="h-full flex-center" trigger="click">
-      <el-badge v-if="noticeList.length > 0" :offset="[0, 15]" :value="noticeList.length" :max="99">
-        <div class="i-svg:bell" />
-      </el-badge>
-
-      <div v-else class="i-svg:bell" />
-
-      <template #dropdown>
-        <div class="p-5">
-          <template v-if="noticeList.length > 0">
-            <div v-for="(item, index) in noticeList" :key="index" class="w-500px py-3">
-              <div class="flex-y-center">
-                <DictLabel v-model="item.type" code="notice_type" size="small" />
-                <el-text
-                  size="small"
-                  class="w-200px cursor-pointer !ml-2 !flex-1"
-                  truncated
-                  @click="handleReadNotice(item.id)"
-                >
-                  {{ item.title }}
-                </el-text>
-
-                <div class="text-xs text-gray">
-                  {{ item.publishTime }}
-                </div>
-              </div>
-            </div>
-            <el-divider />
-            <div class="flex-x-between">
-              <el-link type="primary" underline="never" @click="handleViewMoreNotice">
-                <span class="text-xs">查看更多</span>
-                <el-icon class="text-xs">
-                  <ArrowRight />
-                </el-icon>
-              </el-link>
-              <el-link
-                v-if="noticeList.length > 0"
-                type="primary"
-                underline="never"
-                @click="handleMarkAllAsRead"
+  <el-dropdown trigger="click">
+    <el-badge v-if="noticeList.length > 0" :value="noticeList.length" :max="99">
+      <div class="i-svg:bell" />
+    </el-badge>
+
+    <div v-else class="i-svg:bell" />
+
+    <template #dropdown>
+      <div class="p-5">
+        <template v-if="noticeList.length > 0">
+          <div v-for="(item, index) in noticeList" :key="index" class="w-500px py-3">
+            <div class="flex-y-center">
+              <DictLabel v-model="item.type" code="notice_type" size="small" />
+              <el-text
+                size="small"
+                class="w-200px cursor-pointer !ml-2 !flex-1"
+                truncated
+                @click="handleReadNotice(item.id)"
               >
-                <span class="text-xs">全部已读</span>
-              </el-link>
-            </div>
-          </template>
-          <template v-else>
-            <div class="flex-center h-150px w-350px">
-              <el-empty :image-size="50" description="暂无消息" />
+                {{ item.title }}
+              </el-text>
+
+              <div class="text-xs text-gray">
+                {{ item.publishTime }}
+              </div>
             </div>
-          </template>
-        </div>
-      </template>
-    </el-dropdown>
-
-    <el-dialog
-      v-model="noticeDialogVisible"
-      :title="noticeDetail?.title ?? '通知详情'"
-      width="800px"
-      custom-class="notification-detail"
-    >
-      <div v-if="noticeDetail" class="p-x-20px">
-        <div class="flex-y-center mb-16px text-13px text-color-secondary">
-          <span class="flex-y-center">
-            <el-icon><User /></el-icon>
-            {{ noticeDetail.publisherName }}
-          </span>
-          <span class="ml-2 flex-y-center">
-            <el-icon><Timer /></el-icon>
-            {{ noticeDetail.publishTime }}
-          </span>
-        </div>
-
-        <div class="max-h-60vh pt-16px mb-24px overflow-y-auto border-t border-solid border-color">
-          <div v-html="noticeDetail.content"></div>
-        </div>
+          </div>
+          <el-divider />
+          <div class="flex-x-between">
+            <el-link type="primary" underline="never" @click="handleViewMoreNotice">
+              <span class="text-xs">查看更多</span>
+              <el-icon class="text-xs">
+                <ArrowRight />
+              </el-icon>
+            </el-link>
+            <el-link
+              v-if="noticeList.length > 0"
+              type="primary"
+              underline="never"
+              @click="handleMarkAllAsRead"
+            >
+              <span class="text-xs">全部已读</span>
+            </el-link>
+          </div>
+        </template>
+        <template v-else>
+          <div class="flex-center h-150px w-350px">
+            <el-empty :image-size="50" description="暂无消息" />
+          </div>
+        </template>
       </div>
-    </el-dialog>
-  </div>
+    </template>
+  </el-dropdown>
+
+  <el-dialog
+    v-model="noticeDialogVisible"
+    :title="noticeDetail?.title ?? '通知详情'"
+    width="800px"
+    custom-class="notification-detail"
+  >
+    <div v-if="noticeDetail" class="p-x-20px">
+      <div class="flex-y-center mb-16px text-13px text-color-secondary">
+        <span class="flex-y-center">
+          <el-icon><User /></el-icon>
+          {{ noticeDetail.publisherName }}
+        </span>
+        <span class="ml-2 flex-y-center">
+          <el-icon><Timer /></el-icon>
+          {{ noticeDetail.publishTime }}
+        </span>
+      </div>
+
+      <div class="max-h-60vh pt-16px mb-24px overflow-y-auto border-t border-solid border-color">
+        <div v-html="noticeDetail.content"></div>
+      </div>
+    </div>
+  </el-dialog>
 </template>
 
 <script setup lang="ts">
@@ -162,14 +160,4 @@ onBeforeUnmount(() => {
 });
 </script>
 
-<style lang="scss" scoped>
-.notification {
-  :deep(.el-badge) {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    width: 100%;
-    height: 100%;
-  }
-}
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index 7d49bc5b..de58d3cf 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -2,9 +2,7 @@
   <!-- 布局大小 -->
   <el-tooltip :content="t('sizeSelect.tooltip')" effect="dark" placement="bottom">
     <el-dropdown trigger="click" @command="handleSizeChange">
-      <div>
-        <div class="i-svg:size" />
-      </div>
+      <div class="i-svg:size" />
       <template #dropdown>
         <el-dropdown-menu>
           <el-dropdown-item
diff --git a/src/layout/components/NavBar/components/NavbarActions.vue b/src/layout/components/NavBar/components/NavbarActions.vue
new file mode 100644
index 00000000..aa06f578
--- /dev/null
+++ b/src/layout/components/NavBar/components/NavbarActions.vue
@@ -0,0 +1,178 @@
+<template>
+  <div :class="['navbar-actions', navbarActionsClass]">
+    <!-- 桌面端工具项 -->
+    <template v-if="isDesktop">
+      <!-- 搜索 -->
+      <div class="navbar-actions__item">
+        <MenuSearch />
+      </div>
+
+      <!-- 全屏 -->
+      <div class="navbar-actions__item">
+        <Fullscreen />
+      </div>
+
+      <!-- 布局大小 -->
+      <div class="navbar-actions__item">
+        <SizeSelect />
+      </div>
+
+      <!-- 语言选择 -->
+      <div class="navbar-actions__item">
+        <LangSelect />
+      </div>
+
+      <!-- 通知 -->
+      <div class="navbar-actions__item">
+        <Notification />
+      </div>
+    </template>
+
+    <!-- 用户菜单 -->
+    <div class="navbar-actions__item">
+      <el-dropdown trigger="click">
+        <div class="user-profile">
+          <img class="user-profile__avatar" :src="http://github.com/userStore.userInfo.avatar" />
+          <span class="user-profile__name">{{ userStore.userInfo.username }}</span>
+        </div>
+        <template #dropdown>
+          <el-dropdown-menu>
+            <el-dropdown-item @click="handleProfileClick">
+              {{ t("navbar.profile") }}
+            </el-dropdown-item>
+            <el-dropdown-item divided @click="logout">
+              {{ t("navbar.logout") }}
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </template>
+      </el-dropdown>
+    </div>
+
+    <!-- 系统设置 -->
+    <div
+      v-if="defaultSettings.showSettings"
+      class="navbar-actions__item"
+      @click="settingStore.settingsVisible = true"
+    >
+      <div class="i-svg:setting" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useI18n } from "vue-i18n";
+import { useRoute, useRouter } from "vue-router";
+import { ElMessageBox } from "element-plus";
+import defaultSettings from "@/settings";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+import { useAppStore, useSettingsStore, useUserStore } from "@/store";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
+
+const { t } = useI18n();
+const appStore = useAppStore();
+const settingStore = useSettingsStore();
+const userStore = useUserStore();
+
+const route = useRoute();
+const router = useRouter();
+
+// 是否为桌面设备
+const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);
+
+/**
+ * 打开个人中心页面
+ */
+function handleProfileClick() {
+  router.push({ name: "Profile" });
+}
+
+// 根据主题和侧边栏配色方案选择样式类
+const navbarActionsClass = computed(() => {
+  // 暗黑主题
+  if (settingStore.theme === ThemeMode.DARK) {
+    return "navbar-actions--white-text";
+  }
+
+  // 经典蓝侧边栏
+  if (settingStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
+    return "navbar-actions--white-text";
+  }
+});
+
+/**
+ * 退出登录
+ */
+function logout() {
+  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
+    lockScroll: false,
+  }).then(() => {
+    userStore.logout().then(() => {
+      router.push(`/login?redirect=${route.fullPath}`);
+    });
+  });
+}
+</script>
+
+<style lang="scss" scoped>
+.navbar-actions {
+  display: flex;
+  align-items: center;
+  height: 100%;
+
+  &__item {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 40px;
+    height: $navbar-height;
+    text-align: center;
+    cursor: pointer;
+
+    :deep([class^="i-svg:"]) {
+      color: var(--el-text-color);
+
+      &:hover {
+        color: var(--el-text-color-primary);
+      }
+    }
+
+    &:hover {
+      color: var(--el-text-color-primary);
+      background: rgb(0 0 0 / 10%);
+    }
+  }
+
+  .user-profile {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    padding: 0 13px;
+
+    &__avatar {
+      width: 32px;
+      height: 32px;
+      border-radius: 50%;
+    }
+
+    &__name {
+      margin-left: 10px;
+    }
+  }
+}
+
+.layout-top,
+.layout-mix {
+  .user-profile__name {
+    color: #fff !important;
+  }
+}
+
+.layout-top .navbar-actions--white-text :deep([class^="i-svg:"]),
+.layout-mix .navbar-actions--white-text :deep([class^="i-svg:"]) {
+  color: #fff !important;
+}
+</style>
diff --git a/src/layout/components/NavBar/components/NavbarRight.vue b/src/layout/components/NavBar/components/NavbarRight.vue
deleted file mode 100644
index 596277c9..00000000
--- a/src/layout/components/NavBar/components/NavbarRight.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-<template>
-  <div :class="['navbar__right', navbarRightClass]">
-    <!-- 桌面端显示 -->
-    <template v-if="isDesktop">
-      <!-- 搜索 -->
-      <MenuSearch />
-
-      <!-- 全屏 -->
-      <Fullscreen />
-
-      <!-- 布局大小 -->
-      <SizeSelect />
-
-      <!-- 语言选择 -->
-      <LangSelect />
-
-      <!-- 通知下拉 -->
-      <Notification />
-    </template>
-
-    <!-- 用户头像（个人中心、退出登录等） -->
-    <el-dropdown trigger="click">
-      <div class="user-profile">
-        <img class="user-profile__avatar" :src="http://github.com/userStore.userInfo.avatar" />
-        <span class="user-profile__name">{{ userStore.userInfo.username }}</span>
-      </div>
-      <template #dropdown>
-        <el-dropdown-menu>
-          <el-dropdown-item @click="handleProfileClick">
-            {{ t("navbar.profile") }}
-          </el-dropdown-item>
-          <el-dropdown-item divided @click="logout">
-            {{ t("navbar.logout") }}
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </template>
-    </el-dropdown>
-
-    <!-- 设置面板 -->
-    <div v-if="defaultSettings.showSettings" @click="settingStore.settingsVisible = true">
-      <div class="i-svg:setting" />
-    </div>
-  </div>
-</template>
-<script setup lang="ts">
-const { t } = useI18n();
-import defaultSettings from "@/settings";
-import { DeviceEnum } from "@/enums/settings/device.enum";
-import { useAppStore, useSettingsStore, useUserStore } from "@/store";
-
-import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
-
-const appStore = useAppStore();
-const settingStore = useSettingsStore();
-const userStore = useUserStore();
-
-const route = useRoute();
-const router = useRouter();
-const isDesktop = computed(() => appStore.device === DeviceEnum.DESKTOP);
-
-/**
- * 打开个人中心页面
- */
-function handleProfileClick() {
-  router.push({ name: "Profile" });
-}
-
-// 根据主题和侧边栏配色方案选择 navbar 右侧的样式类
-const navbarRightClass = computed(() => {
-  // 如果暗黑主题
-  if (settingStore.theme === ThemeMode.DARK) {
-    return "navbar__right--white";
-  }
-
-  // 如果侧边栏是经典蓝
-  if (settingStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
-    return "navbar__right--white";
-  }
-});
-
-/**
- * 退出登录
- */
-function logout() {
-  ElMessageBox.confirm("确定注销并退出系统吗？", "提示", {
-    confirmButtonText: "确定",
-    cancelButtonText: "取消",
-    type: "warning",
-    lockScroll: false,
-  }).then(() => {
-    userStore.logout().then(() => {
-      router.push(`/login?redirect=${route.fullPath}`);
-    });
-  });
-}
-</script>
-
-<style lang="scss" scoped>
-.navbar__right {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  & > * {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    min-width: 40px;
-    height: $navbar-height;
-    color: var(--el-text-color);
-    text-align: center;
-    cursor: pointer;
-
-    &:hover {
-      background: rgb(0 0 0 / 10%);
-    }
-  }
-  .user-profile {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    height: 100%;
-    padding: 0 13px;
-
-    &__avatar {
-      width: 32px;
-      height: 32px;
-      border-radius: 50%;
-    }
-
-    &__name {
-      margin-left: 10px;
-    }
-  }
-}
-
-.layout-top .navbar__right--white > *,
-.layout-mix .navbar__right--white > * {
-  color: #fff;
-}
-
-.layout-top .navbar__right--white :deep([class^="i-svg:"]),
-.layout-mix .navbar__right--white :deep([class^="i-svg:"]) {
-  color: #fff !important;
-}
-
-.dark .navbar__right > *:hover {
-  color: #ccc;
-}
-</style>
diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index 5a4a73e1..d4d32c5b 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -1,25 +1,30 @@
 <template>
   <div class="navbar">
-    <div class="navbar__left">
-      <!-- 展开/收缩菜单  -->
+    <div class="flex-y-center">
+      <!-- 菜单折叠按钮 -->
       <Hamburger :is-active="isSidebarOpened" @toggle-click="toggleSideBar" />
-      <!-- 面包屑 -->
+      <!-- 面包屑导航 -->
       <Breadcrumb />
     </div>
-    <!-- 导航栏右侧 -->
-    <NavbarRight />
+    <!-- 导航栏操作区域 -->
+    <div class="navbar__actions">
+      <NavbarActions />
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import { useAppStore } from "@/store";
+import Hamburger from "@/components/Hamburger/index.vue";
+import Breadcrumb from "@/components/Breadcrumb/index.vue";
+import NavbarActions from "./components/NavbarActions.vue";
 
 const appStore = useAppStore();
 
-// 侧边栏是否打开
+// 侧边栏展开状态
 const isSidebarOpened = computed(() => appStore.sidebar.opened);
 
-// 展开/收缩菜单
+// 切换侧边栏展开/折叠状态
 function toggleSideBar() {
   appStore.toggleSidebar();
 }
@@ -32,7 +37,7 @@ function toggleSideBar() {
   height: $navbar-height;
   background: var(--el-bg-color);
 
-  &__left {
+  &__actions {
     display: flex;
     align-items: center;
   }
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 606a7b74..67acf469 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -4,7 +4,7 @@
     <div v-if="layout == LayoutMode.MIX" class="flex w-full">
       <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
       <SidebarMixTopMenu class="flex-1" />
-      <NavbarRight />
+      <NavbarActions />
     </div>
 
     <!-- 顶部布局 || 左侧布局 -->
@@ -15,16 +15,16 @@
       </el-scrollbar>
 
       <!-- 顶部导航 -->
-      <NavbarRight v-if="layout == LayoutMode.TOP" />
+      <NavbarActions v-if="layout == LayoutMode.TOP" />
     </template>
   </div>
 </template>
 
 <script setup lang="ts">
+import { computed } from "vue";
 import { LayoutMode } from "@/enums/settings/layout.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
-
-import NavbarRight from "../NavBar/components/NavbarRight.vue";
+import NavbarActions from "../NavBar/components/NavbarActions.vue";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 22494383..6a1374ef 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -71,10 +71,11 @@ declare module "vue" {
     Hamburger: (typeof import("./../components/Hamburger/index.vue"))["default"];
     IconSelect: (typeof import("./../components/IconSelect/index.vue"))["default"];
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
+    LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
     MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
+    NavbarActions: (typeof import("./../layout/components/NavBar/components/NavbarActions.vue"))["default"];
     Notification: (typeof import("./../components/Notification/index.vue"))["default"];
-    LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];
     PageSearch: (typeof import("./../components/CURD/PageSearch.vue"))["default"];
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 24283388..b7edfd27 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -122,9 +122,12 @@ const route = useRoute();
 onMounted(() => getCaptcha());
 
 const loginFormRef = ref<FormInstance>();
-const loading = ref(false); // 按钮 loading 状态
-const isCapsLock = ref(false); // 是否大写锁定
-const captchaBase64 = ref(); // 验证码图片Base64字符串
+const loading = ref(false);
+// 是否大写锁定
+const isCapsLock = ref(false);
+// 验证码图片Base64字符串
+const captchaBase64 = ref();
+// 记住我
 const rememberMe = Auth.getRememberMe();
 
 const loginFormData = ref<LoginFormData>({
@@ -178,7 +181,9 @@ function getCaptcha() {
     .finally(() => (codeLoading.value = false));
 }
 
-// 登录提交处理
+/**
+ * 登录提交
+ */
 async function handleLoginSubmit() {
   try {
     // 1. 表单验证
@@ -211,8 +216,9 @@ async function handleLoginSubmit() {
 
 /**
  * 解析重定向目标
+ *
  * @param query 路由查询参数
- * @returns 标准化后的路由地址对象
+ * @returns 标准化后的路由地址
  */
 function resolveRedirectTarget(query: LocationQuery): RouteLocationRaw {
   // 默认跳转路径

From af30411317dc5e771bd3d05c8198de203ab7c136 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 23 May 2025 09:51:13 +0800
Subject: [PATCH 386/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/index.vue                          | 306 ------------------
 src/layouts/README.md                         |  59 ++++
 src/layouts/components/LayoutBase.vue         |  46 +++
 src/layouts/components/LayoutMenu.vue         | 130 ++++++++
 .../components/LeftSideLayout/index.vue       | 110 +++++++
 .../components/MixMenuLayout/index.vue        | 143 ++++++++
 .../components/TopMenuLayout/index.vue        |  86 +++++
 .../components/common/LayoutSidebar.vue       |  46 +++
 src/layouts/composables/useLayout.ts          |  66 ++++
 src/layouts/composables/useLayoutMenu.ts      |  58 ++++
 .../composables/useLayoutResponsive.ts        |  36 +++
 src/layouts/index.vue                         |  27 ++
 src/router/index.ts                           |   2 +-
 src/store/modules/permission.store.ts         |   2 +-
 14 files changed, 809 insertions(+), 308 deletions(-)
 delete mode 100644 src/layout/index.vue
 create mode 100644 src/layouts/README.md
 create mode 100644 src/layouts/components/LayoutBase.vue
 create mode 100644 src/layouts/components/LayoutMenu.vue
 create mode 100644 src/layouts/components/LeftSideLayout/index.vue
 create mode 100644 src/layouts/components/MixMenuLayout/index.vue
 create mode 100644 src/layouts/components/TopMenuLayout/index.vue
 create mode 100644 src/layouts/components/common/LayoutSidebar.vue
 create mode 100644 src/layouts/composables/useLayout.ts
 create mode 100644 src/layouts/composables/useLayoutMenu.ts
 create mode 100644 src/layouts/composables/useLayoutResponsive.ts
 create mode 100644 src/layouts/index.vue

diff --git a/src/layout/index.vue b/src/layout/index.vue
deleted file mode 100644
index 9227afc8..00000000
--- a/src/layout/index.vue
+++ /dev/null
@@ -1,306 +0,0 @@
-<template>
-  <div class="layout" :class="layoutClass">
-    <!-- 移动端遮罩层 -->
-    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="handleCloseSidebar" />
-
-    <!-- 侧边栏 -->
-    <Sidebar class="layout__sidebar" />
-
-    <!-- 混合布局 -->
-    <div v-if="layout === LayoutMode.MIX" class="layout__container">
-      <!-- 左侧菜单栏 -->
-      <div class="layout__sidebar--left">
-        <el-scrollbar>
-          <SidebarMenu :data="sideMenuRoutes" :base-path="activeTopMenuPath" />
-        </el-scrollbar>
-        <!-- 侧边栏切换按钮 -->
-        <div class="layout__sidebar-toggle">
-          <Hamburger :is-active="appStore.sidebar.opened" @toggle-click="handleToggleSidebar" />
-        </div>
-      </div>
-      <!-- 主内容区域 -->
-      <div :class="{ hasTagsView: isShowTagsView }" class="layout__main">
-        <TagsView v-if="isShowTagsView" />
-        <AppMain />
-        <Settings v-if="defaultSettings.showSettings" />
-        <!-- 返回顶部按钮 -->
-        <el-backtop target=".app-main">
-          <div class="i-svg:backtop w-6 h-6" />
-        </el-backtop>
-      </div>
-    </div>
-
-    <!-- 左侧或顶部布局的主内容区 -->
-    <div v-else :class="{ hasTagsView: isShowTagsView }" class="layout__main">
-      <NavBar v-if="layout === LayoutMode.LEFT" />
-      <TagsView v-if="isShowTagsView" />
-      <AppMain />
-      <Settings v-if="defaultSettings.showSettings" />
-      <!-- 返回顶部按钮 -->
-      <el-backtop target=".app-main">
-        <div class="i-svg:backtop w-6 h-6" />
-      </el-backtop>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-// 状态管理
-import { useAppStore, useSettingsStore, usePermissionStore } from "@/store";
-
-// 配置
-import defaultSettings from "@/settings";
-
-// 枚举
-import { DeviceEnum } from "@/enums/settings/device.enum";
-import { LayoutMode } from "@/enums/settings/layout.enum";
-
-// 组件
-import NavBar from "./components/NavBar/index.vue";
-
-const appStore = useAppStore();
-const settingsStore = useSettingsStore();
-const permissionStore = usePermissionStore();
-const width = useWindowSize().width;
-
-// 常量
-const WIDTH_DESKTOP = 992; // 响应式布局容器固定宽度（大屏 >=1200px，中屏 >=992px，小屏 >=768px）
-
-// 计算属性
-const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE); // 是否为移动设备
-const isSidebarOpen = computed(() => appStore.sidebar.opened); // 侧边栏是否展开
-const isShowTagsView = computed(() => settingsStore.tagsView); // 是否显示标签视图
-const layout = computed(() => settingsStore.layout); // 当前布局模式（left、top、mix）
-const activeTopMenuPath = computed(() => appStore.activeTopMenuPath); // 顶部菜单激活路径
-const sideMenuRoutes = computed(() => permissionStore.sideMenuRoutes); // 混合布局左侧菜单路由
-
-// 监听顶部菜单激活路径变化，更新混合布局左侧菜单路由
-watch(
-  () => activeTopMenuPath.value,
-  (newVal: string) => {
-    permissionStore.updateSideMenu(newVal);
-  },
-  { deep: true, immediate: true }
-);
-
-// 监听窗口宽度变化，调整设备类型和侧边栏状态
-watchEffect(() => {
-  const isDesktop = width.value >= WIDTH_DESKTOP;
-  appStore.toggleDevice(isDesktop ? DeviceEnum.DESKTOP : DeviceEnum.MOBILE);
-  if (isDesktop) {
-    appStore.openSideBar();
-  } else {
-    appStore.closeSideBar();
-  }
-});
-
-// 监听路由变化，如果是移动设备且侧边栏展开，则关闭侧边栏
-const route = useRoute();
-watch(route, () => {
-  if (isMobile.value && isSidebarOpen.value) {
-    appStore.closeSideBar();
-  }
-});
-
-// 计算属性：布局样式
-const layoutClass = computed(() => ({
-  hideSidebar: !appStore.sidebar.opened,
-  openSidebar: appStore.sidebar.opened,
-  mobile: appStore.device === DeviceEnum.MOBILE,
-  [`layout-${settingsStore.layout}`]: true,
-}));
-
-/**
- * 处理遮罩层点击事件，关闭侧边栏
- */
-function handleCloseSidebar() {
-  appStore.closeSideBar();
-}
-
-/**
- * 处理切换侧边栏的展开/收起状态
- */
-function handleToggleSidebar() {
-  appStore.toggleSidebar();
-}
-</script>
-<style lang="scss" scoped>
-.layout {
-  width: 100%;
-  height: 100%;
-
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
-
-  &__sidebar {
-    position: fixed;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    z-index: 999;
-    width: $sidebar-width;
-    background-color: $menu-background;
-    transition: width 0.28s;
-
-    :deep(.el-menu) {
-      border: none;
-    }
-  }
-
-  &__main {
-    position: relative;
-    height: 100%;
-    margin-left: $sidebar-width;
-    overflow-y: auto;
-    transition: margin-left 0.28s;
-
-    .fixed-header {
-      position: sticky;
-      top: 0;
-      z-index: 9;
-      transition: width 0.28s;
-    }
-  }
-}
-
-// 占位符选择器
-%layout__sidebar--horizontal {
-  width: 100% !important;
-  height: $navbar-height;
-
-  :deep(.el-scrollbar) {
-    flex: 1;
-    height: $navbar-height;
-  }
-
-  :deep(.el-menu-item),
-  :deep(.el-sub-menu__title),
-  :deep(.el-menu--horizontal) {
-    height: $navbar-height;
-    line-height: $navbar-height;
-  }
-}
-
-.layout-top {
-  .layout__sidebar {
-    position: sticky;
-    display: flex;
-    @extend %layout__sidebar--horizontal;
-  }
-
-  .layout__main {
-    height: calc(100vh - $navbar-height);
-    margin-left: 0;
-  }
-}
-
-.layout-mix {
-  .layout__sidebar {
-    @extend %layout__sidebar--horizontal;
-  }
-
-  .layout__container {
-    display: flex;
-    height: 100%;
-    padding-top: $navbar-height;
-
-    .layout__sidebar--left {
-      position: relative;
-      width: $sidebar-width;
-      height: 100%;
-      background-color: var(--menu-background);
-
-      :deep(.el-scrollbar) {
-        height: calc(100vh - $navbar-height - 50px);
-      }
-
-      :deep(.el-menu) {
-        height: 100%;
-        border: none;
-      }
-
-      .layout__sidebar-toggle {
-        position: absolute;
-        bottom: 0;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        width: 100%;
-        height: 50px;
-        line-height: 50px;
-        box-shadow: 0 0 6px -2px var(--el-color-primary);
-      }
-    }
-
-    .layout__main {
-      flex: 1;
-      min-width: 0;
-      margin-left: 0;
-    }
-  }
-}
-
-.hideSidebar {
-  &.layout-left {
-    .layout__main {
-      margin-left: $sidebar-width-collapsed;
-    }
-  }
-
-  &.layout-top {
-    .layout__main {
-      margin-left: 0;
-    }
-  }
-
-  &.layout-mix {
-    .layout__sidebar {
-      width: 100%;
-    }
-
-    .layout__container {
-      .layout__sidebar--left {
-        width: $sidebar-width-collapsed;
-      }
-    }
-  }
-}
-
-.layout-left {
-  &.hideSidebar {
-    .layout__sidebar {
-      width: $sidebar-width-collapsed;
-    }
-
-    .layout__main {
-      margin-left: $sidebar-width-collapsed;
-    }
-
-    &.mobile {
-      .layout__sidebar {
-        pointer-events: none;
-        transform: translate3d(-$sidebar-width, 0, 0);
-        transition-duration: 0.3s;
-      }
-
-      .layout__main {
-        margin-left: 0;
-      }
-    }
-  }
-  &.openSidebar {
-    &.mobile {
-      .layout__main {
-        margin-left: 0;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/layouts/README.md b/src/layouts/README.md
new file mode 100644
index 00000000..f31eb7b5
--- /dev/null
+++ b/src/layouts/README.md
@@ -0,0 +1,59 @@
+# 布局系统
+
+本项目的布局系统采用模块化、可组合式API的架构，支持三种不同的布局模式:
+
+1. **左侧菜单布局 (LeftSideLayout)**: 传统的管理系统布局，左侧为菜单栏，顶部为导航栏
+2. **顶部菜单布局 (TopMenuLayout)**: 顶部为主菜单栏，适合菜单项较少的应用
+3. **混合菜单布局 (MixMenuLayout)**: 顶部为一级菜单，左侧为对应的子菜单，适合菜单层级较多的复杂应用
+
+## 目录结构
+
+```
+layouts/
+├── README.md                    # 文档说明
+├── index.vue                    # 布局入口，根据设置选择对应的布局组件
+├── composables/                 # 可组合式API
+│   ├── useLayout.ts             # 布局通用逻辑
+│   ├── useLayoutResponsive.ts   # 响应式布局逻辑
+│   └── useLayoutMenu.ts         # 菜单处理逻辑
+└── components/                  # 布局组件
+    ├── LayoutBase.vue           # 基础布局组件
+    ├── SidebarMenu.vue          # 菜单组件
+    ├── common/                  # 公共组件
+    │   └── LayoutSidebar.vue    # 侧边栏公共组件
+    ├── LeftSideLayout/          # 左侧菜单布局
+    │   └── index.vue
+    ├── TopMenuLayout/           # 顶部菜单布局
+    │   └── index.vue
+    └── MixMenuLayout/           # 混合菜单布局
+        └── index.vue
+```
+
+## 主要功能
+
+1. **响应式适配**: 自动适配桌面端和移动端，移动端下自动收起侧边栏
+2. **多种布局模式**: 支持左侧菜单、顶部菜单、混合菜单三种模式
+3. **主题切换**: 支持明亮/暗黑主题
+4. **标签页**: 支持多标签页功能，可通过设置开启/关闭
+
+## 可组合式API
+
+### useLayout
+
+提供布局相关的基础功能:
+- 侧边栏展开/收起控制
+- 布局模式获取
+- 布局样式类计算
+
+### useLayoutResponsive
+
+提供响应式布局功能:
+- 根据屏幕尺寸自动调整设备类型
+- 根据设备类型自动调整侧边栏状态
+
+### useLayoutMenu
+
+提供菜单相关功能:
+- 获取菜单数据
+- 处理菜单激活状态
+- 混合布局下的菜单联动
\ No newline at end of file
diff --git a/src/layouts/components/LayoutBase.vue b/src/layouts/components/LayoutBase.vue
new file mode 100644
index 00000000..bcd43332
--- /dev/null
+++ b/src/layouts/components/LayoutBase.vue
@@ -0,0 +1,46 @@
+<template>
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
+
+    <!-- 布局内容插槽 -->
+    <slot></slot>
+
+    <!-- 设置面板 -->
+    <Settings v-if="isShowSettings" />
+
+    <!-- 返回顶部按钮 -->
+    <el-backtop target=".app-main">
+      <div class="i-svg:backtop w-6 h-6" />
+    </el-backtop>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useLayout } from "../composables/useLayout";
+import { useLayoutResponsive } from "../composables/useLayoutResponsive";
+import Settings from "@/layout/components/Settings/index.vue";
+
+// 布局相关
+const { layoutClass, isShowSettings, isSidebarOpen, closeSidebar } = useLayout();
+
+// 响应式处理
+const { isMobile } = useLayoutResponsive();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  width: 100%;
+  height: 100%;
+
+  &__overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+}
+</style>
diff --git a/src/layouts/components/LayoutMenu.vue b/src/layouts/components/LayoutMenu.vue
new file mode 100644
index 00000000..2c5ae936
--- /dev/null
+++ b/src/layouts/components/LayoutMenu.vue
@@ -0,0 +1,130 @@
+<!-- 菜单组件 -->
+<template>
+  <el-menu
+    ref="menuRef"
+    :default-active="currentRoute.path"
+    :collapse="!appStore.sidebar.opened"
+    :background-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-background']
+        : undefined
+    "
+    :text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-text']
+        : undefined
+    "
+    :active-text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-active-text']
+        : undefined
+    "
+    :popper-effect="theme"
+    :unique-opened="false"
+    :collapse-transition="false"
+    :mode="menuMode"
+    @open="onMenuOpen"
+    @close="onMenuClose"
+  >
+    <!-- 菜单项 -->
+    <SidebarMenuItem
+      v-for="route in data"
+      :key="route.path"
+      :item="route"
+      :base-path="resolveFullPath(route.path)"
+    />
+  </el-menu>
+</template>
+
+<script lang="ts" setup>
+import { ref, computed, watch, PropType } from "vue";
+import { useRoute } from "vue-router";
+import path from "path-browserify";
+import type { MenuInstance } from "element-plus";
+import type { RouteRecordRaw } from "vue-router";
+import { SidebarColor } from "@/enums/settings/theme.enum";
+import { useSettingsStore, useAppStore } from "@/store";
+import { isExternal } from "@/utils/index";
+import SidebarMenuItem from "@/layout/components/Sidebar/components/SidebarMenuItem.vue";
+import variables from "@/styles/variables.module.scss";
+
+const props = defineProps({
+  data: {
+    type: Array as PropType<RouteRecordRaw[]>,
+    default: () => [],
+  },
+  basePath: {
+    type: String,
+    required: true,
+    example: "/system",
+  },
+  menuMode: {
+    type: String as PropType<"vertical" | "horizontal">,
+    default: "vertical",
+    validator: (value: string) => ["vertical", "horizontal"].includes(value),
+  },
+});
+
+const menuRef = ref<MenuInstance>();
+const settingsStore = useSettingsStore();
+const appStore = useAppStore();
+const currentRoute = useRoute();
+
+// 存储已展开的菜单项索引
+const expandedMenuIndexes = ref<string[]>([]);
+
+// 获取主题
+const theme = computed(() => settingsStore.theme);
+
+// 获取浅色主题下的侧边栏配色方案
+const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
+
+/**
+ * 获取完整路径
+ *
+ * @param routePath 当前路由的相对路径  /user
+ * @returns 完整的绝对路径 D://vue3-element-admin/system/user
+ */
+function resolveFullPath(routePath: string) {
+  if (isExternal(routePath)) {
+    return routePath;
+  }
+  if (isExternal(props.basePath)) {
+    return props.basePath;
+  }
+
+  // 解析路径，生成完整的绝对路径
+  return path.resolve(props.basePath, routePath);
+}
+
+/**
+ * 打开菜单
+ *
+ * @param index 当前展开的菜单项索引
+ */
+const onMenuOpen = (index: string) => {
+  expandedMenuIndexes.value.push(index);
+};
+
+/**
+ * 关闭菜单
+ *
+ * @param index 当前收起的菜单项索引
+ */
+const onMenuClose = (index: string) => {
+  expandedMenuIndexes.value = expandedMenuIndexes.value.filter((item) => item !== index);
+};
+
+/**
+ * 监听菜单模式变化：当菜单模式切换为水平模式时，关闭所有展开的菜单项，
+ * 避免在水平模式下菜单项显示错位。
+ */
+watch(
+  () => props.menuMode,
+  (newMode) => {
+    if (newMode === "horizontal" && menuRef.value) {
+      expandedMenuIndexes.value.forEach((item) => menuRef.value!.close(item));
+    }
+  }
+);
+</script>
diff --git a/src/layouts/components/LeftSideLayout/index.vue b/src/layouts/components/LeftSideLayout/index.vue
new file mode 100644
index 00000000..429f9eb6
--- /dev/null
+++ b/src/layouts/components/LeftSideLayout/index.vue
@@ -0,0 +1,110 @@
+<template>
+  <LayoutBase>
+    <!-- 左侧菜单栏 -->
+    <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
+      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
+        <el-scrollbar>
+          <SidebarMenu :data="routes" base-path="" />
+        </el-scrollbar>
+      </LayoutSidebar>
+    </div>
+
+    <!-- 主内容区 -->
+    <div
+      :class="{
+        hasTagsView: isShowTagsView,
+        'layout__main--collapsed': !isSidebarOpen,
+      }"
+      class="layout__main"
+    >
+      <NavBar />
+      <TagsView v-if="isShowTagsView" />
+      <AppMain />
+    </div>
+  </LayoutBase>
+</template>
+
+<script setup lang="ts">
+import { useLayout } from "../../composables/useLayout";
+import { useLayoutMenu } from "../../composables/useLayoutMenu";
+import LayoutBase from "../LayoutBase.vue";
+import LayoutSidebar from "../common/LayoutSidebar.vue";
+import NavBar from "@/layout/components/NavBar/index.vue";
+import TagsView from "@/layout/components/TagsView/index.vue";
+import AppMain from "@/layout/components/AppMain/index.vue";
+import SidebarMenu from "../LayoutMenu.vue";
+
+// 布局相关参数
+const { isShowTagsView, isShowLogo, isSidebarOpen } = useLayout();
+
+// 菜单相关
+const { routes } = useLayoutMenu();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  &__sidebar {
+    position: fixed;
+    top: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 999;
+    width: $sidebar-width;
+    background-color: $menu-background;
+    transition: width 0.28s;
+
+    &--collapsed {
+      width: $sidebar-width-collapsed;
+    }
+  }
+
+  &__main {
+    position: relative;
+    height: 100%;
+    margin-left: $sidebar-width;
+    overflow-y: auto;
+    transition: margin-left 0.28s;
+
+    &--collapsed {
+      margin-left: $sidebar-width-collapsed;
+    }
+
+    .fixed-header {
+      position: sticky;
+      top: 0;
+      z-index: 9;
+      transition: width 0.28s;
+    }
+  }
+}
+
+/* 移动端样式 */
+:deep(.mobile) {
+  .layout__sidebar {
+    position: fixed;
+    left: 0;
+    transition: transform 0.28s;
+  }
+
+  &.hideSidebar {
+    .layout__sidebar {
+      width: $sidebar-width !important;
+      transform: translateX(-$sidebar-width);
+    }
+
+    .layout__main {
+      margin-left: 0 !important;
+    }
+  }
+
+  .layout__main {
+    margin-left: 0;
+  }
+}
+
+:deep(.hasTagsView) {
+  .app-main {
+    height: calc(100vh - $navbar-height - $tags-view-height) !important;
+  }
+}
+</style>
diff --git a/src/layouts/components/MixMenuLayout/index.vue b/src/layouts/components/MixMenuLayout/index.vue
new file mode 100644
index 00000000..aa78e9a2
--- /dev/null
+++ b/src/layouts/components/MixMenuLayout/index.vue
@@ -0,0 +1,143 @@
+<template>
+  <LayoutBase>
+    <!-- 顶部菜单栏 -->
+    <div class="layout__header">
+      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="false">
+        <SidebarMixTopMenu />
+        <NavbarActions />
+      </LayoutSidebar>
+    </div>
+
+    <!-- 主内容区容器 -->
+    <div class="layout__container">
+      <!-- 左侧菜单栏 -->
+      <div class="layout__sidebar--left" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
+        <el-scrollbar>
+          <SidebarMenu :data="sideMenuRoutes" :base-path="activeTopMenuPath" />
+        </el-scrollbar>
+        <!-- 侧边栏切换按钮 -->
+        <div class="layout__sidebar-toggle">
+          <Hamburger :is-active="isSidebarOpen" @toggle-click="toggleSidebar" />
+        </div>
+      </div>
+
+      <!-- 主内容区 -->
+      <div :class="{ hasTagsView: isShowTagsView }" class="layout__main">
+        <TagsView v-if="isShowTagsView" />
+        <AppMain />
+      </div>
+    </div>
+  </LayoutBase>
+</template>
+
+<script setup lang="ts">
+import { useLayout } from "../../composables/useLayout";
+import { useLayoutMenu } from "../../composables/useLayoutMenu";
+import LayoutBase from "../LayoutBase.vue";
+import LayoutSidebar from "../common/LayoutSidebar.vue";
+import SidebarMixTopMenu from "@/layout/components/Sidebar/components/SidebarMixTopMenu.vue";
+import NavbarActions from "@/layout/components/NavBar/components/NavbarActions.vue";
+import TagsView from "@/layout/components/TagsView/index.vue";
+import AppMain from "@/layout/components/AppMain/index.vue";
+import SidebarMenu from "../LayoutMenu.vue";
+import Hamburger from "@/components/Hamburger/index.vue";
+
+// 布局相关参数
+const { isShowTagsView, isShowLogo, isSidebarOpen, toggleSidebar } = useLayout();
+
+// 菜单相关
+const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  &__header {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+    height: $navbar-height;
+    background-color: $menu-background;
+
+    :deep(.layout-sidebar) {
+      display: flex;
+      width: 100% !important;
+      height: $navbar-height;
+    }
+  }
+
+  &__container {
+    display: flex;
+    height: calc(100vh - $navbar-height);
+    padding-top: 0;
+
+    .layout__sidebar--left {
+      position: relative;
+      width: $sidebar-width;
+      height: 100%;
+      background-color: var(--menu-background);
+      transition: width 0.28s;
+
+      &--collapsed {
+        width: $sidebar-width-collapsed !important;
+      }
+
+      :deep(.el-scrollbar) {
+        height: calc(100vh - $navbar-height - 50px);
+      }
+
+      :deep(.el-menu) {
+        height: 100%;
+        border: none;
+      }
+
+      .layout__sidebar-toggle {
+        position: absolute;
+        bottom: 0;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        width: 100%;
+        height: 50px;
+        line-height: 50px;
+        box-shadow: 0 0 6px -2px var(--el-color-primary);
+      }
+    }
+
+    .layout__main {
+      flex: 1;
+      min-width: 0;
+      height: 100%;
+      margin-left: 0;
+      overflow-y: auto;
+    }
+  }
+}
+
+/* 移动端样式 */
+:deep(.mobile) {
+  .layout__container {
+    .layout__sidebar--left {
+      position: fixed;
+      top: $navbar-height;
+      bottom: 0;
+      left: 0;
+      z-index: 1000;
+      transition: transform 0.28s;
+    }
+  }
+
+  &.hideSidebar {
+    .layout__sidebar--left {
+      width: $sidebar-width !important;
+      transform: translateX(-$sidebar-width);
+    }
+  }
+}
+
+:deep(.hasTagsView) {
+  .app-main {
+    height: calc(100vh - $navbar-height - $tags-view-height) !important;
+  }
+}
+</style>
diff --git a/src/layouts/components/TopMenuLayout/index.vue b/src/layouts/components/TopMenuLayout/index.vue
new file mode 100644
index 00000000..9f7607c0
--- /dev/null
+++ b/src/layouts/components/TopMenuLayout/index.vue
@@ -0,0 +1,86 @@
+<template>
+  <LayoutBase>
+    <!-- 顶部菜单栏 -->
+    <div class="layout__header">
+      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="false">
+        <el-scrollbar>
+          <SidebarMenu :data="routes" base-path="" menu-mode="horizontal" />
+        </el-scrollbar>
+        <NavbarActions />
+      </LayoutSidebar>
+    </div>
+
+    <!-- 主内容区 -->
+    <div :class="{ hasTagsView: isShowTagsView }" class="layout__main">
+      <TagsView v-if="isShowTagsView" />
+      <AppMain />
+    </div>
+  </LayoutBase>
+</template>
+
+<script setup lang="ts">
+import { useLayout } from "../../composables/useLayout";
+import { useLayoutMenu } from "../../composables/useLayoutMenu";
+import LayoutBase from "../LayoutBase.vue";
+import LayoutSidebar from "../common/LayoutSidebar.vue";
+import NavbarActions from "@/layout/components/NavBar/components/NavbarActions.vue";
+import TagsView from "@/layout/components/TagsView/index.vue";
+import AppMain from "@/layout/components/AppMain/index.vue";
+import SidebarMenu from "../LayoutMenu.vue";
+
+// 布局相关参数
+const { isShowTagsView, isShowLogo } = useLayout();
+
+// 菜单相关
+const { routes } = useLayoutMenu();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  &__header {
+    position: sticky;
+    top: 0;
+    z-index: 999;
+    width: 100%;
+    height: $navbar-height;
+    background-color: $menu-background;
+
+    :deep(.layout-sidebar) {
+      display: flex;
+      width: 100% !important;
+      height: $navbar-height;
+
+      .el-scrollbar {
+        flex: 1;
+        height: $navbar-height;
+      }
+
+      .el-menu-item,
+      .el-sub-menu__title,
+      .el-menu--horizontal {
+        height: $navbar-height;
+        line-height: $navbar-height;
+      }
+    }
+  }
+
+  &__main {
+    position: relative;
+    height: calc(100vh - $navbar-height);
+    margin-left: 0;
+    overflow-y: auto;
+
+    .fixed-header {
+      position: sticky;
+      top: 0;
+      z-index: 9;
+    }
+  }
+}
+
+:deep(.hasTagsView) {
+  .app-main {
+    height: calc(100vh - $navbar-height - $tags-view-height) !important;
+  }
+}
+</style>
diff --git a/src/layouts/components/common/LayoutSidebar.vue b/src/layouts/components/common/LayoutSidebar.vue
new file mode 100644
index 00000000..6933bd30
--- /dev/null
+++ b/src/layouts/components/common/LayoutSidebar.vue
@@ -0,0 +1,46 @@
+<template>
+  <div :class="{ 'has-logo': showLogo }" class="layout-sidebar">
+    <!-- Logo -->
+    <SidebarLogo v-if="showLogo" :collapse="isCollapsed" />
+    <!-- 主菜单内容 -->
+    <slot></slot>
+  </div>
+</template>
+
+<script setup lang="ts">
+defineProps({
+  /**
+   * 是否显示Logo
+   */
+  showLogo: {
+    type: Boolean,
+    default: true,
+  },
+  /**
+   * 是否折叠
+   */
+  isCollapsed: {
+    type: Boolean,
+    default: false,
+  },
+});
+</script>
+
+<style lang="scss" scoped>
+.layout-sidebar {
+  position: relative;
+  height: 100%;
+  background-color: var(--menu-background);
+  transition: width 0.28s;
+
+  &.has-logo {
+    .el-scrollbar {
+      height: calc(100vh - $navbar-height);
+    }
+  }
+
+  :deep(.el-menu) {
+    border: none;
+  }
+}
+</style>
diff --git a/src/layouts/composables/useLayout.ts b/src/layouts/composables/useLayout.ts
new file mode 100644
index 00000000..9fec35dd
--- /dev/null
+++ b/src/layouts/composables/useLayout.ts
@@ -0,0 +1,66 @@
+import { computed, watchEffect } from "vue";
+import { useAppStore, useSettingsStore } from "@/store";
+import defaultSettings from "@/settings";
+
+/**
+ * 布局相关的通用逻辑
+ */
+export function useLayout() {
+  const appStore = useAppStore();
+  const settingsStore = useSettingsStore();
+
+  // 计算当前布局模式
+  const currentLayout = computed(() => settingsStore.layout);
+
+  // 侧边栏展开状态
+  const isSidebarOpen = computed(() => appStore.sidebar.opened);
+
+  // 是否显示标签视图
+  const isShowTagsView = computed(() => settingsStore.tagsView);
+
+  // 是否显示设置面板
+  const isShowSettings = computed(() => defaultSettings.showSettings);
+
+  // 是否显示Logo
+  const isShowLogo = computed(() => settingsStore.sidebarLogo);
+
+  // 布局CSS类
+  const layoutClass = computed(() => ({
+    hideSidebar: !appStore.sidebar.opened,
+    openSidebar: appStore.sidebar.opened,
+    mobile: appStore.device === "mobile",
+    [`layout-${settingsStore.layout}`]: true,
+  }));
+
+  /**
+   * 处理切换侧边栏的展开/收起状态
+   */
+  function toggleSidebar() {
+    appStore.toggleSidebar();
+  }
+
+  /**
+   * 关闭侧边栏（移动端）
+   */
+  function closeSidebar() {
+    appStore.closeSideBar();
+  }
+
+  // 监听路由变化，在移动端自动关闭侧边栏
+  watchEffect(() => {
+    if (appStore.device === "mobile" && appStore.sidebar.opened) {
+      appStore.closeSideBar();
+    }
+  });
+
+  return {
+    currentLayout,
+    isSidebarOpen,
+    isShowTagsView,
+    isShowSettings,
+    isShowLogo,
+    layoutClass,
+    toggleSidebar,
+    closeSidebar,
+  };
+}
diff --git a/src/layouts/composables/useLayoutMenu.ts b/src/layouts/composables/useLayoutMenu.ts
new file mode 100644
index 00000000..68d35e9a
--- /dev/null
+++ b/src/layouts/composables/useLayoutMenu.ts
@@ -0,0 +1,58 @@
+import { computed, watch } from "vue";
+import { useRoute } from "vue-router";
+import { useAppStore, usePermissionStore } from "@/store";
+
+/**
+ * 布局菜单处理逻辑
+ */
+export function useLayoutMenu() {
+  const route = useRoute();
+  const appStore = useAppStore();
+  const permissionStore = usePermissionStore();
+
+  // 顶部菜单激活路径
+  const activeTopMenuPath = computed(() => appStore.activeTopMenuPath);
+
+  // 常规路由（左侧菜单或顶部菜单）
+  const routes = computed(() => permissionStore.routes);
+
+  // 混合布局左侧菜单路由
+  const sideMenuRoutes = computed(() => permissionStore.sideMenuRoutes);
+
+  // 当前激活的菜单
+  const activeMenu = computed(() => {
+    const { meta, path } = route;
+
+    // 如果设置了activeMenu，则使用
+    if (meta?.activeMenu) {
+      return meta.activeMenu;
+    }
+
+    return path;
+  });
+
+  // 监听顶部菜单路径变化，更新侧边菜单
+  watch(
+    () => activeTopMenuPath.value,
+    (newPath) => {
+      permissionStore.updateSideMenu(newPath);
+    },
+    { immediate: true }
+  );
+
+  /**
+   * 处理顶部菜单点击
+   * @param path 菜单路径
+   */
+  function handleTopMenuClick(path: string) {
+    appStore.activeTopMenu(path);
+  }
+
+  return {
+    routes,
+    sideMenuRoutes,
+    activeMenu,
+    activeTopMenuPath,
+    handleTopMenuClick,
+  };
+}
diff --git a/src/layouts/composables/useLayoutResponsive.ts b/src/layouts/composables/useLayoutResponsive.ts
new file mode 100644
index 00000000..b8dd9ada
--- /dev/null
+++ b/src/layouts/composables/useLayoutResponsive.ts
@@ -0,0 +1,36 @@
+import { watchEffect, computed } from "vue";
+import { useWindowSize } from "@vueuse/core";
+import { useAppStore } from "@/store";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+
+/**
+ * 布局响应式处理逻辑
+ */
+export function useLayoutResponsive() {
+  const appStore = useAppStore();
+  const { width } = useWindowSize();
+
+  // 定义响应式断点
+  const WIDTH_DESKTOP = 992; // 桌面设备断点 (>=992px)
+
+  // 设置当前设备类型并调整侧边栏状态
+  watchEffect(() => {
+    const isDesktop = width.value >= WIDTH_DESKTOP;
+    const deviceType = isDesktop ? DeviceEnum.DESKTOP : DeviceEnum.MOBILE;
+
+    // 更新设备类型
+    appStore.toggleDevice(deviceType);
+
+    // 根据设备类型调整侧边栏状态
+    if (isDesktop) {
+      appStore.openSideBar();
+    } else {
+      appStore.closeSideBar();
+    }
+  });
+
+  return {
+    isDesktop: computed(() => width.value >= WIDTH_DESKTOP),
+    isMobile: computed(() => appStore.device === DeviceEnum.MOBILE),
+  };
+}
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
new file mode 100644
index 00000000..6c7209a3
--- /dev/null
+++ b/src/layouts/index.vue
@@ -0,0 +1,27 @@
+<template>
+  <component :is="currentLayoutComponent" />
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+import { useLayout } from "./composables/useLayout";
+import LeftSideLayout from "./components/LeftSideLayout/index.vue";
+import TopMenuLayout from "./components/TopMenuLayout/index.vue";
+import MixMenuLayout from "./components/MixMenuLayout/index.vue";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+
+const { currentLayout } = useLayout();
+
+// 根据当前布局模式选择对应的组件
+const currentLayoutComponent = computed(() => {
+  switch (currentLayout.value) {
+    case LayoutMode.TOP:
+      return TopMenuLayout;
+    case LayoutMode.MIX:
+      return MixMenuLayout;
+    case LayoutMode.LEFT:
+    default:
+      return LeftSideLayout;
+  }
+});
+</script>
diff --git a/src/router/index.ts b/src/router/index.ts
index 57058ee4..38bf3e60 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import type { App } from "vue";
 import { createRouter, createWebHashHistory, type RouteRecordRaw } from "vue-router";
 
-export const Layout = () => import("@/layout/index.vue");
+export const Layout = () => import("@/layouts/index.vue");
 
 // 静态路由
 export const constantRoutes: RouteRecordRaw[] = [
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index 968eb08a..007e786e 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu.api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layout/index.vue");
+const Layout = () => import("@/layouts/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 存储所有路由，包括静态路由和动态路由

From b5b766487cfa2b4c9b7e511ccd84c3aa51281487 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 23 May 2025 13:16:56 +0800
Subject: [PATCH 387/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NavBar/components/NavbarActions.vue       |  73 ++++++---
 src/layout/components/NavBar/index.vue        |   3 +
 .../Sidebar/components/SidebarMixTopMenu.vue  |  92 ++++++-----
 .../components/LeftSideLayout/index.vue       |  30 ++--
 .../components/MixMenuLayout/index.vue        | 143 ++++++++++++++++--
 src/layouts/composables/useLayout.ts          |  17 ++-
 6 files changed, 274 insertions(+), 84 deletions(-)

diff --git a/src/layout/components/NavBar/components/NavbarActions.vue b/src/layout/components/NavBar/components/NavbarActions.vue
index aa06f578..e22cc39b 100644
--- a/src/layout/components/NavBar/components/NavbarActions.vue
+++ b/src/layout/components/NavBar/components/NavbarActions.vue
@@ -88,15 +88,27 @@ function handleProfileClick() {
 
 // 根据主题和侧边栏配色方案选择样式类
 const navbarActionsClass = computed(() => {
-  // 暗黑主题
-  if (settingStore.theme === ThemeMode.DARK) {
+  const { theme, sidebarColorScheme, layout } = settingStore;
+
+  // 暗黑主题下，所有布局都使用白色文字
+  if (theme === ThemeMode.DARK) {
     return "navbar-actions--white-text";
   }
 
-  // 经典蓝侧边栏
-  if (settingStore.sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
-    return "navbar-actions--white-text";
+  // 明亮主题下
+  if (theme === ThemeMode.LIGHT) {
+    // 顶部布局和混合布局的顶部区域使用深色背景，需要白色文字
+    if (layout === "top" || layout === "mix") {
+      return "navbar-actions--white-text";
+    }
+
+    // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏仍使用默认颜色
+    if (layout === "left" && sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
+      return ""; // 使用默认的深色文字
+    }
   }
+
+  return "";
 });
 
 /**
@@ -130,18 +142,21 @@ function logout() {
     height: $navbar-height;
     text-align: center;
     cursor: pointer;
+    transition: all 0.3s;
 
+    // 默认图标样式（明亮模式 + 左侧布局）
     :deep([class^="i-svg:"]) {
-      color: var(--el-text-color);
-
-      &:hover {
-        color: var(--el-text-color-primary);
-      }
+      font-size: 18px;
+      color: var(--el-text-color-regular);
+      transition: color 0.3s;
     }
 
     &:hover {
-      color: var(--el-text-color-primary);
-      background: rgb(0 0 0 / 10%);
+      background: rgba(0, 0, 0, 0.04);
+
+      :deep([class^="i-svg:"]) {
+        color: var(--el-color-primary);
+      }
     }
   }
 
@@ -160,19 +175,41 @@ function logout() {
 
     &__name {
       margin-left: 10px;
+      color: var(--el-text-color-regular);
+      transition: color 0.3s;
     }
   }
 }
 
-.layout-top,
-.layout-mix {
+// 白色文字样式（用于深色背景：暗黑主题、顶部布局、混合布局）
+.navbar-actions--white-text {
+  .navbar-actions__item {
+    :deep([class^="i-svg:"]) {
+      color: rgba(255, 255, 255, 0.85);
+    }
+
+    &:hover {
+      background: rgba(255, 255, 255, 0.1);
+
+      :deep([class^="i-svg:"]) {
+        color: #fff;
+      }
+    }
+  }
+
   .user-profile__name {
-    color: #fff !important;
+    color: rgba(255, 255, 255, 0.85);
   }
 }
 
-.layout-top .navbar-actions--white-text :deep([class^="i-svg:"]),
-.layout-mix .navbar-actions--white-text :deep([class^="i-svg:"]) {
-  color: #fff !important;
+// 确保下拉菜单中的图标不受影响
+:deep(.el-dropdown-menu) {
+  [class^="i-svg:"] {
+    color: var(--el-text-color-regular) !important;
+
+    &:hover {
+      color: var(--el-color-primary) !important;
+    }
+  }
 }
 </style>
diff --git a/src/layout/components/NavBar/index.vue b/src/layout/components/NavBar/index.vue
index d4d32c5b..b7b952f3 100644
--- a/src/layout/components/NavBar/index.vue
+++ b/src/layout/components/NavBar/index.vue
@@ -26,7 +26,10 @@ const isSidebarOpened = computed(() => appStore.sidebar.opened);
 
 // 切换侧边栏展开/折叠状态
 function toggleSideBar() {
+  console.log("🔄 Hamburger clicked! Current state:", isSidebarOpened.value);
+  console.log("🔄 Device type:", appStore.device);
   appStore.toggleSidebar();
+  console.log("🔄 New state:", appStore.sidebar.opened);
 }
 </script>
 
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
index 2fd657d1..643d719e 100644
--- a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
@@ -1,42 +1,40 @@
 <!-- 混合布局顶部菜单 -->
 <template>
-  <el-scrollbar>
-    <el-menu
-      mode="horizontal"
-      :default-active="activePath"
-      :background-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-          ? variables['menu-background']
-          : undefined
-      "
-      :text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-          ? variables['menu-text']
-          : undefined
-      "
-      :active-text-color="
-        theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-          ? variables['menu-active-text']
-          : undefined
-      "
-      @select="handleMenuSelect"
-    >
-      <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
-        <template #title>
-          <template v-if="route.meta && route.meta.icon">
-            <el-icon v-if="route.meta.icon.startsWith('el-icon')" class="sub-el-icon">
-              <component :is="route.meta.icon.replace('el-icon-', '')" />
-            </el-icon>
-            <div v-else :class="`i-svg:${route.meta.icon}`" />
-          </template>
-          <span v-if="route.path === '/'">首页</span>
-          <span v-else-if="route.meta && route.meta.title" class="ml-1">
-            {{ translateRouteTitle(route.meta.title) }}
-          </span>
+  <el-menu
+    mode="horizontal"
+    :default-active="activePath"
+    :background-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-background']
+        : undefined
+    "
+    :text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-text']
+        : undefined
+    "
+    :active-text-color="
+      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
+        ? variables['menu-active-text']
+        : undefined
+    "
+    @select="handleMenuSelect"
+  >
+    <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
+      <template #title>
+        <template v-if="route.meta && route.meta.icon">
+          <el-icon v-if="route.meta.icon.startsWith('el-icon')" class="sub-el-icon">
+            <component :is="route.meta.icon.replace('el-icon-', '')" />
+          </el-icon>
+          <div v-else :class="`i-svg:${route.meta.icon}`" />
         </template>
-      </el-menu-item>
-    </el-menu>
-  </el-scrollbar>
+        <span v-if="route.path === '/'">首页</span>
+        <span v-else-if="route.meta && route.meta.title" class="ml-1">
+          {{ translateRouteTitle(route.meta.title) }}
+        </span>
+      </template>
+    </el-menu-item>
+  </el-menu>
 </template>
 
 <script lang="ts" setup>
@@ -117,3 +115,25 @@ onMounted(() => {
   topMenus.value = permissionStore.routes.filter((item) => !item.meta || !item.meta.hidden);
 });
 </script>
+
+<style lang="scss" scoped>
+.el-menu {
+  width: 100%;
+  height: 100%;
+
+  &--horizontal {
+    height: $navbar-height !important;
+
+    // 确保菜单项垂直居中
+    :deep(.el-menu-item) {
+      height: 100%;
+      line-height: $navbar-height;
+    }
+
+    // 移除默认的底部边框
+    &:after {
+      display: none;
+    }
+  }
+}
+</style>
diff --git a/src/layouts/components/LeftSideLayout/index.vue b/src/layouts/components/LeftSideLayout/index.vue
index 429f9eb6..fee1ebcf 100644
--- a/src/layouts/components/LeftSideLayout/index.vue
+++ b/src/layouts/components/LeftSideLayout/index.vue
@@ -35,10 +35,14 @@ import AppMain from "@/layout/components/AppMain/index.vue";
 import SidebarMenu from "../LayoutMenu.vue";
 
 // 布局相关参数
-const { isShowTagsView, isShowLogo, isSidebarOpen } = useLayout();
+const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
 
 // 菜单相关
 const { routes } = useLayoutMenu();
+
+// 添加调试日志
+console.log("🔍 LeftSideLayout - isSidebarOpen:", isSidebarOpen.value);
+console.log("🔍 LeftSideLayout - isMobile:", isMobile.value);
 </script>
 
 <style lang="scss" scoped>
@@ -78,32 +82,34 @@ const { routes } = useLayoutMenu();
   }
 }
 
-/* 移动端样式 */
-:deep(.mobile) {
+/* 移动端样式 - 注意这里需要正确应用到父元素 */
+.mobile {
   .layout__sidebar {
-    position: fixed;
-    left: 0;
-    transition: transform 0.28s;
+    width: $sidebar-width !important;
+    transition:
+      transform 0.28s,
+      width 0s;
   }
 
   &.hideSidebar {
     .layout__sidebar {
-      width: $sidebar-width !important;
       transform: translateX(-$sidebar-width);
     }
+  }
 
-    .layout__main {
-      margin-left: 0 !important;
+  &.openSidebar {
+    .layout__sidebar {
+      transform: translateX(0);
     }
   }
 
   .layout__main {
-    margin-left: 0;
+    margin-left: 0 !important;
   }
 }
 
-:deep(.hasTagsView) {
-  .app-main {
+.hasTagsView {
+  :deep(.app-main) {
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
   }
 }
diff --git a/src/layouts/components/MixMenuLayout/index.vue b/src/layouts/components/MixMenuLayout/index.vue
index aa78e9a2..30f16b39 100644
--- a/src/layouts/components/MixMenuLayout/index.vue
+++ b/src/layouts/components/MixMenuLayout/index.vue
@@ -2,10 +2,22 @@
   <LayoutBase>
     <!-- 顶部菜单栏 -->
     <div class="layout__header">
-      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="false">
-        <SidebarMixTopMenu />
-        <NavbarActions />
-      </LayoutSidebar>
+      <div class="layout__header-content">
+        <!-- Logo区域 -->
+        <div v-if="isShowLogo" class="layout__header-logo">
+          <SidebarLogo :collapse="false" />
+        </div>
+
+        <!-- 顶部菜单区域 -->
+        <div class="layout__header-menu">
+          <SidebarMixTopMenu />
+        </div>
+
+        <!-- 右侧操作区域 -->
+        <div class="layout__header-actions">
+          <NavbarActions />
+        </div>
+      </div>
     </div>
 
     <!-- 主内容区容器 -->
@@ -13,7 +25,22 @@
       <!-- 左侧菜单栏 -->
       <div class="layout__sidebar--left" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
         <el-scrollbar>
-          <SidebarMenu :data="sideMenuRoutes" :base-path="activeTopMenuPath" />
+          <el-menu
+            :default-active="activeMenu"
+            :collapse="!isSidebarOpen"
+            :collapse-transition="false"
+            :unique-opened="false"
+            :background-color="variables['menu-background']"
+            :text-color="variables['menu-text']"
+            :active-text-color="variables['menu-active-text']"
+          >
+            <SidebarMenuItem
+              v-for="route in sideMenuRoutes"
+              :key="route.path"
+              :item="route"
+              :base-path="resolvePath(route.path)"
+            />
+          </el-menu>
         </el-scrollbar>
         <!-- 侧边栏切换按钮 -->
         <div class="layout__sidebar-toggle">
@@ -31,22 +58,52 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from "vue";
+import { useRoute } from "vue-router";
 import { useLayout } from "../../composables/useLayout";
 import { useLayoutMenu } from "../../composables/useLayoutMenu";
 import LayoutBase from "../LayoutBase.vue";
-import LayoutSidebar from "../common/LayoutSidebar.vue";
+import SidebarLogo from "@/layout/components/Sidebar/components/SidebarLogo.vue";
 import SidebarMixTopMenu from "@/layout/components/Sidebar/components/SidebarMixTopMenu.vue";
 import NavbarActions from "@/layout/components/NavBar/components/NavbarActions.vue";
 import TagsView from "@/layout/components/TagsView/index.vue";
 import AppMain from "@/layout/components/AppMain/index.vue";
-import SidebarMenu from "../LayoutMenu.vue";
+import SidebarMenuItem from "@/layout/components/Sidebar/components/SidebarMenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
+import variables from "@/styles/variables.module.scss";
+
+const route = useRoute();
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, toggleSidebar } = useLayout();
 
 // 菜单相关
 const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
+
+// 当前激活的菜单
+const activeMenu = computed(() => {
+  const { meta, path } = route;
+  // 如果设置了activeMenu，则使用
+  if (meta?.activeMenu && typeof meta.activeMenu === "string") {
+    return meta.activeMenu;
+  }
+  return path;
+});
+
+/**
+ * 解析路径 - 混合模式下，左侧菜单是从顶级菜单下的子菜单开始的
+ * 所以需要拼接顶级菜单路径
+ */
+function resolvePath(routePath: string) {
+  // 如果已经是绝对路径，直接返回
+  if (routePath.startsWith("/")) {
+    return activeTopMenuPath.value + routePath;
+  }
+  // 否则拼接
+  return `${activeTopMenuPath.value}/${routePath}`;
+}
+
+console.log("🎨 MixMenuLayout rendered");
 </script>
 
 <style lang="scss" scoped>
@@ -57,12 +114,74 @@ const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
     z-index: 999;
     width: 100%;
     height: $navbar-height;
-    background-color: $menu-background;
+    background-color: var(--menu-background);
+    border-bottom: 1px solid var(--el-border-color-lighter);
+
+    &-content {
+      display: flex;
+      align-items: center;
+      height: 100%;
+      padding: 0 16px;
+    }
+
+    &-logo {
+      flex-shrink: 0;
+      width: 200px;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      :deep(.logo) {
+        height: 100%;
 
-    :deep(.layout-sidebar) {
+        a {
+          height: 100%;
+        }
+      }
+    }
+
+    &-menu {
+      flex: 1;
+      height: 100%;
+      display: flex;
+      align-items: center;
+      margin: 0 16px;
+      overflow: hidden;
+
+      :deep(.el-menu) {
+        height: 100%;
+        border: none;
+        background-color: transparent;
+      }
+
+      :deep(.el-menu--horizontal) {
+        display: flex;
+        align-items: center;
+        height: 100%;
+
+        .el-menu-item {
+          height: 100%;
+          line-height: $navbar-height;
+          border-bottom: none;
+
+          &:hover {
+            background-color: rgba(255, 255, 255, 0.08);
+          }
+
+          &.is-active {
+            background-color: rgba(255, 255, 255, 0.12);
+            border-bottom: 2px solid var(--el-color-primary);
+          }
+        }
+      }
+    }
+
+    &-actions {
+      flex-shrink: 0;
       display: flex;
-      width: 100% !important;
-      height: $navbar-height;
+      align-items: center;
+      height: 100%;
     }
   }
 
@@ -78,7 +197,7 @@ const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
       background-color: var(--menu-background);
       transition: width 0.28s;
 
-      &--collapsed {
+      &.layout__sidebar--collapsed {
         width: $sidebar-width-collapsed !important;
       }
 
diff --git a/src/layouts/composables/useLayout.ts b/src/layouts/composables/useLayout.ts
index 9fec35dd..07dfe373 100644
--- a/src/layouts/composables/useLayout.ts
+++ b/src/layouts/composables/useLayout.ts
@@ -1,4 +1,4 @@
-import { computed, watchEffect } from "vue";
+import { computed } from "vue";
 import { useAppStore, useSettingsStore } from "@/store";
 import defaultSettings from "@/settings";
 
@@ -24,6 +24,9 @@ export function useLayout() {
   // 是否显示Logo
   const isShowLogo = computed(() => settingsStore.sidebarLogo);
 
+  // 是否移动设备
+  const isMobile = computed(() => appStore.device === "mobile");
+
   // 布局CSS类
   const layoutClass = computed(() => ({
     hideSidebar: !appStore.sidebar.opened,
@@ -46,12 +49,13 @@ export function useLayout() {
     appStore.closeSideBar();
   }
 
+  // 暂时注释掉这个逻辑，避免影响手动操作
   // 监听路由变化，在移动端自动关闭侧边栏
-  watchEffect(() => {
-    if (appStore.device === "mobile" && appStore.sidebar.opened) {
-      appStore.closeSideBar();
-    }
-  });
+  // watchEffect(() => {
+  //   if (appStore.device === "mobile" && appStore.sidebar.opened) {
+  //     appStore.closeSideBar();
+  //   }
+  // });
 
   return {
     currentLayout,
@@ -59,6 +63,7 @@ export function useLayout() {
     isShowTagsView,
     isShowSettings,
     isShowLogo,
+    isMobile,
     layoutClass,
     toggleSidebar,
     closeSidebar,

From 3008b68234659fbc7a7ec81cffbdb6a66de630a8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 23 May 2025 13:43:59 +0800
Subject: [PATCH 388/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Sidebar/index.vue       | 45 -------------------
 .../components/AppMain/index.vue              |  0
 .../{LayoutBase.vue => BaseLayout.vue}        |  2 +-
 src/layouts/components/LayoutMenu.vue         |  2 +-
 .../{LeftSideLayout => LeftLayout}/index.vue  | 16 +++----
 .../{MixMenuLayout => MixLayout}/index.vue    | 20 ++++-----
 .../NavBar/components/NavbarActions.vue       |  0
 .../components/NavBar/index.vue               |  0
 .../Settings/components/LayoutSelect.vue      |  0
 .../components/Settings/index.vue             |  0
 .../Sidebar/components/SidebarLogo.vue        |  0
 .../Sidebar/components/SidebarMenu.vue        |  0
 .../Sidebar/components/SidebarMenuItem.vue    |  0
 .../components/SidebarMenuItemTitle.vue       |  0
 .../Sidebar/components/SidebarMixTopMenu.vue  |  0
 .../components/TagsView/index.vue             |  0
 .../{TopMenuLayout => TopLayout}/index.vue    | 42 +++++------------
 src/layouts/index.vue                         | 12 ++---
 18 files changed, 36 insertions(+), 103 deletions(-)
 delete mode 100644 src/layout/components/Sidebar/index.vue
 rename src/{layout => layouts}/components/AppMain/index.vue (100%)
 rename src/layouts/components/{LayoutBase.vue => BaseLayout.vue} (94%)
 rename src/layouts/components/{LeftSideLayout => LeftLayout}/index.vue (85%)
 rename src/layouts/components/{MixMenuLayout => MixLayout}/index.vue (90%)
 rename src/{layout => layouts}/components/NavBar/components/NavbarActions.vue (100%)
 rename src/{layout => layouts}/components/NavBar/index.vue (100%)
 rename src/{layout => layouts}/components/Settings/components/LayoutSelect.vue (100%)
 rename src/{layout => layouts}/components/Settings/index.vue (100%)
 rename src/{layout => layouts}/components/Sidebar/components/SidebarLogo.vue (100%)
 rename src/{layout => layouts}/components/Sidebar/components/SidebarMenu.vue (100%)
 rename src/{layout => layouts}/components/Sidebar/components/SidebarMenuItem.vue (100%)
 rename src/{layout => layouts}/components/Sidebar/components/SidebarMenuItemTitle.vue (100%)
 rename src/{layout => layouts}/components/Sidebar/components/SidebarMixTopMenu.vue (100%)
 rename src/{layout => layouts}/components/TagsView/index.vue (100%)
 rename src/layouts/components/{TopMenuLayout => TopLayout}/index.vue (58%)

diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
deleted file mode 100644
index 67acf469..00000000
--- a/src/layout/components/Sidebar/index.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<template>
-  <div :class="{ 'has-logo': sidebarLogo }">
-    <!-- 混合布局 -->
-    <div v-if="layout == LayoutMode.MIX" class="flex w-full">
-      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
-      <SidebarMixTopMenu class="flex-1" />
-      <NavbarActions />
-    </div>
-
-    <!-- 顶部布局 || 左侧布局 -->
-    <template v-else>
-      <SidebarLogo v-if="sidebarLogo" :collapse="isSidebarCollapsed" />
-      <el-scrollbar>
-        <SidebarMenu :data="permissionStore.routes" base-path="" />
-      </el-scrollbar>
-
-      <!-- 顶部导航 -->
-      <NavbarActions v-if="layout == LayoutMode.TOP" />
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from "vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
-import NavbarActions from "../NavBar/components/NavbarActions.vue";
-
-const appStore = useAppStore();
-const settingsStore = useSettingsStore();
-const permissionStore = usePermissionStore();
-
-const sidebarLogo = computed(() => settingsStore.sidebarLogo);
-const layout = computed(() => settingsStore.layout);
-
-const isSidebarCollapsed = computed(() => !appStore.sidebar.opened);
-</script>
-
-<style lang="scss" scoped>
-.has-logo {
-  .el-scrollbar {
-    height: calc(100vh - $navbar-height);
-  }
-}
-</style>
diff --git a/src/layout/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
similarity index 100%
rename from src/layout/components/AppMain/index.vue
rename to src/layouts/components/AppMain/index.vue
diff --git a/src/layouts/components/LayoutBase.vue b/src/layouts/components/BaseLayout.vue
similarity index 94%
rename from src/layouts/components/LayoutBase.vue
rename to src/layouts/components/BaseLayout.vue
index bcd43332..501b1d70 100644
--- a/src/layouts/components/LayoutBase.vue
+++ b/src/layouts/components/BaseLayout.vue
@@ -19,7 +19,7 @@
 <script setup lang="ts">
 import { useLayout } from "../composables/useLayout";
 import { useLayoutResponsive } from "../composables/useLayoutResponsive";
-import Settings from "@/layout/components/Settings/index.vue";
+import Settings from "@/layouts/components/Settings/index.vue";
 
 // 布局相关
 const { layoutClass, isShowSettings, isSidebarOpen, closeSidebar } = useLayout();
diff --git a/src/layouts/components/LayoutMenu.vue b/src/layouts/components/LayoutMenu.vue
index 2c5ae936..7ec2074b 100644
--- a/src/layouts/components/LayoutMenu.vue
+++ b/src/layouts/components/LayoutMenu.vue
@@ -45,7 +45,7 @@ import type { RouteRecordRaw } from "vue-router";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
-import SidebarMenuItem from "@/layout/components/Sidebar/components/SidebarMenuItem.vue";
+import SidebarMenuItem from "@/layouts/components/Sidebar/components/SidebarMenuItem.vue";
 import variables from "@/styles/variables.module.scss";
 
 const props = defineProps({
diff --git a/src/layouts/components/LeftSideLayout/index.vue b/src/layouts/components/LeftLayout/index.vue
similarity index 85%
rename from src/layouts/components/LeftSideLayout/index.vue
rename to src/layouts/components/LeftLayout/index.vue
index fee1ebcf..66afabac 100644
--- a/src/layouts/components/LeftSideLayout/index.vue
+++ b/src/layouts/components/LeftLayout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <LayoutBase>
+  <BaseLayout>
     <!-- 左侧菜单栏 -->
     <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
       <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
@@ -21,17 +21,17 @@
       <TagsView v-if="isShowTagsView" />
       <AppMain />
     </div>
-  </LayoutBase>
+  </BaseLayout>
 </template>
 
 <script setup lang="ts">
 import { useLayout } from "../../composables/useLayout";
 import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import LayoutBase from "../LayoutBase.vue";
+import BaseLayout from "../BaseLayout.vue";
 import LayoutSidebar from "../common/LayoutSidebar.vue";
-import NavBar from "@/layout/components/NavBar/index.vue";
-import TagsView from "@/layout/components/TagsView/index.vue";
-import AppMain from "@/layout/components/AppMain/index.vue";
+import NavBar from "@/layouts/components/NavBar/index.vue";
+import TagsView from "@/layouts/components/TagsView/index.vue";
+import AppMain from "@/layouts/components/AppMain/index.vue";
 import SidebarMenu from "../LayoutMenu.vue";
 
 // 布局相关参数
@@ -41,8 +41,8 @@ const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
 const { routes } = useLayoutMenu();
 
 // 添加调试日志
-console.log("🔍 LeftSideLayout - isSidebarOpen:", isSidebarOpen.value);
-console.log("🔍 LeftSideLayout - isMobile:", isMobile.value);
+console.log("🔍 LeftLayout - isSidebarOpen:", isSidebarOpen.value);
+console.log("🔍 LeftLayout - isMobile:", isMobile.value);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layouts/components/MixMenuLayout/index.vue b/src/layouts/components/MixLayout/index.vue
similarity index 90%
rename from src/layouts/components/MixMenuLayout/index.vue
rename to src/layouts/components/MixLayout/index.vue
index 30f16b39..46fac677 100644
--- a/src/layouts/components/MixMenuLayout/index.vue
+++ b/src/layouts/components/MixLayout/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <LayoutBase>
+  <BaseLayout>
     <!-- 顶部菜单栏 -->
     <div class="layout__header">
       <div class="layout__header-content">
@@ -54,7 +54,7 @@
         <AppMain />
       </div>
     </div>
-  </LayoutBase>
+  </BaseLayout>
 </template>
 
 <script setup lang="ts">
@@ -62,13 +62,13 @@ import { computed } from "vue";
 import { useRoute } from "vue-router";
 import { useLayout } from "../../composables/useLayout";
 import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import LayoutBase from "../LayoutBase.vue";
-import SidebarLogo from "@/layout/components/Sidebar/components/SidebarLogo.vue";
-import SidebarMixTopMenu from "@/layout/components/Sidebar/components/SidebarMixTopMenu.vue";
-import NavbarActions from "@/layout/components/NavBar/components/NavbarActions.vue";
-import TagsView from "@/layout/components/TagsView/index.vue";
-import AppMain from "@/layout/components/AppMain/index.vue";
-import SidebarMenuItem from "@/layout/components/Sidebar/components/SidebarMenuItem.vue";
+import BaseLayout from "../BaseLayout.vue";
+import SidebarLogo from "@/layouts/components/Sidebar/components/SidebarLogo.vue";
+import SidebarMixTopMenu from "@/layouts/components/Sidebar/components/SidebarMixTopMenu.vue";
+import NavbarActions from "@/layouts/components/NavBar/components/NavbarActions.vue";
+import TagsView from "@/layouts/components/TagsView/index.vue";
+import AppMain from "@/layouts/components/AppMain/index.vue";
+import SidebarMenuItem from "@/layouts/components/Sidebar/components/SidebarMenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 
@@ -103,7 +103,7 @@ function resolvePath(routePath: string) {
   return `${activeTopMenuPath.value}/${routePath}`;
 }
 
-console.log("🎨 MixMenuLayout rendered");
+console.log("🎨 MixLayout rendered");
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layout/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
similarity index 100%
rename from src/layout/components/NavBar/components/NavbarActions.vue
rename to src/layouts/components/NavBar/components/NavbarActions.vue
diff --git a/src/layout/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
similarity index 100%
rename from src/layout/components/NavBar/index.vue
rename to src/layouts/components/NavBar/index.vue
diff --git a/src/layout/components/Settings/components/LayoutSelect.vue b/src/layouts/components/Settings/components/LayoutSelect.vue
similarity index 100%
rename from src/layout/components/Settings/components/LayoutSelect.vue
rename to src/layouts/components/Settings/components/LayoutSelect.vue
diff --git a/src/layout/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
similarity index 100%
rename from src/layout/components/Settings/index.vue
rename to src/layouts/components/Settings/index.vue
diff --git a/src/layout/components/Sidebar/components/SidebarLogo.vue b/src/layouts/components/Sidebar/components/SidebarLogo.vue
similarity index 100%
rename from src/layout/components/Sidebar/components/SidebarLogo.vue
rename to src/layouts/components/Sidebar/components/SidebarLogo.vue
diff --git a/src/layout/components/Sidebar/components/SidebarMenu.vue b/src/layouts/components/Sidebar/components/SidebarMenu.vue
similarity index 100%
rename from src/layout/components/Sidebar/components/SidebarMenu.vue
rename to src/layouts/components/Sidebar/components/SidebarMenu.vue
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItem.vue b/src/layouts/components/Sidebar/components/SidebarMenuItem.vue
similarity index 100%
rename from src/layout/components/Sidebar/components/SidebarMenuItem.vue
rename to src/layouts/components/Sidebar/components/SidebarMenuItem.vue
diff --git a/src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue b/src/layouts/components/Sidebar/components/SidebarMenuItemTitle.vue
similarity index 100%
rename from src/layout/components/Sidebar/components/SidebarMenuItemTitle.vue
rename to src/layouts/components/Sidebar/components/SidebarMenuItemTitle.vue
diff --git a/src/layout/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layouts/components/Sidebar/components/SidebarMixTopMenu.vue
similarity index 100%
rename from src/layout/components/Sidebar/components/SidebarMixTopMenu.vue
rename to src/layouts/components/Sidebar/components/SidebarMixTopMenu.vue
diff --git a/src/layout/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
similarity index 100%
rename from src/layout/components/TagsView/index.vue
rename to src/layouts/components/TagsView/index.vue
diff --git a/src/layouts/components/TopMenuLayout/index.vue b/src/layouts/components/TopLayout/index.vue
similarity index 58%
rename from src/layouts/components/TopMenuLayout/index.vue
rename to src/layouts/components/TopLayout/index.vue
index 9f7607c0..a3be577a 100644
--- a/src/layouts/components/TopMenuLayout/index.vue
+++ b/src/layouts/components/TopLayout/index.vue
@@ -1,11 +1,9 @@
 <template>
-  <LayoutBase>
+  <BaseLayout>
     <!-- 顶部菜单栏 -->
     <div class="layout__header">
       <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="false">
-        <el-scrollbar>
-          <SidebarMenu :data="routes" base-path="" menu-mode="horizontal" />
-        </el-scrollbar>
+        <LayoutMenu :data="routes" menu-mode="horizontal" base-path="" />
         <NavbarActions />
       </LayoutSidebar>
     </div>
@@ -15,18 +13,18 @@
       <TagsView v-if="isShowTagsView" />
       <AppMain />
     </div>
-  </LayoutBase>
+  </BaseLayout>
 </template>
 
 <script setup lang="ts">
 import { useLayout } from "../../composables/useLayout";
 import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import LayoutBase from "../LayoutBase.vue";
+import BaseLayout from "../BaseLayout.vue";
 import LayoutSidebar from "../common/LayoutSidebar.vue";
-import NavbarActions from "@/layout/components/NavBar/components/NavbarActions.vue";
-import TagsView from "@/layout/components/TagsView/index.vue";
-import AppMain from "@/layout/components/AppMain/index.vue";
-import SidebarMenu from "../LayoutMenu.vue";
+import LayoutMenu from "../LayoutMenu.vue";
+import NavbarActions from "@/layouts/components/NavBar/components/NavbarActions.vue";
+import TagsView from "@/layouts/components/TagsView/index.vue";
+import AppMain from "@/layouts/components/AppMain/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo } = useLayout();
@@ -49,37 +47,17 @@ const { routes } = useLayoutMenu();
       display: flex;
       width: 100% !important;
       height: $navbar-height;
-
-      .el-scrollbar {
-        flex: 1;
-        height: $navbar-height;
-      }
-
-      .el-menu-item,
-      .el-sub-menu__title,
-      .el-menu--horizontal {
-        height: $navbar-height;
-        line-height: $navbar-height;
-      }
     }
   }
 
   &__main {
-    position: relative;
     height: calc(100vh - $navbar-height);
-    margin-left: 0;
     overflow-y: auto;
-
-    .fixed-header {
-      position: sticky;
-      top: 0;
-      z-index: 9;
-    }
   }
 }
 
-:deep(.hasTagsView) {
-  .app-main {
+.hasTagsView {
+  :deep(.app-main) {
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
   }
 }
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 6c7209a3..97d31741 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -5,9 +5,9 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useLayout } from "./composables/useLayout";
-import LeftSideLayout from "./components/LeftSideLayout/index.vue";
-import TopMenuLayout from "./components/TopMenuLayout/index.vue";
-import MixMenuLayout from "./components/MixMenuLayout/index.vue";
+import LeftLayout from "./components/LeftLayout/index.vue";
+import TopLayout from "./components/TopLayout/index.vue";
+import MixLayout from "./components/MixLayout/index.vue";
 import { LayoutMode } from "@/enums/settings/layout.enum";
 
 const { currentLayout } = useLayout();
@@ -16,12 +16,12 @@ const { currentLayout } = useLayout();
 const currentLayoutComponent = computed(() => {
   switch (currentLayout.value) {
     case LayoutMode.TOP:
-      return TopMenuLayout;
+      return TopLayout;
     case LayoutMode.MIX:
-      return MixMenuLayout;
+      return MixLayout;
     case LayoutMode.LEFT:
     default:
-      return LeftSideLayout;
+      return LeftLayout;
   }
 });
 </script>

From 51f9b298c6b8d8af30147c785333b588501cc974 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 23 May 2025 14:46:41 +0800
Subject: [PATCH 389/497] =?UTF-8?q?wip:=20=E5=B8=83=E5=B1=80=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/README.md                         |  83 ++++++++---
 .../{AppMain/index.vue => AppMain.vue}        |   0
 .../{Settings/index.vue => Settings.vue}      | 133 ++++++++++++++++-
 .../Settings/components/LayoutSelect.vue      | 140 ------------------
 .../Sidebar/components/SidebarMenu.vue        | 132 -----------------
 .../LayoutSidebar.vue => Sidebar/index.vue}   |   2 +
 .../{TagsView/index.vue => TagsView.vue}      |   0
 .../components/MenuItem.vue}                  |  10 +-
 .../components/MenuItemTitle.vue}             |   0
 .../components/MixTopMenu.vue}                |  25 +---
 .../{LayoutMenu.vue => menu/index.vue}        |   4 +-
 src/layouts/index.vue                         |   6 +-
 .../{components => views}/BaseLayout.vue      |   2 +-
 .../index.vue => views/LeftLayout.vue}        |  22 +--
 .../index.vue => views/MixLayout.vue}         |  22 +--
 .../index.vue => views/TopLayout.vue}         |  22 +--
 16 files changed, 247 insertions(+), 356 deletions(-)
 rename src/layouts/components/{AppMain/index.vue => AppMain.vue} (100%)
 rename src/layouts/components/{Settings/index.vue => Settings.vue} (63%)
 delete mode 100644 src/layouts/components/Settings/components/LayoutSelect.vue
 delete mode 100644 src/layouts/components/Sidebar/components/SidebarMenu.vue
 rename src/layouts/components/{common/LayoutSidebar.vue => Sidebar/index.vue} (92%)
 rename src/layouts/components/{TagsView/index.vue => TagsView.vue} (100%)
 rename src/layouts/components/{Sidebar/components/SidebarMenuItem.vue => menu/components/MenuItem.vue} (95%)
 rename src/layouts/components/{Sidebar/components/SidebarMenuItemTitle.vue => menu/components/MenuItemTitle.vue} (100%)
 rename src/layouts/components/{Sidebar/components/SidebarMixTopMenu.vue => menu/components/MixTopMenu.vue} (82%)
 rename src/layouts/components/{LayoutMenu.vue => menu/index.vue} (96%)
 rename src/layouts/{components => views}/BaseLayout.vue (94%)
 rename src/layouts/{components/LeftLayout/index.vue => views/LeftLayout.vue} (77%)
 rename src/layouts/{components/MixLayout/index.vue => views/MixLayout.vue} (89%)
 rename src/layouts/{components/TopLayout/index.vue => views/TopLayout.vue} (60%)

diff --git a/src/layouts/README.md b/src/layouts/README.md
index f31eb7b5..9d36e764 100644
--- a/src/layouts/README.md
+++ b/src/layouts/README.md
@@ -1,34 +1,71 @@
 # 布局系统
 
-本项目的布局系统采用模块化、可组合式API的架构，支持三种不同的布局模式:
-
-1. **左侧菜单布局 (LeftSideLayout)**: 传统的管理系统布局，左侧为菜单栏，顶部为导航栏
-2. **顶部菜单布局 (TopMenuLayout)**: 顶部为主菜单栏，适合菜单项较少的应用
-3. **混合菜单布局 (MixMenuLayout)**: 顶部为一级菜单，左侧为对应的子菜单，适合菜单层级较多的复杂应用
-
 ## 目录结构
 
 ```
 layouts/
-├── README.md                    # 文档说明
-├── index.vue                    # 布局入口，根据设置选择对应的布局组件
-├── composables/                 # 可组合式API
-│   ├── useLayout.ts             # 布局通用逻辑
-│   ├── useLayoutResponsive.ts   # 响应式布局逻辑
-│   └── useLayoutMenu.ts         # 菜单处理逻辑
-└── components/                  # 布局组件
-    ├── LayoutBase.vue           # 基础布局组件
-    ├── SidebarMenu.vue          # 菜单组件
-    ├── common/                  # 公共组件
-    │   └── LayoutSidebar.vue    # 侧边栏公共组件
-    ├── LeftSideLayout/          # 左侧菜单布局
-    │   └── index.vue
-    ├── TopMenuLayout/           # 顶部菜单布局
-    │   └── index.vue
-    └── MixMenuLayout/           # 混合菜单布局
-        └── index.vue
+├── index.vue              # 布局系统入口，根据设置动态加载布局
+├── BaseLayout.vue         # 基础布局容器，提供通用功能
+├── LeftLayout.vue         # 左侧菜单布局
+├── TopLayout.vue          # 顶部菜单布局
+├── MixLayout.vue          # 混合布局（顶部+左侧）
+├── components/            # 布局相关组件
+│   ├── AppMain.vue        # 主内容区域
+│   ├── NavBar.vue         # 导航栏
+│   ├── NavbarActions.vue  # 导航栏右侧操作区
+│   ├── TagsView.vue       # 标签页视图
+│   ├── LayoutMenu.vue     # 菜单组件
+│   ├── Sidebar/           # 侧边栏相关组件
+│   │   ├── SidebarLogo.vue         # Logo 组件
+│   │   ├── SidebarMenu.vue         # 菜单主体（未使用）
+│   │   ├── SidebarMenuItem.vue     # 菜单项
+│   │   ├── SidebarMenuItemTitle.vue # 菜单项标题
+│   │   └── SidebarMixTopMenu.vue   # 混合布局顶部菜单
+│   ├── Settings/          # 设置面板
+│   │   └── index.vue      # 设置面板主组件（包含布局选择）
+│   └── common/            # 通用组件
+│       └── LayoutSidebar.vue # 侧边栏容器
+└── composables/           # 组合式函数
+    ├── useLayout.ts       # 布局相关逻辑
+    ├── useLayoutMenu.ts   # 菜单相关逻辑
+    └── useLayoutResponsive.ts # 响应式处理
 ```
 
+## 布局说明
+
+### 1. LeftLayout（左侧布局）
+- 传统的左侧固定菜单布局
+- 支持菜单折叠/展开
+- 适合大多数管理系统
+
+### 2. TopLayout（顶部布局）
+- 菜单位于顶部横向排列
+- 适合一级菜单较少的系统
+- 节省横向空间
+
+### 3. MixLayout（混合布局）
+- 一级菜单在顶部，二级菜单在左侧
+- 适合菜单层级较多的大型系统
+- 提供更好的菜单组织方式
+
+## 使用方式
+
+布局系统会根据 `settings store` 中的 `layout` 配置自动切换：
+
+```typescript
+// 在设置面板中切换布局
+// 或通过代码：
+settingsStore.layout = LayoutMode.LEFT; // 'left' | 'top' | 'mix'
+```
+
+## 自定义布局
+
+如需添加新布局：
+
+1. 在 `layouts/` 目录下创建新的布局组件（如 `CustomLayout.vue`）
+2. 在 `index.vue` 中导入并添加到切换逻辑
+3. 在 `enums/settings/layout.enum.ts` 中添加新的布局类型
+
 ## 主要功能
 
 1. **响应式适配**: 自动适配桌面端和移动端，移动端下自动收起侧边栏
diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain.vue
similarity index 100%
rename from src/layouts/components/AppMain/index.vue
rename to src/layouts/components/AppMain.vue
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings.vue
similarity index 63%
rename from src/layouts/components/Settings/index.vue
rename to src/layouts/components/Settings.vue
index 06554be0..925e04ac 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings.vue
@@ -61,7 +61,31 @@
     <!-- 布局设置 -->
     <section class="config-section">
       <el-divider>{{ t("settings.navigation") }}</el-divider>
-      <LayoutSelect v-model="settingsStore.layout" @update:model-value="handleLayoutChange" />
+
+      <!-- 整合的布局选择器 -->
+      <div class="layout-select">
+        <el-tooltip
+          v-for="item in layoutOptions"
+          :key="item.value"
+          :content="item.label"
+          placement="bottom"
+        >
+          <div
+            role="button"
+            tabindex="0"
+            :class="[
+              'layout-item',
+              item.className,
+              { 'is-active': settingsStore.layout === item.value },
+            ]"
+            @click="handleLayoutChange(item.value)"
+            @keydown.enter.space="handleLayoutChange(item.value)"
+          >
+            <div class="layout-item-part" />
+            <div class="layout-item-part" />
+          </div>
+        </el-tooltip>
+      </div>
     </section>
   </el-drawer>
 </template>
@@ -72,6 +96,20 @@ import { LayoutMode } from "@/enums/settings/layout.enum";
 import { ThemeMode } from "@/enums/settings/theme.enum";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
+
+// 布局选项配置
+interface LayoutOption {
+  value: LayoutMode;
+  label: string;
+  className: string;
+}
+
+const layoutOptions: LayoutOption[] = [
+  { value: LayoutMode.LEFT, label: "左侧模式", className: "left" },
+  { value: LayoutMode.TOP, label: "顶部模式", className: "top" },
+  { value: LayoutMode.MIX, label: "混合模式", className: "mix" },
+];
+
 // 颜色预设
 const colorPresets = [
   "#4080FF",
@@ -190,4 +228,97 @@ const handleCloseDrawer = () => {
     }
   }
 }
+
+/* 布局选择器样式 */
+.layout-select {
+  display: flex;
+  gap: 10px;
+  justify-content: space-evenly;
+  padding: 10px 0;
+  --layout-primary: #1b2a47;
+  --layout-background: #f0f2f5;
+  --layout-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
+  --layout-hover: #e3f1f9;
+}
+
+.layout-item {
+  position: relative;
+  width: 18%;
+  height: 50px;
+  cursor: pointer;
+  background: var(--layout-background);
+  border-radius: 8px;
+  box-shadow: var(--layout-shadow);
+
+  transition:
+    transform 0.2s ease,
+    border-color 0.2s ease,
+    box-shadow 0.2s ease;
+
+  &:hover {
+    background-color: var(--layout-hover);
+    transform: scale(1.02);
+  }
+
+  &:focus-visible {
+    outline: 2px solid var(--el-color-primary);
+  }
+
+  &-part {
+    position: absolute;
+    background: var(--layout-primary);
+    border-radius: 4px;
+    box-shadow: var(--layout-shadow);
+    transition: all 0.3s ease;
+  }
+
+  &.left {
+    .layout-item-part {
+      &:first-child {
+        width: 30%;
+        height: 100%;
+        border-radius: 4px 0 0 4px;
+      }
+      &:last-child {
+        top: 0;
+        right: 0;
+        width: 70%;
+        height: 30%;
+        background: #fff;
+        border-radius: 0 4px 4px 0;
+      }
+    }
+  }
+
+  &.top {
+    .layout-item-part:first-child {
+      width: 100%;
+      height: 30%;
+      border-radius: 4px 4px 0 0;
+    }
+  }
+
+  &.mix {
+    .layout-item-part {
+      &:first-child {
+        width: 100%;
+        height: 30%;
+        border-radius: 4px 4px 0 0;
+      }
+      &:last-child {
+        bottom: 0;
+        left: 0;
+        width: 30%;
+        height: 70%;
+        border-radius: 0 0 4px 4px;
+      }
+    }
+  }
+}
+
+.is-active {
+  background-color: var(--layout-hover);
+  border: 2px solid var(--el-color-primary);
+  transform: scale(1.05);
+}
 </style>
diff --git a/src/layouts/components/Settings/components/LayoutSelect.vue b/src/layouts/components/Settings/components/LayoutSelect.vue
deleted file mode 100644
index 488341cc..00000000
--- a/src/layouts/components/Settings/components/LayoutSelect.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-  <div class="layout-select">
-    <el-tooltip
-      v-for="item in layoutOptions"
-      :key="item.value"
-      :content="item.label"
-      placement="bottom"
-    >
-      <div
-        role="button"
-        tabindex="0"
-        :class="['layout-item', item.className, { 'is-active': modelValue === item.value }]"
-        @click="handleLayoutChange(item.value)"
-        @keydown.enter.space="handleLayoutChange(item.value)"
-      >
-        <div class="layout-item-part" />
-        <div class="layout-item-part" />
-      </div>
-    </el-tooltip>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { LayoutMode } from "@/enums/settings/layout.enum";
-
-interface LayoutOption {
-  value: LayoutMode;
-  label: string;
-  className: string;
-}
-
-const layoutOptions: LayoutOption[] = [
-  { value: LayoutMode.LEFT, label: "左侧模式", className: "left" },
-  { value: LayoutMode.TOP, label: "顶部模式", className: "top" },
-  { value: LayoutMode.MIX, label: "混合模式", className: "mix" },
-];
-
-const modelValue = defineModel<LayoutMode>("modelValue", {
-  required: true,
-  default: () => LayoutMode.LEFT,
-});
-
-function handleLayoutChange(layout: LayoutMode) {
-  modelValue.value = layout;
-}
-</script>
-
-<style scoped lang="scss">
-.layout-select {
-  display: flex;
-  gap: 10px;
-  justify-content: space-evenly;
-  padding: 10px 0;
-  --layout-primary: #1b2a47;
-  --layout-background: #f0f2f5;
-  --layout-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
-  --layout-hover: #e3f1f9;
-}
-
-.layout-item {
-  position: relative;
-  width: 18%;
-  height: 50px;
-  cursor: pointer;
-  background: var(--layout-background);
-  border-radius: 8px;
-  box-shadow: var(--layout-shadow);
-
-  transition:
-    transform 0.2s ease,
-    border-color 0.2s ease,
-    box-shadow 0.2s ease;
-
-  &:hover {
-    background-color: var(--layout-hover);
-    transform: scale(1.02); /* 稍微放大，避免过于夸张 */
-  }
-
-  &:focus-visible {
-    outline: 2px solid var(--el-color-primary);
-  }
-
-  &-part {
-    position: absolute;
-    background: var(--layout-primary);
-    border-radius: 4px; /* 保持和父容器一致的圆角 */
-    box-shadow: var(--layout-shadow);
-    transition: all 0.3s ease;
-  }
-
-  &.left {
-    .layout-item-part {
-      &:first-child {
-        width: 30%;
-        height: 100%;
-        border-radius: 4px 0 0 4px; /* 左边部分圆角 */
-      }
-      &:last-child {
-        top: 0;
-        right: 0;
-        width: 70%;
-        height: 30%;
-        background: #fff;
-        border-radius: 0 4px 4px 0; /* 右边部分圆角 */
-      }
-    }
-  }
-
-  &.top {
-    .layout-item-part:first-child {
-      width: 100%;
-      height: 30%;
-      border-radius: 4px 4px 0 0; /* 顶部部分圆角 */
-    }
-  }
-
-  &.mix {
-    .layout-item-part {
-      &:first-child {
-        width: 100%;
-        height: 30%;
-        border-radius: 4px 4px 0 0; /* 顶部部分圆角 */
-      }
-      &:last-child {
-        bottom: 0;
-        left: 0;
-        width: 30%;
-        height: 70%;
-        border-radius: 0 0 4px 4px; /* 底部部分圆角 */
-      }
-    }
-  }
-}
-
-.is-active {
-  background-color: var(--layout-hover);
-  border: 2px solid var(--el-color-primary);
-  transform: scale(1.05); /* 轻微放大 */
-}
-</style>
diff --git a/src/layouts/components/Sidebar/components/SidebarMenu.vue b/src/layouts/components/Sidebar/components/SidebarMenu.vue
deleted file mode 100644
index 4c8b36f5..00000000
--- a/src/layouts/components/Sidebar/components/SidebarMenu.vue
+++ /dev/null
@@ -1,132 +0,0 @@
-<!-- 菜单组件 -->
-<template>
-  <el-menu
-    ref="menuRef"
-    :default-active="currentRoute.path"
-    :collapse="!appStore.sidebar.opened"
-    :background-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-background']
-        : undefined
-    "
-    :text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-text']
-        : undefined
-    "
-    :active-text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-active-text']
-        : undefined
-    "
-    :popper-effect="theme"
-    :unique-opened="false"
-    :collapse-transition="false"
-    :mode="menuMode"
-    @open="onMenuOpen"
-    @close="onMenuClose"
-  >
-    <!-- 菜单项 -->
-    <SidebarMenuItem
-      v-for="route in data"
-      :key="route.path"
-      :item="route"
-      :base-path="resolveFullPath(route.path)"
-    />
-  </el-menu>
-</template>
-
-<script lang="ts" setup>
-import path from "path-browserify";
-import type { MenuInstance } from "element-plus";
-import type { RouteRecordRaw } from "vue-router";
-
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { SidebarColor } from "@/enums/settings/theme.enum";
-import { useSettingsStore, useAppStore } from "@/store";
-import { isExternal } from "@/utils/index";
-
-import variables from "@/styles/variables.module.scss";
-
-const props = defineProps({
-  data: {
-    type: Array<RouteRecordRaw>,
-    default: () => [],
-  },
-  basePath: {
-    type: String,
-    required: true,
-    example: "/system",
-  },
-});
-
-const menuRef = ref<MenuInstance>();
-const settingsStore = useSettingsStore();
-const appStore = useAppStore();
-const currentRoute = useRoute();
-
-// 存储已展开的菜单项索引
-const expandedMenuIndexes = ref<string[]>([]);
-
-// 根据布局模式设置菜单的显示方式：顶部布局使用水平模式，其他使用垂直模式
-const menuMode = computed(() => {
-  return settingsStore.layout === LayoutMode.TOP ? "horizontal" : "vertical";
-});
-
-// 获取主题
-const theme = computed(() => settingsStore.theme);
-
-// 获取浅色主题下的侧边栏配色方案
-const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
-
-/**
- * 获取完整路径
- *
- * @param routePath 当前路由的相对路径  /user
- * @returns 完整的绝对路径 D://vue3-element-admin/system/user
- */
-function resolveFullPath(routePath: string) {
-  if (isExternal(routePath)) {
-    return routePath;
-  }
-  if (isExternal(props.basePath)) {
-    return props.basePath;
-  }
-
-  // 解析路径，生成完整的绝对路径
-  return path.resolve(props.basePath, routePath);
-}
-
-/**
- * 打开菜单
- *
- * @param index 当前展开的菜单项索引
- */
-const onMenuOpen = (index: string) => {
-  expandedMenuIndexes.value.push(index);
-};
-
-/**
- * 关闭菜单
- *
- * @param index 当前收起的菜单项索引
- */
-const onMenuClose = (index: string) => {
-  expandedMenuIndexes.value = expandedMenuIndexes.value.filter((item) => item !== index);
-};
-
-/**
- * 监听菜单模式变化：当菜单模式切换为水平模式时，关闭所有展开的菜单项，
- * 避免在水平模式下菜单项显示错位。
- *
- * @see https://gitee.com/youlaiorg/vue3-element-admin/issues/IAJ1DR
- */
-watch(
-  () => menuMode.value,
-  () => {
-    if (menuMode.value === "horizontal") {
-      expandedMenuIndexes.value.forEach((item) => menuRef.value!.close(item));
-    }
-  }
-);
-</script>
diff --git a/src/layouts/components/common/LayoutSidebar.vue b/src/layouts/components/Sidebar/index.vue
similarity index 92%
rename from src/layouts/components/common/LayoutSidebar.vue
rename to src/layouts/components/Sidebar/index.vue
index 6933bd30..a022aeef 100644
--- a/src/layouts/components/common/LayoutSidebar.vue
+++ b/src/layouts/components/Sidebar/index.vue
@@ -8,6 +8,8 @@
 </template>
 
 <script setup lang="ts">
+import SidebarLogo from "./components/SidebarLogo.vue";
+
 defineProps({
   /**
    * 是否显示Logo
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView.vue
similarity index 100%
rename from src/layouts/components/TagsView/index.vue
rename to src/layouts/components/TagsView.vue
diff --git a/src/layouts/components/Sidebar/components/SidebarMenuItem.vue b/src/layouts/components/menu/components/MenuItem.vue
similarity index 95%
rename from src/layouts/components/Sidebar/components/SidebarMenuItem.vue
rename to src/layouts/components/menu/components/MenuItem.vue
index ede0ef3c..0be3c3b3 100644
--- a/src/layouts/components/Sidebar/components/SidebarMenuItem.vue
+++ b/src/layouts/components/menu/components/MenuItem.vue
@@ -22,7 +22,7 @@
           :index="resolvePath(onlyOneChild.path)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <SidebarMenuItemTitle
+          <MenuItemTitle
             :icon="onlyOneChild.meta.icon || item.meta?.icon"
             :title="onlyOneChild.meta.title"
           />
@@ -33,10 +33,10 @@
     <!--【非叶子节点】显示含多个子节点的父菜单，或始终显示的单子节点 -->
     <el-sub-menu v-else :index="resolvePath(item.path)" teleported>
       <template #title>
-        <SidebarMenuItemTitle v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
+        <MenuItemTitle v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
       </template>
 
-      <SidebarMenuItem
+      <MenuItem
         v-for="child in item.children"
         :key="child.path"
         :is-nest="true"
@@ -48,8 +48,10 @@
 </template>
 
 <script setup lang="ts">
+import MenuItemTitle from "./MenuItemTitle.vue";
+
 defineOptions({
-  name: "SidebarMenuItem",
+  name: "MenuItem",
   inheritAttrs: false,
 });
 
diff --git a/src/layouts/components/Sidebar/components/SidebarMenuItemTitle.vue b/src/layouts/components/menu/components/MenuItemTitle.vue
similarity index 100%
rename from src/layouts/components/Sidebar/components/SidebarMenuItemTitle.vue
rename to src/layouts/components/menu/components/MenuItemTitle.vue
diff --git a/src/layouts/components/Sidebar/components/SidebarMixTopMenu.vue b/src/layouts/components/menu/components/MixTopMenu.vue
similarity index 82%
rename from src/layouts/components/Sidebar/components/SidebarMixTopMenu.vue
rename to src/layouts/components/menu/components/MixTopMenu.vue
index 643d719e..76bb342c 100644
--- a/src/layouts/components/Sidebar/components/SidebarMixTopMenu.vue
+++ b/src/layouts/components/menu/components/MixTopMenu.vue
@@ -2,7 +2,7 @@
 <template>
   <el-menu
     mode="horizontal"
-    :default-active="activePath"
+    :default-active="activeTopMenuPath"
     :background-color="
       theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
         ? variables['menu-background']
@@ -21,26 +21,20 @@
     @select="handleMenuSelect"
   >
     <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
-      <template #title>
-        <template v-if="route.meta && route.meta.icon">
-          <el-icon v-if="route.meta.icon.startsWith('el-icon')" class="sub-el-icon">
-            <component :is="route.meta.icon.replace('el-icon-', '')" />
-          </el-icon>
-          <div v-else :class="`i-svg:${route.meta.icon}`" />
-        </template>
-        <span v-if="route.path === '/'">首页</span>
-        <span v-else-if="route.meta && route.meta.title" class="ml-1">
-          {{ translateRouteTitle(route.meta.title) }}
-        </span>
-      </template>
+      <MenuItemTitle v-if="route.meta" :icon="route.meta.icon" :title="route.meta.title" />
     </el-menu-item>
   </el-menu>
 </template>
 
 <script lang="ts" setup>
+import MenuItemTitle from "./MenuItemTitle.vue";
+
+defineOptions({
+  name: "MixTopMenu",
+});
+
 import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
-import { translateRouteTitle } from "@/utils/i18n";
 import variables from "@/styles/variables.module.scss";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 
@@ -49,9 +43,6 @@ const appStore = useAppStore();
 const permissionStore = usePermissionStore();
 const settingsStore = useSettingsStore();
 
-// 当前激活的顶部菜单路径
-const activePath = computed(() => appStore.activeTopMenuPath);
-
 // 获取主题
 const theme = computed(() => settingsStore.theme);
 
diff --git a/src/layouts/components/LayoutMenu.vue b/src/layouts/components/menu/index.vue
similarity index 96%
rename from src/layouts/components/LayoutMenu.vue
rename to src/layouts/components/menu/index.vue
index 7ec2074b..9787e4ef 100644
--- a/src/layouts/components/LayoutMenu.vue
+++ b/src/layouts/components/menu/index.vue
@@ -27,7 +27,7 @@
     @close="onMenuClose"
   >
     <!-- 菜单项 -->
-    <SidebarMenuItem
+    <MenuItem
       v-for="route in data"
       :key="route.path"
       :item="route"
@@ -45,7 +45,7 @@ import type { RouteRecordRaw } from "vue-router";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
-import SidebarMenuItem from "@/layouts/components/Sidebar/components/SidebarMenuItem.vue";
+import MenuItem from "./components/MenuItem.vue";
 import variables from "@/styles/variables.module.scss";
 
 const props = defineProps({
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 97d31741..2c382e7b 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -5,9 +5,9 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useLayout } from "./composables/useLayout";
-import LeftLayout from "./components/LeftLayout/index.vue";
-import TopLayout from "./components/TopLayout/index.vue";
-import MixLayout from "./components/MixLayout/index.vue";
+import LeftLayout from "./views/LeftLayout.vue";
+import TopLayout from "./views/TopLayout.vue";
+import MixLayout from "./views/MixLayout.vue";
 import { LayoutMode } from "@/enums/settings/layout.enum";
 
 const { currentLayout } = useLayout();
diff --git a/src/layouts/components/BaseLayout.vue b/src/layouts/views/BaseLayout.vue
similarity index 94%
rename from src/layouts/components/BaseLayout.vue
rename to src/layouts/views/BaseLayout.vue
index 501b1d70..d8680eeb 100644
--- a/src/layouts/components/BaseLayout.vue
+++ b/src/layouts/views/BaseLayout.vue
@@ -19,7 +19,7 @@
 <script setup lang="ts">
 import { useLayout } from "../composables/useLayout";
 import { useLayoutResponsive } from "../composables/useLayoutResponsive";
-import Settings from "@/layouts/components/Settings/index.vue";
+import Settings from "../components/Settings.vue";
 
 // 布局相关
 const { layoutClass, isShowSettings, isSidebarOpen, closeSidebar } = useLayout();
diff --git a/src/layouts/components/LeftLayout/index.vue b/src/layouts/views/LeftLayout.vue
similarity index 77%
rename from src/layouts/components/LeftLayout/index.vue
rename to src/layouts/views/LeftLayout.vue
index 66afabac..d8660efa 100644
--- a/src/layouts/components/LeftLayout/index.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -2,11 +2,11 @@
   <BaseLayout>
     <!-- 左侧菜单栏 -->
     <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
-      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
+      <Sidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
         <el-scrollbar>
-          <SidebarMenu :data="routes" base-path="" />
+          <Menu :data="routes" base-path="" />
         </el-scrollbar>
-      </LayoutSidebar>
+      </Sidebar>
     </div>
 
     <!-- 主内容区 -->
@@ -25,14 +25,14 @@
 </template>
 
 <script setup lang="ts">
-import { useLayout } from "../../composables/useLayout";
-import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import BaseLayout from "../BaseLayout.vue";
-import LayoutSidebar from "../common/LayoutSidebar.vue";
-import NavBar from "@/layouts/components/NavBar/index.vue";
-import TagsView from "@/layouts/components/TagsView/index.vue";
-import AppMain from "@/layouts/components/AppMain/index.vue";
-import SidebarMenu from "../LayoutMenu.vue";
+import { useLayout } from "../composables/useLayout";
+import { useLayoutMenu } from "../composables/useLayoutMenu";
+import BaseLayout from "./BaseLayout.vue";
+import Sidebar from "../components/Sidebar/index.vue";
+import NavBar from "../components/navbar/index.vue";
+import TagsView from "../components/TagsView.vue";
+import AppMain from "../components/AppMain.vue";
+import Menu from "../components/menu/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
diff --git a/src/layouts/components/MixLayout/index.vue b/src/layouts/views/MixLayout.vue
similarity index 89%
rename from src/layouts/components/MixLayout/index.vue
rename to src/layouts/views/MixLayout.vue
index 46fac677..a8002033 100644
--- a/src/layouts/components/MixLayout/index.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -10,7 +10,7 @@
 
         <!-- 顶部菜单区域 -->
         <div class="layout__header-menu">
-          <SidebarMixTopMenu />
+          <MixTopMenu />
         </div>
 
         <!-- 右侧操作区域 -->
@@ -34,7 +34,7 @@
             :text-color="variables['menu-text']"
             :active-text-color="variables['menu-active-text']"
           >
-            <SidebarMenuItem
+            <MenuItem
               v-for="route in sideMenuRoutes"
               :key="route.path"
               :item="route"
@@ -60,15 +60,15 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useRoute } from "vue-router";
-import { useLayout } from "../../composables/useLayout";
-import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import BaseLayout from "../BaseLayout.vue";
-import SidebarLogo from "@/layouts/components/Sidebar/components/SidebarLogo.vue";
-import SidebarMixTopMenu from "@/layouts/components/Sidebar/components/SidebarMixTopMenu.vue";
-import NavbarActions from "@/layouts/components/NavBar/components/NavbarActions.vue";
-import TagsView from "@/layouts/components/TagsView/index.vue";
-import AppMain from "@/layouts/components/AppMain/index.vue";
-import SidebarMenuItem from "@/layouts/components/Sidebar/components/SidebarMenuItem.vue";
+import { useLayout } from "../composables/useLayout";
+import { useLayoutMenu } from "../composables/useLayoutMenu";
+import BaseLayout from "./BaseLayout.vue";
+import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import MixTopMenu from "../components/menu/components/MixTopMenu.vue";
+import NavbarActions from "../components/navbar/components/NavbarActions.vue";
+import TagsView from "../components/TagsView.vue";
+import AppMain from "../components/AppMain.vue";
+import MenuItem from "../components/menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 
diff --git a/src/layouts/components/TopLayout/index.vue b/src/layouts/views/TopLayout.vue
similarity index 60%
rename from src/layouts/components/TopLayout/index.vue
rename to src/layouts/views/TopLayout.vue
index a3be577a..d92c66a9 100644
--- a/src/layouts/components/TopLayout/index.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -2,10 +2,10 @@
   <BaseLayout>
     <!-- 顶部菜单栏 -->
     <div class="layout__header">
-      <LayoutSidebar :show-logo="isShowLogo" :is-collapsed="false">
-        <LayoutMenu :data="routes" menu-mode="horizontal" base-path="" />
+      <Sidebar :show-logo="isShowLogo" :is-collapsed="false">
+        <Menu :data="routes" menu-mode="horizontal" base-path="" />
         <NavbarActions />
-      </LayoutSidebar>
+      </Sidebar>
     </div>
 
     <!-- 主内容区 -->
@@ -17,14 +17,14 @@
 </template>
 
 <script setup lang="ts">
-import { useLayout } from "../../composables/useLayout";
-import { useLayoutMenu } from "../../composables/useLayoutMenu";
-import BaseLayout from "../BaseLayout.vue";
-import LayoutSidebar from "../common/LayoutSidebar.vue";
-import LayoutMenu from "../LayoutMenu.vue";
-import NavbarActions from "@/layouts/components/NavBar/components/NavbarActions.vue";
-import TagsView from "@/layouts/components/TagsView/index.vue";
-import AppMain from "@/layouts/components/AppMain/index.vue";
+import { useLayout } from "../composables/useLayout";
+import { useLayoutMenu } from "../composables/useLayoutMenu";
+import BaseLayout from "./BaseLayout.vue";
+import Sidebar from "../components/Sidebar/index.vue";
+import Menu from "../components/menu/index.vue";
+import NavbarActions from "../components/navbar/components/NavbarActions.vue";
+import TagsView from "../components/TagsView.vue";
+import AppMain from "../components/AppMain.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo } = useLayout();

From cfe041d7d2c0750f82da693e756c21d68f90675d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 23 May 2025 15:26:37 +0800
Subject: [PATCH 390/497] =?UTF-8?q?wip:=20=E5=B8=83=E5=B1=80=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/README.md                         | 96 -------------------
 .../{AppMain.vue => AppMain/index.vue}        |  0
 .../NavBar/components/NavbarActions.vue       | 43 +++++++--
 src/layouts/components/NavBar/index.vue       |  4 +
 .../{Settings.vue => Settings/index.vue}      |  0
 .../Sidebar/components/SidebarLogo.vue        |  2 +-
 .../{TagsView.vue => TagsView/index.vue}      |  0
 src/layouts/views/BaseLayout.vue              |  2 +-
 src/layouts/views/LeftLayout.vue              |  8 +-
 src/layouts/views/MixLayout.vue               | 10 +-
 src/layouts/views/TopLayout.vue               | 82 ++++++++++++++--
 src/types/components.d.ts                     | 11 ---
 12 files changed, 125 insertions(+), 133 deletions(-)
 delete mode 100644 src/layouts/README.md
 rename src/layouts/components/{AppMain.vue => AppMain/index.vue} (100%)
 rename src/layouts/components/{Settings.vue => Settings/index.vue} (100%)
 rename src/layouts/components/{TagsView.vue => TagsView/index.vue} (100%)

diff --git a/src/layouts/README.md b/src/layouts/README.md
deleted file mode 100644
index 9d36e764..00000000
--- a/src/layouts/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# 布局系统
-
-## 目录结构
-
-```
-layouts/
-├── index.vue              # 布局系统入口，根据设置动态加载布局
-├── BaseLayout.vue         # 基础布局容器，提供通用功能
-├── LeftLayout.vue         # 左侧菜单布局
-├── TopLayout.vue          # 顶部菜单布局
-├── MixLayout.vue          # 混合布局（顶部+左侧）
-├── components/            # 布局相关组件
-│   ├── AppMain.vue        # 主内容区域
-│   ├── NavBar.vue         # 导航栏
-│   ├── NavbarActions.vue  # 导航栏右侧操作区
-│   ├── TagsView.vue       # 标签页视图
-│   ├── LayoutMenu.vue     # 菜单组件
-│   ├── Sidebar/           # 侧边栏相关组件
-│   │   ├── SidebarLogo.vue         # Logo 组件
-│   │   ├── SidebarMenu.vue         # 菜单主体（未使用）
-│   │   ├── SidebarMenuItem.vue     # 菜单项
-│   │   ├── SidebarMenuItemTitle.vue # 菜单项标题
-│   │   └── SidebarMixTopMenu.vue   # 混合布局顶部菜单
-│   ├── Settings/          # 设置面板
-│   │   └── index.vue      # 设置面板主组件（包含布局选择）
-│   └── common/            # 通用组件
-│       └── LayoutSidebar.vue # 侧边栏容器
-└── composables/           # 组合式函数
-    ├── useLayout.ts       # 布局相关逻辑
-    ├── useLayoutMenu.ts   # 菜单相关逻辑
-    └── useLayoutResponsive.ts # 响应式处理
-```
-
-## 布局说明
-
-### 1. LeftLayout（左侧布局）
-- 传统的左侧固定菜单布局
-- 支持菜单折叠/展开
-- 适合大多数管理系统
-
-### 2. TopLayout（顶部布局）
-- 菜单位于顶部横向排列
-- 适合一级菜单较少的系统
-- 节省横向空间
-
-### 3. MixLayout（混合布局）
-- 一级菜单在顶部，二级菜单在左侧
-- 适合菜单层级较多的大型系统
-- 提供更好的菜单组织方式
-
-## 使用方式
-
-布局系统会根据 `settings store` 中的 `layout` 配置自动切换：
-
-```typescript
-// 在设置面板中切换布局
-// 或通过代码：
-settingsStore.layout = LayoutMode.LEFT; // 'left' | 'top' | 'mix'
-```
-
-## 自定义布局
-
-如需添加新布局：
-
-1. 在 `layouts/` 目录下创建新的布局组件（如 `CustomLayout.vue`）
-2. 在 `index.vue` 中导入并添加到切换逻辑
-3. 在 `enums/settings/layout.enum.ts` 中添加新的布局类型
-
-## 主要功能
-
-1. **响应式适配**: 自动适配桌面端和移动端，移动端下自动收起侧边栏
-2. **多种布局模式**: 支持左侧菜单、顶部菜单、混合菜单三种模式
-3. **主题切换**: 支持明亮/暗黑主题
-4. **标签页**: 支持多标签页功能，可通过设置开启/关闭
-
-## 可组合式API
-
-### useLayout
-
-提供布局相关的基础功能:
-- 侧边栏展开/收起控制
-- 布局模式获取
-- 布局样式类计算
-
-### useLayoutResponsive
-
-提供响应式布局功能:
-- 根据屏幕尺寸自动调整设备类型
-- 根据设备类型自动调整侧边栏状态
-
-### useLayoutMenu
-
-提供菜单相关功能:
-- 获取菜单数据
-- 处理菜单激活状态
-- 混合布局下的菜单联动
\ No newline at end of file
diff --git a/src/layouts/components/AppMain.vue b/src/layouts/components/AppMain/index.vue
similarity index 100%
rename from src/layouts/components/AppMain.vue
rename to src/layouts/components/AppMain/index.vue
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index e22cc39b..ef21a064 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -138,15 +138,44 @@ function logout() {
     display: flex;
     align-items: center;
     justify-content: center;
-    min-width: 40px;
-    height: $navbar-height;
+    min-width: 36px;
+    height: 100%;
+    padding: 0 8px;
     text-align: center;
     cursor: pointer;
     transition: all 0.3s;
 
+    // 确保直接子元素也居中
+    > * {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+
+    // 确保 el-dropdown 也居中
+    :deep(.el-dropdown) {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+    }
+
+    // 修复可能的 SVG 图标容器
+    :deep(.icon-container),
+    :deep(.action-icon) {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+    }
+
     // 默认图标样式（明亮模式 + 左侧布局）
     :deep([class^="i-svg:"]) {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
       font-size: 18px;
+      line-height: 1;
       color: var(--el-text-color-regular);
       transition: color 0.3s;
     }
@@ -165,18 +194,20 @@ function logout() {
     align-items: center;
     justify-content: center;
     height: 100%;
-    padding: 0 13px;
+    padding: 0 8px;
 
     &__avatar {
-      width: 32px;
-      height: 32px;
+      width: 28px;
+      height: 28px;
       border-radius: 50%;
+      flex-shrink: 0;
     }
 
     &__name {
-      margin-left: 10px;
+      margin-left: 8px;
       color: var(--el-text-color-regular);
       transition: color 0.3s;
+      white-space: nowrap;
     }
   }
 }
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index b7b952f3..f455c6d9 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -37,12 +37,16 @@ function toggleSideBar() {
 .navbar {
   display: flex;
   justify-content: space-between;
+  align-items: center;
   height: $navbar-height;
+  padding: 0 20px;
   background: var(--el-bg-color);
+  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   &__actions {
     display: flex;
     align-items: center;
+    height: 100%;
   }
 }
 </style>
diff --git a/src/layouts/components/Settings.vue b/src/layouts/components/Settings/index.vue
similarity index 100%
rename from src/layouts/components/Settings.vue
rename to src/layouts/components/Settings/index.vue
diff --git a/src/layouts/components/Sidebar/components/SidebarLogo.vue b/src/layouts/components/Sidebar/components/SidebarLogo.vue
index 5fa80e9c..841784ef 100644
--- a/src/layouts/components/Sidebar/components/SidebarLogo.vue
+++ b/src/layouts/components/Sidebar/components/SidebarLogo.vue
@@ -30,7 +30,7 @@ defineProps({
   background-color: $sidebar-logo-background;
 
   .title {
-    flex-shrink: 0; /* 防止容器在空间不足时缩小 */
+    flex-shrink: 0;
     margin-left: 10px;
     font-size: 14px;
     font-weight: bold;
diff --git a/src/layouts/components/TagsView.vue b/src/layouts/components/TagsView/index.vue
similarity index 100%
rename from src/layouts/components/TagsView.vue
rename to src/layouts/components/TagsView/index.vue
diff --git a/src/layouts/views/BaseLayout.vue b/src/layouts/views/BaseLayout.vue
index d8680eeb..218d57ff 100644
--- a/src/layouts/views/BaseLayout.vue
+++ b/src/layouts/views/BaseLayout.vue
@@ -19,7 +19,7 @@
 <script setup lang="ts">
 import { useLayout } from "../composables/useLayout";
 import { useLayoutResponsive } from "../composables/useLayoutResponsive";
-import Settings from "../components/Settings.vue";
+import Settings from "../components/Settings/index.vue";
 
 // 布局相关
 const { layoutClass, isShowSettings, isSidebarOpen, closeSidebar } = useLayout();
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index d8660efa..286e68eb 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -29,10 +29,10 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import Sidebar from "../components/Sidebar/index.vue";
-import NavBar from "../components/navbar/index.vue";
-import TagsView from "../components/TagsView.vue";
-import AppMain from "../components/AppMain.vue";
-import Menu from "../components/menu/index.vue";
+import NavBar from "../components/Navbar/index.vue";
+import TagsView from "../components/TagsView/index.vue";
+import AppMain from "../components/AppMain/index.vue";
+import Menu from "../components/Menu/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index a8002033..f2731ac8 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -64,11 +64,11 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
-import MixTopMenu from "../components/menu/components/MixTopMenu.vue";
-import NavbarActions from "../components/navbar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView.vue";
-import AppMain from "../components/AppMain.vue";
-import MenuItem from "../components/menu/components/MenuItem.vue";
+import MixTopMenu from "../components/Menu/components/MixTopMenu.vue";
+import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import TagsView from "../components/TagsView/index.vue";
+import AppMain from "../components/AppMain/index.vue";
+import MenuItem from "../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index d92c66a9..88071f9a 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -2,10 +2,16 @@
   <BaseLayout>
     <!-- 顶部菜单栏 -->
     <div class="layout__header">
-      <Sidebar :show-logo="isShowLogo" :is-collapsed="false">
+      <div class="layout__header-left">
+        <!-- Logo -->
+        <SidebarLogo v-if="isShowLogo" :collapse="false" />
+        <!-- 菜单 -->
         <Menu :data="routes" menu-mode="horizontal" base-path="" />
+      </div>
+      <!-- 操作按钮 -->
+      <div class="layout__header-right">
         <NavbarActions />
-      </Sidebar>
+      </div>
     </div>
 
     <!-- 主内容区 -->
@@ -20,11 +26,11 @@
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import Sidebar from "../components/Sidebar/index.vue";
-import Menu from "../components/menu/index.vue";
-import NavbarActions from "../components/navbar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView.vue";
-import AppMain from "../components/AppMain.vue";
+import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import Menu from "../components/Menu/index.vue";
+import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import TagsView from "../components/TagsView/index.vue";
+import AppMain from "../components/AppMain/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo } = useLayout();
@@ -39,14 +45,72 @@ const { routes } = useLayoutMenu();
     position: sticky;
     top: 0;
     z-index: 999;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
     width: 100%;
     height: $navbar-height;
+    padding: 0 20px;
     background-color: $menu-background;
+    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
-    :deep(.layout-sidebar) {
+    &-left {
       display: flex;
-      width: 100% !important;
+      align-items: center;
+      height: 100%;
+      flex: 1;
+
+      // Logo 样式
+      :deep(.sidebar-logo) {
+        width: 200px;
+        height: $navbar-height;
+        padding: 0;
+        margin-right: 20px;
+        background: transparent;
+
+        .sidebar-logo__link {
+          height: 100%;
+        }
+
+        .logo {
+          width: 100%;
+          background-color: transparent;
+        }
+      }
+    }
+
+    &-right {
+      display: flex;
+      align-items: center;
+      height: 100%;
+    }
+
+    // 限制菜单高度
+    :deep(.el-menu--horizontal) {
+      flex: 1;
       height: $navbar-height;
+      line-height: $navbar-height;
+      border: none;
+      background-color: transparent;
+
+      .el-menu-item {
+        height: $navbar-height;
+        line-height: $navbar-height;
+        padding: 0 20px;
+      }
+
+      .el-sub-menu {
+        .el-sub-menu__title {
+          height: $navbar-height;
+          line-height: $navbar-height;
+          padding: 0 20px;
+        }
+      }
+
+      // 修复子菜单弹出位置
+      .el-menu--popup {
+        min-width: 160px;
+      }
     }
   }
 
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 6a1374ef..6e194f02 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -7,7 +7,6 @@ export {}
 declare module "vue" {
   export interface GlobalComponents {
     AppLink: (typeof import("./../components/AppLink/index.vue"))["default"];
-    AppMain: (typeof import("./../layout/components/AppMain/index.vue"))["default"];
     Breadcrumb: (typeof import("./../components/Breadcrumb/index.vue"))["default"];
     CopyButton: (typeof import("./../components/CopyButton/index.vue"))["default"];
     CURD: (typeof import("./../components/CURD/index.vue"))["default"];
@@ -71,10 +70,8 @@ declare module "vue" {
     Hamburger: (typeof import("./../components/Hamburger/index.vue"))["default"];
     IconSelect: (typeof import("./../components/IconSelect/index.vue"))["default"];
     LangSelect: (typeof import("./../components/LangSelect/index.vue"))["default"];
-    LayoutSelect: (typeof import("./../layout/components/Settings/components/LayoutSelect.vue"))["default"];
     MenuSearch: (typeof import("./../components/MenuSearch/index.vue"))["default"];
     MultiImageUpload: (typeof import("./../components/Upload/MultiImageUpload.vue"))["default"];
-    NavbarActions: (typeof import("./../layout/components/NavBar/components/NavbarActions.vue"))["default"];
     Notification: (typeof import("./../components/Notification/index.vue"))["default"];
     PageContent: (typeof import("./../components/CURD/PageContent.vue"))["default"];
     PageModal: (typeof import("./../components/CURD/PageModal.vue"))["default"];
@@ -82,17 +79,9 @@ declare module "vue" {
     Pagination: (typeof import("./../components/Pagination/index.vue"))["default"];
     RouterLink: (typeof import("vue-router"))["RouterLink"];
     RouterView: (typeof import("vue-router"))["RouterView"];
-    Settings: (typeof import("./../layout/components/Settings/index.vue"))["default"];
-    Sidebar: (typeof import("./../layout/components/Sidebar/index.vue"))["default"];
-    SidebarLogo: (typeof import("./../layout/components/Sidebar/components/SidebarLogo.vue"))["default"];
-    SidebarMenu: (typeof import("./../layout/components/Sidebar/components/SidebarMenu.vue"))["default"];
-    SidebarMenuItem: (typeof import("./../layout/components/Sidebar/components/SidebarMenuItem.vue"))["default"];
-    SidebarMenuItemTitle: (typeof import("./../layout/components/Sidebar/components/SidebarMenuItemTitle.vue"))["default"];
-    SidebarMixTopMenu: (typeof import("./../layout/components/Sidebar/components/SidebarMixTopMenu.vue"))["default"];
     SingleImageUpload: (typeof import("./../components/Upload/SingleImageUpload.vue"))["default"];
     SizeSelect: (typeof import("./../components/SizeSelect/index.vue"))["default"];
     TableSelect: (typeof import("./../components/TableSelect/index.vue"))["default"];
-    TagsView: (typeof import("./../layout/components/TagsView/index.vue"))["default"];
     WangEditor: (typeof import("./../components/WangEditor/index.vue"))["default"];
   }
   export interface ComponentCustomProperties {

From 32686ad80709940efc3211daf6a2c4513550a79c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 24 May 2025 07:35:46 +0800
Subject: [PATCH 391/497] =?UTF-8?q?refactor:=20=E9=A1=B9=E7=9B=AE=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   6 +-
 eslint.config.ts                              | 149 +++--
 src/api/auth.api.ts                           |   2 +-
 src/api/codegen.api.ts                        |   4 +-
 src/api/file.api.ts                           |   4 +-
 src/api/system/config.api.ts                  |   4 +-
 src/api/system/dept.api.ts                    |   4 +-
 src/api/system/dict.api.ts                    |   8 +-
 src/api/system/menu.api.ts                    |   6 +-
 src/api/system/notice.api.ts                  |   4 +-
 src/api/system/role.api.ts                    |   6 +-
 src/api/system/user.api.ts                    |  20 +-
 src/components/AppLink/index.vue              |   2 +-
 src/components/CURD/PageContent.vue           |   9 +-
 src/components/CURD/PageSearch.vue            |   4 +-
 src/components/CURD/types.ts                  |   2 +-
 src/components/CURD/usePage.ts                |   8 +-
 src/components/TableSelect/index.vue          |   2 +-
 src/components/Upload/FileUpload.vue          |   6 +-
 src/composables/useDictSync.ts                |  52 +-
 src/composables/useOnlineCount.ts             |  98 ++-
 src/composables/useStomp.ts                   | 150 +++--
 src/lang/index.ts                             |   2 +-
 .../NavBar/components/NavbarActions.vue       |   1 -
 src/layouts/components/Settings/index.vue     |   2 +-
 src/layouts/components/TagsView/index.vue     | 589 +++++++++---------
 src/plugins/permission.ts                     | 183 ++++--
 src/plugins/websocket.ts                      | 124 +++-
 src/store/modules/permission.store.ts         |  10 +
 src/store/modules/settings.store.ts           |   2 +-
 src/store/modules/user.store.ts               |  11 +
 src/types/global.d.ts                         |   2 +-
 src/utils/request.ts                          | 174 ++++--
 src/views/codegen/index.vue                   |   2 +-
 src/views/demo/curd/config/content.ts         |   4 +-
 src/views/demo/curd/config/edit.ts            |   2 +-
 src/views/demo/curd/config/options.ts         |   6 +-
 src/views/demo/curd/config2/add.ts            |   2 +-
 src/views/demo/curd/config2/content.ts        |   2 +-
 src/views/demo/curd/config2/edit.ts           |   2 +-
 src/views/demo/curd/config2/search.ts         |   2 +-
 src/views/demo/dictionary.vue                 |  12 +-
 src/views/demo/icon-selector.vue              |  14 +-
 src/views/demo/signature.vue                  |  44 +-
 src/views/demo/table-select/config/select.ts  |   2 +-
 src/views/demo/table-select/index.vue         |  46 +-
 src/views/demo/text-scroll.vue                |   2 +-
 src/views/demo/wang-editor.vue                |  12 +-
 src/views/login/components/Login.vue          |  12 +-
 tsconfig.json                                 |   2 +-
 vite.config.ts                                |  27 +-
 51 files changed, 1175 insertions(+), 670 deletions(-)

diff --git a/.env.development b/.env.development
index 55b854a1..782874ea 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,11 @@ VITE_APP_PORT=3000
 VITE_APP_BASE_API=/dev-api
 
 # 接口地址
-VITE_APP_API_URL=https://api.youlai.tech # 线上
-# VITE_APP_API_URL=http://localhost:8989    # 本地
+# VITE_APP_API_URL=https://api.youlai.tech # 线上
+VITE_APP_API_URL=http://localhost:8989    # 本地
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws
-VITE_APP_WS_ENDPOINT=
+VITE_APP_WS_ENDPOINT=ws://localhost:8989/ws
 
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/eslint.config.ts b/eslint.config.ts
index 319b85fe..9ad5e1f1 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -2,8 +2,7 @@
 
 import eslint from "@eslint/js";
 import pluginVue from "eslint-plugin-vue";
-import pluginTypeScript from "@typescript-eslint/eslint-plugin";
-import parserTypeScript from "@typescript-eslint/parser";
+import * as typescriptEslint from "typescript-eslint";
 import vueParser from "vue-eslint-parser";
 import globals from "globals";
 import configPrettier from "eslint-config-prettier";
@@ -52,73 +51,108 @@ const elementPlusComponents = {
 };
 
 export default [
+  // 忽略文件配置
+  {
+    ignores: [
+      "**/node_modules/**",
+      "**/dist/**",
+      "**/build/**",
+      "**/.nuxt/**",
+      "**/.output/**",
+      "**/coverage/**",
+      "**/*.min.*",
+      "**/auto-imports.d.ts",
+      "**/components.d.ts",
+    ],
+  },
+
+  // 基础 JavaScript 配置
+  eslint.configs.recommended,
+
+  // Vue 推荐配置
+  ...pluginVue.configs["flat/recommended"],
+
+  // TypeScript 推荐配置
+  ...typescriptEslint.configs.recommended,
+
   // 全局配置
   {
     // 指定要检查的文件
-    files: ["**/*.js", "**/*.ts", "**/*.vue"],
-    ignores: ["node_modules/**", "dist/**", "build/**"],
+    files: ["**/*.{js,mjs,cjs,ts,mts,cts,vue}"],
     languageOptions: {
-      ecmaVersion: 2022,
+      ecmaVersion: "latest",
       sourceType: "module",
       globals: {
         ...globals.browser, // 浏览器环境全局变量
         ...globals.node, // Node.js 环境全局变量
+        ...globals.es2022, // ES2022 全局对象
         ...autoImportGlobals, // 自动导入的 API 函数
         ...elementPlusComponents, // Element Plus 组件
         // 全局类型定义，解决 TypeScript 中定义但 ESLint 不识别的问题
         PageQuery: "readonly",
         PageResult: "readonly",
         OptionType: "readonly",
-        ResponseData: "readonly",
+        ApiResponse: "readonly",
         ExcelResult: "readonly",
         TagView: "readonly",
         AppSettings: "readonly",
         __APP_INFO__: "readonly",
       },
-      parser: parserTypeScript,
-      parserOptions: {
-        sourceType: "module",
-      },
+    },
+    plugins: {
+      vue: pluginVue,
+      "@typescript-eslint": typescriptEslint.plugin,
     },
     rules: {
-      // 全局规则
-      "no-unused-vars": [
-        "error",
-        {
-          vars: "all",
-          args: "after-used",
-          ignoreRestSiblings: true,
-          argsIgnorePattern: "^_", // 忽略以下划线开头的参数
-          varsIgnorePattern: "^[A-Z][A-Z0-9_]*$", // 忽略全大写的常量/枚举
-        },
-      ],
-      // 禁用未定义变量检查，TypeScript 已处理类型检查
+      // 基础规则
+      "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+      "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+
+      // ES6+ 规则
+      "prefer-const": "error",
+      "no-var": "error",
+      "object-shorthand": "error",
+
+      // 最佳实践
+      eqeqeq: ["error", "always", { null: "ignore" }],
+      "no-multi-spaces": "error",
+      "no-multiple-empty-lines": ["error", { max: 1, maxBOF: 0, maxEOF: 0 }],
+
+      // 禁用与 TypeScript 冲突的规则
+      "no-unused-vars": "off",
       "no-undef": "off",
+      "no-redeclare": "off",
     },
   },
 
-  // 基础 JavaScript 配置
-  eslint.configs.recommended,
-
-  // Vue 配置
+  // Vue 文件特定配置
   {
     files: ["**/*.vue"],
-    plugins: {
-      vue: pluginVue,
-    },
     languageOptions: {
       parser: vueParser,
       parserOptions: {
-        ecmaVersion: 2022,
+        ecmaVersion: "latest",
         sourceType: "module",
-        parser: parserTypeScript,
+        parser: typescriptEslint.parser,
+        extraFileExtensions: [".vue"],
       },
     },
-    processor: pluginVue.processors[".vue"],
     rules: {
+      // Vue 规则
       "vue/multi-word-component-names": "off",
       "vue/no-v-html": "off",
       "vue/require-default-prop": "off",
+      "vue/require-explicit-emits": "error",
+      "vue/no-unused-vars": "error",
+      "vue/no-mutating-props": "error",
+      "vue/attribute-hyphenation": ["error", "always"],
+      "vue/v-on-event-hyphenation": ["error", "always"],
+      "vue/block-order": [
+        "error",
+        {
+          order: ["template", "script", "style"],
+        },
+      ],
       "vue/html-self-closing": [
         "error",
         {
@@ -127,20 +161,27 @@ export default [
             normal: "never",
             component: "always",
           },
+          svg: "always",
+          math: "always",
         },
       ],
-      "vue/no-unused-vars": "off",
+      "vue/component-name-in-template-casing": ["error", "PascalCase"],
     },
   },
 
-  // TypeScript 配置
+  // TypeScript 文件特定配置
   {
-    files: ["**/*.ts", "**/*.tsx", "**/*.vue"],
-    plugins: {
-      "@typescript-eslint": pluginTypeScript,
+    files: ["**/*.{ts,tsx,mts,cts}"],
+    languageOptions: {
+      parser: typescriptEslint.parser,
+      parserOptions: {
+        project: true,
+        tsconfigRootDir: import.meta.dirname,
+      },
     },
     rules: {
-      "@typescript-eslint/no-explicit-any": "off",
+      // TypeScript 规则
+      "@typescript-eslint/no-explicit-any": "warn",
       "@typescript-eslint/no-empty-function": "off",
       "@typescript-eslint/no-empty-object-type": "off",
       "@typescript-eslint/ban-ts-comment": "off",
@@ -155,22 +196,44 @@ export default [
           varsIgnorePattern: "^[A-Z][A-Z0-9_]*$", // 忽略全大写的常量/枚举
         },
       ],
+      "@typescript-eslint/consistent-type-imports": [
+        "error",
+        {
+          prefer: "type-imports",
+          fixStyle: "inline-type-imports",
+        },
+      ],
+      "@typescript-eslint/no-import-type-side-effects": "error",
     },
   },
 
-  // CURD 组件配置
+  // .d.ts 文件配置
   {
-    files: ["**/components/CURD/**/*.{ts,vue}"],
+    files: ["**/*.d.ts"],
     rules: {
-      "no-unused-vars": "off",
+      "@typescript-eslint/no-explicit-any": "off",
       "@typescript-eslint/no-unused-vars": "off",
     },
   },
 
-  // Prettier 集成
+  // 测试文件配置
   {
+    files: ["**/__tests__/**", "**/*.{test,spec}.{js,ts,vue}"],
     rules: {
-      ...configPrettier.rules,
+      "no-console": "off",
+      "@typescript-eslint/no-explicit-any": "off",
     },
   },
+
+  // CURD 组件配置
+  {
+    files: ["**/components/CURD/**/*.{ts,vue}"],
+    rules: {
+      "no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": "off",
+    },
+  },
+
+  // Prettier 集成（必须放在最后）
+  configPrettier,
 ];
diff --git a/src/api/auth.api.ts b/src/api/auth.api.ts
index e27d85e0..772e9ef3 100644
--- a/src/api/auth.api.ts
+++ b/src/api/auth.api.ts
@@ -25,7 +25,7 @@ const AuthAPI = {
     return request<any, LoginResult>({
       url: `${AUTH_BASE_URL}/refresh-token`,
       method: "post",
-      params: { refreshToken: refreshToken },
+      params: { refreshToken },
       headers: {
         Authorization: "no-auth",
       },
diff --git a/src/api/codegen.api.ts b/src/api/codegen.api.ts
index b3b613fc..cddee813 100644
--- a/src/api/codegen.api.ts
+++ b/src/api/codegen.api.ts
@@ -8,7 +8,7 @@ const GeneratorAPI = {
     return request<any, PageResult<TablePageVO[]>>({
       url: `${GENERATOR_BASE_URL}/table/page`,
       method: "get",
-      params: params,
+      params,
     });
   },
 
@@ -25,7 +25,7 @@ const GeneratorAPI = {
     return request({
       url: `${GENERATOR_BASE_URL}/${tableName}/config`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/file.api.ts b/src/api/file.api.ts
index 0b109772..504d916e 100644
--- a/src/api/file.api.ts
+++ b/src/api/file.api.ts
@@ -42,7 +42,7 @@ const FileAPI = {
     return request({
       url: "/api/v1/files",
       method: "delete",
-      params: { filePath: filePath },
+      params: { filePath },
     });
   },
 
@@ -53,7 +53,7 @@ const FileAPI = {
    */
   download(url: string, fileName?: string) {
     return request({
-      url: url,
+      url,
       method: "get",
       responseType: "blob",
     }).then((res) => {
diff --git a/src/api/system/config.api.ts b/src/api/system/config.api.ts
index f280ee1c..42ba7672 100644
--- a/src/api/system/config.api.ts
+++ b/src/api/system/config.api.ts
@@ -25,7 +25,7 @@ const ConfigAPI = {
     return request({
       url: `${CONFIG_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -34,7 +34,7 @@ const ConfigAPI = {
     return request({
       url: `${CONFIG_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/dept.api.ts b/src/api/system/dept.api.ts
index 200065d3..6182a555 100644
--- a/src/api/system/dept.api.ts
+++ b/src/api/system/dept.api.ts
@@ -48,7 +48,7 @@ const DeptAPI = {
     return request({
       url: `${DEPT_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -63,7 +63,7 @@ const DeptAPI = {
     return request({
       url: `${DEPT_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
index b148e0a4..0f8a4fd5 100644
--- a/src/api/system/dict.api.ts
+++ b/src/api/system/dict.api.ts
@@ -55,7 +55,7 @@ const DictAPI = {
     return request({
       url: `${DICT_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -69,7 +69,7 @@ const DictAPI = {
     return request({
       url: `${DICT_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -119,7 +119,7 @@ const DictAPI = {
     return request({
       url: `${DICT_BASE_URL}/${dictCode}/items`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -143,7 +143,7 @@ const DictAPI = {
     return request({
       url: `${DICT_BASE_URL}/${dictCode}/items/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/menu.api.ts b/src/api/system/menu.api.ts
index 06c11ed2..45f95b3c 100644
--- a/src/api/system/menu.api.ts
+++ b/src/api/system/menu.api.ts
@@ -40,7 +40,7 @@ const MenuAPI = {
     return request<any, OptionType[]>({
       url: `${MENU_BASE_URL}/options`,
       method: "get",
-      params: { onlyParent: onlyParent },
+      params: { onlyParent },
     });
   },
 
@@ -66,7 +66,7 @@ const MenuAPI = {
     return request({
       url: `${MENU_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -81,7 +81,7 @@ const MenuAPI = {
     return request({
       url: `${MENU_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/notice.api.ts b/src/api/system/notice.api.ts
index b5e65e79..471c5e7b 100644
--- a/src/api/system/notice.api.ts
+++ b/src/api/system/notice.api.ts
@@ -35,7 +35,7 @@ const NoticeAPI = {
     return request({
       url: `${NOTICE_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -49,7 +49,7 @@ const NoticeAPI = {
     return request({
       url: `${NOTICE_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/role.api.ts b/src/api/system/role.api.ts
index be680229..6a822efb 100644
--- a/src/api/system/role.api.ts
+++ b/src/api/system/role.api.ts
@@ -42,7 +42,7 @@ const RoleAPI = {
     return request({
       url: `${ROLE_BASE_URL}/${roleId}/menus`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -64,7 +64,7 @@ const RoleAPI = {
     return request({
       url: `${ROLE_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -78,7 +78,7 @@ const RoleAPI = {
     return request({
       url: `${ROLE_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/api/system/user.api.ts b/src/api/system/user.api.ts
index 1d16fd1c..2a26b34c 100644
--- a/src/api/system/user.api.ts
+++ b/src/api/system/user.api.ts
@@ -50,7 +50,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}`,
       method: "post",
-      data: data,
+      data,
     });
   },
 
@@ -64,7 +64,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/${id}`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -78,7 +78,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/${id}/password/reset`,
       method: "put",
-      params: { password: password },
+      params: { password },
     });
   },
 
@@ -129,7 +129,7 @@ const UserAPI = {
     return request<any, ExcelResult>({
       url: `${USER_BASE_URL}/import`,
       method: "post",
-      params: { deptId: deptId },
+      params: { deptId },
       data: formData,
       headers: {
         "Content-Type": "multipart/form-data",
@@ -150,7 +150,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/profile`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -159,7 +159,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/password`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -168,7 +168,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/mobile/code`,
       method: "post",
-      params: { mobile: mobile },
+      params: { mobile },
     });
   },
 
@@ -177,7 +177,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/mobile`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
@@ -186,7 +186,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/email/code`,
       method: "post",
-      params: { email: email },
+      params: { email },
     });
   },
 
@@ -195,7 +195,7 @@ const UserAPI = {
     return request({
       url: `${USER_BASE_URL}/email`,
       method: "put",
-      data: data,
+      data,
     });
   },
 
diff --git a/src/components/AppLink/index.vue b/src/components/AppLink/index.vue
index b97aacfe..b3b8f172 100644
--- a/src/components/AppLink/index.vue
+++ b/src/components/AppLink/index.vue
@@ -33,6 +33,6 @@ const linkProps = (to: any) => {
       rel: "noopener noreferrer",
     };
   }
-  return { to: to };
+  return { to };
 };
 </script>
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index ace91a2a..cddab0a8 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -8,9 +8,10 @@
       <div class="toolbar-left flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
         <template v-for="btn in toolbarLeftBtn">
           <el-button
+            v-bind="btn.attrs"
+            :key="btn.name"
             v-hasPerm="btn.perm ?? '*:*:*'"
             :disabled="btn.name === 'delete' && removeIds.length === 0"
-            v-bind="btn.attrs"
             @click="handleToolbar(btn.name)"
           >
             {{ btn.text }}
@@ -546,7 +547,7 @@ const exportsFormRef = ref<FormInstance>();
 const exportsFormData = reactive({
   filename: "",
   sheetname: "",
-  fields: fields,
+  fields,
   origin: ExportsOriginEnum.CURRENT,
 });
 const exportsFormRules: FormRules = {
@@ -807,8 +808,8 @@ function handleModify(field: string, value: boolean | string | number, row: Reco
   if (props.contentConfig.modifyAction) {
     props.contentConfig.modifyAction({
       [pk]: row[pk],
-      field: field,
-      value: value,
+      field,
+      value,
     });
   } else {
     ElMessage.error("未配置modifyAction");
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index afd380eb..1e6f8a4a 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -72,7 +72,7 @@ const emit = defineEmits<{
 }>();
 // 组件映射表
 const componentMap = new Map<ISearchComponent, any>([
-  /* eslint-disable */
+   
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
   ["select", markRaw(ElSelect)], // @ts-ignore
@@ -84,7 +84,7 @@ const componentMap = new Map<ISearchComponent, any>([
   ["tree-select", markRaw(ElTreeSelect)], // @ts-ignore
   ["input-tag", markRaw(ElInputTag)], // @ts-ignore
   ["custom-tag", markRaw(InputTag)],
-  /* eslint-enable */
+   
 ]);
 
 // 存储表单实例
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 19095438..d7775873 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -3,7 +3,7 @@ import type { FormProps, TableProps, ColProps, ButtonProps, CardProps } from "el
 import type PageContent from "./PageContent.vue";
 import type PageModal from "./PageModal.vue";
 import type PageSearch from "./PageSearch.vue";
-import { CSSProperties } from "vue";
+import type { CSSProperties } from "vue";
 
 export type PageSearchInstance = InstanceType<typeof PageSearch>;
 export type PageContentInstance = InstanceType<typeof PageContent>;
diff --git a/src/components/CURD/usePage.ts b/src/components/CURD/usePage.ts
index dd2d7be3..18261f2e 100644
--- a/src/components/CURD/usePage.ts
+++ b/src/components/CURD/usePage.ts
@@ -36,12 +36,12 @@ function usePage() {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
       RefImpl.value?.handleDisabled(false);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       RefImpl.value?.setFormData(from ? from : row);
     } else {
       editModalRef.value?.setModalVisible();
       editModalRef.value?.handleDisabled(false);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       editModalRef.value?.setFormData(from ? from : row);
     }
   }
@@ -54,12 +54,12 @@ function usePage() {
     if (RefImpl) {
       RefImpl.value?.setModalVisible();
       RefImpl.value?.handleDisabled(true);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       RefImpl.value?.setFormData(from ? from : row);
     } else {
       editModalRef.value?.setModalVisible();
       editModalRef.value?.handleDisabled(true);
-      let from = await (callback?.(row) ?? Promise.resolve(row));
+      const from = await (callback?.(row) ?? Promise.resolve(row));
       editModalRef.value?.setFormData(from ? from : row);
     }
   }
diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue
index 95fb808b..455c2e2b 100644
--- a/src/components/TableSelect/index.vue
+++ b/src/components/TableSelect/index.vue
@@ -226,7 +226,7 @@ const queryParams = reactive<{
   [key: string]: any;
 }>({
   pageNum: 1,
-  pageSize: pageSize,
+  pageSize,
 });
 
 // 计算popover的宽度
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 4832b246..1b3466c4 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -130,7 +130,7 @@ watch(
     fileList.value = value.map((item) => {
       const name = item.name ? item.name : item.url?.substring(item.url.lastIndexOf("/") + 1);
       return {
-        name: name,
+        name,
         url: item.url,
         status: "success",
         uid: getUid(),
@@ -199,11 +199,11 @@ const handleSuccess = (response: any, uploadFile: UploadFile, files: UploadFiles
       return file.status === "success" || file.status === "fail";
     })
   ) {
-    let fileInfos = [] as FileInfo[];
+    const fileInfos = [] as FileInfo[];
     files.map((file: UploadFile) => {
       if (file.status === "success") {
         //只取携带response的才是刚上传的
-        let res = file.response as FileInfo;
+        const res = file.response as FileInfo;
         if (res) {
           fileInfos.push({ name: res.name, url: res.url } as FileInfo);
         }
diff --git a/src/composables/useDictSync.ts b/src/composables/useDictSync.ts
index bf7f3c7e..ca9551b6 100644
--- a/src/composables/useDictSync.ts
+++ b/src/composables/useDictSync.ts
@@ -1,6 +1,6 @@
 import { useDictStoreHook } from "@/store/modules/dict.store";
 import { useStomp } from "./useStomp";
-import { IMessage } from "@stomp/stompjs";
+import type { IMessage } from "@stomp/stompjs";
 import { ref } from "vue";
 
 // 字典消息类型
@@ -39,6 +39,9 @@ function createDictSyncHook() {
   // 消息回调函数列表
   const messageCallbacks = ref<DictMessageCallback[]>([]);
 
+  // 重试定时器
+  let retryTimer: any = null;
+
   /**
    * 注册字典消息回调
    * @param callback 回调函数
@@ -62,7 +65,7 @@ function createDictSyncHook() {
       // 检查是否配置了WebSocket端点
       const wsEndpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
       if (!wsEndpoint) {
-        console.log("[WebSocket] 未配置WebSocket端点,跳过连接");
+        console.log("[DictSync] 未配置WebSocket端点,跳过连接");
         return;
       }
 
@@ -72,7 +75,7 @@ function createDictSyncHook() {
       // 设置字典订阅
       setupDictSubscription();
     } catch (error) {
-      console.error("[WebSocket] 初始化失败:", error);
+      console.error("[DictSync] 初始化失败:", error);
     }
   };
 
@@ -80,6 +83,12 @@ function createDictSyncHook() {
    * 关闭WebSocket
    */
   const closeWebSocket = () => {
+    // 清理重试定时器
+    if (retryTimer) {
+      clearTimeout(retryTimer);
+      retryTimer = null;
+    }
+
     // 取消所有订阅
     subscriptionIds.value.forEach((id) => {
       unsubscribe(id);
@@ -99,27 +108,40 @@ function createDictSyncHook() {
 
     // 防止重复订阅
     if (subscribedTopics.value.has(topic)) {
-      console.log(`跳过重复订阅: ${topic}`);
+      console.log(`[DictSync] 跳过重复订阅: ${topic}`);
       return;
     }
 
-    console.log(`开始尝试订阅字典主题: ${topic}`);
+    console.log(`[DictSync] 开始尝试订阅字典主题: ${topic}`);
 
     // 使用简化的重试逻辑，依赖useStomp的连接管理
     const attemptSubscribe = () => {
       if (!isConnected.value) {
-        console.log("等待WebSocket连接建立...");
+        console.log("[DictSync] 等待WebSocket连接建立...");
+        // 清理之前的定时器，防止重复
+        if (retryTimer) {
+          clearTimeout(retryTimer);
+        }
         // 10秒后再次尝试
-        setTimeout(attemptSubscribe, 10000);
+        retryTimer = setTimeout(() => {
+          retryTimer = null;
+          attemptSubscribe();
+        }, 10000);
         return;
       }
 
+      // 清理重试定时器
+      if (retryTimer) {
+        clearTimeout(retryTimer);
+        retryTimer = null;
+      }
+
       // 检查是否已订阅
       if (subscribedTopics.value.has(topic)) {
         return;
       }
 
-      console.log(`连接已建立，开始订阅: ${topic}`);
+      console.log(`[DictSync] 连接已建立，开始订阅: ${topic}`);
 
       // 订阅字典更新
       const subId = subscribe(topic, (message: IMessage) => {
@@ -129,9 +151,9 @@ function createDictSyncHook() {
       if (subId) {
         subscriptionIds.value.push(subId);
         subscribedTopics.value.add(topic);
-        console.log(`字典主题订阅成功: ${topic}`);
+        console.log(`[DictSync] 字典主题订阅成功: ${topic}`);
       } else {
-        console.warn(`字典主题订阅失败: ${topic}`);
+        console.warn(`[DictSync] 字典主题订阅失败: ${topic}`);
       }
     };
 
@@ -148,7 +170,7 @@ function createDictSyncHook() {
 
     try {
       // 记录接收到的消息
-      console.log(`收到字典更新消息: ${message.body}`);
+      console.log(`[DictSync] 收到字典更新消息: ${message.body}`);
 
       // 尝试解析消息
       const parsedData = JSON.parse(message.body) as DictMessage;
@@ -158,21 +180,21 @@ function createDictSyncHook() {
 
       // 清除缓存，等待按需加载
       dictStore.removeDictItem(dictCode);
-      console.log(`字典缓存已清除: ${dictCode}`);
+      console.log(`[DictSync] 字典缓存已清除: ${dictCode}`);
 
       // 调用所有注册的回调函数
       messageCallbacks.value.forEach((callback) => {
         try {
           callback(parsedData);
         } catch (callbackError) {
-          console.error("[WebSocket] 回调执行失败:", callbackError);
+          console.error("[DictSync] 回调执行失败:", callbackError);
         }
       });
 
       // 显示提示消息
-      console.info(`字典 ${dictCode} 已变更，将在下次使用时自动加载`);
+      console.info(`[DictSync] 字典 ${dictCode} 已变更，将在下次使用时自动加载`);
     } catch (error) {
-      console.error("[WebSocket] 解析消息失败:", error);
+      console.error("[DictSync] 解析消息失败:", error);
     }
   };
 
diff --git a/src/composables/useOnlineCount.ts b/src/composables/useOnlineCount.ts
index fac73274..086a8d75 100644
--- a/src/composables/useOnlineCount.ts
+++ b/src/composables/useOnlineCount.ts
@@ -1,14 +1,16 @@
-import { ref, onMounted, onUnmounted, watch } from "vue";
+import { ref, onMounted, onUnmounted, watch, getCurrentInstance } from "vue";
 import { useStomp } from "./useStomp";
 import { ElMessage } from "element-plus";
-import { Storage } from "@/utils/storage";
-import { ACCESS_TOKEN_KEY } from "@/constants/cache-keys";
+import { registerWebSocketInstance } from "@/plugins/websocket";
+import { Auth } from "@/utils/auth";
+
+// 全局单例实例
+let globalInstance: ReturnType<typeof createOnlineCountHook> | null = null;
 
 /**
- * 在线用户计数组合式函数
- * 用于订阅后端推送的在线用户数量变化
+ * 创建在线用户计数的核心逻辑
  */
-export function useOnlineCount() {
+function createOnlineCountHook() {
   // 在线用户数量
   const onlineUserCount = ref(0);
 
@@ -22,18 +24,23 @@ export function useOnlineCount() {
   const isConnecting = ref(false);
 
   // 使用Stomp客户端 - 配置使用指数退避策略
+  const stompInstance = useStomp({
+    reconnectDelay: 15000, // 重连基础延迟
+    maxReconnectAttempts: 3, // 重连次数上限
+    connectionTimeout: 10000, // 连接超时
+    useExponentialBackoff: true, // 启用指数退避
+  });
+
   const {
     connect,
     subscribe,
     unsubscribe,
     disconnect,
     isConnected: stompConnected,
-  } = useStomp({
-    reconnectDelay: 15000, // 重连基础延迟
-    maxReconnectAttempts: 3, // 重连次数上限
-    connectionTimeout: 10000, // 连接超时
-    useExponentialBackoff: true, // 启用指数退避
-  });
+  } = stompInstance;
+
+  // 注册到全局实例管理器
+  registerWebSocketInstance("onlineCount", stompInstance);
 
   // 订阅ID
   let subscriptionId = "";
@@ -49,7 +56,7 @@ export function useOnlineCount() {
 
       // 一旦连接成功，立即订阅主题
       subscribeToOnlineCount();
-      console.log("WebSocket连接成功，已订阅在线用户计数主题");
+      console.log("[useOnlineCount] WebSocket连接成功，已订阅在线用户计数主题");
     }
   });
 
@@ -81,7 +88,7 @@ export function useOnlineCount() {
           lastUpdateTime.value = Date.now();
         }
       } catch (error) {
-        console.error("解析在线用户数量失败:", error);
+        console.error("[useOnlineCount] 解析在线用户数量失败:", error);
       }
     });
   };
@@ -95,18 +102,19 @@ export function useOnlineCount() {
     // 检查WebSocket端点是否配置
     const wsEndpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
     if (!wsEndpoint) {
-      console.log("未配置WebSocket端点(VITE_APP_WS_ENDPOINT),跳过WebSocket连接");
+      console.log("[useOnlineCount] 未配置WebSocket端点(VITE_APP_WS_ENDPOINT),跳过WebSocket连接");
       return;
     }
 
-    // 检查是否有可用的令牌
-    const hasToken = !!Storage.get(ACCESS_TOKEN_KEY, "");
-    if (!hasToken) {
-      console.log("没有检测到有效令牌，不尝试WebSocket连接");
+    // 使用 Auth.getAccessToken() 获取令牌，确保获取到最新的
+    const accessToken = Auth.getAccessToken();
+    if (!accessToken) {
+      console.log("[useOnlineCount] 没有检测到有效令牌，不尝试WebSocket连接");
       return;
     }
 
     isConnecting.value = true;
+    console.log("[useOnlineCount] 开始建立WebSocket连接...");
 
     // 连接WebSocket
     connect();
@@ -115,17 +123,17 @@ export function useOnlineCount() {
     clearTimeout(connectionTimeoutTimer);
     connectionTimeoutTimer = setTimeout(() => {
       if (!isConnected.value) {
-        console.warn("WebSocket连接超时，将自动尝试重连");
+        console.warn("[useOnlineCount] WebSocket连接超时，将自动尝试重连");
         ElMessage.warning("正在尝试连接服务器，请稍候...");
 
         // 超时后尝试重新连接
         closeWebSocket();
         setTimeout(() => {
           // 再次检查令牌有效性
-          if (Storage.get(ACCESS_TOKEN_KEY, "")) {
+          if (Auth.getAccessToken()) {
             initWebSocket();
           } else {
-            console.log("令牌无效，放弃重连");
+            console.log("[useOnlineCount] 令牌无效，放弃重连");
           }
         }, 3000);
       }
@@ -160,16 +168,6 @@ export function useOnlineCount() {
     isConnecting.value = false;
   };
 
-  // 组件挂载时初始化WebSocket
-  onMounted(() => {
-    initWebSocket();
-  });
-
-  // 组件卸载时关闭WebSocket
-  onUnmounted(() => {
-    closeWebSocket();
-  });
-
   return {
     onlineUserCount,
     lastUpdateTime,
@@ -179,3 +177,39 @@ export function useOnlineCount() {
     closeWebSocket,
   };
 }
+
+/**
+ * 在线用户计数组合式函数
+ * 使用单例模式，避免重复创建 WebSocket 连接
+ * @param options 配置选项
+ * @param options.autoInit 是否在组件挂载时自动初始化（默认 true）
+ */
+export function useOnlineCount(options: { autoInit?: boolean } = {}) {
+  const { autoInit = true } = options;
+
+  if (!globalInstance) {
+    globalInstance = createOnlineCountHook();
+  }
+
+  // 只有在组件上下文中且 autoInit 为 true 时才使用生命周期钩子
+  if (autoInit && getCurrentInstance()) {
+    // 组件挂载时检查是否需要初始化WebSocket
+    onMounted(() => {
+      // 只有在未连接且未连接中时才尝试初始化
+      if (!globalInstance!.isConnected.value && !globalInstance!.isConnecting.value) {
+        console.log("[useOnlineCount] 组件挂载，尝试初始化WebSocket连接");
+        globalInstance!.initWebSocket();
+      } else {
+        console.log("[useOnlineCount] WebSocket已连接或正在连接，跳过初始化");
+      }
+    });
+
+    // 组件卸载时不关闭连接，保持全局连接
+    onUnmounted(() => {
+      // 不关闭连接，让其他组件继续使用
+      console.log("[useOnlineCount] Component unmounted, keeping WebSocket connection");
+    });
+  }
+
+  return globalInstance;
+}
diff --git a/src/composables/useStomp.ts b/src/composables/useStomp.ts
index 98f5b13c..c2b8912b 100644
--- a/src/composables/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -1,4 +1,4 @@
-import { Client, IMessage, StompSubscription } from "@stomp/stompjs";
+import { Client, type IMessage, type StompSubscription } from "@stomp/stompjs";
 import { Auth } from "@/utils/auth";
 
 export interface UseStompOptions {
@@ -48,13 +48,18 @@ export function useStomp(options: UseStompOptions = {}) {
   const subscriptions = new Map<string, StompSubscription>();
 
   // 用于保存 STOMP 客户端的实例
-  let client = ref<Client | null>(null);
+  const client = ref<Client | null>(null);
+  // 防止重复连接的标志
+  let isConnecting = false;
+  let isManualDisconnect = false;
 
   /**
    * 初始化 STOMP 客户端
    */
   const initializeClient = () => {
-    if (client.value) {
+    // 如果客户端已存在且正在连接或已连接，直接返回
+    if (client.value && (client.value.active || client.value.connected)) {
+      console.log("STOMP客户端已存在且处于活动状态，跳过初始化");
       return;
     }
 
@@ -73,6 +78,16 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
+    // 如果有旧的客户端，先清理
+    if (client.value) {
+      try {
+        client.value.deactivate();
+      } catch (error) {
+        console.warn("清理旧客户端时出错:", error);
+      }
+      client.value = null;
+    }
+
     // 创建 STOMP 客户端
     client.value = new Client({
       brokerURL: brokerURL.value,
@@ -80,7 +95,7 @@ export function useStomp(options: UseStompOptions = {}) {
         Authorization: `Bearer ${currentToken}`,
       },
       debug: options.debug ? console.log : () => {},
-      reconnectDelay: useExponentialBackoff ? 0 : reconnectDelay, // 禁用内置重连机制
+      reconnectDelay: 0, // 禁用内置重连机制，使用自定义重连
       heartbeatIncoming: 4000,
       heartbeatOutgoing: 4000,
     });
@@ -88,18 +103,21 @@ export function useStomp(options: UseStompOptions = {}) {
     // 设置连接监听器
     client.value.onConnect = () => {
       isConnected.value = true;
+      isConnecting = false;
       reconnectCount.value = 0;
       clearTimeout(connectionTimeoutTimer);
+      clearTimeout(reconnectTimer);
       console.log("WebSocket连接已建立");
     };
 
     // 设置断开连接监听器
     client.value.onDisconnect = () => {
       isConnected.value = false;
+      isConnecting = false;
       console.log("WebSocket连接已断开");
 
-      // 如果使用自定义指数退避重连策略，则在这里处理
-      if (useExponentialBackoff && reconnectCount.value < maxReconnectAttempts) {
+      // 如果不是手动断开且未达到最大重连次数，则尝试重连
+      if (!isManualDisconnect && reconnectCount.value < maxReconnectAttempts) {
         handleReconnect();
       }
     };
@@ -107,32 +125,31 @@ export function useStomp(options: UseStompOptions = {}) {
     // 设置 Web Socket 关闭监听器
     client.value.onWebSocketClose = (event) => {
       isConnected.value = false;
+      isConnecting = false;
       console.log(`WebSocket已关闭: ${event?.code} ${event?.reason}`);
 
-      // 如果是授权问题导致的关闭，尝试重新获取令牌
-      if (event?.code === 1000 || event?.code === 1006 || event?.code === 1008) {
-        console.log("可能是授权问题导致连接关闭，尝试重新建立连接");
-
-        // 等待一段时间后再尝试重连，避免立即重连
-        setTimeout(() => {
-          // 强制重新初始化客户端，获取最新令牌
-          client.value = null;
-
-          // 检查当前是否有有效令牌
-          const freshToken = Auth.getAccessToken();
-          if (freshToken) {
-            initializeClient();
-            connect();
-          } else {
-            console.warn("没有有效令牌，暂不重连WebSocket");
-          }
-        }, 3000);
+      // 如果是手动断开，不要重连
+      if (isManualDisconnect) {
+        console.log("手动断开连接，不进行重连");
+        return;
+      }
+
+      // 如果是授权问题导致的关闭，尝试重连
+      if (
+        (event?.code === 1000 || event?.code === 1006 || event?.code === 1008) &&
+        reconnectCount.value < maxReconnectAttempts
+      ) {
+        console.log("检测到连接异常关闭，将尝试重连");
+
+        // 通过 handleReconnect 统一处理重连，避免重复计数
+        handleReconnect();
       }
     };
 
     // 设置错误监听器
     client.value.onStompError = (frame) => {
       console.error("STOMP错误:", frame.headers, frame.body);
+      isConnecting = false;
 
       // 检查是否是授权错误
       if (
@@ -141,6 +158,8 @@ export function useStomp(options: UseStompOptions = {}) {
         frame.body?.includes("Token")
       ) {
         console.warn("WebSocket授权错误，请检查登录状态");
+        // 授权错误不进行重连
+        isManualDisconnect = true;
       }
     };
   };
@@ -149,13 +168,18 @@ export function useStomp(options: UseStompOptions = {}) {
    * 处理重连逻辑
    */
   const handleReconnect = () => {
+    // 如果已经在连接中或手动断开，不重连
+    if (isConnecting || isManualDisconnect) {
+      return;
+    }
+
     if (reconnectCount.value >= maxReconnectAttempts) {
       console.error(`已达到最大重连次数(${maxReconnectAttempts})，停止重连`);
       return;
     }
 
     reconnectCount.value++;
-    console.log(`尝试重连(${reconnectCount.value}/${maxReconnectAttempts})...`);
+    console.log(`准备重连(${reconnectCount.value}/${maxReconnectAttempts})...`);
 
     // 使用指数退避策略增加重连间隔
     const delay = useExponentialBackoff
@@ -169,8 +193,9 @@ export function useStomp(options: UseStompOptions = {}) {
 
     // 设置重连计时器
     reconnectTimer = setTimeout(() => {
-      if (!isConnected.value && client.value) {
-        client.value.activate();
+      if (!isConnected.value && !isManualDisconnect && !isConnecting) {
+        console.log(`开始重连...`);
+        connect();
       }
     }, delay);
   };
@@ -195,12 +220,21 @@ export function useStomp(options: UseStompOptions = {}) {
    * 激活连接（如果已经连接或正在激活则直接返回）
    */
   const connect = () => {
+    // 重置手动断开标志
+    isManualDisconnect = false;
+
     // 检查是否有配置WebSocket端点
     if (!brokerURL.value) {
       console.error("WebSocket连接失败: 未配置WebSocket端点URL");
       return;
     }
 
+    // 防止重复连接
+    if (isConnecting) {
+      console.log("WebSocket正在连接中，跳过重复连接请求");
+      return;
+    }
+
     if (!client.value) {
       initializeClient();
     }
@@ -210,29 +244,35 @@ export function useStomp(options: UseStompOptions = {}) {
       return;
     }
 
-    // 避免重复连接:检查是否已连接或正在连接
+    // 避免重复连接:检查是否已连接
     if (client.value.connected) {
       console.log("WebSocket已经连接,跳过重复连接");
+      isConnected.value = true;
       return;
     }
 
-    if (client.value.active) {
-      console.log("WebSocket连接正在进行中,跳过重复连接请求");
-      return;
-    }
+    // 设置连接标志
+    isConnecting = true;
 
     // 设置连接超时
     clearTimeout(connectionTimeoutTimer);
     connectionTimeoutTimer = setTimeout(() => {
-      if (!isConnected.value) {
+      if (!isConnected.value && isConnecting) {
         console.warn("WebSocket连接超时");
-        if (useExponentialBackoff) {
+        isConnecting = false;
+        if (!isManualDisconnect && reconnectCount.value < maxReconnectAttempts) {
           handleReconnect();
         }
       }
     }, connectionTimeout);
 
-    client.value.activate();
+    try {
+      client.value.activate();
+      console.log("正在建立WebSocket连接...");
+    } catch (error) {
+      console.error("激活WebSocket连接失败:", error);
+      isConnecting = false;
+    }
   };
 
   /**
@@ -276,31 +316,45 @@ export function useStomp(options: UseStompOptions = {}) {
    * 断开WebSocket连接
    */
   const disconnect = () => {
-    if (client.value && client.value.connected) {
-      // 清除所有订阅
-      for (const [id, subscription] of subscriptions.entries()) {
-        subscription.unsubscribe();
-        subscriptions.delete(id);
-      }
-
-      // 断开连接
-      client.value.deactivate();
-      console.log("WebSocket连接已断开");
-    }
+    // 设置手动断开标志
+    isManualDisconnect = true;
 
-    // 清除重连计时器
+    // 清除所有计时器
     if (reconnectTimer) {
       clearTimeout(reconnectTimer);
       reconnectTimer = null;
     }
 
-    // 清除连接超时计时器
     if (connectionTimeoutTimer) {
       clearTimeout(connectionTimeoutTimer);
       connectionTimeoutTimer = null;
     }
 
+    // 清除所有订阅
+    for (const [id, subscription] of subscriptions.entries()) {
+      try {
+        subscription.unsubscribe();
+      } catch (error) {
+        console.warn(`取消订阅 ${id} 时出错:`, error);
+      }
+    }
+    subscriptions.clear();
+
+    // 断开连接
+    if (client.value) {
+      try {
+        if (client.value.connected || client.value.active) {
+          client.value.deactivate();
+          console.log("WebSocket连接已主动断开");
+        }
+      } catch (error) {
+        console.error("断开WebSocket连接时出错:", error);
+      }
+      client.value = null;
+    }
+
     isConnected.value = false;
+    isConnecting = false;
     reconnectCount.value = 0;
   };
 
diff --git a/src/lang/index.ts b/src/lang/index.ts
index c94e0186..c16f4c87 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -19,7 +19,7 @@ const messages = {
 const i18n = createI18n({
   legacy: false,
   locale: appStore.language,
-  messages: messages,
+  messages,
   globalInjection: true,
 });
 
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index ef21a064..a2ab7c80 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -62,7 +62,6 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
-import { ElMessageBox } from "element-plus";
 import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore, useSettingsStore, useUserStore } from "@/store";
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 925e04ac..0766d655 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -181,7 +181,7 @@ const handleLayoutChange = (layout: LayoutMode) => {
  * @param findName 查找的名称
  */
 function findTopLevelRoute(tree: any[], findName: string) {
-  let parentMap: any = {};
+  const parentMap: any = {};
 
   function buildParentMap(node: any, parent: any) {
     parentMap[node.name] = parent;
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index d020958e..7aca352e 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -6,19 +6,15 @@
         v-for="tag in visitedViews"
         ref="tagRef"
         :key="tag.fullPath"
-        :class="'tags-item ' + (tagsViewStore.isActive(tag) ? 'active' : '')"
+        :class="['tags-item', { active: tagsViewStore.isActive(tag) }]"
         :to="{ path: tag.path, query: tag.query }"
-        @click.middle="!isAffix(tag) ? closeSelectedTag(tag) : ''"
-        @contextmenu.prevent="openContentMenu(tag, $event)"
+        @click.middle="handleMiddleClick(tag)"
+        @contextmenu.prevent="(event: MouseEvent) => openContextMenu(tag, event)"
       >
         <!-- 标签文本 -->
         <span class="tag-text">{{ translateRouteTitle(tag.title) }}</span>
         <!-- 关闭按钮，固定标签不显示 -->
-        <span
-          v-if="!isAffix(tag)"
-          class="tag-close-icon"
-          @click.prevent.stop="closeSelectedTag(tag)"
-        >
+        <span v-if="!tag.affix" class="tag-close-btn" @click.prevent.stop="closeSelectedTag(tag)">
           ×
         </span>
       </router-link>
@@ -26,15 +22,15 @@
 
     <!-- 标签右键菜单 -->
     <ul
-      v-show="contentMenuVisible"
+      v-show="contextMenu.visible"
       class="contextmenu"
-      :style="{ left: left + 'px', top: top + 'px' }"
+      :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
     >
       <li @click="refreshSelectedTag(selectedTag)">
         <div class="i-svg:refresh" />
         刷新
       </li>
-      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)">
+      <li v-if="!selectedTag?.affix" @click="closeSelectedTag(selectedTag)">
         <div class="i-svg:close" />
         关闭
       </li>
@@ -42,11 +38,11 @@
         <div class="i-svg:close_other" />
         关闭其它
       </li>
-      <li v-if="!isFirstView()" @click="closeLeftTags">
+      <li v-if="!isFirstView" @click="closeLeftTags">
         <div class="i-svg:close_left" />
         关闭左侧
       </li>
-      <li v-if="!isLastView()" @click="closeRightTags">
+      <li v-if="!isLastView" @click="closeRightTags">
         <div class="i-svg:close_right" />
         关闭右侧
       </li>
@@ -59,366 +55,391 @@
 </template>
 
 <script setup lang="ts">
-import { useRoute, useRouter, RouteRecordRaw } from "vue-router";
+import { useRoute, useRouter, type RouteRecordRaw } from "vue-router";
 import { resolve } from "path-browserify";
 import { translateRouteTitle } from "@/utils/i18n";
-
 import { usePermissionStore, useTagsViewStore, useSettingsStore, useAppStore } from "@/store";
 
+// ========================= 类型定义 =========================
+interface ContextMenu {
+  visible: boolean;
+  x: number;
+  y: number;
+}
+
+// ========================= 组合式 API =========================
 const instance = getCurrentInstance();
 const proxy = instance?.proxy;
 const router = useRouter();
 const route = useRoute();
 
-// 权限、标签页状态管理
+// 状态管理
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
+const settingsStore = useSettingsStore();
 const appStore = useAppStore();
 
-// 响应式引用访问已访问的标签视图列表
+// ========================= 响应式数据 =========================
 const { visitedViews } = storeToRefs(tagsViewStore);
-const settingsStore = useSettingsStore();
 const layout = computed(() => settingsStore.layout);
 
 // 当前选中的标签
-const selectedTag = ref<TagView>({
-  path: "",
-  fullPath: "",
-  name: "",
-  title: "",
-  affix: false,
-  keepAlive: false,
+const selectedTag = ref<TagView | null>(null);
+
+// 右键菜单状态
+const contextMenu = reactive<ContextMenu>({
+  visible: false,
+  x: 0,
+  y: 0,
 });
 
-// 固定标签列表
-const affixTags = ref<TagView[]>([]);
-// 右键菜单位置
-const left = ref(0);
-const top = ref(0);
+// 滚动条引用
+const scrollbarRef = ref();
 
-// 监听路由变化，添加标签并移动到当前标签位置
-watch(
-  route,
-  () => {
-    addTags();
-    moveToCurrentTag();
-  },
-  {
-    immediate: true, // 初始化立即执行
-  }
-);
+// ========================= 计算属性 =========================
+// 路由映射缓存，提升查找性能
+const routePathMap = computed(() => {
+  const map = new Map<string, TagView>();
+  visitedViews.value.forEach((tag) => {
+    map.set(tag.path, tag);
+  });
+  return map;
+});
 
-// 右键菜单显示状态
-const contentMenuVisible = ref(false);
-// 监听右键菜单显示状态，添加或移除点击事件监听器
-watch(contentMenuVisible, (value) => {
-  if (value) {
-    document.body.addEventListener("click", closeContentMenu);
-  } else {
-    document.body.removeEventListener("click", closeContentMenu);
-  }
+// 判断是否为第一个标签
+const isFirstView = computed(() => {
+  if (!selectedTag.value) return false;
+  return (
+    selectedTag.value.path === "/dashboard" ||
+    selectedTag.value.fullPath === visitedViews.value[1]?.fullPath
+  );
 });
 
+// 判断是否为最后一个标签
+const isLastView = computed(() => {
+  if (!selectedTag.value) return false;
+  return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1]?.fullPath;
+});
+
+// ========================= 核心函数 =========================
 /**
- * 过滤出需要固定的标签
- * @param routes 路由配置
- * @param basePath 基础路径
- * @returns 固定标签列表
+ * 递归提取固定标签
  */
-function filterAffixTags(routes: RouteRecordRaw[], basePath = "/") {
-  let tags: TagView[] = [];
-  routes.forEach((route: RouteRecordRaw) => {
-    const tagPath = resolve(basePath, route.path);
-    // 当路由设置了meta.affix属性时，加入固定标签列表
-    if (route.meta?.affix) {
-      tags.push({
-        path: tagPath,
-        fullPath: tagPath,
-        name: String(route.name),
-        title: route.meta?.title || "no-name",
-        affix: route.meta?.affix,
-        keepAlive: route.meta?.keepAlive,
-      });
-    }
-    // 递归处理子路由
-    if (route.children) {
-      const tempTags = filterAffixTags(route.children, basePath + route.path);
-      if (tempTags.length >= 1) {
-        tags = [...tags, ...tempTags];
+const extractAffixTags = (routes: RouteRecordRaw[], basePath = "/"): TagView[] => {
+  const affixTags: TagView[] = [];
+
+  const traverse = (routeList: RouteRecordRaw[], currentBasePath: string) => {
+    routeList.forEach((route) => {
+      const fullPath = resolve(currentBasePath, route.path);
+
+      // 如果是固定标签，添加到列表
+      if (route.meta?.affix) {
+        affixTags.push({
+          path: fullPath,
+          fullPath,
+          name: String(route.name || ""),
+          title: route.meta.title || "no-name",
+          affix: true,
+          keepAlive: route.meta.keepAlive || false,
+        });
       }
-    }
-  });
-  return tags;
-}
+
+      // 递归处理子路由
+      if (route.children?.length) {
+        traverse(route.children, fullPath);
+      }
+    });
+  };
+
+  traverse(routes, basePath);
+  return affixTags;
+};
 
 /**
- * 初始化标签列表，添加需要固定的标签
+ * 查找路由的顶级父节点
  */
-function initTags() {
-  const tags: TagView[] = filterAffixTags(permissionStore.routes);
-  affixTags.value = tags;
-  for (const tag of tags) {
-    // 必须有标签名称才添加
+const findTopLevelParent = (
+  routes: RouteRecordRaw[],
+  targetName: string
+): RouteRecordRaw | null => {
+  // 构建父子关系映射
+  const parentMap = new Map<string, RouteRecordRaw>();
+
+  const buildMap = (routeList: RouteRecordRaw[], parent: RouteRecordRaw | null = null) => {
+    routeList.forEach((route) => {
+      if (parent) {
+        parentMap.set(route.name as string, parent);
+      }
+
+      if (route.children?.length) {
+        buildMap(route.children, route);
+      }
+    });
+  };
+
+  buildMap(routes);
+
+  // 向上查找顶级父节点
+  let current = parentMap.get(targetName);
+  let topLevel = current;
+
+  while (current) {
+    const parent = parentMap.get(current.name as string);
+    if (!parent) break;
+    topLevel = current;
+    current = parent;
+  }
+
+  return topLevel || null;
+};
+
+// ========================= 标签操作 =========================
+/**
+ * 初始化固定标签
+ */
+const initAffixTags = () => {
+  const affixTags = extractAffixTags(permissionStore.routes);
+
+  affixTags.forEach((tag) => {
     if (tag.name) {
       tagsViewStore.addVisitedView(tag);
     }
-  }
-}
+  });
+};
 
 /**
- * 添加当前路由到标签列表
+ * 添加当前路由标签
  */
-function addTags() {
-  if (route.meta.title) {
-    tagsViewStore.addView({
-      name: route.name as string,
-      title: route.meta.title,
-      path: route.path,
-      fullPath: route.fullPath,
-      affix: route.meta?.affix,
-      keepAlive: route.meta?.keepAlive,
-      query: route.query,
-    });
-  }
-}
+const addCurrentTag = () => {
+  if (!route.meta?.title) return;
+
+  tagsViewStore.addView({
+    name: route.name as string,
+    title: route.meta.title,
+    path: route.path,
+    fullPath: route.fullPath,
+    affix: route.meta.affix || false,
+    keepAlive: route.meta.keepAlive || false,
+    query: route.query,
+  });
+};
 
 /**
- * the purpose of this function is make sure to move the current active tag into the view
+ * 更新当前标签（优化版本）
  */
-function moveToCurrentTag() {
-  // 使用 nextTick() 确保在更新 tagsView 组件之前滚动到正确位置
+const updateCurrentTag = () => {
   nextTick(() => {
-    for (const tag of visitedViews.value) {
-      if (tag.path === route.path) {
-        // 当查询参数不同时更新标签
-        if (tag.fullPath !== route.fullPath) {
-          tagsViewStore.updateVisitedView({
-            name: route.name as string,
-            title: route.meta.title || "",
-            path: route.path,
-            fullPath: route.fullPath,
-            affix: route.meta?.affix,
-            keepAlive: route.meta?.keepAlive,
-            query: route.query,
-          });
-        }
-      }
+    const currentTag = routePathMap.value.get(route.path);
+
+    if (currentTag && currentTag.fullPath !== route.fullPath) {
+      tagsViewStore.updateVisitedView({
+        name: route.name as string,
+        title: route.meta?.title || "",
+        path: route.path,
+        fullPath: route.fullPath,
+        affix: route.meta?.affix || false,
+        keepAlive: route.meta?.keepAlive || false,
+        query: route.query,
+      });
     }
   });
-}
+};
 
+// ========================= 事件处理 =========================
 /**
- * 判断标签是否为固定标签
- * @param tag 标签对象
- * @returns 是否为固定标签
+ * 处理中键点击
  */
-function isAffix(tag: TagView) {
-  return tag?.affix;
-}
+const handleMiddleClick = (tag: TagView) => {
+  if (!tag.affix) {
+    closeSelectedTag(tag);
+  }
+};
 
 /**
- * 判断选中的标签是否为第一个可见标签
- * @returns 是否为第一个可见标签
+ * 打开右键菜单
  */
-function isFirstView() {
-  return (
-    selectedTag.value.path === "/dashboard" ||
-    selectedTag.value.fullPath === tagsViewStore.visitedViews[1]?.fullPath
-  );
-}
+const openContextMenu = (tag: TagView, event: MouseEvent) => {
+  const MENU_MIN_WIDTH = 105;
+  const MENU_MARGIN = 15;
+
+  const containerRect = proxy?.$el.getBoundingClientRect();
+  const offsetLeft = containerRect?.left || 0;
+  const containerWidth = proxy?.$el.offsetWidth || 0;
+
+  const maxLeft = containerWidth - MENU_MIN_WIDTH;
+  const leftPosition = event.clientX - offsetLeft + MENU_MARGIN;
+
+  contextMenu.x = Math.min(leftPosition, maxLeft);
+  contextMenu.y = layout.value === "mix" ? event.clientY - 50 : event.clientY;
+  contextMenu.visible = true;
+
+  selectedTag.value = tag;
+};
 
 /**
- * 判断选中的标签是否为最后一个可见标签
- * @returns 是否为最后一个可见标签
+ * 关闭右键菜单
  */
-function isLastView() {
-  return (
-    selectedTag.value.fullPath ===
-    tagsViewStore.visitedViews[tagsViewStore.visitedViews.length - 1]?.fullPath
-  );
-}
+const closeContextMenu = () => {
+  contextMenu.visible = false;
+};
+
+/**
+ * 处理滚轮事件
+ */
+const handleScroll = (event: WheelEvent) => {
+  closeContextMenu();
+
+  const scrollWrapper = scrollbarRef.value?.wrapRef;
+  if (!scrollWrapper) return;
 
+  const hasHorizontalScroll = scrollWrapper.scrollWidth > scrollWrapper.clientWidth;
+  if (!hasHorizontalScroll) return;
+
+  const deltaY = event.deltaY || -(event as any).wheelDelta || 0;
+  const newScrollLeft = scrollWrapper.scrollLeft + deltaY;
+
+  scrollbarRef.value.setScrollLeft(newScrollLeft);
+};
+
+// ========================= 标签管理 =========================
 /**
- * 刷新选中的标签页
- * @param view 标签对象
+ * 刷新标签
  */
-function refreshSelectedTag(view: TagView) {
-  tagsViewStore.delCachedView(view);
-  const { fullPath } = view;
+const refreshSelectedTag = (tag: TagView | null) => {
+  if (!tag) return;
+
+  tagsViewStore.delCachedView(tag);
   nextTick(() => {
-    router.replace("/redirect" + fullPath);
+    router.replace("/redirect" + tag.fullPath);
   });
-}
+};
 
 /**
- * 关闭选中的标签页
- * @param view 标签对象
+ * 关闭标签
  */
-function closeSelectedTag(view: TagView) {
-  tagsViewStore.delView(view).then((res: any) => {
-    if (tagsViewStore.isActive(view)) {
-      tagsViewStore.toLastView(res.visitedViews, view);
+const closeSelectedTag = (tag: TagView | null) => {
+  if (!tag) return;
+
+  tagsViewStore.delView(tag).then((result: any) => {
+    if (tagsViewStore.isActive(tag)) {
+      tagsViewStore.toLastView(result.visitedViews, tag);
     }
   });
-}
+};
 
 /**
- * 关闭选中标签左侧的所有标签
+ * 关闭左侧标签
  */
-function closeLeftTags() {
-  tagsViewStore.delLeftViews(selectedTag.value).then((res: any) => {
-    if (!res.visitedViews.find((item: any) => item.path === route.path)) {
-      tagsViewStore.toLastView(res.visitedViews);
+const closeLeftTags = () => {
+  if (!selectedTag.value) return;
+
+  tagsViewStore.delLeftViews(selectedTag.value).then((result: any) => {
+    const hasCurrentRoute = result.visitedViews.some((item: TagView) => item.path === route.path);
+
+    if (!hasCurrentRoute) {
+      tagsViewStore.toLastView(result.visitedViews);
     }
   });
-}
+};
 
 /**
- * 关闭选中标签右侧的所有标签
+ * 关闭右侧标签
  */
-function closeRightTags() {
-  tagsViewStore.delRightViews(selectedTag.value).then((res: any) => {
-    if (!res.visitedViews.find((item: any) => item.path === route.path)) {
-      tagsViewStore.toLastView(res.visitedViews);
+const closeRightTags = () => {
+  if (!selectedTag.value) return;
+
+  tagsViewStore.delRightViews(selectedTag.value).then((result: any) => {
+    const hasCurrentRoute = result.visitedViews.some((item: TagView) => item.path === route.path);
+
+    if (!hasCurrentRoute) {
+      tagsViewStore.toLastView(result.visitedViews);
     }
   });
-}
+};
 
 /**
- * 关闭除选中标签外的所有标签
+ * 关闭其他标签
  */
-function closeOtherTags() {
+const closeOtherTags = () => {
+  if (!selectedTag.value) return;
+
   router.push(selectedTag.value);
   tagsViewStore.delOtherViews(selectedTag.value).then(() => {
-    moveToCurrentTag();
+    updateCurrentTag();
   });
-}
+};
 
 /**
  * 关闭所有标签
- * @param view 标签对象
  */
-function closeAllTags(view: TagView) {
-  tagsViewStore.delAllViews().then((res: any) => {
-    tagsViewStore.toLastView(res.visitedViews, view);
+const closeAllTags = (tag: TagView | null) => {
+  tagsViewStore.delAllViews().then((result: any) => {
+    tagsViewStore.toLastView(result.visitedViews, tag || undefined);
   });
-}
-
-/**
- * 打开右键菜单
- * @param tag 标签对象
- * @param e 鼠标事件
- */
-function openContentMenu(tag: TagView, e: MouseEvent) {
-  const menuMinWidth = 105;
-  const offsetLeft = proxy?.$el.getBoundingClientRect().left; // 容器左边距
-  const offsetWidth = proxy?.$el.offsetWidth; // 容器宽度
-  const maxLeft = offsetWidth - menuMinWidth; // 左边界
-  const leftPosition = e.clientX - offsetLeft + 15; // 15: 右边距
-
-  // 确保菜单不超出容器右边界
-  if (leftPosition > maxLeft) {
-    left.value = maxLeft;
-  } else {
-    left.value = leftPosition;
-  }
-
-  // 混合模式下，需要减去顶部菜单(fixed)的高度
-  if (layout.value === "mix") {
-    top.value = e.clientY - 50;
-  } else {
-    top.value = e.clientY;
-  }
-
-  contentMenuVisible.value = true;
-  selectedTag.value = tag;
-}
-
-/**
- * 关闭右键菜单
- */
-function closeContentMenu() {
-  contentMenuVisible.value = false;
-}
-
-/**
- * 处理鼠标滚轮事件，实现水平滚动
- */
-const scrollbarRef = ref();
-function handleScroll(event: any) {
-  closeContentMenu();
-  // 检查是否有横向滚动条
-  if (scrollbarRef.value.wrapRef.scrollWidth > scrollbarRef.value.wrapRef.clientWidth) {
-    const wheelDelta = event.wheelDelta || 0; // 向上滚动时为120，向下滚动时为-120
-    const scrollLeft = scrollbarRef.value.wrapRef.scrollLeft; // 当前滚动条到左边的距离
-    // 设置滚动条到左边的距离
-    scrollbarRef.value.setScrollLeft(scrollLeft - wheelDelta);
-  }
-}
+};
 
+// ========================= 混合布局处理 =========================
 /**
- * 寻找最外层父节点
- * @param tree 路由树
- * @param findName 要查找的节点名称
- * @returns 最外层父节点
+ * 更新顶部菜单激活状态（混合布局）
  */
-function findOutermostParent(tree: any[], findName: string) {
-  let parentMap: any = {};
-
-  function buildParentMap(node: any, parent: any) {
-    parentMap[node.name] = parent;
-
-    if (node.children) {
-      for (let i = 0; i < node.children.length; i++) {
-        buildParentMap(node.children[i], node);
-      }
-    }
-  }
+const updateTopMenuActive = (routeName: string) => {
+  if (layout.value !== "mix") return;
 
-  for (let i = 0; i < tree.length; i++) {
-    buildParentMap(tree[i], null);
+  const topParent = findTopLevelParent(permissionStore.routes, routeName);
+  if (topParent && appStore.activeTopMenuPath !== topParent.path) {
+    appStore.activeTopMenu(topParent.path);
   }
+};
 
-  let currentNode = parentMap[findName];
-  while (currentNode) {
-    if (!parentMap[currentNode.name]) {
-      return currentNode;
+// ========================= 组合式函数：右键菜单管理 =========================
+const useContextMenuManager = () => {
+  const handleOutsideClick = () => {
+    closeContextMenu();
+  };
+
+  watchEffect(() => {
+    if (contextMenu.visible) {
+      document.addEventListener("click", handleOutsideClick);
+    } else {
+      document.removeEventListener("click", handleOutsideClick);
     }
-    currentNode = parentMap[currentNode.name];
-  }
-
-  return null;
-}
+  });
 
-/**
- * 重新激活顶部菜单
- * @param newVal 新的路由名
- */
-const againActiveTop = (newVal: string) => {
-  if (layout.value !== "mix") return;
-  const parent = findOutermostParent(permissionStore.routes, newVal);
-  if (appStore.activeTopMenu !== parent.path) {
-    appStore.activeTopMenu(parent.path);
-  }
+  // 组件卸载时清理
+  onBeforeUnmount(() => {
+    document.removeEventListener("click", handleOutsideClick);
+  });
 };
 
-// 如果是混合模式，更改selectedTag，需要对应高亮的activeTop
+// ========================= 监听器和生命周期 =========================
+// 监听路由变化
+watch(
+  route,
+  () => {
+    addCurrentTag();
+    updateCurrentTag();
+  },
+  { immediate: true }
+);
+
+// 监听路由名变化（混合布局）
 watch(
   () => route.name,
-  (newVal) => {
-    if (newVal) {
-      againActiveTop(newVal as string);
+  (newRouteName) => {
+    if (newRouteName) {
+      updateTopMenuActive(newRouteName as string);
     }
   },
-  {
-    deep: true,
-  }
+  { deep: true }
 );
 
-// 组件挂载时初始化标签
+// 初始化
 onMounted(() => {
-  initTags();
+  initAffixTags();
 });
+
+// 启用右键菜单管理
+useContextMenuManager();
 </script>
 
 <style lang="scss" scoped>
@@ -429,12 +450,10 @@ onMounted(() => {
   border: 1px solid var(--el-border-color-light);
   box-shadow: 0 1px 1px var(--el-box-shadow-light);
 
-  /* 滚动容器样式 */
   .scroll-container {
     white-space: nowrap;
   }
 
-  /* 标签项样式 */
   .tags-item {
     position: relative;
     display: inline-flex;
@@ -448,8 +467,8 @@ onMounted(() => {
     color: var(--el-text-color-primary);
     background: var(--el-bg-color);
     border: 1px solid var(--el-border-color);
+    transition: all 0.2s ease;
 
-    /* 第一个和最后一个标签的边距调整 */
     &:first-of-type {
       margin-left: 15px;
     }
@@ -457,14 +476,12 @@ onMounted(() => {
       margin-right: 15px;
     }
 
-    /* 标签文本样式 */
     .tag-text {
       display: inline-block;
       vertical-align: middle;
     }
 
-    /* 关闭按钮样式 */
-    .tag-close-icon {
+    .tag-close-btn {
       display: inline-flex;
       align-items: center;
       justify-content: center;
@@ -484,11 +501,11 @@ onMounted(() => {
       }
     }
 
-    /* 活动标签样式 */
     &.active {
       color: var(--el-color-white);
       background-color: var(--el-color-primary);
       border-color: var(--el-color-primary);
+
       &::before {
         position: relative;
         display: inline-block;
@@ -500,8 +517,7 @@ onMounted(() => {
         border-radius: 50%;
       }
 
-      /* 活动标签关闭按钮样式 */
-      .tag-close-icon {
+      .tag-close-btn {
         color: var(--el-color-white);
 
         &:hover {
@@ -512,7 +528,6 @@ onMounted(() => {
     }
   }
 
-  /* 右键菜单样式 */
   .contextmenu {
     position: absolute;
     z-index: 3000;
@@ -526,11 +541,15 @@ onMounted(() => {
     border-radius: 4px;
     box-shadow: var(--el-box-shadow-light);
 
-    /* 菜单项样式 */
     li {
+      display: flex;
+      gap: 8px;
+      align-items: center;
       padding: 7px 16px;
       margin: 0;
       cursor: pointer;
+      transition: background-color 0.2s;
+
       &:hover {
         background: var(--el-fill-color-light);
       }
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 162c49f2..3fb045ae 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -5,73 +5,178 @@ import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 import { ROLE_ROOT } from "@/constants";
 
+// 路由生成锁，防止重复生成
+let isGeneratingRoutes = false;
+
 export function setupPermission() {
   // 白名单路由
   const whiteList = ["/login"];
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
-    console.log("to.path", to.path);
+    console.log("🚀 Route guard triggered:", { to: to.path, from: from.path });
+
+    const isLoggedIn = Auth.isLoggedIn();
+
+    if (isLoggedIn) {
+      console.log("✅ User is logged in");
 
-    const isLogin = Auth.isLoggedIn();
-    if (isLogin) {
+      // 如果已登录但访问登录页，重定向到首页
       if (to.path === "/login") {
-        // 如果已登录，跳转到首页
+        console.log("🔄 Redirecting from login to home");
         next({ path: "/" });
-      } else {
-        // 未登录
-        const permissionStore = usePermissionStore();
-        // 判断路由是否加载完成
-        if (permissionStore.routesLoaded) {
-          if (to.matched.length === 0) {
-            // 路由未匹配，跳转到404
-            next("/404");
-          } else {
-            // 动态设置页面标题
-            const title = (to.params.title as string) || (to.query.title as string);
-            if (title) {
-              to.meta.title = title;
-            }
-            next();
-          }
-        } else {
-          try {
-            // 生成路由
-            const dynamicRoutes = await permissionStore.generateRoutes();
-            dynamicRoutes.forEach((route: RouteRecordRaw) => router.addRoute(route));
-            next({ ...to, replace: true });
-          } catch (error) {
-            console.error(error);
-            // 路由加载失败，重置 token 并重定向到登录页
-            await useUserStore().resetAllState();
-            redirectToLogin(to, next);
-            NProgress.done();
-          }
-        }
+        return;
       }
+
+      // 处理已登录用户的路由访问
+      await handleAuthenticatedUser(to, from, next);
     } else {
-      // 未登录，判断是否在白名单中
+      console.log("❌ User not logged in");
+
+      // 未登录用户的处理
       if (whiteList.includes(to.path)) {
         next();
       } else {
-        // 不在白名单，重定向到登录页
         redirectToLogin(to, next);
         NProgress.done();
       }
     }
   });
 
-  // 后置守卫，保证每次路由跳转结束时关闭进度条
-  router.afterEach(() => {
+  // 后置守卫，确保进度条关闭
+  router.afterEach((to, from) => {
+    console.log("✅ Route navigation completed:", { to: to.path, from: from.path });
     NProgress.done();
   });
 }
 
-// 重定向到登录页
+/**
+ * 处理已登录用户的路由访问
+ */
+async function handleAuthenticatedUser(
+  to: RouteLocationNormalized,
+  from: RouteLocationNormalized,
+  next: NavigationGuardNext
+) {
+  const permissionStore = usePermissionStore();
+  const userStore = useUserStore();
+
+  try {
+    // 检查用户信息是否存在
+    if (!userStore.userInfo.username) {
+      console.log("🔄 User info not found, fetching...");
+      await userStore.getUserInfo();
+    }
+
+    // 检查路由是否已生成
+    if (!permissionStore.routesLoaded) {
+      console.log("🔄 Routes not loaded, generating...");
+
+      // 防止重复生成路由
+      if (isGeneratingRoutes) {
+        console.log("⏳ Routes already generating, waiting...");
+        // 等待当前路由生成完成
+        await waitForRoutesGeneration(permissionStore);
+      } else {
+        await generateAndAddRoutes(permissionStore);
+      }
+
+      // 路由生成完成后，重新导航到目标路由
+      console.log("🔄 Routes generated, redirecting to:", to.path);
+      next({ ...to, replace: true });
+      return;
+    }
+
+    // 路由已加载，检查路由是否存在
+    if (to.matched.length === 0) {
+      console.log("❌ Route not found, redirecting to 404");
+      next("/404");
+      return;
+    }
+
+    // 动态设置页面标题
+    const title = (to.params.title as string) || (to.query.title as string);
+    if (title) {
+      to.meta.title = title;
+    }
+
+    console.log("✅ Route access granted:", to.path);
+    next();
+  } catch (error) {
+    console.error("❌ Route guard error:", error);
+
+    // 出错时重置状态并重定向到登录页
+    await resetUserStateAndRedirect(to, next);
+  }
+}
+
+/**
+ * 生成并添加动态路由
+ */
+async function generateAndAddRoutes(permissionStore: any) {
+  isGeneratingRoutes = true;
+
+  try {
+    console.log("🔧 Generating dynamic routes...");
+    const dynamicRoutes = await permissionStore.generateRoutes();
+
+    // 添加路由到路由器
+    dynamicRoutes.forEach((route: RouteRecordRaw) => {
+      router.addRoute(route);
+    });
+
+    console.log("✅ All dynamic routes generated and added");
+  } finally {
+    isGeneratingRoutes = false;
+  }
+}
+
+/**
+ * 等待路由生成完成
+ */
+async function waitForRoutesGeneration(permissionStore: any): Promise<void> {
+  return new Promise((resolve) => {
+    const checkInterval = setInterval(() => {
+      if (!isGeneratingRoutes && permissionStore.routesLoaded) {
+        clearInterval(checkInterval);
+        resolve();
+      }
+    }, 50); // 每50ms检查一次
+
+    // 超时保护，最多等待5秒
+    setTimeout(() => {
+      clearInterval(checkInterval);
+      console.warn("⚠️ Routes generation timeout");
+      resolve();
+    }, 5000);
+  });
+}
+
+/**
+ * 重置用户状态并重定向到登录页
+ */
+async function resetUserStateAndRedirect(to: RouteLocationNormalized, next: NavigationGuardNext) {
+  try {
+    await useUserStore().resetAllState();
+    redirectToLogin(to, next);
+  } catch (resetError) {
+    console.error("❌ Failed to reset user state:", resetError);
+    // 强制跳转到登录页
+    next("/login");
+  } finally {
+    NProgress.done();
+  }
+}
+
+/**
+ * 重定向到登录页
+ */
 function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext) {
   const params = new URLSearchParams(to.query as Record<string, string>);
   const queryString = params.toString();
   const redirect = queryString ? `${to.path}?${queryString}` : to.path;
+
+  console.log("🔄 Redirecting to login with redirect:", redirect);
   next(`/login?redirect=${encodeURIComponent(redirect)}`);
 }
 
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index edbdb290..b843aa12 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,8 +1,29 @@
 import { useDictSync } from "@/composables/useDictSync";
 import { Auth } from "@/utils/auth";
+import { useUserStore } from "@/store";
+import { watch } from "vue";
+
+// 全局 WebSocket 实例管理
+const websocketInstances = new Map<string, any>();
 
 // 用于防止重复初始化的状态标记
 let isInitialized = false;
+let dictWebSocketInstance: ReturnType<typeof useDictSync> | null = null;
+
+/**
+ * 注册 WebSocket 实例
+ */
+export function registerWebSocketInstance(key: string, instance: any) {
+  websocketInstances.set(key, instance);
+  console.log(`[WebSocketPlugin] Registered WebSocket instance: ${key}`);
+}
+
+/**
+ * 获取 WebSocket 实例
+ */
+export function getWebSocketInstance(key: string) {
+  return websocketInstances.get(key);
+}
 
 /**
  * 初始化WebSocket服务
@@ -34,19 +55,27 @@ export function setupWebSocket() {
   try {
     // 延迟初始化，确保应用完全启动
     setTimeout(() => {
-      const dictWebSocket = useDictSync();
+      // 保存实例引用
+      dictWebSocketInstance = useDictSync();
+      registerWebSocketInstance("dictSync", dictWebSocketInstance);
 
       // 初始化字典WebSocket服务
-      dictWebSocket.initWebSocket();
+      dictWebSocketInstance.initWebSocket();
       console.log("[WebSocketPlugin] 字典WebSocket初始化完成");
 
-      // 在窗口关闭前断开WebSocket连接
-      window.addEventListener("beforeunload", () => {
-        console.log("[WebSocketPlugin] 窗口即将关闭，断开WebSocket连接");
-        dictWebSocket.closeWebSocket();
-        isInitialized = false;
+      // 初始化在线用户计数WebSocket
+      import("@/composables/useOnlineCount").then(({ useOnlineCount }) => {
+        const onlineCountInstance = useOnlineCount({ autoInit: false });
+        onlineCountInstance.initWebSocket();
+        console.log("[WebSocketPlugin] 在线用户计数WebSocket初始化完成");
       });
 
+      // 在窗口关闭前断开WebSocket连接
+      window.addEventListener("beforeunload", handleWindowClose);
+
+      // 监听用户注销事件
+      watchUserLogout();
+
       console.log("[WebSocketPlugin] WebSocket服务初始化完成");
       isInitialized = true;
     }, 1000); // 延迟1秒初始化
@@ -54,3 +83,84 @@ export function setupWebSocket() {
     console.error("[WebSocketPlugin] 初始化WebSocket服务失败:", error);
   }
 }
+
+/**
+ * 处理窗口关闭
+ */
+function handleWindowClose() {
+  console.log("[WebSocketPlugin] 窗口即将关闭，断开WebSocket连接");
+  cleanupWebSocket();
+}
+
+/**
+ * 监听用户注销
+ */
+function watchUserLogout() {
+  const userStore = useUserStore();
+
+  // 监听用户信息变化，当用户信息被清空时断开连接
+  watch(
+    () => userStore.userInfo,
+    (newUserInfo, oldUserInfo) => {
+      // 从有用户信息变为无用户信息，说明用户注销了
+      if (oldUserInfo?.username && !newUserInfo?.username) {
+        console.log("[WebSocketPlugin] 检测到用户注销，断开WebSocket连接");
+        cleanupWebSocket();
+      }
+    },
+    { deep: true }
+  );
+}
+
+/**
+ * 清理WebSocket连接
+ */
+export function cleanupWebSocket() {
+  // 清理字典 WebSocket
+  if (dictWebSocketInstance) {
+    try {
+      dictWebSocketInstance.closeWebSocket();
+      console.log("[WebSocketPlugin] 字典WebSocket连接已断开");
+    } catch (error) {
+      console.error("[WebSocketPlugin] 断开字典WebSocket连接失败:", error);
+    }
+  }
+
+  // 清理所有注册的 WebSocket 实例
+  websocketInstances.forEach((instance, key) => {
+    try {
+      if (instance && typeof instance.disconnect === "function") {
+        instance.disconnect();
+        console.log(`[WebSocketPlugin] ${key} WebSocket连接已断开`);
+      } else if (instance && typeof instance.closeWebSocket === "function") {
+        instance.closeWebSocket();
+        console.log(`[WebSocketPlugin] ${key} WebSocket连接已断开`);
+      }
+    } catch (error) {
+      console.error(`[WebSocketPlugin] 断开 ${key} WebSocket连接失败:`, error);
+    }
+  });
+
+  // 清空实例映射
+  websocketInstances.clear();
+
+  // 移除事件监听器
+  window.removeEventListener("beforeunload", handleWindowClose);
+
+  // 重置状态
+  dictWebSocketInstance = null;
+  isInitialized = false;
+}
+
+/**
+ * 重新初始化WebSocket（用于登录后重连）
+ */
+export function reinitializeWebSocket() {
+  // 先清理现有连接
+  cleanupWebSocket();
+
+  // 延迟后重新初始化
+  setTimeout(() => {
+    setupWebSocket();
+  }, 500);
+}
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index 007e786e..ffc549f9 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -22,14 +22,24 @@ export const usePermissionStore = defineStore("permission", () => {
    */
   function generateRoutes() {
     return new Promise<RouteRecordRaw[]>((resolve, reject) => {
+      console.log("🔧 Starting to generate routes...");
+
       MenuAPI.getRoutes()
         .then((data) => {
           const dynamicRoutes = parseDynamicRoutes(data);
+
           routes.value = [...constantRoutes, ...dynamicRoutes];
           routesLoaded.value = true;
+
+          console.log("✅ Routes generation completed successfully");
           resolve(dynamicRoutes);
         })
         .catch((error) => {
+          console.error("❌ Failed to generate routes:", error);
+
+          // 即使失败也要设置状态，避免无限重试
+          routesLoaded.value = false;
+
           reject(error);
         });
     });
diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings.store.ts
index f4b0afff..30fb0808 100644
--- a/src/store/modules/settings.store.ts
+++ b/src/store/modules/settings.store.ts
@@ -1,6 +1,6 @@
 import defaultSettings from "@/settings";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
-import { LayoutMode } from "@/enums/settings/layout.enum";
+import type { LayoutMode } from "@/enums/settings/layout.enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 
 type SettingsValue = boolean | string;
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 4f0944ae..8a0b1235 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -90,6 +90,17 @@ export const useUserStore = defineStore("user", () => {
     // 清除标签视图
     useTagsViewStore().delAllViews();
 
+    // 3. 清理 WebSocket 连接
+    // 动态导入避免循环依赖
+    import("@/plugins/websocket")
+      .then(({ cleanupWebSocket }) => {
+        cleanupWebSocket();
+        console.log("[UserStore] WebSocket connections cleaned up");
+      })
+      .catch((error) => {
+        console.error("[UserStore] Failed to cleanup WebSocket:", error);
+      });
+
     return Promise.resolve();
   }
 
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 54d2a356..460ba70c 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -2,7 +2,7 @@ declare global {
   /**
    * 响应数据
    */
-  interface ResponseData<T = any> {
+  interface ApiResponse<T = any> {
     code: string;
     data: T;
     msg: string;
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 15bf8860..4baf361f 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -5,102 +5,170 @@ import { ResultEnum } from "@/enums/api/result.enum";
 import { Auth } from "@/utils/auth";
 import router from "@/router";
 
-// 创建 axios 实例
-const service = axios.create({
+/**
+ * 创建 HTTP 请求实例
+ */
+const httpRequest = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
   timeout: 50000,
   headers: { "Content-Type": "application/json;charset=utf-8" },
   paramsSerializer: (params) => qs.stringify(params),
 });
 
-// 请求拦截器
-service.interceptors.request.use(
+/**
+ * 请求拦截器 - 添加 Authorization 头
+ */
+httpRequest.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
     const accessToken = Auth.getAccessToken();
+
     // 如果 Authorization 设置为 no-auth，则不携带 Token
     if (config.headers.Authorization !== "no-auth" && accessToken) {
       config.headers.Authorization = `Bearer ${accessToken}`;
     } else {
       delete config.headers.Authorization;
     }
+
     return config;
   },
-  (error) => Promise.reject(error)
+  (error) => {
+    console.error("Request interceptor error:", error);
+    return Promise.reject(error);
+  }
 );
-// 响应拦截器
-service.interceptors.response.use(
-  (response: AxiosResponse) => {
-    // 如果响应是二进制流，则直接返回，用于下载文件、Excel 导出等
+
+/**
+ * 响应拦截器 - 统一处理响应和错误
+ */
+httpRequest.interceptors.response.use(
+  (response: AxiosResponse<ApiResponse>) => {
+    // 如果响应是二进制流，则直接返回（用于文件下载、Excel 导出等）
     if (response.config.responseType === "blob") {
       return response;
     }
+
     const { code, data, msg } = response.data;
+
+    // 请求成功
     if (code === ResultEnum.SUCCESS) {
       return data;
     }
+
+    // 业务错误
     ElMessage.error(msg || "系统出错");
-    return Promise.reject(new Error(msg || "Error"));
+    return Promise.reject(new Error(msg || "Business Error"));
   },
   async (error) => {
-    console.error("request error", error); // for debug
+    console.error("Response interceptor error:", error);
+
     const { config, response } = error;
-    if (response) {
-      const { code, msg } = response.data;
-      if (code === ResultEnum.ACCESS_TOKEN_INVALID) {
-        // Token 过期，刷新 Token
-        return handleTokenRefresh(config);
-      } else if (code === ResultEnum.REFRESH_TOKEN_INVALID) {
-        // 刷新 Token 过期，跳转登录页
-        await handleSessionExpired();
-        return Promise.reject(new Error(msg || "Error"));
-      } else {
-        ElMessage.error(msg || "系统出错");
-      }
+
+    // 网络错误或服务器无响应
+    if (!response) {
+      ElMessage.error("网络连接失败，请检查网络设置");
+      return Promise.reject(error);
+    }
+
+    const { code, msg } = response.data as ApiResponse;
+
+    switch (code) {
+      case ResultEnum.ACCESS_TOKEN_INVALID:
+        // Access Token 过期，尝试刷新
+        return refreshTokenAndRetry(config);
+
+      case ResultEnum.REFRESH_TOKEN_INVALID:
+        // Refresh Token 过期，跳转登录页
+        await redirectToLogin("登录已过期，请重新登录");
+        return Promise.reject(new Error(msg || "Refresh Token Invalid"));
+
+      default:
+        ElMessage.error(msg || "请求失败");
+        return Promise.reject(new Error(msg || "Request Error"));
     }
-    return Promise.reject(error.message);
   }
 );
-export default service;
-// 是否正在刷新标识，避免重复刷新
-let isRefreshing = false;
-// 因 Token 过期导致的请求等待队列
-const waitingQueue: Array<() => void> = [];
-// 刷新 Token 处理
-async function handleTokenRefresh(config: InternalAxiosRequestConfig) {
-  return new Promise((resolve) => {
+
+/**
+ * 重试请求的回调函数类型
+ */
+type RetryCallback = () => void;
+
+// Token 刷新相关状态
+let isRefreshingToken = false;
+const pendingRequests: RetryCallback[] = [];
+
+/**
+ * 刷新 Token 并重试请求
+ */
+async function refreshTokenAndRetry(config: InternalAxiosRequestConfig): Promise<any> {
+  return new Promise((resolve, reject) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      config.headers.Authorization = `Bearer ${Auth.getAccessToken()}`;
-      resolve(service(config));
+      const newToken = Auth.getAccessToken();
+      if (newToken && config.headers) {
+        config.headers.Authorization = `Bearer ${newToken}`;
+      }
+      httpRequest(config).then(resolve).catch(reject);
     };
-    waitingQueue.push(retryRequest);
-    if (!isRefreshing) {
-      isRefreshing = true;
+
+    // 将请求加入等待队列
+    pendingRequests.push(retryRequest);
+
+    // 如果没有正在刷新，则开始刷新流程
+    if (!isRefreshingToken) {
+      isRefreshingToken = true;
+
       useUserStoreHook()
         .refreshToken()
         .then(() => {
-          // 依次重试队列中所有请求, 重试后清空队列
-          waitingQueue.forEach((callback) => callback());
-          waitingQueue.length = 0;
+          // 刷新成功，重试所有等待的请求
+          pendingRequests.forEach((callback) => {
+            try {
+              callback();
+            } catch (error) {
+              console.error("Retry request error:", error);
+            }
+          });
+          // 清空队列
+          pendingRequests.length = 0;
         })
         .catch(async (error) => {
-          console.error("handleTokenRefresh error", error);
-          // 刷新 Token 失败，跳转登录页
-          await handleSessionExpired();
+          console.error("Token refresh failed:", error);
+          // 刷新失败，清空队列并跳转登录页
+          pendingRequests.length = 0;
+          await redirectToLogin("登录状态已失效，请重新登录");
+          // 拒绝所有等待的请求
+          pendingRequests.forEach(() => {
+            reject(new Error("Token refresh failed"));
+          });
         })
         .finally(() => {
-          isRefreshing = false;
+          isRefreshingToken = false;
         });
     }
   });
 }
-// 处理会话过期
-async function handleSessionExpired() {
-  ElNotification({
-    title: "提示",
-    message: "您的会话已过期，请重新登录",
-    type: "info",
-  });
-  await useUserStoreHook().resetAllState();
-  router.push("/login");
+
+/**
+ * 重定向到登录页面
+ */
+async function redirectToLogin(message: string = "请重新登录"): Promise<void> {
+  try {
+    ElNotification({
+      title: "提示",
+      message,
+      type: "warning",
+      duration: 3000,
+    });
+
+    await useUserStoreHook().resetAllState();
+
+    // 跳转到登录页，保留当前路由用于登录后跳转
+    const currentPath = router.currentRoute.value.fullPath;
+    await router.push(`/login?redirect=${encodeURIComponent(currentPath)}`);
+  } catch (error) {
+    console.error("Redirect to login error:", error);
+  }
 }
+
+export default httpRequest;
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index b0bc3667..b84bd6c6 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -547,7 +547,7 @@ const initSort = () => {
 
 const setNodeSort = (oldIndex: number, newIndex: number) => {
   // 使用arr复制一份表格数组数据
-  let arr = Object.assign([], genConfigFormData.value.fieldConfigs);
+  const arr = Object.assign([], genConfigFormData.value.fieldConfigs);
   const currentRow = arr.splice(oldIndex, 1)[0];
   arr.splice(newIndex, 0, currentRow);
   arr.forEach((item: FieldConfig, index) => {
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 020b1fd1..57a50d20 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -21,7 +21,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
       list: res.list,
     };
   },
-  indexAction: function (params) {
+  indexAction (params) {
     return UserAPI.getPage(params);
   },
   deleteAction: UserAPI.deleteByIds,
@@ -35,7 +35,7 @@ const contentConfig: IContentConfig<UserPageQuery> = {
     console.log("importsAction", data);
     return Promise.resolve();
   },
-  exportsAction: async function (params) {
+  async exportsAction (params) {
     // 模拟获取到的是全量数据
     const res = await UserAPI.getPage(params);
     console.log("exportsAction", res.list);
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 57b44448..49c96ebd 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -15,7 +15,7 @@ const modalConfig: IModalConfig<UserForm> = {
   beforeSubmit(data) {
     console.log("beforeSubmit", data);
   },
-  formAction: function (data) {
+  formAction (data) {
     return UserAPI.update(data.id as string, data);
   },
   formItems: [
diff --git a/src/views/demo/curd/config/options.ts b/src/views/demo/curd/config/options.ts
index 4fe2f479..3f7bd82b 100644
--- a/src/views/demo/curd/config/options.ts
+++ b/src/views/demo/curd/config/options.ts
@@ -9,9 +9,9 @@ interface OptionType {
 }
 
 // 明确指定类型为 OptionType[]
-export let deptArr = ref<OptionType[]>([]);
-export let roleArr = ref<OptionType[]>([]);
-export let stateArr = ref<OptionType[]>([
+export const deptArr = ref<OptionType[]>([]);
+export const roleArr = ref<OptionType[]>([]);
+export const stateArr = ref<OptionType[]>([
   { label: "启用", value: 1 },
   { label: "禁用", value: 0 },
 ]);
diff --git a/src/views/demo/curd/config2/add.ts b/src/views/demo/curd/config2/add.ts
index 0c5300ee..374b4e96 100644
--- a/src/views/demo/curd/config2/add.ts
+++ b/src/views/demo/curd/config2/add.ts
@@ -1,4 +1,4 @@
-import { type UserForm } from "@/api/system/user.api";
+import type { UserForm } from "@/api/system/user.api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { deptArr } from "../config/options";
 
diff --git a/src/views/demo/curd/config2/content.ts b/src/views/demo/curd/config2/content.ts
index 11a82169..e9bd3b02 100644
--- a/src/views/demo/curd/config2/content.ts
+++ b/src/views/demo/curd/config2/content.ts
@@ -7,7 +7,7 @@ const contentConfig: IContentConfig = {
   },
   pagePosition: "right",
   toolbar: [],
-  indexAction: function (params) {
+  indexAction (params) {
     // 模拟发起网络请求获取列表数据
     console.log("indexAction:", params);
     return Promise.resolve({
diff --git a/src/views/demo/curd/config2/edit.ts b/src/views/demo/curd/config2/edit.ts
index d69ee6f2..6dacc1d5 100644
--- a/src/views/demo/curd/config2/edit.ts
+++ b/src/views/demo/curd/config2/edit.ts
@@ -15,7 +15,7 @@ const modalConfig: IModalConfig = {
   beforeSubmit(data) {
     console.log("beforeSubmit", data);
   },
-  formAction: function (data) {
+  formAction (data) {
     // return UserAPI.update(data.id as string, data);
     // 模拟发起网络请求修改字段
     ElMessage.success(JSON.stringify(data));
diff --git a/src/views/demo/curd/config2/search.ts b/src/views/demo/curd/config2/search.ts
index 15611a7c..b49e8b2b 100644
--- a/src/views/demo/curd/config2/search.ts
+++ b/src/views/demo/curd/config2/search.ts
@@ -35,7 +35,7 @@ const searchConfig: ISearchConfig = {
       attrs: { placeholder: "全部", clearable: true },
       options: stateArr as any,
       events: {
-        change: function (e) {
+        change (e) {
           console.log("选中的值: ", e);
         },
       },
diff --git a/src/views/demo/dictionary.vue b/src/views/demo/dictionary.vue
index 60969300..c69cb9c5 100644
--- a/src/views/demo/dictionary.vue
+++ b/src/views/demo/dictionary.vue
@@ -1,10 +1,4 @@
 <!-- 字典组件示例 -->
-<script setup lang="ts">
-const stringValue = ref("1"); // 性别(值为String)
-const numberValue = ref(1); // 性别(值为Number)
-const arrayValue = ref(["1", "2"]); // 性别(值为Array)
-</script>
-
 <template>
   <div class="app-container">
     <el-link
@@ -46,3 +40,9 @@ const arrayValue = ref(["1", "2"]); // 性别(值为Array)
     </el-form>
   </div>
 </template>
+
+<script setup lang="ts">
+const stringValue = ref("1"); // 性别(值为String)
+const numberValue = ref(1); // 性别(值为Number)
+const arrayValue = ref(["1", "2"]); // 性别(值为Array)
+</script>
diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-selector.vue
index c9df065e..d3a79682 100644
--- a/src/views/demo/icon-selector.vue
+++ b/src/views/demo/icon-selector.vue
@@ -1,11 +1,4 @@
 <!-- 图标选择器示例 -->
-<script setup lang="ts">
-// element-plus 图标格式以el-icon-开头
-const iconName = ref("el-icon-edit");
-// 本地SVG图标格式取 src/assets/icons 下的文件名，不需要svg后缀
-// const iconName = ref("api");
-</script>
-
 <template>
   <div class="app-container">
     <el-link
@@ -19,3 +12,10 @@ const iconName = ref("el-icon-edit");
     <icon-select v-model="iconName" />
   </div>
 </template>
+
+<script setup lang="ts">
+// element-plus 图标格式以el-icon-开头
+const iconName = ref("el-icon-edit");
+// 本地SVG图标格式取 src/assets/icons 下的文件名，不需要svg后缀
+// const iconName = ref("api");
+</script>
diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue
index 2905ed68..52e4a1ec 100644
--- a/src/views/demo/signature.vue
+++ b/src/views/demo/signature.vue
@@ -1,3 +1,25 @@
+<template>
+  <div class="canvas-dom">
+    <h3>基于canvas实现的签名组件</h3>
+    <header>
+      <el-button type="primary" @click="handleSaveImg">保存为图片</el-button>
+      <el-button @click="handleToFile">保存到后端</el-button>
+      <el-button @click="handleClearSign">清空签名</el-button>
+    </header>
+    <canvas
+      ref="canvas"
+      height="200"
+      width="500"
+      @mousedown="onEventStart"
+      @mousemove.stop.prevent="onEventMove"
+      @mouseup="onEventEnd"
+      @touchstart="onEventStart"
+      @touchmove.stop.prevent="onEventMove"
+      @touchend="onEventEnd"
+    />
+    <img v-if="imgUrl" :src="http://github.com/imgUrl" alt="签名" />
+  </div>
+</template>
 <script setup lang="ts">
 import FileAPI from "@/api/file.api";
 
@@ -133,28 +155,6 @@ function paint(
   ctx.stroke();
 }
 </script>
-<template>
-  <div class="canvas-dom">
-    <h3>基于canvas实现的签名组件</h3>
-    <header>
-      <el-button type="primary" @click="handleSaveImg">保存为图片</el-button>
-      <el-button @click="handleToFile">保存到后端</el-button>
-      <el-button @click="handleClearSign">清空签名</el-button>
-    </header>
-    <canvas
-      ref="canvas"
-      height="200"
-      width="500"
-      @mousedown="onEventStart"
-      @mousemove.stop.prevent="onEventMove"
-      @mouseup="onEventEnd"
-      @touchstart="onEventStart"
-      @touchmove.stop.prevent="onEventMove"
-      @touchend="onEventEnd"
-    />
-    <img v-if="imgUrl" :src="http://github.com/imgUrl" alt="签名" />
-  </div>
-</template>
 <style scoped lang="scss">
 .canvas-dom {
   width: 100%;
diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index 874df7ad..c04b2561 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -81,7 +81,7 @@ const selectConfig: ISelectConfig = {
       },
     },
   ],
-  indexAction: function (params) {
+  indexAction (params) {
     if ("createAt" in params) {
       const createAt = params.createAt as string[];
       if (createAt?.length > 1) {
diff --git a/src/views/demo/table-select/index.vue b/src/views/demo/table-select/index.vue
index 0d7202c3..c9c8397b 100644
--- a/src/views/demo/table-select/index.vue
+++ b/src/views/demo/table-select/index.vue
@@ -1,4 +1,27 @@
 <!-- 列表选择器示例 -->
+<template>
+  <div class="app-container">
+    <el-link
+      href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/table-select/index.vue"
+      type="primary"
+      target="_blank"
+      class="mb-10"
+    >
+      示例源码 请点击>>>>
+    </el-link>
+    <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
+      <template #status="scope">
+        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+        </el-tag>
+      </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row.gender" code="gender" />
+      </template>
+    </table-select>
+  </div>
+</template>
+
 <script setup lang="ts">
 import selectConfig from "./config/select";
 import { useDictStore } from "@/store";
@@ -29,26 +52,3 @@ const text = computed(() => {
     : "";
 });
 </script>
-
-<template>
-  <div class="app-container">
-    <el-link
-      href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/table-select/index.vue"
-      type="primary"
-      target="_blank"
-      class="mb-10"
-    >
-      示例源码 请点击>>>>
-    </el-link>
-    <table-select :text="text" :select-config="selectConfig" @confirm-click="handleConfirm">
-      <template #status="scope">
-        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
-          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
-        </el-tag>
-      </template>
-      <template #gender="scope">
-        <DictLabel v-model="scope.row.gender" code="gender" />
-      </template>
-    </table-select>
-  </div>
-</template>
diff --git a/src/views/demo/text-scroll.vue b/src/views/demo/text-scroll.vue
index 7c638bf4..e7000461 100644
--- a/src/views/demo/text-scroll.vue
+++ b/src/views/demo/text-scroll.vue
@@ -13,7 +13,7 @@
     <TextScroll type="info" text="这是一条信息类型的滚动公告" />
 
     <!-- 自定义速度和方向 -->
-    <TextScroll text="这是一条速度较慢、向右滚动的公告" :speed="30" direction="right" showClose />
+    <TextScroll text="这是一条速度较慢、向右滚动的公告" :speed="30" direction="right" show-close />
   </div>
 </template>
 
diff --git a/src/views/demo/wang-editor.vue b/src/views/demo/wang-editor.vue
index 560f0ecb..dbb15257 100644
--- a/src/views/demo/wang-editor.vue
+++ b/src/views/demo/wang-editor.vue
@@ -1,10 +1,4 @@
 <!-- wangEditor富文本编辑器示例 -->
-<script setup lang="ts">
-import WangEditor from "@/components/WangEditor/index.vue";
-
-const value = ref("初始化内容");
-</script>
-
 <template>
   <div class="app-container">
     <el-link
@@ -22,3 +16,9 @@ const value = ref("初始化内容");
     </div>
   </div>
 </template>
+
+<script setup lang="ts">
+import WangEditor from "@/components/WangEditor/index.vue";
+
+const value = ref("初始化内容");
+</script>
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index b7edfd27..b1741992 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -135,7 +135,7 @@ const loginFormData = ref<LoginFormData>({
   password: "123456",
   captchaKey: "",
   captchaCode: "",
-  rememberMe: rememberMe,
+  rememberMe,
 });
 
 const loginRules = computed(() => {
@@ -195,12 +195,16 @@ async function handleLoginSubmit() {
     // 2. 执行登录
     await userStore.login(loginFormData.value);
 
-    // 3. 获取用户信息
+    // 3. 获取用户信息（包含用户角色，用于路由生成）
     await userStore.getUserInfo();
 
-    // 4. 解析并跳转目标地址
+    // 4. 登录成功，让路由守卫处理跳转逻辑
+    // 解析目标地址，但不直接跳转
     const redirect = resolveRedirectTarget(route.query);
-    await router.push(redirect);
+    console.log("🎉 Login successful, target redirect:", redirect);
+
+    // 通过替换当前路由触发路由守卫，让守卫处理后续的路由生成和跳转
+    await router.replace(redirect);
 
     // 5. 记住我功能已实现，根据用户选择决定token的存储方式:
     // - 选中"记住我": token存储在localStorage中，浏览器关闭后仍然有效
diff --git a/tsconfig.json b/tsconfig.json
index 7afb4fcd..c50ab871 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,6 +28,6 @@
     "types": ["node", "vite/client", "element-plus/global"]
   },
 
-  "include": ["mock/**/*.ts", "src/**/*.ts", "src/**/*.vue", "vite.config.ts"],
+  "include": ["mock/**/*.ts", "src/**/*.ts", "src/**/*.vue", "vite.config.ts", "eslint.config.ts"],
   "exclude": ["node_modules", "dist"]
 }
diff --git a/vite.config.ts b/vite.config.ts
index d6547df9..5c0c5192 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -22,6 +22,8 @@ const pathSrc = resolve(__dirname, "src");
 // Vite配置  https://cn.vitejs.dev/config
 export default defineConfig(({ mode }: ConfigEnv) => {
   const env = loadEnv(mode, process.cwd());
+  const isProduction = mode === "production";
+
   return {
     resolve: {
       alias: {
@@ -189,17 +191,20 @@ export default defineConfig(({ mode }: ConfigEnv) => {
     // 构建配置
     build: {
       chunkSizeWarningLimit: 2000, // 消除打包大小超过500kb警告
-      minify: "terser", // Vite 2.6.x 以上需要配置 minify: "terser", terserOptions 才能生效
-      terserOptions: {
-        compress: {
-          keep_infinity: true, // 防止 Infinity 被压缩成 1/0，这可能会导致 Chrome 上的性能问题
-          drop_console: true, // 生产环境去除 console
-          drop_debugger: true, // 生产环境去除 debugger
-        },
-        format: {
-          comments: false, // 删除注释
-        },
-      },
+      minify: isProduction ? "terser" : false, // 只在生产环境启用压缩
+      terserOptions: isProduction
+        ? {
+            compress: {
+              keep_infinity: true, // 防止 Infinity 被压缩成 1/0，这可能会导致 Chrome 上的性能问题
+              drop_console: true, // 生产环境去除 console.log, console.warn, console.error 等
+              drop_debugger: true, // 生产环境去除 debugger
+              pure_funcs: ["console.log", "console.info"], // 移除指定的函数调用
+            },
+            format: {
+              comments: false, // 删除注释
+            },
+          }
+        : {},
       rollupOptions: {
         output: {
           // manualChunks: {

From 4833aa3ba7ced22cb517e0819ff6c3db267f67e0 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 00:30:49 +0800
Subject: [PATCH 392/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 eslint.config.ts                              | 47 +++++-------------
 src/components/CURD/PageContent.vue           | 19 +++----
 src/components/CURD/PageModal.vue             |  6 ++-
 src/components/CURD/PageSearch.vue            |  8 +--
 src/components/Hamburger/index.vue            |  3 ++
 src/components/TableSelect/index.vue          |  2 +-
 .../NavBar/components/NavbarActions.vue       | 49 ++++++++++++++++---
 src/layouts/views/MixLayout.vue               | 25 +++++-----
 src/layouts/views/TopLayout.vue               | 11 ++---
 9 files changed, 93 insertions(+), 77 deletions(-)

diff --git a/eslint.config.ts b/eslint.config.ts
index 9ad5e1f1..7e3fb4c4 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -56,10 +56,6 @@ export default [
     ignores: [
       "**/node_modules/**",
       "**/dist/**",
-      "**/build/**",
-      "**/.nuxt/**",
-      "**/.output/**",
-      "**/coverage/**",
       "**/*.min.*",
       "**/auto-imports.d.ts",
       "**/components.d.ts",
@@ -114,7 +110,7 @@ export default [
       "object-shorthand": "error",
 
       // 最佳实践
-      eqeqeq: ["error", "always", { null: "ignore" }],
+      eqeqeq: "off",
       "no-multi-spaces": "error",
       "no-multiple-empty-lines": ["error", { max: 1, maxBOF: 0, maxEOF: 0 }],
 
@@ -122,6 +118,7 @@ export default [
       "no-unused-vars": "off",
       "no-undef": "off",
       "no-redeclare": "off",
+      "@typescript-eslint/ban-ts-comment": "off",
     },
   },
 
@@ -144,9 +141,10 @@ export default [
       "vue/require-default-prop": "off",
       "vue/require-explicit-emits": "error",
       "vue/no-unused-vars": "error",
-      "vue/no-mutating-props": "error",
-      "vue/attribute-hyphenation": ["error", "always"],
-      "vue/v-on-event-hyphenation": ["error", "always"],
+      "vue/no-mutating-props": "off",
+      "vue/valid-v-for": "warn",
+      "vue/no-template-shadow": "warn",
+      "vue/return-in-computed-property": "warn",
       "vue/block-order": [
         "error",
         {
@@ -166,6 +164,7 @@ export default [
         },
       ],
       "vue/component-name-in-template-casing": ["error", "PascalCase"],
+      "@typescript-eslint/no-explicit-any": "off",
     },
   },
 
@@ -181,28 +180,14 @@ export default [
     },
     rules: {
       // TypeScript 规则
-      "@typescript-eslint/no-explicit-any": "warn",
+      "@typescript-eslint/no-explicit-any": "off", // 允许使用any类型，方便开发
       "@typescript-eslint/no-empty-function": "off",
       "@typescript-eslint/no-empty-object-type": "off",
       "@typescript-eslint/ban-ts-comment": "off",
       "@typescript-eslint/no-non-null-assertion": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "error",
-        {
-          vars: "all",
-          args: "after-used",
-          ignoreRestSiblings: true,
-          argsIgnorePattern: "^_", // 忽略以下划线开头的参数
-          varsIgnorePattern: "^[A-Z][A-Z0-9_]*$", // 忽略全大写的常量/枚举
-        },
-      ],
-      "@typescript-eslint/consistent-type-imports": [
-        "error",
-        {
-          prefer: "type-imports",
-          fixStyle: "inline-type-imports",
-        },
-      ],
+      "@typescript-eslint/no-unused-vars": "warn", // 降级为警告
+      "@typescript-eslint/no-unused-expressions": "warn", // 降级为警告
+      "@typescript-eslint/consistent-type-imports": "off", // 关闭强制使用type import
       "@typescript-eslint/no-import-type-side-effects": "error",
     },
   },
@@ -216,21 +201,13 @@ export default [
     },
   },
 
-  // 测试文件配置
-  {
-    files: ["**/__tests__/**", "**/*.{test,spec}.{js,ts,vue}"],
-    rules: {
-      "no-console": "off",
-      "@typescript-eslint/no-explicit-any": "off",
-    },
-  },
-
   // CURD 组件配置
   {
     files: ["**/components/CURD/**/*.{ts,vue}"],
     rules: {
       "no-unused-vars": "off",
       "@typescript-eslint/no-unused-vars": "off",
+      "@typescript-eslint/no-explicit-any": "off",
     },
   },
 
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index cddab0a8..2e47ccdb 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -6,11 +6,10 @@
     <div class="flex flex-col md:flex-row justify-between gap-y-2.5 mb-2.5">
       <!-- 左侧工具栏 -->
       <div class="toolbar-left flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
-        <template v-for="btn in toolbarLeftBtn">
+        <template v-for="(btn, index) in toolbarLeftBtn" :key="index">
           <el-button
-            v-bind="btn.attrs"
-            :key="btn.name"
             v-hasPerm="btn.perm ?? '*:*:*'"
+            v-bind="btn.attrs"
             :disabled="btn.name === 'delete' && removeIds.length === 0"
             @click="handleToolbar(btn.name)"
           >
@@ -20,13 +19,13 @@
       </div>
       <!-- 右侧工具栏 -->
       <div class="toolbar-right flex gap-y-2.5 gap-x-2 md:gap-x-3 flex-wrap">
-        <template v-for="btn in toolbarRightBtn">
+        <template v-for="(btn, index) in toolbarRightBtn" :key="index">
           <el-popover v-if="btn.name === 'filter'" placement="bottom" trigger="click">
             <template #reference>
               <el-button v-bind="btn.attrs"></el-button>
             </template>
             <el-scrollbar max-height="350px">
-              <template v-for="col in cols" :key="col">
+              <template v-for="col in cols" :key="col.prop">
                 <el-checkbox v-if="col.prop" v-model="col.show" :label="col.label" />
               </template>
             </el-scrollbar>
@@ -52,7 +51,7 @@
       @selection-change="handleSelectionChange"
       @filter-change="handleFilterChange"
     >
-      <template v-for="col in cols" :key="col">
+      <template v-for="col in cols" :key="col.prop">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
             <!-- 显示图片 -->
@@ -159,7 +158,7 @@
             </template>
             <!-- 列操作栏 -->
             <template v-else-if="col.templet === 'tool'">
-              <template v-for="btn in tableToolbarBtn">
+              <template v-for="(btn, index) in tableToolbarBtn" :key="index">
                 <el-button
                   v-if="btn.render === undefined || btn.render(scope.row)"
                   v-hasPerm="btn.perm ?? '*:*:*'"
@@ -239,7 +238,7 @@
           </el-form-item>
           <el-form-item label="字段" prop="fields">
             <el-checkbox-group v-model="exportsFormData.fields">
-              <template v-for="col in cols" :key="col">
+              <template v-for="col in cols" :key="col.prop">
                 <el-checkbox v-if="col.prop" :value="col.prop" :label="col.label" />
               </template>
             </el-checkbox-group>
@@ -433,7 +432,9 @@ const tableToolbarBtn = createToolbar(tableToolbar, { link: true, size: "small"
 // 表格列
 const cols = ref(
   props.contentConfig.cols.map((col) => {
-    col.initFn && col.initFn(col);
+    if (col.initFn) {
+      col.initFn(col);
+    }
     if (col.show === undefined) {
       col.show = true;
     }
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index 637445cc..3b8195ae 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -42,6 +42,7 @@
                       <component
                         :is="childrenMap.get(item.type)"
                         v-for="opt in item.options"
+                        :key="opt.value"
                         :label="opt.label"
                         :value="opt.value"
                       ></component>
@@ -104,6 +105,7 @@
                         <component
                           :is="childrenMap.get(item.type)"
                           v-for="opt in item.options"
+                          :key="opt.value"
                           :label="opt.label"
                           :value="opt.value"
                         ></component>
@@ -224,7 +226,9 @@ const handleSubmit = useThrottleFn(() => {
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item.initFn && item.initFn(item);
+    if (item.initFn) {
+      item.initFn(item);
+    }
     formRules[item.prop] = item?.rules ?? [];
     props.modalConfig.form = { labelWidth: "auto", ...props.modalConfig?.form };
 
diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 1e6f8a4a..8f42a554 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -33,7 +33,7 @@
               v-on="item.events || {}"
             >
               <template v-if="item.type === 'select'">
-                <template v-for="opt in item.options">
+                <template v-for="opt in item.options" :key="opt.value">
                   <el-option :label="opt.label" :value="opt.value" />
                 </template>
               </template>
@@ -72,7 +72,6 @@ const emit = defineEmits<{
 }>();
 // 组件映射表
 const componentMap = new Map<ISearchComponent, any>([
-   
   // @ts-ignore
   ["input", markRaw(ElInput)], // @ts-ignore
   ["select", markRaw(ElSelect)], // @ts-ignore
@@ -84,7 +83,6 @@ const componentMap = new Map<ISearchComponent, any>([
   ["tree-select", markRaw(ElTreeSelect)], // @ts-ignore
   ["input-tag", markRaw(ElInputTag)], // @ts-ignore
   ["custom-tag", markRaw(InputTag)],
-   
 ]);
 
 // 存储表单实例
@@ -131,7 +129,9 @@ const handleReset = () => {
 
 onMounted(() => {
   formItems.forEach((item) => {
-    item?.initFn && item.initFn(item);
+    if (item?.initFn) {
+      item.initFn(item);
+    }
     if (["input-tag", "custom-tag", "cascader"].includes(item?.type ?? "")) {
       queryParams[item.prop] = Array.isArray(item.initialValue) ? item.initialValue : [];
     } else if (item.type === "input-number") {
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 58d2bd10..1ad9db84 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -31,6 +31,9 @@ const hamburgerClass = computed(() => {
   ) {
     return "hamburger--white";
   }
+
+  // 默认返回空字符串
+  return "";
 });
 
 function toggleClick() {
diff --git a/src/components/TableSelect/index.vue b/src/components/TableSelect/index.vue
index 455c2e2b..c546f75c 100644
--- a/src/components/TableSelect/index.vue
+++ b/src/components/TableSelect/index.vue
@@ -284,7 +284,7 @@ const selectedItems = ref<IObject[]>([]);
 const confirmText = computed(() => {
   return selectedItems.value.length > 0 ? `已选(${selectedItems.value.length})` : "确 定";
 });
-function handleSelect(selection: any[], _row: any) {
+function handleSelect(selection: any[]) {
   if (isMultiple || selection.length === 0) {
     // 多选
     selectedItems.value = selection;
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index a2ab7c80..083c2a82 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -66,6 +66,7 @@ import defaultSettings from "@/settings";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore, useSettingsStore, useUserStore } from "@/store";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
+import { LayoutMode } from "@/enums";
 
 const { t } = useI18n();
 const appStore = useAppStore();
@@ -96,18 +97,29 @@ const navbarActionsClass = computed(() => {
 
   // 明亮主题下
   if (theme === ThemeMode.LIGHT) {
-    // 顶部布局和混合布局的顶部区域使用深色背景，需要白色文字
-    if (layout === "top" || layout === "mix") {
-      return "navbar-actions--white-text";
+    // 顶部布局和混合布局的顶部区域：
+    // - 如果侧边栏是经典蓝色，使用白色文字
+    // - 如果侧边栏是极简白色，使用深色文字
+    if (layout === LayoutMode.TOP || layout === LayoutMode.MIX) {
+      if (sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
+        return "navbar-actions--white-text";
+      } else {
+        return "navbar-actions--dark-text";
+      }
     }
 
-    // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏仍使用默认颜色
+    // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏使用白色文字
     if (layout === "left" && sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
-      return ""; // 使用默认的深色文字
+      return "navbar-actions--white-text";
+    }
+
+    // 左侧布局下的其他情况（包括极简白），使用默认深色文字
+    if (layout === "left") {
+      return "navbar-actions--dark-text";
     }
   }
 
-  return "";
+  return "navbar-actions--dark-text";
 });
 
 /**
@@ -196,17 +208,17 @@ function logout() {
     padding: 0 8px;
 
     &__avatar {
+      flex-shrink: 0;
       width: 28px;
       height: 28px;
       border-radius: 50%;
-      flex-shrink: 0;
     }
 
     &__name {
       margin-left: 8px;
       color: var(--el-text-color-regular);
-      transition: color 0.3s;
       white-space: nowrap;
+      transition: color 0.3s;
     }
   }
 }
@@ -232,6 +244,27 @@ function logout() {
   }
 }
 
+// 深色文字样式（用于浅色背景：明亮主题下的左侧布局）
+.navbar-actions--dark-text {
+  .navbar-actions__item {
+    :deep([class^="i-svg:"]) {
+      color: var(--el-text-color-regular) !important;
+    }
+
+    &:hover {
+      background: rgba(0, 0, 0, 0.04);
+
+      :deep([class^="i-svg:"]) {
+        color: var(--el-color-primary) !important;
+      }
+    }
+  }
+
+  .user-profile__name {
+    color: var(--el-text-color-regular) !important;
+  }
+}
+
 // 确保下拉菜单中的图标不受影响
 :deep(.el-dropdown-menu) {
   [class^="i-svg:"] {
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index f2731ac8..55747140 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -35,10 +35,10 @@
             :active-text-color="variables['menu-active-text']"
           >
             <MenuItem
-              v-for="route in sideMenuRoutes"
-              :key="route.path"
-              :item="route"
-              :base-path="resolvePath(route.path)"
+              v-for="item in sideMenuRoutes"
+              :key="item.path"
+              :item="item"
+              :base-path="resolvePath(item.path)"
             />
           </el-menu>
         </el-scrollbar>
@@ -121,16 +121,16 @@ console.log("🎨 MixLayout rendered");
       display: flex;
       align-items: center;
       height: 100%;
-      padding: 0 16px;
+      padding: 0;
     }
 
     &-logo {
-      flex-shrink: 0;
-      width: 200px;
-      height: 100%;
       display: flex;
+      flex-shrink: 0;
       align-items: center;
       justify-content: center;
+      width: $sidebar-width;
+      height: 100%;
 
       :deep(.logo) {
         height: 100%;
@@ -142,17 +142,17 @@ console.log("🎨 MixLayout rendered");
     }
 
     &-menu {
-      flex: 1;
-      height: 100%;
       display: flex;
+      flex: 1;
       align-items: center;
+      height: 100%;
       margin: 0 16px;
       overflow: hidden;
 
       :deep(.el-menu) {
         height: 100%;
-        border: none;
         background-color: transparent;
+        border: none;
       }
 
       :deep(.el-menu--horizontal) {
@@ -178,10 +178,11 @@ console.log("🎨 MixLayout rendered");
     }
 
     &-actions {
-      flex-shrink: 0;
       display: flex;
+      flex-shrink: 0;
       align-items: center;
       height: 100%;
+      padding: 0 16px;
     }
   }
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index 88071f9a..83a1097f 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -46,23 +46,22 @@ const { routes } = useLayoutMenu();
     top: 0;
     z-index: 999;
     display: flex;
-    justify-content: space-between;
     align-items: center;
+    justify-content: space-between;
     width: 100%;
     height: $navbar-height;
-    padding: 0 20px;
     background-color: $menu-background;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
     &-left {
       display: flex;
+      flex: 1;
       align-items: center;
       height: 100%;
-      flex: 1;
 
       // Logo 样式
       :deep(.sidebar-logo) {
-        width: 200px;
+        width: $sidebar-width;
         height: $navbar-height;
         padding: 0;
         margin-right: 20px;
@@ -90,20 +89,18 @@ const { routes } = useLayoutMenu();
       flex: 1;
       height: $navbar-height;
       line-height: $navbar-height;
-      border: none;
       background-color: transparent;
+      border: none;
 
       .el-menu-item {
         height: $navbar-height;
         line-height: $navbar-height;
-        padding: 0 20px;
       }
 
       .el-sub-menu {
         .el-sub-menu__title {
           height: $navbar-height;
           line-height: $navbar-height;
-          padding: 0 20px;
         }
       }
 

From 6d8de5dbdb7aa0cc2c0357580b44e6e484842699 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 06:22:00 +0800
Subject: [PATCH 393/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NavBar/components/NavbarActions.vue     | 10 ----------
 .../{menu => NavMenu}/components/MenuItem.vue          |  0
 .../{menu => NavMenu}/components/MenuItemTitle.vue     |  0
 .../{menu => NavMenu}/components/MixTopMenu.vue        |  0
 src/layouts/components/{menu => NavMenu}/index.vue     |  0
 src/layouts/views/LeftLayout.vue                       |  4 ++--
 src/layouts/views/MixLayout.vue                        |  6 +++---
 src/layouts/views/TopLayout.vue                        |  4 ++--
 8 files changed, 7 insertions(+), 17 deletions(-)
 rename src/layouts/components/{menu => NavMenu}/components/MenuItem.vue (100%)
 rename src/layouts/components/{menu => NavMenu}/components/MenuItemTitle.vue (100%)
 rename src/layouts/components/{menu => NavMenu}/components/MixTopMenu.vue (100%)
 rename src/layouts/components/{menu => NavMenu}/index.vue (100%)

diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index 083c2a82..87ca259f 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -107,16 +107,6 @@ const navbarActionsClass = computed(() => {
         return "navbar-actions--dark-text";
       }
     }
-
-    // 左侧布局下，如果侧边栏是经典蓝色，顶部导航栏使用白色文字
-    if (layout === "left" && sidebarColorScheme === SidebarColor.CLASSIC_BLUE) {
-      return "navbar-actions--white-text";
-    }
-
-    // 左侧布局下的其他情况（包括极简白），使用默认深色文字
-    if (layout === "left") {
-      return "navbar-actions--dark-text";
-    }
   }
 
   return "navbar-actions--dark-text";
diff --git a/src/layouts/components/menu/components/MenuItem.vue b/src/layouts/components/NavMenu/components/MenuItem.vue
similarity index 100%
rename from src/layouts/components/menu/components/MenuItem.vue
rename to src/layouts/components/NavMenu/components/MenuItem.vue
diff --git a/src/layouts/components/menu/components/MenuItemTitle.vue b/src/layouts/components/NavMenu/components/MenuItemTitle.vue
similarity index 100%
rename from src/layouts/components/menu/components/MenuItemTitle.vue
rename to src/layouts/components/NavMenu/components/MenuItemTitle.vue
diff --git a/src/layouts/components/menu/components/MixTopMenu.vue b/src/layouts/components/NavMenu/components/MixTopMenu.vue
similarity index 100%
rename from src/layouts/components/menu/components/MixTopMenu.vue
rename to src/layouts/components/NavMenu/components/MixTopMenu.vue
diff --git a/src/layouts/components/menu/index.vue b/src/layouts/components/NavMenu/index.vue
similarity index 100%
rename from src/layouts/components/menu/index.vue
rename to src/layouts/components/NavMenu/index.vue
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index 286e68eb..217cda53 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -29,10 +29,10 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import Sidebar from "../components/Sidebar/index.vue";
-import NavBar from "../components/Navbar/index.vue";
+import NavBar from "../components/NavBar/index.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import Menu from "../components/Menu/index.vue";
+import Menu from "../components/NavMenu/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 55747140..978439a2 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -64,11 +64,11 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
-import MixTopMenu from "../components/Menu/components/MixTopMenu.vue";
-import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import MixTopMenu from "../components/NavMenu/components/MixTopMenu.vue";
+import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import MenuItem from "../components/Menu/components/MenuItem.vue";
+import MenuItem from "../components/NavMenu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index 83a1097f..bb8cab78 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -27,8 +27,8 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
-import Menu from "../components/Menu/index.vue";
-import NavbarActions from "../components/Navbar/components/NavbarActions.vue";
+import Menu from "../components/NavMenu/index.vue";
+import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
 

From 845b0c1520feb866fd8b8bff5088e58deb483a66 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 06:39:32 +0800
Subject: [PATCH 394/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/router/index.ts b/src/router/index.ts
index 38bf3e60..a31f4441 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -28,6 +28,7 @@ export const constantRoutes: RouteRecordRaw[] = [
     name: "/",
     component: Layout,
     redirect: "/dashboard",
+    meta: { title: "dashboard" },
     children: [
       {
         path: "dashboard",

From d178aa9b60d64eded62d22fda7a90441b61750e5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 06:49:03 +0800
Subject: [PATCH 395/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SidebarLogo.vue => AppLogo/index.vue}     |  0
 src/layouts/components/Sidebar/index.vue      | 48 -------------------
 src/layouts/views/LeftLayout.vue              | 26 ++++++++--
 src/layouts/views/MixLayout.vue               |  4 +-
 src/layouts/views/TopLayout.vue               |  4 +-
 5 files changed, 27 insertions(+), 55 deletions(-)
 rename src/layouts/components/{Sidebar/components/SidebarLogo.vue => AppLogo/index.vue} (100%)
 delete mode 100644 src/layouts/components/Sidebar/index.vue

diff --git a/src/layouts/components/Sidebar/components/SidebarLogo.vue b/src/layouts/components/AppLogo/index.vue
similarity index 100%
rename from src/layouts/components/Sidebar/components/SidebarLogo.vue
rename to src/layouts/components/AppLogo/index.vue
diff --git a/src/layouts/components/Sidebar/index.vue b/src/layouts/components/Sidebar/index.vue
deleted file mode 100644
index a022aeef..00000000
--- a/src/layouts/components/Sidebar/index.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<template>
-  <div :class="{ 'has-logo': showLogo }" class="layout-sidebar">
-    <!-- Logo -->
-    <SidebarLogo v-if="showLogo" :collapse="isCollapsed" />
-    <!-- 主菜单内容 -->
-    <slot></slot>
-  </div>
-</template>
-
-<script setup lang="ts">
-import SidebarLogo from "./components/SidebarLogo.vue";
-
-defineProps({
-  /**
-   * 是否显示Logo
-   */
-  showLogo: {
-    type: Boolean,
-    default: true,
-  },
-  /**
-   * 是否折叠
-   */
-  isCollapsed: {
-    type: Boolean,
-    default: false,
-  },
-});
-</script>
-
-<style lang="scss" scoped>
-.layout-sidebar {
-  position: relative;
-  height: 100%;
-  background-color: var(--menu-background);
-  transition: width 0.28s;
-
-  &.has-logo {
-    .el-scrollbar {
-      height: calc(100vh - $navbar-height);
-    }
-  }
-
-  :deep(.el-menu) {
-    border: none;
-  }
-}
-</style>
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index 217cda53..455545d9 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -2,11 +2,14 @@
   <BaseLayout>
     <!-- 左侧菜单栏 -->
     <div class="layout__sidebar" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
-      <Sidebar :show-logo="isShowLogo" :is-collapsed="!isSidebarOpen">
+      <div :class="{ 'has-logo': isShowLogo }" class="layout-sidebar">
+        <!-- Logo -->
+        <AppLogo v-if="isShowLogo" :collapse="!isSidebarOpen" />
+        <!-- 主菜单内容 -->
         <el-scrollbar>
           <Menu :data="routes" base-path="" />
         </el-scrollbar>
-      </Sidebar>
+      </div>
     </div>
 
     <!-- 主内容区 -->
@@ -28,7 +31,7 @@
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import Sidebar from "../components/Sidebar/index.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import NavBar from "../components/NavBar/index.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
@@ -60,6 +63,23 @@ console.log("🔍 LeftLayout - isMobile:", isMobile.value);
     &--collapsed {
       width: $sidebar-width-collapsed;
     }
+
+    .layout-sidebar {
+      position: relative;
+      height: 100%;
+      background-color: var(--menu-background);
+      transition: width 0.28s;
+
+      &.has-logo {
+        .el-scrollbar {
+          height: calc(100vh - $navbar-height);
+        }
+      }
+
+      :deep(.el-menu) {
+        border: none;
+      }
+    }
   }
 
   &__main {
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 978439a2..fee46740 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -5,7 +5,7 @@
       <div class="layout__header-content">
         <!-- Logo区域 -->
         <div v-if="isShowLogo" class="layout__header-logo">
-          <SidebarLogo :collapse="false" />
+          <AppLogo :collapse="false" />
         </div>
 
         <!-- 顶部菜单区域 -->
@@ -63,7 +63,7 @@ import { useRoute } from "vue-router";
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import MixTopMenu from "../components/NavMenu/components/MixTopMenu.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index bb8cab78..f152bc83 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -4,7 +4,7 @@
     <div class="layout__header">
       <div class="layout__header-left">
         <!-- Logo -->
-        <SidebarLogo v-if="isShowLogo" :collapse="false" />
+        <AppLogo v-if="isShowLogo" :collapse="false" />
         <!-- 菜单 -->
         <Menu :data="routes" menu-mode="horizontal" base-path="" />
       </div>
@@ -26,7 +26,7 @@
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
-import SidebarLogo from "../components/Sidebar/components/SidebarLogo.vue";
+import AppLogo from "../components/AppLogo/index.vue";
 import Menu from "../components/NavMenu/index.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";

From 02f57ff3d38fed720e2889c7b0330749955683bc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 06:58:13 +0800
Subject: [PATCH 396/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/{NavMenu/index.vue => Menu/BasicMenu.vue}      | 0
 .../components/{NavMenu/components => Menu}/MixTopMenu.vue    | 2 +-
 .../components/{NavMenu => Menu}/components/MenuItem.vue      | 0
 .../components/{NavMenu => Menu}/components/MenuItemTitle.vue | 0
 src/layouts/views/LeftLayout.vue                              | 4 ++--
 src/layouts/views/MixLayout.vue                               | 4 ++--
 src/layouts/views/TopLayout.vue                               | 4 ++--
 src/router/index.ts                                           | 1 -
 8 files changed, 7 insertions(+), 8 deletions(-)
 rename src/layouts/components/{NavMenu/index.vue => Menu/BasicMenu.vue} (100%)
 rename src/layouts/components/{NavMenu/components => Menu}/MixTopMenu.vue (98%)
 rename src/layouts/components/{NavMenu => Menu}/components/MenuItem.vue (100%)
 rename src/layouts/components/{NavMenu => Menu}/components/MenuItemTitle.vue (100%)

diff --git a/src/layouts/components/NavMenu/index.vue b/src/layouts/components/Menu/BasicMenu.vue
similarity index 100%
rename from src/layouts/components/NavMenu/index.vue
rename to src/layouts/components/Menu/BasicMenu.vue
diff --git a/src/layouts/components/NavMenu/components/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
similarity index 98%
rename from src/layouts/components/NavMenu/components/MixTopMenu.vue
rename to src/layouts/components/Menu/MixTopMenu.vue
index 76bb342c..21ac34c3 100644
--- a/src/layouts/components/NavMenu/components/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script lang="ts" setup>
-import MenuItemTitle from "./MenuItemTitle.vue";
+import MenuItemTitle from "./components/MenuItemTitle.vue";
 
 defineOptions({
   name: "MixTopMenu",
diff --git a/src/layouts/components/NavMenu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
similarity index 100%
rename from src/layouts/components/NavMenu/components/MenuItem.vue
rename to src/layouts/components/Menu/components/MenuItem.vue
diff --git a/src/layouts/components/NavMenu/components/MenuItemTitle.vue b/src/layouts/components/Menu/components/MenuItemTitle.vue
similarity index 100%
rename from src/layouts/components/NavMenu/components/MenuItemTitle.vue
rename to src/layouts/components/Menu/components/MenuItemTitle.vue
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index 455545d9..e71d29bb 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -7,7 +7,7 @@
         <AppLogo v-if="isShowLogo" :collapse="!isSidebarOpen" />
         <!-- 主菜单内容 -->
         <el-scrollbar>
-          <Menu :data="routes" base-path="" />
+          <BasicMenu :data="routes" base-path="" />
         </el-scrollbar>
       </div>
     </div>
@@ -35,7 +35,7 @@ import AppLogo from "../components/AppLogo/index.vue";
 import NavBar from "../components/NavBar/index.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import Menu from "../components/NavMenu/index.vue";
+import BasicMenu from "../components/Menu/BasicMenu.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index fee46740..7cbea3d1 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -64,11 +64,11 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import AppLogo from "../components/AppLogo/index.vue";
-import MixTopMenu from "../components/NavMenu/components/MixTopMenu.vue";
+import MixTopMenu from "../components/Menu/MixTopMenu.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
-import MenuItem from "../components/NavMenu/components/MenuItem.vue";
+import MenuItem from "../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index f152bc83..3b772816 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -6,7 +6,7 @@
         <!-- Logo -->
         <AppLogo v-if="isShowLogo" :collapse="false" />
         <!-- 菜单 -->
-        <Menu :data="routes" menu-mode="horizontal" base-path="" />
+        <BasicMenu :data="routes" menu-mode="horizontal" base-path="" />
       </div>
       <!-- 操作按钮 -->
       <div class="layout__header-right">
@@ -27,7 +27,7 @@ import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import AppLogo from "../components/AppLogo/index.vue";
-import Menu from "../components/NavMenu/index.vue";
+import BasicMenu from "../components/Menu/BasicMenu.vue";
 import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
 import TagsView from "../components/TagsView/index.vue";
 import AppMain from "../components/AppMain/index.vue";
diff --git a/src/router/index.ts b/src/router/index.ts
index a31f4441..38bf3e60 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -28,7 +28,6 @@ export const constantRoutes: RouteRecordRaw[] = [
     name: "/",
     component: Layout,
     redirect: "/dashboard",
-    meta: { title: "dashboard" },
     children: [
       {
         path: "dashboard",

From 01d83e21d1d9600a74f28325be4e7e4831f52a76 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 07:44:17 +0800
Subject: [PATCH 397/497] =?UTF-8?q?fix:=20=E6=B7=B7=E5=90=88=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=94=AF=E4=B8=80=E5=AD=90=E8=8F=9C=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E7=9B=AE=E5=BD=95=E6=A0=87=E9=A2=98=E4=B8=8D=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/MixTopMenu.vue | 33 ++++++++++++++++++++--
 1 file changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index 21ac34c3..6e18cc05 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -20,8 +20,8 @@
     "
     @select="handleMenuSelect"
   >
-    <el-menu-item v-for="route in topMenus" :key="route.path" :index="route.path">
-      <MenuItemTitle v-if="route.meta" :icon="route.meta.icon" :title="route.meta.title" />
+    <el-menu-item v-for="menuItem in processedTopMenus" :key="menuItem.path" :index="menuItem.path">
+      <MenuItemTitle v-if="menuItem.meta" :icon="menuItem.meta.icon" :title="menuItem.meta.title" />
     </el-menu-item>
   </el-menu>
 </template>
@@ -52,6 +52,35 @@ const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
 // 顶部菜单列表
 const topMenus = ref<RouteRecordRaw[]>([]);
 
+// 处理后的顶部菜单列表 - 智能显示唯一子菜单的标题
+const processedTopMenus = computed(() => {
+  return topMenus.value.map((route) => {
+    // 如果路由设置了 alwaysShow=true，或者没有子菜单，直接返回原路由
+    if (route.meta?.alwaysShow || !route.children || route.children.length === 0) {
+      return route;
+    }
+
+    // 过滤出非隐藏的子菜单
+    const visibleChildren = route.children.filter((child) => !child.meta?.hidden);
+
+    // 如果只有一个非隐藏的子菜单，显示子菜单的信息
+    if (visibleChildren.length === 1) {
+      const onlyChild = visibleChildren[0];
+      return {
+        ...route,
+        meta: {
+          ...route.meta,
+          title: onlyChild.meta?.title || route.meta?.title,
+          icon: onlyChild.meta?.icon || route.meta?.icon,
+        },
+      };
+    }
+
+    // 其他情况返回原路由
+    return route;
+  });
+});
+
 // 获取当前路由路径的顶部菜单路径
 const activeTopMenuPath =
   useRoute().path.split("/").filter(Boolean).length > 1

From 5eaccf112ceb8a52ab5ecd88ae21795e7d1e695d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 08:22:50 +0800
Subject: [PATCH 398/497] =?UTF-8?q?refactor:=20=E5=91=BD=E5=90=8D=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |   4 +-
 src/constants/cache-keys.ts               |   8 --
 src/constants/index.ts                    |   3 +
 src/constants/storage-keys.ts             |  53 ++++++++
 src/lang/package/en.ts                    |   6 +-
 src/lang/package/zh-cn.ts                 |   9 +-
 src/layouts/components/Settings/index.vue |  20 +--
 src/layouts/composables/useLayout.ts      |   4 +-
 src/settings.ts                           |  10 +-
 src/store/modules/settings.store.ts       | 159 +++++++++++++++-------
 src/types/global.d.ts                     |  10 +-
 src/utils/auth.ts                         |  38 +++---
 12 files changed, 219 insertions(+), 105 deletions(-)
 delete mode 100644 src/constants/cache-keys.ts
 create mode 100644 src/constants/storage-keys.ts

diff --git a/src/App.vue b/src/App.vue
index 764bbf26..bb0263fd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -3,7 +3,7 @@
     <!-- 开启水印 -->
     <el-watermark
       :font="{ color: fontColor }"
-      :content="watermarkEnabled ? defaultSettings.watermarkContent : ''"
+      :content="showWatermark ? defaultSettings.watermarkContent : ''"
       :z-index="9999"
       class="wh-full"
     >
@@ -23,7 +23,7 @@ const settingsStore = useSettingsStore();
 
 const locale = computed(() => appStore.locale);
 const size = computed(() => appStore.size as ComponentSize);
-const watermarkEnabled = computed(() => settingsStore.watermarkEnabled);
+const showWatermark = computed(() => settingsStore.showWatermark);
 
 // 明亮/暗黑主题水印字体颜色适配
 const fontColor = computed(() => {
diff --git a/src/constants/cache-keys.ts b/src/constants/cache-keys.ts
deleted file mode 100644
index e1355933..00000000
--- a/src/constants/cache-keys.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- * 缓存键常量
- */
-export const ACCESS_TOKEN_KEY = "access_token";
-export const REFRESH_TOKEN_KEY = "refresh_token";
-export const DICT_CACHE_KEY = "dict_cache";
-export const REMEMBER_ME_KEY = "remember_me";
-// 可在此处添加其他缓存键
diff --git a/src/constants/index.ts b/src/constants/index.ts
index 83e52a3c..f8be9d9d 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1 +1,4 @@
 export const ROLE_ROOT = "ROOT";
+
+// 🔗 导出所有存储键常量
+export * from "./storage-keys";
diff --git a/src/constants/storage-keys.ts b/src/constants/storage-keys.ts
new file mode 100644
index 00000000..8f2b95dc
--- /dev/null
+++ b/src/constants/storage-keys.ts
@@ -0,0 +1,53 @@
+/**
+ * 存储键常量统一管理
+ * 包括 localStorage、sessionStorage 等各种存储的键名
+ */
+
+// 🔐 用户认证相关
+export const ACCESS_TOKEN_KEY = "access_token";
+export const REFRESH_TOKEN_KEY = "refresh_token";
+export const REMEMBER_ME_KEY = "remember_me";
+
+// 📊 数据缓存相关
+export const DICT_CACHE_KEY = "dict_cache";
+
+// 🎨 系统设置相关
+export const SHOW_TAGS_VIEW_KEY = "showTagsView";
+export const SHOW_APP_LOGO_KEY = "showAppLogo";
+export const SHOW_WATERMARK_KEY = "showWatermark";
+export const LAYOUT_KEY = "layout";
+export const SIDEBAR_COLOR_SCHEME_KEY = "sidebarColorScheme";
+export const THEME_KEY = "theme";
+export const THEME_COLOR_KEY = "themeColor";
+
+// 🎯 功能分组的键映射对象
+
+// 认证相关键集合
+export const AUTH_KEYS = {
+  ACCESS_TOKEN: ACCESS_TOKEN_KEY,
+  REFRESH_TOKEN: REFRESH_TOKEN_KEY,
+  REMEMBER_ME: REMEMBER_ME_KEY,
+} as const;
+
+// 缓存相关键集合
+export const CACHE_KEYS = {
+  DICT_CACHE: DICT_CACHE_KEY,
+} as const;
+
+// 设置相关键集合
+export const SETTINGS_KEYS = {
+  SHOW_TAGS_VIEW: SHOW_TAGS_VIEW_KEY,
+  SHOW_APP_LOGO: SHOW_APP_LOGO_KEY,
+  SHOW_WATERMARK: SHOW_WATERMARK_KEY,
+  SIDEBAR_COLOR_SCHEME: SIDEBAR_COLOR_SCHEME_KEY,
+  LAYOUT: LAYOUT_KEY,
+  THEME_COLOR: THEME_COLOR_KEY,
+  THEME: THEME_KEY,
+} as const;
+
+// 📦 所有存储键的统一集合
+export const ALL_STORAGE_KEYS = {
+  ...AUTH_KEYS,
+  ...CACHE_KEYS,
+  ...SETTINGS_KEYS,
+} as const;
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 73653665..97944db1 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -70,10 +70,10 @@ export default {
     interface: "Interface",
     navigation: "Navigation",
     themeColor: "Theme Color",
-    tagsView: "Tags View",
-    sidebarLogo: "Sidebar Logo",
+    showTagsView: "Show Tags View",
+    showAppLogo: "Show App Logo",
     sidebarColorScheme: "Sidebar Color Scheme",
-    watermark: "Watermark",
+    showWatermark: "Show Watermark",
     classicBlue: "Classic Blue",
     minimalWhite: "Minimal White",
   },
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index c97e2f0d..429cc8e6 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -70,10 +70,13 @@ export default {
     interface: "界面设置",
     navigation: "导航设置",
     themeColor: "主题颜色",
-    tagsView: "开启 Tags-View",
-    sidebarLogo: "侧边栏 Logo",
+    themeColorTip: "主题颜色",
+    darkMode: "暗黑模式",
+    layoutSetting: "布局设置",
     sidebarColorScheme: "侧边栏配色",
-    watermark: "开启水印",
+    showTagsView: "显示页签",
+    showAppLogo: "显示Logo",
+    showWatermark: "显示水印",
     classicBlue: "经典蓝",
     minimalWhite: "极简白",
   },
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 0766d655..b5241645 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -32,18 +32,18 @@
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.tagsView") }}</span>
-        <el-switch v-model="settingsStore.tagsView" />
+        <span class="text-xs">{{ t("settings.showTagsView") }}</span>
+        <el-switch v-model="settingsStore.showTagsView" />
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.sidebarLogo") }}</span>
-        <el-switch v-model="settingsStore.sidebarLogo" />
+        <span class="text-xs">{{ t("settings.showAppLogo") }}</span>
+        <el-switch v-model="settingsStore.showAppLogo" />
       </div>
 
       <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.watermark") }}</span>
-        <el-switch v-model="settingsStore.watermarkEnabled" />
+        <span class="text-xs">{{ t("settings.showWatermark") }}</span>
+        <el-switch v-model="settingsStore.showWatermark" />
       </div>
       <div v-if="!isDark" class="config-item flex-x-between">
         <span class="text-xs">{{ t("settings.sidebarColorScheme") }}</span>
@@ -133,7 +133,7 @@ const sidebarColor = ref(settingsStore.sidebarColorScheme);
 
 const selectedThemeColor = computed({
   get: () => settingsStore.themeColor,
-  set: (value) => settingsStore.changeThemeColor(value),
+  set: (value) => settingsStore.updateThemeColor(value),
 });
 
 const drawerVisible = computed({
@@ -147,7 +147,7 @@ const drawerVisible = computed({
  * @param isDark 是否启用暗黑模式
  */
 const handleThemeChange = (isDark: string | number | boolean) => {
-  settingsStore.changeTheme(isDark ? ThemeMode.DARK : ThemeMode.LIGHT);
+  settingsStore.updateTheme(isDark ? ThemeMode.DARK : ThemeMode.LIGHT);
 };
 
 /**
@@ -156,7 +156,7 @@ const handleThemeChange = (isDark: string | number | boolean) => {
  * @param val 颜色方案名称
  */
 const changeSidebarColor = (val: any) => {
-  settingsStore.changeSidebarColor(val);
+  settingsStore.updateSidebarColorScheme(val);
 };
 
 /**
@@ -165,7 +165,7 @@ const changeSidebarColor = (val: any) => {
  * @param layout - 布局模式
  */
 const handleLayoutChange = (layout: LayoutMode) => {
-  settingsStore.changeLayout(layout);
+  settingsStore.updateLayout(layout);
   if (layout === LayoutMode.MIX && route.name) {
     const topLevelRoute = findTopLevelRoute(permissionStore.routes, route.name as string);
     if (appStore.activeTopMenuPath !== topLevelRoute.path) {
diff --git a/src/layouts/composables/useLayout.ts b/src/layouts/composables/useLayout.ts
index 07dfe373..31fec66f 100644
--- a/src/layouts/composables/useLayout.ts
+++ b/src/layouts/composables/useLayout.ts
@@ -16,13 +16,13 @@ export function useLayout() {
   const isSidebarOpen = computed(() => appStore.sidebar.opened);
 
   // 是否显示标签视图
-  const isShowTagsView = computed(() => settingsStore.tagsView);
+  const isShowTagsView = computed(() => settingsStore.showTagsView);
 
   // 是否显示设置面板
   const isShowSettings = computed(() => defaultSettings.showSettings);
 
   // 是否显示Logo
-  const isShowLogo = computed(() => settingsStore.sidebarLogo);
+  const isShowLogo = computed(() => settingsStore.showAppLogo);
 
   // 是否移动设备
   const isMobile = computed(() => appStore.device === "mobile");
diff --git a/src/settings.ts b/src/settings.ts
index dbd14afc..817a9c7b 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -13,9 +13,9 @@ const defaultSettings: AppSettings = {
   // 是否显示设置
   showSettings: true,
   // 是否显示标签视图
-  tagsView: true,
-  // 是否显示侧边栏Logo
-  sidebarLogo: true,
+  showTagsView: true,
+  // 是否显示应用Logo
+  showAppLogo: true,
   // 布局方式，默认为左侧布局
   layout: LayoutMode.LEFT,
   // 主题，根据操作系统的色彩方案自动选择
@@ -26,8 +26,8 @@ const defaultSettings: AppSettings = {
   language: LanguageEnum.ZH_CN,
   // 主题颜色
   themeColor: "#4080FF",
-  // 是否开启水印
-  watermarkEnabled: false,
+  // 是否显示水印
+  showWatermark: false,
   // 水印内容
   watermarkContent: pkg.name,
   // 侧边栏配色方案
diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings.store.ts
index 30fb0808..d9628b3f 100644
--- a/src/store/modules/settings.store.ts
+++ b/src/store/modules/settings.store.ts
@@ -2,34 +2,67 @@ import defaultSettings from "@/settings";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 import type { LayoutMode } from "@/enums/settings/layout.enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
+import { SETTINGS_KEYS } from "@/constants";
 
-type SettingsValue = boolean | string;
+// 🎯 设置项类型定义
+interface SettingsState {
+  // 界面显示设置
+  settingsVisible: boolean;
+  showTagsView: boolean;
+  showAppLogo: boolean;
+  showWatermark: boolean;
+
+  // 布局设置
+  layout: LayoutMode;
+  sidebarColorScheme: string;
+
+  // 主题设置
+  theme: ThemeMode;
+  themeColor: string;
+}
+
+// 🎯 可变更的设置项类型
+type MutableSetting = Exclude<keyof SettingsState, "settingsVisible">;
+type SettingValue<K extends MutableSetting> = SettingsState[K];
 
 export const useSettingsStore = defineStore("setting", () => {
-  // 基本设置
-  const settingsVisible = ref(false);
-  // 标签视图
-  const tagsView = useStorage<boolean>("tagsView", defaultSettings.tagsView);
-  // 侧边栏 Logo
-  const sidebarLogo = useStorage<boolean>("sidebarLogo", defaultSettings.sidebarLogo);
-  // 侧边栏配色方案 (经典蓝/极简白)
+  // 🎯 基础设置 - 非持久化
+  const settingsVisible = ref<boolean>(false);
+
+  // 🎯 持久化设置 - 使用分组常量
+  const showTagsView = useStorage<boolean>(
+    SETTINGS_KEYS.SHOW_TAGS_VIEW,
+    defaultSettings.showTagsView
+  );
+
+  const showAppLogo = useStorage<boolean>(SETTINGS_KEYS.SHOW_APP_LOGO, defaultSettings.showAppLogo);
+
+  const showWatermark = useStorage<boolean>(
+    SETTINGS_KEYS.SHOW_WATERMARK,
+    defaultSettings.showWatermark
+  );
+
   const sidebarColorScheme = useStorage<string>(
-    "sidebarColorScheme",
+    SETTINGS_KEYS.SIDEBAR_COLOR_SCHEME,
     defaultSettings.sidebarColorScheme
   );
-  // 布局
-  const layout = useStorage<LayoutMode>("layout", defaultSettings.layout as LayoutMode);
-  // 水印
-  const watermarkEnabled = useStorage<boolean>(
-    "watermarkEnabled",
-    defaultSettings.watermarkEnabled
-  );
 
-  // 主题
-  const themeColor = useStorage<string>("themeColor", defaultSettings.themeColor);
-  const theme = useStorage<ThemeMode>("theme", defaultSettings.theme);
+  const layout = useStorage<LayoutMode>(SETTINGS_KEYS.LAYOUT, defaultSettings.layout as LayoutMode);
+
+  const themeColor = useStorage<string>(SETTINGS_KEYS.THEME_COLOR, defaultSettings.themeColor);
+
+  const theme = useStorage<ThemeMode>(SETTINGS_KEYS.THEME, defaultSettings.theme);
+
+  // 🎯 设置项映射
+  const settingsMap = {
+    showTagsView,
+    showAppLogo,
+    showWatermark,
+    sidebarColorScheme,
+    layout,
+  } as const;
 
-  //  监听主题变化
+  // 🎯 监听器 - 主题变化
   watch(
     [theme, themeColor],
     ([newTheme, newThemeColor]) => {
@@ -40,7 +73,7 @@ export const useSettingsStore = defineStore("setting", () => {
     { immediate: true }
   );
 
-  //  监听浅色侧边栏配色方案变化
+  // 🎯 监听器 - 侧边栏配色方案变化
   watch(
     [sidebarColorScheme],
     ([newSidebarColorScheme]) => {
@@ -49,49 +82,79 @@ export const useSettingsStore = defineStore("setting", () => {
     { immediate: true }
   );
 
-  // 设置映射
-  const settingsMap: Record<string, Ref<SettingsValue>> = {
-    tagsView,
-    sidebarLogo,
-    sidebarColorScheme,
-    layout,
-    watermarkEnabled,
-  };
-
-  function changeSetting({ key, value }: { key: string; value: SettingsValue }) {
+  // 🎯 统一的设置更新方法 - 类型安全
+  function updateSetting<K extends keyof typeof settingsMap>(key: K, value: SettingValue<K>): void {
     const setting = settingsMap[key];
-    if (setting) setting.value = value;
+    if (setting) {
+      (setting as Ref<any>).value = value;
+    }
+  }
+
+  // 🎯 主题相关的专用更新方法
+  function updateTheme(newTheme: ThemeMode): void {
+    theme.value = newTheme;
+  }
+
+  function updateThemeColor(newColor: string): void {
+    themeColor.value = newColor;
   }
 
-  function changeTheme(val: ThemeMode) {
-    theme.value = val;
+  function updateSidebarColorScheme(newScheme: string): void {
+    sidebarColorScheme.value = newScheme;
   }
 
-  function changeSidebarColor(val: string) {
-    sidebarColorScheme.value = val;
+  function updateLayout(newLayout: LayoutMode): void {
+    layout.value = newLayout;
   }
 
-  function changeThemeColor(color: string) {
-    themeColor.value = color;
+  // 🎯 设置面板显示控制
+  function toggleSettingsPanel(): void {
+    settingsVisible.value = !settingsVisible.value;
   }
 
-  function changeLayout(val: LayoutMode) {
-    layout.value = val;
+  function showSettingsPanel(): void {
+    settingsVisible.value = true;
+  }
+
+  function hideSettingsPanel(): void {
+    settingsVisible.value = false;
+  }
+
+  // 🎯 批量重置设置
+  function resetSettings(): void {
+    showTagsView.value = defaultSettings.showTagsView;
+    showAppLogo.value = defaultSettings.showAppLogo;
+    showWatermark.value = defaultSettings.showWatermark;
+    sidebarColorScheme.value = defaultSettings.sidebarColorScheme;
+    layout.value = defaultSettings.layout as LayoutMode;
+    themeColor.value = defaultSettings.themeColor;
+    theme.value = defaultSettings.theme;
   }
 
   return {
+    // 状态
     settingsVisible,
-    tagsView,
-    sidebarLogo,
+    showTagsView,
+    showAppLogo,
+    showWatermark,
     sidebarColorScheme,
     layout,
     themeColor,
     theme,
-    watermarkEnabled,
-    changeSetting,
-    changeTheme,
-    changeThemeColor,
-    changeLayout,
-    changeSidebarColor,
+
+    // 更新方法
+    updateSetting,
+    updateTheme,
+    updateThemeColor,
+    updateSidebarColorScheme,
+    updateLayout,
+
+    // 面板控制
+    toggleSettingsPanel,
+    showSettingsPanel,
+    hideSettingsPanel,
+
+    // 重置功能
+    resetSettings,
   };
 });
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 460ba70c..25487ca1 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -59,9 +59,9 @@ declare global {
     /** 是否显示设置 */
     showSettings: boolean;
     /** 是否显示多标签导航 */
-    tagsView: boolean;
-    /** 是否显示侧边栏Logo */
-    sidebarLogo: boolean;
+    showTagsView: boolean;
+    /** 是否显示应用Logo */
+    showAppLogo: boolean;
     /** 导航栏布局(left|top|mix) */
     layout: "left" | "top" | "mix";
     /** 主题颜色 */
@@ -72,8 +72,8 @@ declare global {
     size: string;
     /** 语言( zh-cn| en) */
     language: string;
-    /** 是否开启水印 */
-    watermarkEnabled: boolean;
+    /** 是否显示水印 */
+    showWatermark: boolean;
     /** 水印内容 */
     watermarkContent: string;
     /** 侧边栏配色方案 */
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 869ea836..db0a7403 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,5 +1,5 @@
 import { Storage } from "./storage";
-import { ACCESS_TOKEN_KEY, REFRESH_TOKEN_KEY, REMEMBER_ME_KEY } from "@/constants/cache-keys";
+import { AUTH_KEYS } from "@/constants";
 
 /**
  * 身份验证工具类
@@ -23,11 +23,11 @@ export class Auth {
    * @returns 当前有效的访问令牌
    */
   static getAccessToken(): string {
-    const isRememberMe = Storage.get<boolean>(REMEMBER_ME_KEY, false);
+    const isRememberMe = Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
     // 根据"记住我"状态决定从哪个存储位置获取token
     return isRememberMe
-      ? Storage.get(ACCESS_TOKEN_KEY, "")
-      : Storage.sessionGet(ACCESS_TOKEN_KEY, "");
+      ? Storage.get(AUTH_KEYS.ACCESS_TOKEN, "")
+      : Storage.sessionGet(AUTH_KEYS.ACCESS_TOKEN, "");
   }
 
   /**
@@ -35,10 +35,10 @@ export class Auth {
    * @returns 当前有效的刷新令牌
    */
   static getRefreshToken(): string {
-    const isRememberMe = Storage.get<boolean>(REMEMBER_ME_KEY, false);
+    const isRememberMe = Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
     return isRememberMe
-      ? Storage.get(REFRESH_TOKEN_KEY, "")
-      : Storage.sessionGet(REFRESH_TOKEN_KEY, "");
+      ? Storage.get(AUTH_KEYS.REFRESH_TOKEN, "")
+      : Storage.sessionGet(AUTH_KEYS.REFRESH_TOKEN, "");
   }
 
   /**
@@ -49,19 +49,19 @@ export class Auth {
    */
   static setTokens(accessToken: string, refreshToken: string, rememberMe: boolean): void {
     // 保存"记住我"状态
-    Storage.set(REMEMBER_ME_KEY, rememberMe);
+    Storage.set(AUTH_KEYS.REMEMBER_ME, rememberMe);
 
     if (rememberMe) {
       // 使用localStorage长期保存
-      Storage.set(ACCESS_TOKEN_KEY, accessToken);
-      Storage.set(REFRESH_TOKEN_KEY, refreshToken);
+      Storage.set(AUTH_KEYS.ACCESS_TOKEN, accessToken);
+      Storage.set(AUTH_KEYS.REFRESH_TOKEN, refreshToken);
     } else {
       // 使用sessionStorage临时保存
-      Storage.sessionSet(ACCESS_TOKEN_KEY, accessToken);
-      Storage.sessionSet(REFRESH_TOKEN_KEY, refreshToken);
+      Storage.sessionSet(AUTH_KEYS.ACCESS_TOKEN, accessToken);
+      Storage.sessionSet(AUTH_KEYS.REFRESH_TOKEN, refreshToken);
       // 清除localStorage中可能存在的token
-      Storage.remove(ACCESS_TOKEN_KEY);
-      Storage.remove(REFRESH_TOKEN_KEY);
+      Storage.remove(AUTH_KEYS.ACCESS_TOKEN);
+      Storage.remove(AUTH_KEYS.REFRESH_TOKEN);
     }
   }
 
@@ -69,10 +69,10 @@ export class Auth {
    * 清除所有身份验证相关的数据
    */
   static clearAuth(): void {
-    Storage.remove(ACCESS_TOKEN_KEY);
-    Storage.remove(REFRESH_TOKEN_KEY);
-    Storage.sessionRemove(ACCESS_TOKEN_KEY);
-    Storage.sessionRemove(REFRESH_TOKEN_KEY);
+    Storage.remove(AUTH_KEYS.ACCESS_TOKEN);
+    Storage.remove(AUTH_KEYS.REFRESH_TOKEN);
+    Storage.sessionRemove(AUTH_KEYS.ACCESS_TOKEN);
+    Storage.sessionRemove(AUTH_KEYS.REFRESH_TOKEN);
     // 不清除记住我设置，保留用户偏好
   }
 
@@ -81,6 +81,6 @@ export class Auth {
    * @returns 是否记住我
    */
   static getRememberMe(): boolean {
-    return Storage.get<boolean>(REMEMBER_ME_KEY, false);
+    return Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
   }
 }

From a3e4d6b85252ca8b8f5301ce6df4b94aca296768 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 25 May 2025 09:35:50 +0800
Subject: [PATCH 399/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/DarkModeSwitch/index.vue   |   2 +-
 src/composables/useOnlineCount.ts         |   1 -
 src/lang/package/en.ts                    |  16 +
 src/lang/package/zh-cn.ts                 |  14 +
 src/layouts/components/AppMain/index.vue  |  16 +-
 src/layouts/components/Settings/index.vue | 636 +++++++++++++++++-----
 src/layouts/index.vue                     |  19 +-
 src/layouts/views/BaseLayout.vue          |   6 +-
 8 files changed, 554 insertions(+), 156 deletions(-)

diff --git a/src/components/DarkModeSwitch/index.vue b/src/components/DarkModeSwitch/index.vue
index c5991b28..780c1abc 100644
--- a/src/components/DarkModeSwitch/index.vue
+++ b/src/components/DarkModeSwitch/index.vue
@@ -34,6 +34,6 @@ const theneList = [
 ];
 
 const handleDarkChange = (theme: ThemeMode) => {
-  settingsStore.changeTheme(theme);
+  settingsStore.updateTheme(theme);
 };
 </script>
diff --git a/src/composables/useOnlineCount.ts b/src/composables/useOnlineCount.ts
index 086a8d75..906278c6 100644
--- a/src/composables/useOnlineCount.ts
+++ b/src/composables/useOnlineCount.ts
@@ -1,6 +1,5 @@
 import { ref, onMounted, onUnmounted, watch, getCurrentInstance } from "vue";
 import { useStomp } from "./useStomp";
-import { ElMessage } from "element-plus";
 import { registerWebSocketInstance } from "@/plugins/websocket";
 import { Auth } from "@/utils/auth";
 
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
index 97944db1..2a863c73 100644
--- a/src/lang/package/en.ts
+++ b/src/lang/package/en.ts
@@ -76,5 +76,21 @@ export default {
     showWatermark: "Show Watermark",
     classicBlue: "Classic Blue",
     minimalWhite: "Minimal White",
+    copyConfig: "Copy Config",
+    resetConfig: "Reset Default",
+    copySuccess: "Configuration copied to clipboard",
+    resetSuccess: "Reset to default configuration",
+    copyDescription:
+      "Copy config will generate current settings code, reset will restore all settings to default",
+    confirmReset: "Are you sure to reset all settings to default? This operation cannot be undone.",
+    applyToFile: "Apply to File",
+    onlyCopy: "Only Copy",
+    leftLayout: "Left Mode",
+    topLayout: "Top Mode",
+    mixLayout: "Mix Mode",
+    configManagement: "Config Management",
+    copyConfigDescription:
+      "Generate current settings code and copy to clipboard, then overwrite src/settings.ts file",
+    resetConfigDescription: "Restore all settings to system default values",
   },
 };
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
index 429cc8e6..f1f9cb2e 100644
--- a/src/lang/package/zh-cn.ts
+++ b/src/lang/package/zh-cn.ts
@@ -79,5 +79,19 @@ export default {
     showWatermark: "显示水印",
     classicBlue: "经典蓝",
     minimalWhite: "极简白",
+    copyConfig: "复制配置",
+    resetConfig: "重置默认",
+    copySuccess: "配置已复制到剪贴板",
+    resetSuccess: "已重置为默认配置",
+    copyDescription: "复制配置将生成当前设置的代码，重置将恢复所有设置为默认值",
+    confirmReset: "确定要重置所有设置为默认值吗？此操作不可恢复。",
+    applyToFile: "应用到文件",
+    onlyCopy: "仅复制",
+    leftLayout: "左侧模式",
+    topLayout: "顶部模式",
+    mixLayout: "混合模式",
+    configManagement: "配置管理",
+    copyConfigDescription: "生成当前设置的代码并复制到剪贴板，然后覆盖 src/settings.ts 文件",
+    resetConfigDescription: "恢复所有设置为系统默认值",
   },
 };
diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 398ee216..8510dc64 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -19,7 +19,7 @@ import variables from "@/styles/variables.module.scss";
 // 缓存页面集合
 const cachedViews = computed(() => useTagsViewStore().cachedViews);
 const appMainHeight = computed(() => {
-  if (useSettingsStore().tagsView) {
+  if (useSettingsStore().showTagsView) {
     return `calc(100vh - ${variables["navbar-height"]} - ${variables["tags-view-height"]})`;
   } else {
     return `calc(100vh - ${variables["navbar-height"]})`;
@@ -32,5 +32,19 @@ const appMainHeight = computed(() => {
   position: relative;
   overflow-y: auto;
   background-color: var(--el-bg-color-page);
+
+  /* 布局切换动画优化 */
+  &.animate__animated {
+    animation-duration: 0.4s;
+    animation-fill-mode: forwards;
+  }
+
+  &.animate__fadeOut {
+    animation-timing-function: ease-in;
+  }
+
+  &.animate__fadeIn {
+    animation-timing-function: ease-out;
+  }
 }
 </style>
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index b5241645..2df32403 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -1,102 +1,167 @@
 <template>
   <el-drawer
     v-model="drawerVisible"
-    size="300"
+    size="380"
     :title="t('settings.project')"
     :before-close="handleCloseDrawer"
+    class="settings-drawer"
   >
-    <section class="config-section">
-      <el-divider>{{ t("settings.theme") }}</el-divider>
-
-      <div class="flex-center">
-        <el-switch
-          v-model="isDark"
-          active-icon="Moon"
-          inactive-icon="Sunny"
-          @change="handleThemeChange"
-        />
-      </div>
-    </section>
-
-    <!-- 界面设置 -->
-    <section class="config-section">
-      <el-divider>{{ t("settings.interface") }}</el-divider>
-
-      <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.themeColor") }}</span>
-        <el-color-picker
-          v-model="selectedThemeColor"
-          :predefine="colorPresets"
-          popper-class="theme-picker-dropdown"
-        />
-      </div>
-
-      <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.showTagsView") }}</span>
-        <el-switch v-model="settingsStore.showTagsView" />
-      </div>
-
-      <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.showAppLogo") }}</span>
-        <el-switch v-model="settingsStore.showAppLogo" />
-      </div>
-
-      <div class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.showWatermark") }}</span>
-        <el-switch v-model="settingsStore.showWatermark" />
-      </div>
-      <div v-if="!isDark" class="config-item flex-x-between">
-        <span class="text-xs">{{ t("settings.sidebarColorScheme") }}</span>
-        <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
-          <el-radio :value="SidebarColor.CLASSIC_BLUE">
-            {{ t("settings.classicBlue") }}
-          </el-radio>
-          <el-radio :value="SidebarColor.MINIMAL_WHITE">
-            {{ t("settings.minimalWhite") }}
-          </el-radio>
-        </el-radio-group>
-      </div>
-    </section>
-
-    <!-- 布局设置 -->
-    <section class="config-section">
-      <el-divider>{{ t("settings.navigation") }}</el-divider>
-
-      <!-- 整合的布局选择器 -->
-      <div class="layout-select">
-        <el-tooltip
-          v-for="item in layoutOptions"
-          :key="item.value"
-          :content="item.label"
-          placement="bottom"
-        >
-          <div
-            role="button"
-            tabindex="0"
-            :class="[
-              'layout-item',
-              item.className,
-              { 'is-active': settingsStore.layout === item.value },
-            ]"
-            @click="handleLayoutChange(item.value)"
-            @keydown.enter.space="handleLayoutChange(item.value)"
-          >
-            <div class="layout-item-part" />
-            <div class="layout-item-part" />
+    <div class="settings-content">
+      <section class="config-section">
+        <el-divider>{{ t("settings.theme") }}</el-divider>
+
+        <div class="flex-center">
+          <el-switch
+            v-model="isDark"
+            active-icon="Moon"
+            inactive-icon="Sunny"
+            class="theme-switch"
+            @change="handleThemeChange"
+          />
+        </div>
+      </section>
+
+      <!-- 界面设置 -->
+      <section class="config-section">
+        <el-divider>{{ t("settings.interface") }}</el-divider>
+
+        <div class="config-item flex-x-between">
+          <span class="text-xs">{{ t("settings.themeColor") }}</span>
+          <el-color-picker
+            v-model="selectedThemeColor"
+            :predefine="colorPresets"
+            popper-class="theme-picker-dropdown"
+          />
+        </div>
+
+        <div class="config-item flex-x-between">
+          <span class="text-xs">{{ t("settings.showTagsView") }}</span>
+          <el-switch v-model="settingsStore.showTagsView" />
+        </div>
+
+        <div class="config-item flex-x-between">
+          <span class="text-xs">{{ t("settings.showAppLogo") }}</span>
+          <el-switch v-model="settingsStore.showAppLogo" />
+        </div>
+
+        <div class="config-item flex-x-between">
+          <span class="text-xs">{{ t("settings.showWatermark") }}</span>
+          <el-switch v-model="settingsStore.showWatermark" />
+        </div>
+        <div v-if="!isDark" class="config-item flex-x-between">
+          <span class="text-xs">{{ t("settings.sidebarColorScheme") }}</span>
+          <el-radio-group v-model="sidebarColor" @change="changeSidebarColor">
+            <el-radio :value="SidebarColor.CLASSIC_BLUE">
+              {{ t("settings.classicBlue") }}
+            </el-radio>
+            <el-radio :value="SidebarColor.MINIMAL_WHITE">
+              {{ t("settings.minimalWhite") }}
+            </el-radio>
+          </el-radio-group>
+        </div>
+      </section>
+
+      <!-- 布局设置 -->
+      <section class="config-section">
+        <el-divider>{{ t("settings.navigation") }}</el-divider>
+
+        <!-- 整合的布局选择器 -->
+        <div class="layout-select">
+          <div class="layout-grid">
+            <el-tooltip
+              v-for="item in layoutOptions"
+              :key="item.value"
+              :content="item.label"
+              placement="bottom"
+            >
+              <div
+                role="button"
+                tabindex="0"
+                :class="[
+                  'layout-item',
+                  item.className,
+                  {
+                    'is-active': settingsStore.layout === item.value,
+                  },
+                ]"
+                @click="handleLayoutChange(item.value)"
+                @keydown.enter.space="handleLayoutChange(item.value)"
+              >
+                <!-- 布局预览图标 -->
+                <div class="layout-preview">
+                  <div v-if="item.value !== LayoutMode.LEFT" class="layout-header"></div>
+                  <div v-if="item.value !== LayoutMode.TOP" class="layout-sidebar"></div>
+                  <div class="layout-main"></div>
+                </div>
+                <!-- 布局名称 -->
+                <div class="layout-name">{{ item.label }}</div>
+                <!-- 选中状态指示器 -->
+                <div v-if="settingsStore.layout === item.value" class="layout-check">
+                  <el-icon><Check /></el-icon>
+                </div>
+              </div>
+            </el-tooltip>
           </div>
-        </el-tooltip>
+        </div>
+      </section>
+    </div>
+
+    <!-- 操作按钮区域 - 固定到底部 -->
+    <div class="action-footer">
+      <div class="action-divider"></div>
+      <div class="action-card">
+        <div class="action-buttons">
+          <el-tooltip
+            content="复制配置将生成当前设置的代码，覆盖 src/settings.ts 下的 defaultSettings 变量"
+            placement="top"
+          >
+            <el-button
+              type="primary"
+              size="default"
+              :icon="copyIcon"
+              :loading="copyLoading"
+              class="action-btn"
+              @click="handleCopySettings"
+            >
+              {{ copyLoading ? "复制中..." : t("settings.copyConfig") }}
+            </el-button>
+          </el-tooltip>
+          <el-tooltip content="重置将恢复所有设置为默认值" placement="top">
+            <el-button
+              type="warning"
+              size="default"
+              :icon="resetIcon"
+              :loading="resetLoading"
+              class="action-btn"
+              @click="handleResetSettings"
+            >
+              {{ resetLoading ? "重置中..." : t("settings.resetConfig") }}
+            </el-button>
+          </el-tooltip>
+        </div>
       </div>
-    </section>
+    </div>
   </el-drawer>
 </template>
 
 <script setup lang="ts">
+import { DocumentCopy, RefreshLeft, Check } from "@element-plus/icons-vue";
+import { markRaw } from "vue";
+
 const { t } = useI18n();
 import { LayoutMode } from "@/enums/settings/layout.enum";
 import { ThemeMode } from "@/enums/settings/theme.enum";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
+// 按钮图标 - 使用markRaw避免响应式警告
+const copyIcon = markRaw(DocumentCopy);
+const resetIcon = markRaw(RefreshLeft);
+
+// 加载状态
+const copyLoading = ref(false);
+const resetLoading = ref(false);
+
 // 布局选项配置
 interface LayoutOption {
   value: LayoutMode;
@@ -105,9 +170,9 @@ interface LayoutOption {
 }
 
 const layoutOptions: LayoutOption[] = [
-  { value: LayoutMode.LEFT, label: "左侧模式", className: "left" },
-  { value: LayoutMode.TOP, label: "顶部模式", className: "top" },
-  { value: LayoutMode.MIX, label: "混合模式", className: "mix" },
+  { value: LayoutMode.LEFT, label: t("settings.leftLayout"), className: "left" },
+  { value: LayoutMode.TOP, label: t("settings.topLayout"), className: "top" },
+  { value: LayoutMode.MIX, label: t("settings.mixLayout"), className: "mix" },
 ];
 
 // 颜色预设
@@ -165,7 +230,10 @@ const changeSidebarColor = (val: any) => {
  * @param layout - 布局模式
  */
 const handleLayoutChange = (layout: LayoutMode) => {
+  if (settingsStore.layout === layout) return;
+
   settingsStore.updateLayout(layout);
+
   if (layout === LayoutMode.MIX && route.name) {
     const topLevelRoute = findTopLevelRoute(permissionStore.routes, route.name as string);
     if (appStore.activeTopMenuPath !== topLevelRoute.path) {
@@ -174,6 +242,89 @@ const handleLayoutChange = (layout: LayoutMode) => {
   }
 };
 
+/**
+ * 复制当前配置
+ */
+const handleCopySettings = async () => {
+  try {
+    copyLoading.value = true;
+
+    // 生成配置代码
+    const configCode = generateSettingsCode();
+
+    // 复制到剪贴板
+    await navigator.clipboard.writeText(configCode);
+
+    // 显示成功消息
+    ElMessage.success({
+      message: t("settings.copySuccess"),
+      duration: 3000,
+    });
+  } catch {
+    ElMessage.error("复制配置失败");
+  } finally {
+    copyLoading.value = false;
+  }
+};
+
+/**
+ * 重置为默认配置
+ */
+const handleResetSettings = async () => {
+  resetLoading.value = true;
+
+  try {
+    settingsStore.resetSettings();
+
+    // 同步更新本地状态
+    isDark.value = settingsStore.theme === ThemeMode.DARK;
+    sidebarColor.value = settingsStore.sidebarColorScheme;
+
+    ElMessage.success(t("settings.resetSuccess"));
+  } catch {
+    ElMessage.error("重置配置失败");
+  } finally {
+    resetLoading.value = false;
+  }
+};
+
+/**
+ * 生成配置代码字符串
+ */
+const generateSettingsCode = (): string => {
+  const settings = {
+    title: "pkg.name",
+    version: "pkg.version",
+    showSettings: true,
+    showTagsView: settingsStore.showTagsView,
+    showAppLogo: settingsStore.showAppLogo,
+    layout: `LayoutMode.${settingsStore.layout.toUpperCase()}`,
+    theme: `ThemeMode.${settingsStore.theme.toUpperCase()}`,
+    size: "ComponentSize.DEFAULT",
+    language: "LanguageEnum.ZH_CN",
+    themeColor: `"${settingsStore.themeColor}"`,
+    showWatermark: settingsStore.showWatermark,
+    watermarkContent: "pkg.name",
+    sidebarColorScheme: `SidebarColor.${settingsStore.sidebarColorScheme.toUpperCase().replace("-", "_")}`,
+  };
+
+  return `const defaultSettings: AppSettings = {
+  title: ${settings.title},
+  version: ${settings.version},
+  showSettings: ${settings.showSettings},
+  showTagsView: ${settings.showTagsView},
+  showAppLogo: ${settings.showAppLogo},
+  layout: ${settings.layout},
+  theme: ${settings.theme},
+  size: ${settings.size},
+  language: ${settings.language},
+  themeColor: ${settings.themeColor},
+  showWatermark: ${settings.showWatermark},
+  watermarkContent: ${settings.watermarkContent},
+  sidebarColorScheme: ${settings.sidebarColorScheme},
+};`;
+};
+
 /**
  * 查找路由的顶层父路由
  *
@@ -216,109 +367,300 @@ const handleCloseDrawer = () => {
 </script>
 
 <style lang="scss" scoped>
+/* 设置抽屉样式 */
+.settings-drawer {
+  :deep(.el-drawer__body) {
+    position: relative;
+    height: 100%;
+    padding: 0;
+    overflow: hidden;
+  }
+}
+
+/* 设置内容区域 */
+.settings-content {
+  height: calc(100vh - 120px); /* 减去头部和底部按钮的高度 */
+  padding: 20px;
+  padding-bottom: 20px;
+  overflow-y: auto;
+}
+
+/* 底部操作区域样式 */
+.action-footer {
+  position: absolute;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 10;
+  padding: 0;
+  background: var(--el-bg-color);
+  border-top: 1px solid var(--el-border-color-light);
+
+  .action-divider {
+    display: none; /* 移除重复的分割线 */
+  }
+
+  .action-card {
+    padding: 16px 20px;
+    margin: 0;
+    background: var(--el-fill-color-extra-light);
+    border: none;
+    border-radius: 0;
+
+    .action-buttons {
+      display: flex;
+      gap: 12px;
+
+      .action-btn {
+        flex: 1;
+        font-size: 14px;
+        border-radius: 8px;
+        transition: all 0.3s ease;
+
+        &:hover {
+          box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+          transform: translateY(-2px);
+        }
+      }
+    }
+  }
+}
+
+/* 主题切换器优化 */
+.theme-switch {
+  transform: scale(1.2);
+  transition: all 0.3s ease;
+
+  &:hover {
+    transform: scale(1.25);
+  }
+}
+
 .config-section {
   margin-bottom: 24px;
 
   .config-item {
     padding: 12px 0;
     border-bottom: 1px solid var(--el-border-color-light);
+    transition: all 0.3s ease;
 
     &:last-child {
       border-bottom: none;
     }
+
+    &:hover {
+      padding-right: 8px;
+      padding-left: 8px;
+      margin: 0 -8px;
+      background-color: var(--el-fill-color-light);
+      border-radius: 6px;
+    }
   }
 }
 
-/* 布局选择器样式 */
+/* 布局选择器样式优化 */
 .layout-select {
-  display: flex;
-  gap: 10px;
-  justify-content: space-evenly;
-  padding: 10px 0;
-  --layout-primary: #1b2a47;
-  --layout-background: #f0f2f5;
-  --layout-shadow: 0 0 8px rgba(0, 0, 0, 0.1);
-  --layout-hover: #e3f1f9;
+  padding: 16px 8px;
+
+  .layout-grid {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 12px;
+    justify-items: center;
+  }
 }
 
 .layout-item {
   position: relative;
-  width: 18%;
-  height: 50px;
+  width: 70px;
+  height: 80px;
+  overflow: hidden;
   cursor: pointer;
-  background: var(--layout-background);
-  border-radius: 8px;
-  box-shadow: var(--layout-shadow);
-
-  transition:
-    transform 0.2s ease,
-    border-color 0.2s ease,
-    box-shadow 0.2s ease;
+  background: linear-gradient(145deg, #ffffff 0%, #f8fafc 100%);
+  border: 2px solid var(--el-border-color-light);
+  border-radius: 12px;
+  box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
 
   &:hover {
-    background-color: var(--layout-hover);
-    transform: scale(1.02);
+    background: linear-gradient(145deg, #ffffff 0%, var(--el-color-primary-light-9) 100%);
+    border-color: var(--el-color-primary-light-3);
+    transform: translateY(-4px) scale(1.05);
+  }
+
+  &:active {
+    transform: translateY(-2px) scale(1.02);
   }
 
-  &:focus-visible {
-    outline: 2px solid var(--el-color-primary);
+  .layout-preview {
+    position: relative;
+    width: 100%;
+    height: 50px;
+    margin: 8px 0 4px 0;
   }
 
-  &-part {
+  .layout-header {
     position: absolute;
-    background: var(--layout-primary);
-    border-radius: 4px;
-    box-shadow: var(--layout-shadow);
-    transition: all 0.3s ease;
+    top: 0;
+    right: 4px;
+    left: 4px;
+    height: 8px;
+    background: linear-gradient(
+      90deg,
+      var(--el-color-primary) 0%,
+      var(--el-color-primary-light-3) 100%
+    );
+    border-radius: 2px;
+  }
+
+  .layout-sidebar {
+    position: absolute;
+    left: 4px;
+    width: 12px;
+    background: linear-gradient(
+      180deg,
+      var(--el-color-primary-dark-2) 0%,
+      var(--el-color-primary) 100%
+    );
+    border-radius: 2px;
+  }
+
+  .layout-main {
+    position: absolute;
+    background: linear-gradient(135deg, #f1f5f9 0%, #e2e8f0 100%);
+    border: 1px solid var(--el-border-color-lighter);
+    border-radius: 2px;
+  }
+
+  .layout-name {
+    position: absolute;
+    right: 0;
+    bottom: 6px;
+    left: 0;
+    font-size: 10px;
+    font-weight: 500;
+    color: var(--el-text-color-regular);
+    text-align: center;
+    transition: color 0.3s ease;
+  }
+
+  .layout-check {
+    position: absolute;
+    top: 4px;
+    right: 4px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 16px;
+    height: 16px;
+    font-size: 10px;
+    color: white;
+    background: var(--el-color-success);
+    border-radius: 50%;
   }
 
+  // 左侧布局
   &.left {
-    .layout-item-part {
-      &:first-child {
-        width: 30%;
-        height: 100%;
-        border-radius: 4px 0 0 4px;
-      }
-      &:last-child {
-        top: 0;
-        right: 0;
-        width: 70%;
-        height: 30%;
-        background: #fff;
-        border-radius: 0 4px 4px 0;
-      }
+    .layout-sidebar {
+      top: 4px;
+      bottom: 4px;
+    }
+    .layout-main {
+      top: 4px;
+      right: 4px;
+      bottom: 4px;
+      left: 20px;
     }
   }
 
+  // 顶部布局
   &.top {
-    .layout-item-part:first-child {
-      width: 100%;
-      height: 30%;
-      border-radius: 4px 4px 0 0;
+    .layout-header {
+      height: 12px;
+    }
+    .layout-main {
+      top: 16px;
+      right: 4px;
+      bottom: 4px;
+      left: 4px;
     }
   }
 
+  // 混合布局
   &.mix {
-    .layout-item-part {
-      &:first-child {
-        width: 100%;
-        height: 30%;
-        border-radius: 4px 4px 0 0;
-      }
-      &:last-child {
-        bottom: 0;
-        left: 0;
-        width: 30%;
-        height: 70%;
-        border-radius: 0 0 4px 4px;
-      }
+    .layout-header {
+      height: 10px;
+    }
+    .layout-sidebar {
+      top: 14px;
+      bottom: 4px;
+    }
+    .layout-main {
+      top: 14px;
+      right: 4px;
+      bottom: 4px;
+      left: 20px;
+    }
+  }
+
+  &.is-active {
+    background: linear-gradient(
+      145deg,
+      var(--el-color-primary-light-9) 0%,
+      var(--el-color-primary-light-8) 100%
+    );
+    border-color: var(--el-color-primary);
+    transform: translateY(-2px) scale(1.08);
+
+    .layout-name {
+      font-weight: 600;
+      color: var(--el-color-primary);
+    }
+  }
+}
+
+/* 深色模式适配 */
+.dark {
+  .action-footer {
+    background: var(--el-bg-color);
+    border-top-color: var(--el-border-color);
+  }
+
+  .action-card {
+    background: var(--el-fill-color-extra-light);
+  }
+
+  .layout-item {
+    background: linear-gradient(145deg, var(--el-bg-color) 0%, var(--el-bg-color-page) 100%);
+    border-color: var(--el-border-color);
+
+    &:hover {
+      background: linear-gradient(
+        145deg,
+        var(--el-bg-color-page) 0%,
+        var(--el-color-primary-light-9) 100%
+      );
+    }
+
+    &.is-active {
+      background: linear-gradient(
+        145deg,
+        var(--el-color-primary-light-9) 0%,
+        var(--el-color-primary-light-8) 100%
+      );
+    }
+
+    .layout-main {
+      background: linear-gradient(135deg, var(--el-fill-color) 0%, var(--el-fill-color-light) 100%);
     }
   }
 }
 
-.is-active {
-  background-color: var(--layout-hover);
-  border: 2px solid var(--el-color-primary);
-  transform: scale(1.05);
+/* 复制配置对话框样式 */
+:deep(.copy-config-dialog) {
+  .el-message-box__content {
+    max-height: 400px;
+    overflow-y: auto;
+  }
 }
 </style>
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 2c382e7b..c3524030 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,5 +1,10 @@
 <template>
-  <component :is="currentLayoutComponent" />
+  <div class="layout-wrapper">
+    <component :is="currentLayoutComponent" />
+
+    <!-- 设置面板 - 独立于布局组件 -->
+    <Settings v-if="isShowSettings" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -8,7 +13,9 @@ import { useLayout } from "./composables/useLayout";
 import LeftLayout from "./views/LeftLayout.vue";
 import TopLayout from "./views/TopLayout.vue";
 import MixLayout from "./views/MixLayout.vue";
+import Settings from "./components/Settings/index.vue";
 import { LayoutMode } from "@/enums/settings/layout.enum";
+import defaultSettings from "@/settings";
 
 const { currentLayout } = useLayout();
 
@@ -24,4 +31,14 @@ const currentLayoutComponent = computed(() => {
       return LeftLayout;
   }
 });
+
+// 是否显示设置面板
+const isShowSettings = computed(() => defaultSettings.showSettings);
 </script>
+
+<style lang="scss" scoped>
+.layout-wrapper {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/layouts/views/BaseLayout.vue b/src/layouts/views/BaseLayout.vue
index 218d57ff..3e305016 100644
--- a/src/layouts/views/BaseLayout.vue
+++ b/src/layouts/views/BaseLayout.vue
@@ -6,9 +6,6 @@
     <!-- 布局内容插槽 -->
     <slot></slot>
 
-    <!-- 设置面板 -->
-    <Settings v-if="isShowSettings" />
-
     <!-- 返回顶部按钮 -->
     <el-backtop target=".app-main">
       <div class="i-svg:backtop w-6 h-6" />
@@ -19,10 +16,9 @@
 <script setup lang="ts">
 import { useLayout } from "../composables/useLayout";
 import { useLayoutResponsive } from "../composables/useLayoutResponsive";
-import Settings from "../components/Settings/index.vue";
 
 // 布局相关
-const { layoutClass, isShowSettings, isSidebarOpen, closeSidebar } = useLayout();
+const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
 
 // 响应式处理
 const { isMobile } = useLayoutResponsive();

From 0d899feeaf7193c3e332b4de906825fe964a8019 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 26 May 2025 08:22:34 +0800
Subject: [PATCH 400/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/views/MixLayout.vue | 49 ++++++++++++++++++++-
 src/layouts/views/TopLayout.vue | 75 +++++++++++++++++++++++++++++++--
 2 files changed, 119 insertions(+), 5 deletions(-)

diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 7cbea3d1..40a02388 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -5,7 +5,7 @@
       <div class="layout__header-content">
         <!-- Logo区域 -->
         <div v-if="isShowLogo" class="layout__header-logo">
-          <AppLogo :collapse="false" />
+          <AppLogo :collapse="isLogoCollapsed" />
         </div>
 
         <!-- 顶部菜单区域 -->
@@ -60,6 +60,7 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useRoute } from "vue-router";
+import { useWindowSize } from "@vueuse/core";
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
@@ -80,6 +81,12 @@ const { isShowTagsView, isShowLogo, isSidebarOpen, toggleSidebar } = useLayout()
 // 菜单相关
 const { sideMenuRoutes, activeTopMenuPath } = useLayoutMenu();
 
+// 响应式窗口尺寸
+const { width } = useWindowSize();
+
+// 只有在小屏设备（移动设备）时才折叠Logo（只显示图标，隐藏文字）
+const isLogoCollapsed = computed(() => width.value < 768);
+
 // 当前激活的菜单
 const activeMenu = computed(() => {
   const { meta, path } = route;
@@ -120,6 +127,7 @@ console.log("🎨 MixLayout rendered");
     &-content {
       display: flex;
       align-items: center;
+      min-width: 768px;
       height: 100%;
       padding: 0;
     }
@@ -129,9 +137,19 @@ console.log("🎨 MixLayout rendered");
       flex-shrink: 0;
       align-items: center;
       justify-content: center;
-      width: $sidebar-width;
+      width: $sidebar-width; // 默认宽度：显示logo+文字
       height: 100%;
 
+      // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
+      @media (min-width: 768px) and (max-width: 1100px) {
+        width: 180px; // 缩小到180px，为菜单腾出空间
+      }
+
+      // 小屏设备：只显示logo，使用收缩宽度
+      @media (max-width: 767px) {
+        width: $sidebar-width-collapsed; // 只显示logo：54px
+      }
+
       :deep(.logo) {
         height: 100%;
 
@@ -145,10 +163,19 @@ console.log("🎨 MixLayout rendered");
       display: flex;
       flex: 1;
       align-items: center;
+      min-width: 0;
       height: 100%;
       margin: 0 16px;
       overflow: hidden;
 
+      @media (min-width: 768px) and (max-width: 1200px) {
+        margin: 0 12px;
+      }
+
+      @media (max-width: 767px) {
+        margin: 0 8px;
+      }
+
       :deep(.el-menu) {
         height: 100%;
         background-color: transparent;
@@ -165,6 +192,16 @@ console.log("🎨 MixLayout rendered");
           line-height: $navbar-height;
           border-bottom: none;
 
+          @media (min-width: 768px) and (max-width: 1200px) {
+            padding: 0 12px;
+            font-size: 14px;
+          }
+
+          @media (max-width: 767px) {
+            padding: 0 8px;
+            font-size: 13px;
+          }
+
           &:hover {
             background-color: rgba(255, 255, 255, 0.08);
           }
@@ -183,6 +220,14 @@ console.log("🎨 MixLayout rendered");
       align-items: center;
       height: 100%;
       padding: 0 16px;
+
+      @media (min-width: 768px) and (max-width: 1200px) {
+        padding: 0 12px;
+      }
+
+      @media (max-width: 767px) {
+        padding: 0 8px;
+      }
     }
   }
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index 3b772816..c809458a 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -4,7 +4,7 @@
     <div class="layout__header">
       <div class="layout__header-left">
         <!-- Logo -->
-        <AppLogo v-if="isShowLogo" :collapse="false" />
+        <AppLogo v-if="isShowLogo" :collapse="isLogoCollapsed" />
         <!-- 菜单 -->
         <BasicMenu :data="routes" menu-mode="horizontal" base-path="" />
       </div>
@@ -23,6 +23,8 @@
 </template>
 
 <script setup lang="ts">
+import { computed } from "vue";
+import { useWindowSize } from "@vueuse/core";
 import { useLayout } from "../composables/useLayout";
 import { useLayoutMenu } from "../composables/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
@@ -37,6 +39,12 @@ const { isShowTagsView, isShowLogo } = useLayout();
 
 // 菜单相关
 const { routes } = useLayoutMenu();
+
+// 响应式窗口尺寸
+const { width } = useWindowSize();
+
+// 只有在小屏设备（移动设备）时才折叠Logo（只显示图标，隐藏文字）
+const isLogoCollapsed = computed(() => width.value < 768);
 </script>
 
 <style lang="scss" scoped>
@@ -49,6 +57,7 @@ const { routes } = useLayoutMenu();
     align-items: center;
     justify-content: space-between;
     width: 100%;
+    min-width: 768px; // 设置最小宽度，防止过度压缩
     height: $navbar-height;
     background-color: $menu-background;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
@@ -57,16 +66,31 @@ const { routes } = useLayoutMenu();
       display: flex;
       flex: 1;
       align-items: center;
+      min-width: 0; // 允许flex收缩
       height: 100%;
+      overflow: hidden; // 防止溢出
 
-      // Logo 样式
+      // Logo 样式 - 使用SCSS变量管理宽度
       :deep(.sidebar-logo) {
-        width: $sidebar-width;
+        flex-shrink: 0; // 防止Logo被压缩
+        width: $sidebar-width; // 默认宽度：显示logo+文字
         height: $navbar-height;
         padding: 0;
         margin-right: 20px;
         background: transparent;
 
+        // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
+        @media (min-width: 768px) and (max-width: 1100px) {
+          width: 180px; // 缩小到180px，为菜单腾出空间
+          margin-right: 16px; // 减少右边距
+        }
+
+        // 小屏设备：只显示logo，使用收缩宽度
+        @media (max-width: 767px) {
+          width: $sidebar-width-collapsed; // 只显示logo：54px
+          margin-right: 12px; // 减少右边距
+        }
+
         .sidebar-logo__link {
           height: 100%;
         }
@@ -80,14 +104,18 @@ const { routes } = useLayoutMenu();
 
     &-right {
       display: flex;
+      flex-shrink: 0; // 防止操作按钮被压缩
       align-items: center;
       height: 100%;
+      padding-left: 12px;
     }
 
     // 限制菜单高度
     :deep(.el-menu--horizontal) {
       flex: 1;
+      min-width: 0; // 允许菜单收缩
       height: $navbar-height;
+      overflow: hidden; // 防止菜单溢出
       line-height: $navbar-height;
       background-color: transparent;
       border: none;
@@ -95,12 +123,33 @@ const { routes } = useLayoutMenu();
       .el-menu-item {
         height: $navbar-height;
         line-height: $navbar-height;
+
+        // 响应式菜单项
+        @media (min-width: 768px) and (max-width: 1200px) {
+          padding: 0 12px; // 中屏设备减少内边距
+          font-size: 14px; // 稍微缩小字体
+        }
+
+        @media (max-width: 767px) {
+          padding: 0 8px; // 小屏设备进一步减少内边距
+          font-size: 13px;
+        }
       }
 
       .el-sub-menu {
         .el-sub-menu__title {
           height: $navbar-height;
           line-height: $navbar-height;
+
+          @media (min-width: 768px) and (max-width: 1200px) {
+            padding: 0 12px;
+            font-size: 14px;
+          }
+
+          @media (max-width: 767px) {
+            padding: 0 8px;
+            font-size: 13px;
+          }
         }
       }
 
@@ -117,9 +166,29 @@ const { routes } = useLayoutMenu();
   }
 }
 
+// 当存在TagsView时的样式调整
 .hasTagsView {
   :deep(.app-main) {
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
   }
 }
+
+// 中屏设备的特殊优化
+@media (min-width: 768px) and (max-width: 1200px) {
+  .layout {
+    &__header {
+      padding: 0 8px; // 添加少量内边距
+    }
+  }
+}
+
+// 小屏设备的特殊优化
+@media (max-width: 767px) {
+  .layout {
+    &__header {
+      min-width: 600px; // 小屏设备的最小宽度
+      padding: 0 4px;
+    }
+  }
+}
 </style>

From dfb9a735d6adcca3f9742393ce1b0c527e7752dc Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 26 May 2025 23:21:14 +0800
Subject: [PATCH 401/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/AppLogo/index.vue      | 50 +++++++++++++++++--
 .../Menu/components/MenuItemTitle.vue         |  4 +-
 .../NavBar/components/NavbarActions.vue       | 42 +++++++++-------
 src/layouts/components/NavBar/index.vue       |  5 +-
 src/layouts/views/MixLayout.vue               |  9 ----
 src/layouts/views/TopLayout.vue               |  9 +---
 6 files changed, 75 insertions(+), 44 deletions(-)

diff --git a/src/layouts/components/AppLogo/index.vue b/src/layouts/components/AppLogo/index.vue
index 841784ef..a7a6370a 100644
--- a/src/layouts/components/AppLogo/index.vue
+++ b/src/layouts/components/AppLogo/index.vue
@@ -37,16 +37,58 @@ defineProps({
     color: $sidebar-logo-text-color;
   }
 }
+</style>
 
+<style lang="scss">
+// 全局样式：针对顶部布局和混合布局的特殊处理
 .layout-top,
 .layout-mix {
   .logo {
-    width: $sidebar-width;
+    // 在顶部和混合布局中，移除背景色，使其透明
+    background-color: transparent !important;
+
+    .title {
+      // 确保标题颜色适配当前主题
+      color: var(--menu-text);
+    }
+  }
+}
+
+// 顶部布局的响应式宽度控制
+.layout-top {
+  .layout__header-left .logo {
+    flex-shrink: 0; // 防止Logo被压缩
+    width: $sidebar-width; // 默认宽度：显示logo+文字
+    margin-right: 20px;
+
+    // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
+    @media (min-width: 768px) and (max-width: 1100px) {
+      width: 180px; // 缩小到180px，为菜单腾出空间
+      margin-right: 16px; // 减少右边距
+    }
+
+    // 小屏设备：只显示logo，使用收缩宽度
+    @media (max-width: 767px) {
+      width: $sidebar-width-collapsed; // 只显示logo：54px
+      margin-right: 12px; // 减少右边距
+    }
   }
+}
+
+// 混合布局的响应式宽度控制
+.layout-mix {
+  .layout__header-logo .logo {
+    flex-shrink: 0;
+    width: $sidebar-width; // 默认宽度：显示logo+文字
+
+    // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
+    @media (min-width: 768px) and (max-width: 1100px) {
+      width: 180px; // 缩小到180px，为菜单腾出空间
+    }
 
-  &.hideSidebar {
-    .logo {
-      width: $sidebar-width-collapsed;
+    // 小屏设备：只显示logo，使用收缩宽度
+    @media (max-width: 767px) {
+      width: $sidebar-width-collapsed; // 只显示logo：54px
     }
   }
 }
diff --git a/src/layouts/components/Menu/components/MenuItemTitle.vue b/src/layouts/components/Menu/components/MenuItemTitle.vue
index 67bf325c..a3b55580 100644
--- a/src/layouts/components/Menu/components/MenuItemTitle.vue
+++ b/src/layouts/components/Menu/components/MenuItemTitle.vue
@@ -42,12 +42,12 @@ const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
   .el-sub-menu,
   .el-menu-item {
     .el-icon {
-      margin-left: 20px;
+      margin: 0 10px;
     }
   }
 
   [class^="i-svg:"] {
-    margin-left: 20px;
+    margin: 0 10px;
   }
 }
 </style>
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index 87ca259f..ef3386ce 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -52,7 +52,7 @@
     <div
       v-if="defaultSettings.showSettings"
       class="navbar-actions__item"
-      @click="settingStore.settingsVisible = true"
+      @click="handleSettingsClick"
     >
       <div class="i-svg:setting" />
     </div>
@@ -68,6 +68,13 @@ import { useAppStore, useSettingsStore, useUserStore } from "@/store";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 import { LayoutMode } from "@/enums";
 
+// 导入子组件
+import MenuSearch from "@/components/MenuSearch/index.vue";
+import Fullscreen from "@/components/Fullscreen/index.vue";
+import SizeSelect from "@/components/SizeSelect/index.vue";
+import LangSelect from "@/components/LangSelect/index.vue";
+import Notification from "@/components/Notification/index.vue";
+
 const { t } = useI18n();
 const appStore = useAppStore();
 const settingStore = useSettingsStore();
@@ -127,6 +134,13 @@ function logout() {
     });
   });
 }
+
+/**
+ * 打开系统设置页面
+ */
+function handleSettingsClick() {
+  settingStore.settingsVisible = true;
+}
 </script>
 
 <style lang="scss" scoped>
@@ -136,45 +150,37 @@ function logout() {
   height: 100%;
 
   &__item {
+    position: relative;
     display: flex;
     align-items: center;
     justify-content: center;
-    min-width: 36px;
+    min-width: 44px; /* 增加最小点击区域到44px，符合人机交互标准 */
     height: 100%;
+    min-height: 44px;
     padding: 0 8px;
     text-align: center;
     cursor: pointer;
     transition: all 0.3s;
 
-    // 确保直接子元素也居中
+    // 确保子元素居中
     > * {
       display: flex;
       align-items: center;
       justify-content: center;
     }
 
-    // 确保 el-dropdown 也居中
-    :deep(.el-dropdown) {
+    // 确保 Element Plus 组件可以正常工作
+    :deep(.el-dropdown),
+    :deep(.el-tooltip) {
       display: flex;
       align-items: center;
       justify-content: center;
+      width: 100%;
       height: 100%;
     }
 
-    // 修复可能的 SVG 图标容器
-    :deep(.icon-container),
-    :deep(.action-icon) {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 100%;
-    }
-
-    // 默认图标样式（明亮模式 + 左侧布局）
+    // 图标样式
     :deep([class^="i-svg:"]) {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
       font-size: 18px;
       line-height: 1;
       color: var(--el-text-color-regular);
diff --git a/src/layouts/components/NavBar/index.vue b/src/layouts/components/NavBar/index.vue
index f455c6d9..fd917b14 100644
--- a/src/layouts/components/NavBar/index.vue
+++ b/src/layouts/components/NavBar/index.vue
@@ -36,12 +36,9 @@ function toggleSideBar() {
 <style lang="scss" scoped>
 .navbar {
   display: flex;
-  justify-content: space-between;
   align-items: center;
+  justify-content: space-between;
   height: $navbar-height;
-  padding: 0 20px;
-  background: var(--el-bg-color);
-  box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
   &__actions {
     display: flex;
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 40a02388..9cda8927 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -165,17 +165,8 @@ console.log("🎨 MixLayout rendered");
       align-items: center;
       min-width: 0;
       height: 100%;
-      margin: 0 16px;
       overflow: hidden;
 
-      @media (min-width: 768px) and (max-width: 1200px) {
-        margin: 0 12px;
-      }
-
-      @media (max-width: 767px) {
-        margin: 0 8px;
-      }
-
       :deep(.el-menu) {
         height: 100%;
         background-color: transparent;
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index c809458a..57bdd295 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -71,7 +71,7 @@ const isLogoCollapsed = computed(() => width.value < 768);
       overflow: hidden; // 防止溢出
 
       // Logo 样式 - 使用SCSS变量管理宽度
-      :deep(.sidebar-logo) {
+      :deep(.logo) {
         flex-shrink: 0; // 防止Logo被压缩
         width: $sidebar-width; // 默认宽度：显示logo+文字
         height: $navbar-height;
@@ -91,14 +91,9 @@ const isLogoCollapsed = computed(() => width.value < 768);
           margin-right: 12px; // 减少右边距
         }
 
-        .sidebar-logo__link {
+        a {
           height: 100%;
         }
-
-        .logo {
-          width: 100%;
-          background-color: transparent;
-        }
       }
     }
 

From 969fcfbb590b540abc1610ab9464b280973047d2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 26 May 2025 23:50:37 +0800
Subject: [PATCH 402/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/components/MenuItemTitle.vue | 4 ++--
 src/layouts/views/MixLayout.vue                          | 1 -
 src/layouts/views/TopLayout.vue                          | 2 --
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/layouts/components/Menu/components/MenuItemTitle.vue b/src/layouts/components/Menu/components/MenuItemTitle.vue
index a3b55580..5fa71c96 100644
--- a/src/layouts/components/Menu/components/MenuItemTitle.vue
+++ b/src/layouts/components/Menu/components/MenuItemTitle.vue
@@ -42,12 +42,12 @@ const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
   .el-sub-menu,
   .el-menu-item {
     .el-icon {
-      margin: 0 10px;
+      margin: 0 auto;
     }
   }
 
   [class^="i-svg:"] {
-    margin: 0 10px;
+    margin: 0 auto;
   }
 }
 </style>
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 9cda8927..1ee93513 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -127,7 +127,6 @@ console.log("🎨 MixLayout rendered");
     &-content {
       display: flex;
       align-items: center;
-      min-width: 768px;
       height: 100%;
       padding: 0;
     }
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index 57bdd295..a7e82c76 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -57,7 +57,6 @@ const isLogoCollapsed = computed(() => width.value < 768);
     align-items: center;
     justify-content: space-between;
     width: 100%;
-    min-width: 768px; // 设置最小宽度，防止过度压缩
     height: $navbar-height;
     background-color: $menu-background;
     box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
@@ -181,7 +180,6 @@ const isLogoCollapsed = computed(() => width.value < 768);
 @media (max-width: 767px) {
   .layout {
     &__header {
-      min-width: 600px; // 小屏设备的最小宽度
       padding: 0 4px;
     }
   }

From 5e7cb0ad1cf6d19680d6e2af7a97f83d6a9011c4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 00:04:06 +0800
Subject: [PATCH 403/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/components/MenuItem.vue | 5 -----
 src/styles/element-plus.scss                        | 2 --
 2 files changed, 7 deletions(-)

diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index 0be3c3b3..87cc6d25 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -139,11 +139,8 @@ function resolvePath(routePath: string) {
 .hideSidebar {
   .submenu-title-noDropdown {
     position: relative;
-    padding: 0 !important;
 
     .el-tooltip {
-      padding: 0 !important;
-
       .sub-el-icon {
         margin-left: 19px;
       }
@@ -162,8 +159,6 @@ function resolvePath(routePath: string) {
     overflow: hidden;
 
     & > .el-sub-menu__title {
-      padding: 0 !important;
-
       .sub-el-icon {
         margin-left: 19px;
       }
diff --git a/src/styles/element-plus.scss b/src/styles/element-plus.scss
index 79361e5f..fc5b729b 100644
--- a/src/styles/element-plus.scss
+++ b/src/styles/element-plus.scss
@@ -2,8 +2,6 @@ $border: 1px solid var(--el-border-color-light);
 
 /* el-dialog */
 .el-dialog {
-  padding: 0 !important;
-
   .el-dialog__header {
     padding: 15px 20px;
     margin: 0;

From a193965dfe106532f32b6e02c7d5b7a95de3098c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 08:10:36 +0800
Subject: [PATCH 404/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/views/MixLayout.vue | 10 -------
 src/layouts/views/TopLayout.vue | 50 +--------------------------------
 2 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 1ee93513..c84f05e2 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -139,16 +139,6 @@ console.log("🎨 MixLayout rendered");
       width: $sidebar-width; // 默认宽度：显示logo+文字
       height: 100%;
 
-      // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-      @media (min-width: 768px) and (max-width: 1100px) {
-        width: 180px; // 缩小到180px，为菜单腾出空间
-      }
-
-      // 小屏设备：只显示logo，使用收缩宽度
-      @media (max-width: 767px) {
-        width: $sidebar-width-collapsed; // 只显示logo：54px
-      }
-
       :deep(.logo) {
         height: 100%;
 
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index a7e82c76..5001e7dd 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -59,7 +59,6 @@ const isLogoCollapsed = computed(() => width.value < 768);
     width: 100%;
     height: $navbar-height;
     background-color: $menu-background;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
     &-left {
       display: flex;
@@ -74,24 +73,10 @@ const isLogoCollapsed = computed(() => width.value < 768);
         flex-shrink: 0; // 防止Logo被压缩
         width: $sidebar-width; // 默认宽度：显示logo+文字
         height: $navbar-height;
-        padding: 0;
-        margin-right: 20px;
-        background: transparent;
-
-        // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-        @media (min-width: 768px) and (max-width: 1100px) {
-          width: 180px; // 缩小到180px，为菜单腾出空间
-          margin-right: 16px; // 减少右边距
-        }
 
         // 小屏设备：只显示logo，使用收缩宽度
-        @media (max-width: 767px) {
+        @media (max-width: 768px) {
           width: $sidebar-width-collapsed; // 只显示logo：54px
-          margin-right: 12px; // 减少右边距
-        }
-
-        a {
-          height: 100%;
         }
       }
     }
@@ -134,23 +119,8 @@ const isLogoCollapsed = computed(() => width.value < 768);
         .el-sub-menu__title {
           height: $navbar-height;
           line-height: $navbar-height;
-
-          @media (min-width: 768px) and (max-width: 1200px) {
-            padding: 0 12px;
-            font-size: 14px;
-          }
-
-          @media (max-width: 767px) {
-            padding: 0 8px;
-            font-size: 13px;
-          }
         }
       }
-
-      // 修复子菜单弹出位置
-      .el-menu--popup {
-        min-width: 160px;
-      }
     }
   }
 
@@ -166,22 +136,4 @@ const isLogoCollapsed = computed(() => width.value < 768);
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
   }
 }
-
-// 中屏设备的特殊优化
-@media (min-width: 768px) and (max-width: 1200px) {
-  .layout {
-    &__header {
-      padding: 0 8px; // 添加少量内边距
-    }
-  }
-}
-
-// 小屏设备的特殊优化
-@media (max-width: 767px) {
-  .layout {
-    &__header {
-      padding: 0 4px;
-    }
-  }
-}
 </style>

From 5defc7e9ea6ebb17ef4775431a1182b35de143d5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 08:21:47 +0800
Subject: [PATCH 405/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/views/MixLayout.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index c84f05e2..007016fa 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -139,6 +139,11 @@ console.log("🎨 MixLayout rendered");
       width: $sidebar-width; // 默认宽度：显示logo+文字
       height: 100%;
 
+      // 小屏设备：只显示logo，使用收缩宽度
+      @media (max-width: 767px) {
+        width: $sidebar-width-collapsed; // 只显示logo：54px
+      }
+
       :deep(.logo) {
         height: 100%;
 

From 264961ce08b17f5e639e284aff5cdc97b5f4c1b5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 11:29:30 +0800
Subject: [PATCH 406/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/AppLogo/index.vue      | 50 +++++---------
 .../components/Menu/components/MenuItem.vue   |  6 --
 .../Menu/components/MenuItemTitle.vue         | 54 +++++++++++----
 src/layouts/components/Settings/index.vue     |  3 +-
 src/layouts/composables/useLayout.ts          |  9 ---
 src/layouts/views/LeftLayout.vue              |  2 +-
 src/layouts/views/MixLayout.vue               | 42 +-----------
 src/layouts/views/TopLayout.vue               | 65 +------------------
 8 files changed, 63 insertions(+), 168 deletions(-)

diff --git a/src/layouts/components/AppLogo/index.vue b/src/layouts/components/AppLogo/index.vue
index a7a6370a..003f209a 100644
--- a/src/layouts/components/AppLogo/index.vue
+++ b/src/layouts/components/AppLogo/index.vue
@@ -40,56 +40,36 @@ defineProps({
 </style>
 
 <style lang="scss">
-// 全局样式：针对顶部布局和混合布局的特殊处理
+// 顶部布局和混合布局的特殊处理
 .layout-top,
 .layout-mix {
   .logo {
-    // 在顶部和混合布局中，移除背景色，使其透明
     background-color: transparent !important;
 
     .title {
-      // 确保标题颜色适配当前主题
       color: var(--menu-text);
     }
   }
 }
 
-// 顶部布局的响应式宽度控制
-.layout-top {
-  .layout__header-left .logo {
-    flex-shrink: 0; // 防止Logo被压缩
-    width: $sidebar-width; // 默认宽度：显示logo+文字
-    margin-right: 20px;
-
-    // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-    @media (min-width: 768px) and (max-width: 1100px) {
-      width: 180px; // 缩小到180px，为菜单腾出空间
-      margin-right: 16px; // 减少右边距
-    }
-
-    // 小屏设备：只显示logo，使用收缩宽度
-    @media (max-width: 767px) {
-      width: $sidebar-width-collapsed; // 只显示logo：54px
-      margin-right: 12px; // 减少右边距
-    }
+// 宽屏时：openSidebar 状态下显示完整Logo+文字
+.openSidebar {
+  &.layout-top .layout__header-left .logo,
+  &.layout-mix .layout__header-logo .logo {
+    width: $sidebar-width; // 210px，显示logo+文字
   }
 }
 
-// 混合布局的响应式宽度控制
-.layout-mix {
-  .layout__header-logo .logo {
-    flex-shrink: 0;
-    width: $sidebar-width; // 默认宽度：显示logo+文字
-
-    // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-    @media (min-width: 768px) and (max-width: 1100px) {
-      width: 180px; // 缩小到180px，为菜单腾出空间
-    }
+// 窄屏时：hideSidebar 状态下只显示Logo图标
+.hideSidebar {
+  &.layout-top .layout__header-left .logo,
+  &.layout-mix .layout__header-logo .logo {
+    width: $sidebar-width-collapsed; // 54px，只显示logo
+  }
 
-    // 小屏设备：只显示logo，使用收缩宽度
-    @media (max-width: 767px) {
-      width: $sidebar-width-collapsed; // 只显示logo：54px
-    }
+  // 隐藏文字，只显示图标
+  .logo .title {
+    display: none;
   }
 }
 </style>
diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index 87cc6d25..4fa3e52d 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -140,12 +140,6 @@ function resolvePath(routePath: string) {
   .submenu-title-noDropdown {
     position: relative;
 
-    .el-tooltip {
-      .sub-el-icon {
-        margin-left: 19px;
-      }
-    }
-
     & > span {
       display: inline-block;
       visibility: hidden;
diff --git a/src/layouts/components/Menu/components/MenuItemTitle.vue b/src/layouts/components/Menu/components/MenuItemTitle.vue
index 5fa71c96..b9d49364 100644
--- a/src/layouts/components/Menu/components/MenuItemTitle.vue
+++ b/src/layouts/components/Menu/components/MenuItemTitle.vue
@@ -1,16 +1,16 @@
 <template>
   <!-- 菜单图标 -->
   <template v-if="icon">
-    <el-icon v-if="isElIcon" class="el-icon">
+    <el-icon v-if="isElIcon" class="menu-icon">
       <component :is="iconComponent" />
     </el-icon>
-    <div v-else :class="`i-svg:${icon}`" />
+    <div v-else :class="`i-svg:${icon}`" class="menu-icon" />
   </template>
   <template v-else>
-    <div class="i-svg:menu" />
+    <div class="i-svg:menu menu-icon" />
   </template>
   <!-- 菜单标题 -->
-  <span v-if="title" class="ml-1">{{ translateRouteTitle(title) }}</span>
+  <span v-if="title" class="menu-title ml-1">{{ translateRouteTitle(title) }}</span>
 </template>
 
 <script setup lang="ts">
@@ -26,28 +26,60 @@ const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
 </script>
 
 <style lang="scss" scoped>
+.menu-icon {
+  display: inline-flex;
+  flex-shrink: 0;
+  align-items: center;
+  justify-content: center;
+  width: 18px;
+  height: 18px;
+  margin-right: 5px;
+  color: currentcolor;
+}
+
 .el-icon {
-  width: 14px !important;
-  margin-right: 0 !important;
+  width: 18px !important;
+  height: 18px !important;
   color: currentcolor;
 }
 
 [class^="i-svg:"] {
-  width: 14px;
-  height: 14px;
+  width: 18px;
+  height: 18px;
   color: currentcolor !important;
 }
 
+// 收缩状态下的样式优化
 .hideSidebar {
   .el-sub-menu,
   .el-menu-item {
+    // 确保菜单项内容居中
+    display: flex !important;
+    align-items: center !important;
+    justify-content: center !important;
+
+    .menu-icon {
+      width: 20px;
+      height: 20px;
+      margin: 0 auto;
+    }
+
     .el-icon {
+      width: 20px !important;
+      height: 20px !important;
+      margin: 0 auto;
+    }
+
+    [class^="i-svg:"] {
+      width: 20px;
+      height: 20px;
       margin: 0 auto;
     }
-  }
 
-  [class^="i-svg:"] {
-    margin: 0 auto;
+    // 隐藏文字标题
+    .menu-title {
+      display: none;
+    }
   }
 }
 </style>
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 2df32403..fd074573 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -146,7 +146,6 @@
 
 <script setup lang="ts">
 import { DocumentCopy, RefreshLeft, Check } from "@element-plus/icons-vue";
-import { markRaw } from "vue";
 
 const { t } = useI18n();
 import { LayoutMode } from "@/enums/settings/layout.enum";
@@ -154,7 +153,7 @@ import { ThemeMode } from "@/enums/settings/theme.enum";
 import { SidebarColor } from "@/enums/settings/theme.enum";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
 
-// 按钮图标 - 使用markRaw避免响应式警告
+// 按钮图标
 const copyIcon = markRaw(DocumentCopy);
 const resetIcon = markRaw(RefreshLeft);
 
diff --git a/src/layouts/composables/useLayout.ts b/src/layouts/composables/useLayout.ts
index 31fec66f..23f54b80 100644
--- a/src/layouts/composables/useLayout.ts
+++ b/src/layouts/composables/useLayout.ts
@@ -1,4 +1,3 @@
-import { computed } from "vue";
 import { useAppStore, useSettingsStore } from "@/store";
 import defaultSettings from "@/settings";
 
@@ -49,14 +48,6 @@ export function useLayout() {
     appStore.closeSideBar();
   }
 
-  // 暂时注释掉这个逻辑，避免影响手动操作
-  // 监听路由变化，在移动端自动关闭侧边栏
-  // watchEffect(() => {
-  //   if (appStore.device === "mobile" && appStore.sidebar.opened) {
-  //     appStore.closeSideBar();
-  //   }
-  // });
-
   return {
     currentLayout,
     isSidebarOpen,
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index e71d29bb..b4ada9cb 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -102,7 +102,7 @@ console.log("🔍 LeftLayout - isMobile:", isMobile.value);
   }
 }
 
-/* 移动端样式 - 注意这里需要正确应用到父元素 */
+/* 移动端样式 */
 .mobile {
   .layout__sidebar {
     width: $sidebar-width !important;
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 1ee93513..4582a17f 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -136,26 +136,7 @@ console.log("🎨 MixLayout rendered");
       flex-shrink: 0;
       align-items: center;
       justify-content: center;
-      width: $sidebar-width; // 默认宽度：显示logo+文字
       height: 100%;
-
-      // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-      @media (min-width: 768px) and (max-width: 1100px) {
-        width: 180px; // 缩小到180px，为菜单腾出空间
-      }
-
-      // 小屏设备：只显示logo，使用收缩宽度
-      @media (max-width: 767px) {
-        width: $sidebar-width-collapsed; // 只显示logo：54px
-      }
-
-      :deep(.logo) {
-        height: 100%;
-
-        a {
-          height: 100%;
-        }
-      }
     }
 
     &-menu {
@@ -182,20 +163,6 @@ console.log("🎨 MixLayout rendered");
           line-height: $navbar-height;
           border-bottom: none;
 
-          @media (min-width: 768px) and (max-width: 1200px) {
-            padding: 0 12px;
-            font-size: 14px;
-          }
-
-          @media (max-width: 767px) {
-            padding: 0 8px;
-            font-size: 13px;
-          }
-
-          &:hover {
-            background-color: rgba(255, 255, 255, 0.08);
-          }
-
           &.is-active {
             background-color: rgba(255, 255, 255, 0.12);
             border-bottom: 2px solid var(--el-color-primary);
@@ -210,14 +177,6 @@ console.log("🎨 MixLayout rendered");
       align-items: center;
       height: 100%;
       padding: 0 16px;
-
-      @media (min-width: 768px) and (max-width: 1200px) {
-        padding: 0 12px;
-      }
-
-      @media (max-width: 767px) {
-        padding: 0 8px;
-      }
     }
   }
 
@@ -255,6 +214,7 @@ console.log("🎨 MixLayout rendered");
         width: 100%;
         height: 50px;
         line-height: 50px;
+        background-color: var(--menu-background);
         box-shadow: 0 0 6px -2px var(--el-color-primary);
       }
     }
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index a7e82c76..6e6497b2 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -59,7 +59,6 @@ const isLogoCollapsed = computed(() => width.value < 768);
     width: 100%;
     height: $navbar-height;
     background-color: $menu-background;
-    box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08);
 
     &-left {
       display: flex;
@@ -67,32 +66,11 @@ const isLogoCollapsed = computed(() => width.value < 768);
       align-items: center;
       min-width: 0; // 允许flex收缩
       height: 100%;
-      overflow: hidden; // 防止溢出
 
-      // Logo 样式 - 使用SCSS变量管理宽度
+      // Logo样式由AppLogo组件的全局样式控制
       :deep(.logo) {
         flex-shrink: 0; // 防止Logo被压缩
-        width: $sidebar-width; // 默认宽度：显示logo+文字
         height: $navbar-height;
-        padding: 0;
-        margin-right: 20px;
-        background: transparent;
-
-        // 中屏设备优化（800px-1100px）：适度缩小但保持显示文字
-        @media (min-width: 768px) and (max-width: 1100px) {
-          width: 180px; // 缩小到180px，为菜单腾出空间
-          margin-right: 16px; // 减少右边距
-        }
-
-        // 小屏设备：只显示logo，使用收缩宽度
-        @media (max-width: 767px) {
-          width: $sidebar-width-collapsed; // 只显示logo：54px
-          margin-right: 12px; // 减少右边距
-        }
-
-        a {
-          height: 100%;
-        }
       }
     }
 
@@ -104,7 +82,7 @@ const isLogoCollapsed = computed(() => width.value < 768);
       padding-left: 12px;
     }
 
-    // 限制菜单高度
+    // 菜单样式
     :deep(.el-menu--horizontal) {
       flex: 1;
       min-width: 0; // 允许菜单收缩
@@ -117,33 +95,12 @@ const isLogoCollapsed = computed(() => width.value < 768);
       .el-menu-item {
         height: $navbar-height;
         line-height: $navbar-height;
-
-        // 响应式菜单项
-        @media (min-width: 768px) and (max-width: 1200px) {
-          padding: 0 12px; // 中屏设备减少内边距
-          font-size: 14px; // 稍微缩小字体
-        }
-
-        @media (max-width: 767px) {
-          padding: 0 8px; // 小屏设备进一步减少内边距
-          font-size: 13px;
-        }
       }
 
       .el-sub-menu {
         .el-sub-menu__title {
           height: $navbar-height;
           line-height: $navbar-height;
-
-          @media (min-width: 768px) and (max-width: 1200px) {
-            padding: 0 12px;
-            font-size: 14px;
-          }
-
-          @media (max-width: 767px) {
-            padding: 0 8px;
-            font-size: 13px;
-          }
         }
       }
 
@@ -166,22 +123,4 @@ const isLogoCollapsed = computed(() => width.value < 768);
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
   }
 }
-
-// 中屏设备的特殊优化
-@media (min-width: 768px) and (max-width: 1200px) {
-  .layout {
-    &__header {
-      padding: 0 8px; // 添加少量内边距
-    }
-  }
-}
-
-// 小屏设备的特殊优化
-@media (max-width: 767px) {
-  .layout {
-    &__header {
-      padding: 0 4px;
-    }
-  }
-}
 </style>

From bdfec03e9b2bd952463acce26222c62ce4efdc95 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 16:15:30 +0800
Subject: [PATCH 407/497] =?UTF-8?q?wip:=20=E5=B8=83=E5=B1=80=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D=E5=92=8C=E7=99=BB=E9=99=86=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/BasicMenu.vue     |  1 -
 src/layouts/components/Menu/MixTopMenu.vue    |  8 ++-
 .../components/Menu/components/MenuItem.vue   |  7 ++-
 ...{MenuItemTitle.vue => MenuItemContent.vue} | 47 +-------------
 src/styles/index.scss                         | 61 +++++++++++++++++++
 src/views/login/components/Login.vue          | 59 +++++++++++++-----
 6 files changed, 115 insertions(+), 68 deletions(-)
 rename src/layouts/components/Menu/components/{MenuItemTitle.vue => MenuItemContent.vue} (55%)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 9787e4ef..f023b2be 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -37,7 +37,6 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, watch, PropType } from "vue";
 import { useRoute } from "vue-router";
 import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index 6e18cc05..a03372d0 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -21,13 +21,17 @@
     @select="handleMenuSelect"
   >
     <el-menu-item v-for="menuItem in processedTopMenus" :key="menuItem.path" :index="menuItem.path">
-      <MenuItemTitle v-if="menuItem.meta" :icon="menuItem.meta.icon" :title="menuItem.meta.title" />
+      <MenuItemContent
+        v-if="menuItem.meta"
+        :icon="menuItem.meta.icon"
+        :title="menuItem.meta.title"
+      />
     </el-menu-item>
   </el-menu>
 </template>
 
 <script lang="ts" setup>
-import MenuItemTitle from "./components/MenuItemTitle.vue";
+import MenuItemContent from "./components/MenuItemContent.vue";
 
 defineOptions({
   name: "MixTopMenu",
diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index 4fa3e52d..2f39454e 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -22,7 +22,8 @@
           :index="resolvePath(onlyOneChild.path)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <MenuItemTitle
+          <MenuItemContent
+            v-if="onlyOneChild.meta"
             :icon="onlyOneChild.meta.icon || item.meta?.icon"
             :title="onlyOneChild.meta.title"
           />
@@ -33,7 +34,7 @@
     <!--【非叶子节点】显示含多个子节点的父菜单，或始终显示的单子节点 -->
     <el-sub-menu v-else :index="resolvePath(item.path)" teleported>
       <template #title>
-        <MenuItemTitle v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
+        <MenuItemContent v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
       </template>
 
       <MenuItem
@@ -48,7 +49,7 @@
 </template>
 
 <script setup lang="ts">
-import MenuItemTitle from "./MenuItemTitle.vue";
+import MenuItemContent from "./MenuItemContent.vue";
 
 defineOptions({
   name: "MenuItem",
diff --git a/src/layouts/components/Menu/components/MenuItemTitle.vue b/src/layouts/components/Menu/components/MenuItemContent.vue
similarity index 55%
rename from src/layouts/components/Menu/components/MenuItemTitle.vue
rename to src/layouts/components/Menu/components/MenuItemContent.vue
index b9d49364..f995608d 100644
--- a/src/layouts/components/Menu/components/MenuItemTitle.vue
+++ b/src/layouts/components/Menu/components/MenuItemContent.vue
@@ -34,52 +34,7 @@ const iconComponent = computed(() => props.icon?.replace("el-icon-", ""));
   width: 18px;
   height: 18px;
   margin-right: 5px;
+  font-size: 18px;
   color: currentcolor;
 }
-
-.el-icon {
-  width: 18px !important;
-  height: 18px !important;
-  color: currentcolor;
-}
-
-[class^="i-svg:"] {
-  width: 18px;
-  height: 18px;
-  color: currentcolor !important;
-}
-
-// 收缩状态下的样式优化
-.hideSidebar {
-  .el-sub-menu,
-  .el-menu-item {
-    // 确保菜单项内容居中
-    display: flex !important;
-    align-items: center !important;
-    justify-content: center !important;
-
-    .menu-icon {
-      width: 20px;
-      height: 20px;
-      margin: 0 auto;
-    }
-
-    .el-icon {
-      width: 20px !important;
-      height: 20px !important;
-      margin: 0 auto;
-    }
-
-    [class^="i-svg:"] {
-      width: 20px;
-      height: 20px;
-      margin: 0 auto;
-    }
-
-    // 隐藏文字标题
-    .menu-title {
-      display: none;
-    }
-  }
-}
 </style>
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 22a4d9e8..95335687 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -10,6 +10,67 @@
   background-color: var(--el-color-primary);
 }
 
+// 混合布局左侧菜单的hover样式
+.layout-mix .layout__sidebar--left .el-menu {
+  .el-menu-item {
+    &:hover {
+      // 极简白主题：使用浅灰色背景
+      background-color: var(--el-fill-color-light) !important;
+    }
+  }
+
+  .el-sub-menu__title {
+    &:hover {
+      // 极简白主题：使用浅灰色背景
+      background-color: var(--el-fill-color-light) !important;
+    }
+  }
+}
+
+// 深色主题或深蓝色侧边栏配色下的左侧菜单hover样式
+html.dark .layout-mix .layout__sidebar--left .el-menu,
+html.sidebar-color-blue .layout-mix .layout__sidebar--left .el-menu {
+  .el-menu-item {
+    &:hover {
+      // 深色背景：使用CSS变量
+      background-color: var(--menu-hover) !important;
+    }
+  }
+
+  .el-sub-menu__title {
+    &:hover {
+      // 深色背景：使用CSS变量
+      background-color: var(--menu-hover) !important;
+    }
+  }
+}
+
+// 窄屏时隐藏菜单文字，只显示图标
+.hideSidebar {
+  // Top布局和Mix布局的水平菜单
+  &.layout-top .layout__header .el-menu--horizontal,
+  &.layout-mix .layout__header .el-menu--horizontal {
+    .el-menu-item,
+    .el-sub-menu__title {
+      .menu-title,
+      span:not([class*="i-svg"]):not(.el-icon) {
+        display: none !important;
+      }
+    }
+  }
+
+  // Mix布局的左侧菜单
+  &.layout-mix .layout__sidebar--left .el-menu {
+    .el-menu-item,
+    .el-sub-menu__title {
+      .menu-title,
+      span:not([class*="i-svg"]):not(.el-icon) {
+        display: none !important;
+      }
+    }
+  }
+}
+
 // 全局搜索区域样式
 .search-container {
   padding: 18px 16px 0;
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index b1741992..1e45fca7 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -86,22 +86,26 @@
     </div>
 
     <!-- 第三方登录 -->
-    <el-divider>
-      <el-text size="small">{{ t("login.otherLoginMethods") }}</el-text>
-    </el-divider>
-    <div class="flex-center gap-x-5 w-full text-[var(--el-text-color-secondary)]">
-      <CommonWrapper>
-        <div text-20px class="i-svg:wechat" />
-      </CommonWrapper>
-      <CommonWrapper>
-        <div text-20px cursor-pointer class="i-svg:qq" />
-      </CommonWrapper>
-      <CommonWrapper>
-        <div text-20px cursor-pointer class="i-svg:github" />
-      </CommonWrapper>
-      <CommonWrapper>
-        <div text-20px cursor-pointer class="i-svg:gitee" />
-      </CommonWrapper>
+    <div class="third-party-login">
+      <div class="divider-container">
+        <div class="divider-line"></div>
+        <span class="divider-text">{{ t("login.otherLoginMethods") }}</span>
+        <div class="divider-line"></div>
+      </div>
+      <div class="flex-center gap-x-5 w-full text-[var(--el-text-color-secondary)]">
+        <CommonWrapper>
+          <div text-20px class="i-svg:wechat" />
+        </CommonWrapper>
+        <CommonWrapper>
+          <div text-20px cursor-pointer class="i-svg:qq" />
+        </CommonWrapper>
+        <CommonWrapper>
+          <div text-20px cursor-pointer class="i-svg:github" />
+        </CommonWrapper>
+        <CommonWrapper>
+          <div text-20px cursor-pointer class="i-svg:gitee" />
+        </CommonWrapper>
+      </div>
     </div>
   </div>
 </template>
@@ -257,3 +261,26 @@ function toOtherForm(type: "register" | "resetPwd") {
   emit("update:modelValue", type);
 }
 </script>
+
+<style lang="scss" scoped>
+.third-party-login {
+  .divider-container {
+    display: flex;
+    align-items: center;
+    margin: 20px 0;
+
+    .divider-line {
+      flex: 1;
+      height: 1px;
+      background: linear-gradient(to right, transparent, var(--el-border-color-light), transparent);
+    }
+
+    .divider-text {
+      padding: 0 16px;
+      font-size: 12px;
+      color: var(--el-text-color-regular);
+      white-space: nowrap;
+    }
+  }
+}
+</style>

From 783eff2be501f55fd17d412b0e0803ad198135ed Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 17:31:44 +0800
Subject: [PATCH 408/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  2 +-
 src/layouts/components/AppLogo/index.vue      |  2 +-
 .../NavBar/components/NavbarActions.vue       |  2 +-
 src/layouts/components/Settings/index.vue     | 19 ++++---------------
 src/layouts/composables/useLayout.ts          |  2 +-
 src/layouts/index.vue                         |  2 +-
 src/settings.ts                               | 19 ++++++++++++++++---
 src/store/modules/app.store.ts                |  2 +-
 src/store/modules/settings.store.ts           |  2 +-
 src/styles/variables.scss                     |  1 +
 src/utils/theme.ts                            |  6 ++++++
 src/views/login/index.vue                     |  2 +-
 12 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index bb0263fd..7a5f3ff6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -14,7 +14,7 @@
 
 <script setup lang="ts">
 import { useAppStore, useSettingsStore } from "@/store";
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 import { ThemeMode } from "@/enums/settings/theme.enum";
 import { ComponentSize } from "@/enums/settings/layout.enum";
 
diff --git a/src/layouts/components/AppLogo/index.vue b/src/layouts/components/AppLogo/index.vue
index 003f209a..1180965f 100644
--- a/src/layouts/components/AppLogo/index.vue
+++ b/src/layouts/components/AppLogo/index.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script lang="ts" setup>
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 import logo from "@/assets/logo.png";
 
 defineProps({
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index ef3386ce..72ec1f87 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -62,7 +62,7 @@
 <script setup lang="ts">
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore, useSettingsStore, useUserStore } from "@/store";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index fd074573..121ac8a0 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -148,10 +148,9 @@
 import { DocumentCopy, RefreshLeft, Check } from "@element-plus/icons-vue";
 
 const { t } = useI18n();
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { ThemeMode } from "@/enums/settings/theme.enum";
-import { SidebarColor } from "@/enums/settings/theme.enum";
+import { LayoutMode, SidebarColor, ThemeMode } from "@/enums";
 import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
+import { themeColorPresets } from "@/settings";
 
 // 按钮图标
 const copyIcon = markRaw(DocumentCopy);
@@ -174,18 +173,8 @@ const layoutOptions: LayoutOption[] = [
   { value: LayoutMode.MIX, label: t("settings.mixLayout"), className: "mix" },
 ];
 
-// 颜色预设
-const colorPresets = [
-  "#4080FF",
-  "#626AEF",
-  "#ff4500",
-  "#ff8c00",
-  "#00ced1",
-  "#1e90ff",
-  "#c71585",
-  "rgb(255, 120, 0)",
-  "hsva(120, 40, 94)",
-];
+// 使用统一的颜色预设配置
+const colorPresets = themeColorPresets;
 
 const route = useRoute();
 const appStore = useAppStore();
diff --git a/src/layouts/composables/useLayout.ts b/src/layouts/composables/useLayout.ts
index 23f54b80..ba2f6188 100644
--- a/src/layouts/composables/useLayout.ts
+++ b/src/layouts/composables/useLayout.ts
@@ -1,5 +1,5 @@
 import { useAppStore, useSettingsStore } from "@/store";
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 
 /**
  * 布局相关的通用逻辑
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index c3524030..9b9a0706 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -15,7 +15,7 @@ import TopLayout from "./views/TopLayout.vue";
 import MixLayout from "./views/MixLayout.vue";
 import Settings from "./components/Settings/index.vue";
 import { LayoutMode } from "@/enums/settings/layout.enum";
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 
 const { currentLayout } = useLayout();
 
diff --git a/src/settings.ts b/src/settings.ts
index 817a9c7b..9641874f 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -5,7 +5,7 @@ const { pkg } = __APP_INFO__;
 // 检查用户的操作系统是否使用深色模式
 const mediaQueryList = window.matchMedia("(prefers-color-scheme: dark)");
 
-const defaultSettings: AppSettings = {
+export const defaultSettings: AppSettings = {
   // 系统Title
   title: pkg.name,
   // 系统版本
@@ -24,7 +24,7 @@ const defaultSettings: AppSettings = {
   size: ComponentSize.DEFAULT,
   // 语言
   language: LanguageEnum.ZH_CN,
-  // 主题颜色
+  // 主题颜色 - 修改此值时需同步修改 src/styles/variables.scss
   themeColor: "#4080FF",
   // 是否显示水印
   showWatermark: false,
@@ -34,4 +34,17 @@ const defaultSettings: AppSettings = {
   sidebarColorScheme: SidebarColor.CLASSIC_BLUE,
 };
 
-export default defaultSettings;
+// 主题色预设 - 经典配色方案
+// 注意：修改默认主题色时，需要同步修改 src/styles/variables.scss 中的 primary.base 值
+export const themeColorPresets = [
+  "#4080FF", // Arco Design 蓝 - 现代感强
+  "#1890FF", // Ant Design 蓝 - 经典商务
+  "#409EFF", // Element Plus 蓝 - 清新自然
+  "#FA8C16", // 活力橙 - 温暖友好
+  "#722ED1", // 优雅紫 - 高端大气
+  "#13C2C2", // 青色 - 科技感
+  "#52C41A", // 成功绿 - 活力清新
+  "#F5222D", // 警示红 - 醒目强烈
+  "#2F54EB", // 深蓝 - 稳重专业
+  "#EB2F96", // 品红 - 时尚个性
+];
diff --git a/src/store/modules/app.store.ts b/src/store/modules/app.store.ts
index de20db83..4ddec187 100644
--- a/src/store/modules/app.store.ts
+++ b/src/store/modules/app.store.ts
@@ -1,4 +1,4 @@
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 
 // 导入 Element Plus 中英文语言包
 import zhCn from "element-plus/es/locale/lang/zh-cn";
diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings.store.ts
index d9628b3f..4263eaf6 100644
--- a/src/store/modules/settings.store.ts
+++ b/src/store/modules/settings.store.ts
@@ -1,4 +1,4 @@
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 import type { LayoutMode } from "@/enums/settings/layout.enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index d96c9585..c907f33a 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -1,6 +1,7 @@
 @forward "element-plus/theme-chalk/src/common/var.scss" with (
   $colors: (
     "primary": (
+      // 默认主题色 - 修改此值时需同步修改 src/settings.ts 中的 themeColor
       "base": #4080ff,
     ),
     "success": (
diff --git a/src/utils/theme.ts b/src/utils/theme.ts
index 558503ee..e4aa3561 100644
--- a/src/utils/theme.ts
+++ b/src/utils/theme.ts
@@ -77,6 +77,12 @@ export function applyTheme(colors: Record<string, string>) {
   Object.entries(colors).forEach(([key, value]) => {
     el.style.setProperty(`--el-color-${key}`, value);
   });
+
+  // 确保主题色立即生效，强制重新渲染
+  requestAnimationFrame(() => {
+    // 触发样式重新计算
+    el.style.setProperty("--theme-update-trigger", Date.now().toString());
+  });
 }
 
 /**
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 40f01c19..cac65417 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -46,7 +46,7 @@
 
 <script setup lang="ts">
 import logo from "@/assets/logo.png";
-import defaultSettings from "@/settings";
+import { defaultSettings } from "@/settings";
 import CommonWrapper from "@/components/CommonWrapper/index.vue";
 import DarkModeSwitch from "@/components/DarkModeSwitch/index.vue";
 

From 82a53efa92ad18a84cd323b72a981c570686e722 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 18:13:19 +0800
Subject: [PATCH 409/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/MixTopMenu.vue | 64 +++++++++++++++++-----
 src/layouts/views/MixLayout.vue            |  1 -
 2 files changed, 49 insertions(+), 16 deletions(-)

diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index a03372d0..96b9eb00 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -85,14 +85,25 @@ const processedTopMenus = computed(() => {
   });
 });
 
+const route = useRoute();
+
 // 获取当前路由路径的顶部菜单路径
-const activeTopMenuPath =
-  useRoute().path.split("/").filter(Boolean).length > 1
-    ? useRoute().path.match(/^\/[^/]+/)?.[0] || "/"
-    : "/";
+const getActiveTopMenuPath = () => {
+  const pathSegments = route.path.split("/").filter(Boolean);
+  return pathSegments.length > 0 ? `/${pathSegments[0]}` : "/";
+};
 
-// 设置当前激活的顶部菜单路径
-appStore.activeTopMenu(activeTopMenuPath);
+// 监听路由变化，更新活跃的顶部菜单
+watch(
+  () => route.path,
+  () => {
+    const newActiveTopMenuPath = getActiveTopMenuPath();
+    if (newActiveTopMenuPath !== appStore.activeTopMenuPath) {
+      appStore.activeTopMenu(newActiveTopMenuPath);
+    }
+  },
+  { immediate: true }
+);
 
 /**
  * 处理菜单点击事件，切换顶部菜单并加载对应的左侧菜单
@@ -109,7 +120,11 @@ const handleMenuSelect = (routePath: string) => {
  */
 function activateFirstLevelMenu(routePath: string) {
   permissionStore.updateSideMenu(routePath); // 更新左侧菜单
-  navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+
+  // 使用 nextTick 确保侧边菜单更新完成后再跳转
+  nextTick(() => {
+    navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+  });
 }
 
 /**
@@ -119,22 +134,41 @@ function activateFirstLevelMenu(routePath: string) {
 const navigateToFirstLeftMenu = (menus: RouteRecordRaw[]) => {
   if (menus.length === 0) return;
 
-  const [firstMenu] = menus;
+  // 查找第一个可访问的菜单项
+  const findFirstAccessibleRoute = (routes: RouteRecordRaw[]): RouteRecordRaw | null => {
+    for (const route of routes) {
+      // 跳过隐藏的菜单项
+      if (route.meta?.hidden) continue;
+
+      // 如果有子菜单，递归查找
+      if (route.children && route.children.length > 0) {
+        const childRoute = findFirstAccessibleRoute(route.children);
+        if (childRoute) return childRoute;
+      } else if (route.name && route.path) {
+        // 找到第一个有名称和路径的菜单项
+        return route;
+      }
+    }
+    return null;
+  };
+
+  const firstRoute = findFirstAccessibleRoute(menus);
 
-  // 如果第一个菜单有子菜单，递归跳转到第一个子菜单
-  if (firstMenu.children && firstMenu.children.length > 0) {
-    navigateToFirstLeftMenu(firstMenu.children as RouteRecordRaw[]);
-  } else if (firstMenu.name) {
+  if (firstRoute && firstRoute.name) {
+    console.log("🎯 Navigating to first menu:", firstRoute.name, firstRoute.path);
     router.push({
-      name: firstMenu.name,
+      name: firstRoute.name,
       query:
-        typeof firstMenu.meta?.params === "object"
-          ? (firstMenu.meta.params as LocationQueryRaw)
+        typeof firstRoute.meta?.params === "object"
+          ? (firstRoute.meta.params as LocationQueryRaw)
           : undefined,
     });
   }
 };
 
+// 当前激活的顶部菜单路径
+const activeTopMenuPath = computed(() => appStore.activeTopMenuPath);
+
 onMounted(() => {
   topMenus.value = permissionStore.routes.filter((item) => !item.meta || !item.meta.hidden);
 });
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 4582a17f..04d85bc9 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -58,7 +58,6 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
 import { useRoute } from "vue-router";
 import { useWindowSize } from "@vueuse/core";
 import { useLayout } from "../composables/useLayout";

From e9d899437936b897368929d6d9c339c2ec0c401c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 27 May 2025 18:29:04 +0800
Subject: [PATCH 410/497] =?UTF-8?q?wip:=20=E4=B8=B4=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/BasicMenu.vue     | 134 +++++++++++++++++-
 .../components/Menu/components/MenuItem.vue   |  37 +++++
 2 files changed, 170 insertions(+), 1 deletion(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index f023b2be..494ee958 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -2,7 +2,7 @@
 <template>
   <el-menu
     ref="menuRef"
-    :default-active="currentRoute.path"
+    :default-active="activeMenuIndex"
     :collapse="!appStore.sidebar.opened"
     :background-color="
       theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
@@ -78,6 +78,83 @@ const theme = computed(() => settingsStore.theme);
 // 获取浅色主题下的侧边栏配色方案
 const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
 
+// 计算当前激活的菜单项
+const activeMenuIndex = computed(() => {
+  const currentPath = currentRoute.path;
+
+  // 如果路由设置了 activeMenu，优先使用
+  if (currentRoute.meta?.activeMenu) {
+    return currentRoute.meta.activeMenu as string;
+  }
+
+  // 在水平模式下（顶部布局），需要找到匹配的顶级菜单
+  if (props.menuMode === "horizontal") {
+    // 首先尝试简单的路径前缀匹配
+    const pathSegments = currentPath.split("/").filter(Boolean);
+    if (pathSegments.length > 0) {
+      const topLevelPath = `/${pathSegments[0]}`;
+
+      // 检查是否有菜单项匹配这个顶级路径
+      const matchingMenu = props.data.find((menu) => {
+        const menuPath = resolveFullPath(menu.path);
+        return menuPath === topLevelPath;
+      });
+
+      if (matchingMenu) {
+        console.log("🎯 Top menu matched:", topLevelPath, "for route:", currentPath);
+        return topLevelPath;
+      }
+    }
+
+    // 如果简单匹配失败，使用详细匹配
+    const findMatchingTopMenu = (menus: RouteRecordRaw[], targetPath: string): string | null => {
+      for (const menu of menus) {
+        const menuPath = resolveFullPath(menu.path);
+
+        // 精确匹配
+        if (targetPath === menuPath) {
+          return menuPath;
+        }
+
+        // 路径前缀匹配（子路径匹配父菜单）
+        if (targetPath.startsWith(menuPath + "/")) {
+          return menuPath;
+        }
+
+        // 如果有子菜单，检查子菜单是否匹配
+        if (menu.children && menu.children.length > 0) {
+          const hasMatchingChild = menu.children.some((child) => {
+            // 对于子菜单，需要正确解析路径
+            let childPath;
+            if (child.path.startsWith("/")) {
+              // 如果子路径是绝对路径，直接使用
+              childPath = child.path;
+            } else {
+              // 如果是相对路径，基于父菜单路径解析
+              childPath = path.resolve(menuPath, child.path);
+            }
+            return targetPath === childPath || targetPath.startsWith(childPath + "/");
+          });
+
+          if (hasMatchingChild) {
+            return menuPath;
+          }
+        }
+      }
+      return null;
+    };
+
+    const matchedMenu = findMatchingTopMenu(props.data, currentPath);
+    if (matchedMenu) {
+      console.log("🎯 Detailed menu matched:", matchedMenu, "for route:", currentPath);
+      return matchedMenu;
+    }
+  }
+
+  // 默认返回当前路径
+  return currentPath;
+});
+
 /**
  * 获取完整路径
  *
@@ -92,6 +169,11 @@ function resolveFullPath(routePath: string) {
     return props.basePath;
   }
 
+  // 如果 basePath 为空（顶部布局），直接返回 routePath
+  if (!props.basePath || props.basePath === "") {
+    return routePath;
+  }
+
   // 解析路径，生成完整的绝对路径
   return path.resolve(props.basePath, routePath);
 }
@@ -126,4 +208,54 @@ watch(
     }
   }
 );
+
+/**
+ * 监听激活菜单变化，为包含激活子菜单的父菜单添加样式类
+ */
+watch(
+  () => activeMenuIndex.value,
+  () => {
+    nextTick(() => {
+      updateParentMenuStyles();
+    });
+  },
+  { immediate: true }
+);
+
+/**
+ * 更新父菜单样式 - 为包含激活子菜单的父菜单添加 has-active-child 类
+ */
+function updateParentMenuStyles() {
+  if (!menuRef.value?.$el) return;
+
+  const menuEl = menuRef.value.$el as HTMLElement;
+
+  // 移除所有现有的 has-active-child 类
+  const allSubMenus = menuEl.querySelectorAll(".el-sub-menu");
+  allSubMenus.forEach((subMenu) => {
+    subMenu.classList.remove("has-active-child");
+  });
+
+  // 查找当前激活的菜单项
+  const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
+  if (activeMenuItem) {
+    // 向上查找父级 el-sub-menu 元素
+    let parent = activeMenuItem.parentElement;
+    while (parent && parent !== menuEl) {
+      if (parent.classList.contains("el-sub-menu")) {
+        parent.classList.add("has-active-child");
+      }
+      parent = parent.parentElement;
+    }
+  }
+}
+
+/**
+ * 组件挂载后立即更新父菜单样式
+ */
+onMounted(() => {
+  nextTick(() => {
+    updateParentMenuStyles();
+  });
+});
 </script>
diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index 2f39454e..8734383c 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -190,4 +190,41 @@ html.sidebar-color-blue {
     background-color: $menu-hover;
   }
 }
+
+// 父菜单激活状态样式 - 当子菜单激活时，父菜单显示激活状态
+.el-sub-menu {
+  // 当父菜单包含激活子菜单时的样式
+  &.has-active-child .el-sub-menu__title {
+    color: var(--el-color-primary) !important;
+    background-color: var(--el-color-primary-light-9) !important;
+
+    .menu-icon {
+      color: var(--el-color-primary) !important;
+    }
+  }
+
+  // 深色主题下的父菜单激活状态
+  html.dark & {
+    &.has-active-child .el-sub-menu__title {
+      color: var(--el-color-primary-light-3) !important;
+      background-color: rgba(64, 128, 255, 0.15) !important;
+
+      .menu-icon {
+        color: var(--el-color-primary-light-3) !important;
+      }
+    }
+  }
+
+  // 深蓝色侧边栏配色下的父菜单激活状态
+  html.sidebar-color-blue & {
+    &.has-active-child .el-sub-menu__title {
+      color: var(--el-color-primary-light-3) !important;
+      background-color: rgba(64, 128, 255, 0.2) !important;
+
+      .menu-icon {
+        color: var(--el-color-primary-light-3) !important;
+      }
+    }
+  }
+}
 </style>

From 98e437fc50d1b7c30d695f2cb64e1c3114907261 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 28 May 2025 17:09:59 +0800
Subject: [PATCH 411/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=90=9C=E7=B4=A2=E6=97=B6=EF=BC=8C=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=B8=8D=E5=AF=B9=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复菜单搜索时，地址不对的bug
---
 src/components/MenuSearch/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/MenuSearch/index.vue b/src/components/MenuSearch/index.vue
index 85d45867..62b99f14 100644
--- a/src/components/MenuSearch/index.vue
+++ b/src/components/MenuSearch/index.vue
@@ -290,7 +290,9 @@ function navigateToRoute(item: SearchItem) {
 
 function loadRoutes(routes: RouteRecordRaw[], parentPath = "") {
   routes.forEach((route) => {
-    const path = route.path.startsWith("/") ? route.path : `${parentPath}/${route.path}`;
+    const path = route.path.startsWith("/")
+      ? route.path
+      : `${parentPath}${parentPath.endsWith("/") ? "" : "/"}${route.path}`;
     if (excludedRoutes.value.includes(route.path) || isExternal(route.path)) return;
 
     if (route.children) {

From ae918d5853ce44860d9e5f9199a1fe35b8458b4f Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Wed, 28 May 2025 17:59:01 +0800
Subject: [PATCH 412/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=B8=80=E4=BA=9B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

删除日志打印，删掉了label-width=auto,该属性可能导致在跳转页面时引发控制台警告信息
---
 src/components/CURD/PageContent.vue             | 2 --
 src/plugins/permission.ts                       | 4 ----
 src/views/codegen/index.vue                     | 2 +-
 src/views/system/config/index.vue               | 4 +++-
 src/views/system/dept/index.vue                 | 2 +-
 src/views/system/menu/index.vue                 | 2 +-
 src/views/system/notice/index.vue               | 8 +-------
 src/views/system/role/index.vue                 | 2 +-
 src/views/system/user/components/UserImport.vue | 1 -
 9 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index ace91a2a..f98330c0 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -210,7 +210,6 @@
         <!-- 表单 -->
         <el-form
           ref="exportsFormRef"
-          label-width="auto"
           style="padding-right: var(--el-dialog-padding-primary)"
           :model="exportsFormData"
           :rules="exportsFormRules"
@@ -267,7 +266,6 @@
         <!-- 表单 -->
         <el-form
           ref="importFormRef"
-          label-width="auto"
           style="padding-right: var(--el-dialog-padding-primary)"
           :model="importFormData"
           :rules="importFormRules"
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index dbce0a03..6d82f990 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -11,19 +11,15 @@ export function setupPermission() {
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
-    console.log("to.path", to.path);
 
     const isLogin = Auth.isLoggedIn();
-    console.log("isLogin", isLogin);
     if (isLogin) {
-      console.log("to.path", to.path);
       if (to.path === "/login") {
         // 如果已登录，跳转到首页
         next({ path: "/" });
       } else {
         // 未登录
         const permissionStore = usePermissionStore();
-        console.log("permissionStore.routesLoaded", permissionStore.routesLoaded);
         // 判断路由是否加载完成
         if (permissionStore.routesLoaded) {
           if (to.matched.length === 0) {
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index b0bc3667..d7b8bc68 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item prop="keywords" label="关键字">
           <el-input
             v-model="queryParams.keywords"
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index a12a9c59..eca97221 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -3,7 +3,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="keywords">
           <el-input
             v-model="queryParams.keywords"
@@ -142,6 +142,8 @@ defineOptions({
 });
 
 import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config.api";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { useDebounceFn } from "@vueuse/core";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 11197547..02eb938b 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="keywords">
           <el-input
             v-model="queryParams.keywords"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 4ef98d45..ef47f888 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item label="关键字" prop="keywords">
           <el-input
             v-model="queryParams.keywords"
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 17870d2b..4fd364f2 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -2,13 +2,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form
-        ref="queryFormRef"
-        :model="queryParams"
-        :inline="true"
-        label-suffix=":"
-        label-width="auto"
-      >
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-suffix=":">
         <el-form-item label="标题" prop="title">
           <el-input
             v-model="queryParams.title"
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 8697902b..00267847 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- 搜索区域 -->
     <div class="search-container">
-      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="auto">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true">
         <el-form-item prop="keywords" label="关键字">
           <el-input
             v-model="queryParams.keywords"
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 38534daa..666bce7e 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -10,7 +10,6 @@
       <el-scrollbar max-height="60vh">
         <el-form
           ref="importFormRef"
-          label-width="auto"
           style="padding-right: var(--el-dialog-padding-primary)"
           :model="importFormData"
           :rules="importFormRules"

From c9401530ada6d5f30fbd8d2eab141cf2ce6be326 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 5 Jun 2025 23:49:30 +0800
Subject: [PATCH 413/497] chore: :hammer: bump version to 2.29.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c32273ca..93a00361 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.29.1",
+  "version": "2.29.2",
   "private": true,
   "type": "module",
   "scripts": {

From 3042e191955caacd631f822e4df4006b23c93551 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 6 Jun 2025 00:28:10 +0800
Subject: [PATCH 414/497] chore: :hammer: bump version to 3.0.0

---
 .env.development              |  6 ++---
 README.en-US.md               |  6 ++---
 README.md                     |  6 ++---
 package.json                  | 42 +++++++++++++++++------------------
 src/views/dashboard/index.vue | 10 ++++-----
 5 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/.env.development b/.env.development
index 782874ea..55b854a1 100644
--- a/.env.development
+++ b/.env.development
@@ -5,11 +5,11 @@ VITE_APP_PORT=3000
 VITE_APP_BASE_API=/dev-api
 
 # 接口地址
-# VITE_APP_API_URL=https://api.youlai.tech # 线上
-VITE_APP_API_URL=http://localhost:8989    # 本地
+VITE_APP_API_URL=https://api.youlai.tech # 线上
+# VITE_APP_API_URL=http://localhost:8989    # 本地
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws
-VITE_APP_WS_ENDPOINT=ws://localhost:8989/ws
+VITE_APP_WS_ENDPOINT=
 
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/README.en-US.md b/README.en-US.md
index 0a92b177..921a9def 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.9-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.16-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.11-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/README.md b/README.md
index 6ff1f482..e65f220f 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.13-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.2.2-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.10-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.16-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.9.11-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/package.json b/package.json
index 93a00361..eff8195a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "2.29.2",
+  "version": "3.0.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -57,64 +57,64 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.10",
+    "element-plus": "^2.9.11",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
     "path-to-regexp": "^8.2.0",
-    "pinia": "^3.0.2",
+    "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
-    "vue": "^3.5.13",
+    "vue": "^3.5.16",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.3",
+    "vue-i18n": "^11.1.5",
     "vue-router": "^4.5.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.26.0",
+    "@eslint/js": "^9.28.0",
     "@iconify/utils": "^2.3.0",
-    "@types/codemirror": "^5.60.15",
+    "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.18",
+    "@types/node": "^22.15.29",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
-    "@types/qs": "^6.9.18",
+    "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.32.1",
-    "@typescript-eslint/parser": "^8.32.1",
+    "@typescript-eslint/eslint-plugin": "^8.33.1",
+    "@typescript-eslint/parser": "^8.33.1",
     "@vitejs/plugin-vue": "^5.2.4",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.1",
-    "eslint": "^9.26.0",
+    "eslint": "^9.28.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.0",
+    "eslint-plugin-prettier": "^5.4.1",
     "eslint-plugin-vue": "^10.1.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.2",
-    "postcss": "^8.5.3",
+    "postcss": "^8.5.4",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.5.3",
-    "sass": "^1.88.0",
-    "stylelint": "^16.19.1",
+    "sass": "^1.89.1",
+    "stylelint": "^16.20.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.0.0",
     "stylelint-config-recommended": "^15.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.6.0",
     "stylelint-prettier": "^5.0.3",
-    "terser": "^5.39.1",
+    "terser": "^5.41.0",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.32.1",
+    "typescript-eslint": "^8.33.1",
     "unocss": "65.4.3",
-    "unplugin-auto-import": "^19.2.0",
-    "unplugin-vue-components": "^28.5.0",
-    "vite": "6.3.2",
+    "unplugin-auto-import": "^19.3.0",
+    "unplugin-vue-components": "^28.7.0",
+    "vite": "^6.3.5",
     "vite-plugin-mock-dev-server": "^1.8.7",
     "vue-eslint-parser": "^10.1.3",
     "vue-tsc": "^2.2.10"
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 4fd0323a..84bdc16f 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -395,14 +395,14 @@ const userStore = useUserStore();
 const vesionList = ref<VersionItem[]>([
   {
     id: "1",
-    title: "v2.4.0",
-    date: "2021-09-01 00:00:00",
-    content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",
+    title: "v3.0.0",
+    date: "2025-06-06 00:00:00",
+    content: "布局重写，代码规范重构。",
     link: "https://gitee.com/youlaiorg/vue3-element-admin/releases",
     tag: "里程碑",
   },
   {
-    id: "1",
+    id: "2",
     title: "v2.4.0",
     date: "2021-09-01 00:00:00",
     content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",
@@ -410,7 +410,7 @@ const vesionList = ref<VersionItem[]>([
     tag: "里程碑",
   },
   {
-    id: "1",
+    id: "3",
     title: "v2.4.0",
     date: "2021-09-01 00:00:00",
     content: "实现基础框架搭建，包含权限管理、路由系统等核心功能。",

From c116b9ddafd4f50085477e6c67b1be8ae8a3a423 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Wed, 11 Jun 2025 15:26:41 +0800
Subject: [PATCH 415/497] =?UTF-8?q?feat:=20:sparkles:=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?VxeTable?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mock/menu.mock.ts                  |  13 +
 package.json                       |   3 +-
 src/main.ts                        |   1 +
 src/plugins/index.ts               |   3 +
 src/plugins/vxeTable.ts            |  70 ++++
 src/styles/index.scss              |   3 +
 src/styles/vxe-table.css           |  92 +++++
 src/styles/vxe-table.scss          |  39 ++
 src/views/demo/vxe-table/index.vue | 632 +++++++++++++++++++++++++++++
 9 files changed, 855 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/vxeTable.ts
 create mode 100644 src/styles/vxe-table.css
 create mode 100644 src/styles/vxe-table.scss
 create mode 100644 src/views/demo/vxe-table/index.vue

diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 02d72db0..6d7b8495 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -472,6 +472,19 @@ export default defineMock([
             params: null,
           },
           children: [
+            {
+              path: "vxe-table",
+              component: "demo/vxe-table/index",
+              name: "VxeTable",
+              meta: {
+                title: "VxeTable",
+                icon: "el-icon-MagicStick",
+                hidden: false,
+                keepAlive: true,
+                alwaysShow: false,
+                params: null,
+              },
+            },
             {
               path: "icon-demo",
               component: "demo/icons",
diff --git a/package.json b/package.json
index eff8195a..3ffa2a77 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,8 @@
     "vue": "^3.5.16",
     "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "^11.1.5",
-    "vue-router": "^4.5.1"
+    "vue-router": "^4.5.1",
+    "vxe-table": "~4.6.25"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
diff --git a/src/main.ts b/src/main.ts
index 38b64409..74fe30d9 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -4,6 +4,7 @@ import setupPlugins from "@/plugins";
 
 // 暗黑主题样式
 import "element-plus/theme-chalk/dark/css-vars.css";
+import "vxe-table/lib/style.css";
 // 暗黑模式自定义变量
 import "@/styles/dark/css-vars.css";
 import "@/styles/index.scss";
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 98d26205..99077563 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -8,6 +8,7 @@ import { setupElIcons } from "./icons";
 import { setupPermission } from "./permission";
 import { setupWebSocket } from "./websocket";
 import { InstallCodeMirror } from "codemirror-editor-vue3";
+import { setupVxeTable } from "./vxeTable";
 
 export default {
   install(app: App<Element>) {
@@ -25,6 +26,8 @@ export default {
     setupPermission();
     // WebSocket服务
     setupWebSocket();
+    // vxe-table
+    setupVxeTable(app);
     // 注册 CodeMirror
     app.use(InstallCodeMirror);
   },
diff --git a/src/plugins/vxeTable.ts b/src/plugins/vxeTable.ts
new file mode 100644
index 00000000..5826fafb
--- /dev/null
+++ b/src/plugins/vxeTable.ts
@@ -0,0 +1,70 @@
+import type { App } from "vue";
+import VXETable from "vxe-table"; // https://vxetable.cn/v4.6/#/table/start/install
+
+// 全局默认参数
+VXETable.setConfig({
+  // 全局尺寸
+  size: "medium",
+  // 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡
+  zIndex: 9999,
+  // 版本号，对于某些带数据缓存的功能有用到，上升版本号可以用于重置数据
+  version: 0,
+  // 全局 loading 提示内容，如果为 null 则不显示文本
+  loadingText: null,
+  table: {
+    showHeader: true,
+    showOverflow: "tooltip",
+    showHeaderOverflow: "tooltip",
+    autoResize: true,
+    // stripe: false,
+    border: "inner",
+    // round: false,
+    emptyText: "暂无数据",
+    rowConfig: {
+      isHover: true,
+      isCurrent: true,
+      // 行数据的唯一主键字段名
+      keyField: "_VXE_ID",
+    },
+    columnConfig: {
+      resizable: false,
+    },
+    align: "center",
+    headerAlign: "center",
+  },
+  pager: {
+    // size: "medium",
+    // 配套的样式
+    perfect: false,
+    pageSize: 10,
+    pagerCount: 7,
+    pageSizes: [10, 20, 50],
+    layouts: [
+      "Total",
+      "PrevJump",
+      "PrevPage",
+      "Number",
+      "NextPage",
+      "NextJump",
+      "Sizes",
+      "FullJump",
+    ],
+  },
+  modal: {
+    minWidth: 500,
+    minHeight: 400,
+    lockView: true,
+    mask: true,
+    // duration: 3000,
+    // marginSize: 20,
+    dblclickZoom: false,
+    showTitleOverflow: true,
+    transfer: true,
+    draggable: false,
+  },
+});
+
+export function setupVxeTable(app: App) {
+  // Vxe Table 组件完整引入
+  app.use(VXETable);
+}
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 95335687..22655067 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -1,5 +1,8 @@
 @use "./reset";
 @use "./element-plus";
+// Vxe Table
+@use "./vxe-table";
+@import url("http://github.com/vxe-table.css");
 
 .app-container {
   padding: 15px;
diff --git a/src/styles/vxe-table.css b/src/styles/vxe-table.css
new file mode 100644
index 00000000..fc1fa4b3
--- /dev/null
+++ b/src/styles/vxe-table.css
@@ -0,0 +1,92 @@
+/**
+ * @description 所有主题模式下的 Vxe Table CSS 变量
+ * @description 用 Element Plus 的 CSS 变量来覆写 Vxe Table 的 CSS 变量，目的是使 Vxe Table 支持多主题模式且样式统一
+ * @description 在此查阅所有可自定义的变量：https://github.com/x-extends/vxe-table/blob/master/styles/css-variable.scss
+ */
+
+:root {
+  /* color */
+  --vxe-font-color: var(--el-text-color-regular);
+  --vxe-primary-color: var(--el-color-primary);
+  --vxe-success-color: var(--el-color-success);
+  --vxe-info-color: var(--el-color-info);
+  --vxe-warning-color: var(--el-color-warning);
+  --vxe-danger-color: var(--el-color-danger);
+  --vxe-font-lighten-color: var(--el-text-color-primary);
+  --vxe-primary-lighten-color: var(--el-color-primary-light-3);
+  --vxe-success-lighten-color: var(--el-color-success-light-3);
+  --vxe-info-lighten-color: var(--el-color-info-light-3);
+  --vxe-warning-lighten-color: var(--el-color-warning-light-3);
+  --vxe-danger-lighten-color: var(--el-color-danger-light-3);
+  --vxe-font-darken-color: var(--el-text-color-secondary);
+  --vxe-primary-darken-color: var(--el-color-primary-dark-2);
+  --vxe-success-darken-color: var(--el-color-success-dark-2);
+  --vxe-info-darken-color: var(--el-color-info-dark-2);
+  --vxe-warning-darken-color: var(--el-color-warning-dark-2);
+  --vxe-danger-darken-color: var(--el-color-danger-dark-2);
+  --vxe-font-disabled-color: var(--el-text-color-disabled);
+  --vxe-primary-disabled-color: var(--el-color-primary-light-5);
+  --vxe-success-disabled-color: var(--el-color-success-light-5);
+  --vxe-info-disabled-color: var(--el-color-info-light-5);
+  --vxe-warning-disabled-color: var(--el-color-warning-light-5);
+  --vxe-danger-disabled-color: var(--el-color-danger-light-5);
+
+  /* input/radio/checkbox */
+  --vxe-input-border-color: var(--el-border-color);
+  --vxe-input-disabled-color: var(--el-text-color-disabled);
+  --vxe-input-disabled-background-color: var(--el-fill-color-light);
+  --vxe-input-placeholder-color: var(--el-text-color-placeholder);
+
+  /* popup */
+  --vxe-table-popup-border-color: var(--el-border-color);
+
+  /* table */
+  --vxe-table-header-font-color: var(--el-text-color-regular);
+  --vxe-table-footer-font-color: var(--el-text-color-regular);
+  --vxe-table-border-color: var(--el-border-color-lighter);
+  --vxe-table-header-background-color: var(--el-bg-color);
+  --vxe-table-body-background-color: var(--el-bg-color);
+  --vxe-table-footer-background-color: var(--el-bg-color);
+  --vxe-table-row-hover-background-color: var(--el-fill-color-light);
+  --vxe-table-row-current-background-color: var(--el-fill-color-light);
+  --vxe-table-row-hover-current-background-color: var(--el-fill-color-light);
+  --vxe-table-checkbox-range-background-color: var(--el-fill-color-light);
+
+  /* menu */
+  --vxe-table-menu-background-color: var(--el-bg-color-overlay);
+
+  /* loading */
+  --vxe-loading-color: var(--el-color-primary);
+  --vxe-loading-background-color: var(--el-mask-color);
+
+  /* validate */
+  --vxe-table-validate-error-color: var(--el-color-danger);
+
+  /* toolbar */
+  --vxe-toolbar-background-color: var(--el-bg-color);
+  --vxe-toolbar-custom-active-background-color: var(--el-bg-color-overlay);
+  --vxe-toolbar-panel-background-color: var(--el-bg-color-overlay);
+
+  /* pager */
+  --vxe-pager-background-color: var(--el-bg-color);
+
+  /* modal */
+  --vxe-modal-header-background-color: var(--el-bg-color);
+  --vxe-modal-body-background-color: var(--el-bg-color);
+  --vxe-modal-border-color: var(--el-border-color);
+
+  /* button */
+  --vxe-button-default-background-color: var(--el-bg-color-overlay);
+
+  /* input */
+  --vxe-input-background-color: var(--el-fill-color-blank);
+  --vxe-input-panel-background-color: var(--el-fill-color-blank);
+
+  /* form */
+  --vxe-form-background-color: var(--el-bg-color);
+  --vxe-form-validate-error-color: var(--el-color-danger);
+
+  /* select */
+  --vxe-select-option-hover-background-color: var(--el-bg-color-overlay);
+  --vxe-select-panel-background-color: var(--el-bg-color);
+}
diff --git a/src/styles/vxe-table.scss b/src/styles/vxe-table.scss
new file mode 100644
index 00000000..f7376ee5
--- /dev/null
+++ b/src/styles/vxe-table.scss
@@ -0,0 +1,39 @@
+// 自定义 Vxe Table 样式
+
+.vxe-grid {
+  // 表单
+  &--form-wrapper {
+    .vxe-form {
+      padding: 10px 20px;
+      margin-bottom: 20px;
+    }
+  }
+
+  // 工具栏
+  &--toolbar-wrapper {
+    .vxe-toolbar {
+      padding: 20px;
+    }
+  }
+
+  // 分页
+  &--pager-wrapper {
+    .vxe-pager {
+      height: 70px;
+      padding: 0 20px;
+
+      &--wrapper {
+        // 参考 Bootstrap 的响应式设计 WIDTH = 768
+        @media screen and (width <= 768px) {
+          .vxe-pager--total,
+          .vxe-pager--sizes,
+          .vxe-pager--jump,
+          .vxe-pager--jump-prev,
+          .vxe-pager--jump-next {
+            display: none;
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/src/views/demo/vxe-table/index.vue b/src/views/demo/vxe-table/index.vue
new file mode 100644
index 00000000..841aff80
--- /dev/null
+++ b/src/views/demo/vxe-table/index.vue
@@ -0,0 +1,632 @@
+<template>
+  <div class="app-container">
+    <!-- 表格 -->
+    <vxe-grid ref="xGrid" v-bind="gridOptions" v-on="gridEvents">
+      <!-- 搜索 -->
+      <!-- <template #form-roles="{ data }">
+        <el-select
+          v-model="data.roles"
+          multiple
+          collapse-tags
+          collapse-tags-tooltip
+          placeholder="请选择角色"
+          filterable
+          clearable
+        >
+          <el-option
+            v-for="item in options"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </template> -->
+      <!-- 左侧按钮列表 -->
+      <template #toolbar-btns>
+        <vxe-button status="primary" icon="vxe-icon-add" @click="curd.onShowModal()">
+          新增用户
+        </vxe-button>
+        <vxe-button status="danger" icon="vxe-icon-delete" @click="curd.onDelete()">
+          批量删除
+        </vxe-button>
+      </template>
+      <!-- 展开列 -->
+      <template #column-expand="{ row }">
+        <div style="padding: 20px">
+          <ul>
+            <li>
+              <span>ID：</span>
+              <span>{{ row.id }}</span>
+            </li>
+            <li>
+              <span>UserName：</span>
+              <span>{{ row.username }}</span>
+            </li>
+            <li>
+              <span>CreateTime：</span>
+              <span>{{ row.createTime }}</span>
+            </li>
+          </ul>
+        </div>
+      </template>
+      <!-- 角色列 -->
+      <template #column-roles="{ row, column }">
+        <el-tag
+          v-for="(role, index) in row[column.field].split(',')"
+          :key="index"
+          :type="role === 'admin' ? 'primary' : 'warning'"
+          effect="plain"
+        >
+          {{ role }}
+        </el-tag>
+      </template>
+      <!-- 操作列 -->
+      <template #column-operate="{ row }">
+        <el-button link type="primary" @click="curd.onShowModal(row)">修改</el-button>
+        <el-button link type="danger" @click="curd.onDelete(row)">删除</el-button>
+      </template>
+    </vxe-grid>
+    <!-- 弹窗 -->
+    <vxe-modal ref="xModal" v-bind="modalOptions">
+      <!-- 表单 -->
+      <vxe-form ref="xForm" v-bind="formOptions" />
+    </vxe-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, onMounted } from "vue";
+import type {
+  VxeGridInstance,
+  VxeGridProps,
+  VxeGridListeners,
+  VxeModalInstance,
+  VxeModalProps,
+  VxeFormInstance,
+  VxeFormProps,
+} from "vxe-table";
+import { VXETable } from "vxe-table";
+
+const options = [
+  { label: "管理员", value: "admin" },
+  { label: "用户", value: "user" },
+  { label: "访客", value: "guest" },
+];
+onMounted(() => {
+  setTimeout(() => {
+    gridOptions!.formConfig!.items!.forEach((item) => {
+      if (item.field === "roles") {
+        item!.itemRender!.props!.options = options;
+      }
+    });
+  }, 500);
+});
+
+// #region vxe-grid
+interface RowMeta {
+  id: number;
+  username: string;
+  roles: string;
+  phone: string;
+  email: string;
+  status: boolean;
+  createTime: string;
+}
+const xGrid = ref<VxeGridInstance<RowMeta>>();
+const gridOptions = reactive<VxeGridProps<RowMeta>>({
+  // 自动监听父元素的变化去重新计算表格
+  autoResize: true,
+  // 是否显示表尾
+  showFooter: true,
+  // 表尾数据（优先级比 footerMethod 高）
+  // footerData: [
+  //   {
+  //     username: "-",
+  //     roles: "-",
+  //     phone: "-",
+  //     email: "-",
+  //     status: "启用：7条",
+  //     createTime: "-",
+  //   },
+  // ],
+  // 表尾的数据获取方法，返回一个二维数组
+  footerMethod({ columns, data }) {
+    return [
+      columns.map((column, columnIndex) => {
+        if (columnIndex === 0 || column.field === undefined) {
+          return "";
+        } else if (column.field === "status") {
+          return `启用：${data.reduce((sum, row) => sum + (row.status ? 1 : 0), 0)}条`;
+        }
+        return "-";
+      }),
+    ];
+  },
+  // 列配置
+  columns: [
+    { type: "checkbox", width: 60 },
+    {
+      type: "expand",
+      width: 60,
+      slots: {
+        // 只对 type=expand 有效，自定义展开后的内容模板
+        content: "column-expand",
+      },
+    },
+    { type: "seq", width: 60 },
+    { field: "id", title: "ID", visible: false },
+    { field: "username", title: "用户名" },
+    { field: "roles", title: "角色", slots: { default: "column-roles" } },
+    { field: "phone", title: "手机号" },
+    { field: "email", title: "邮箱" },
+    {
+      field: "status",
+      title: "状态",
+      sortable: true,
+      filters: [
+        { label: "启用", value: true },
+        { label: "禁用", value: false },
+      ],
+      // 数据筛选，只对 filters 有效，筛选是否允许多选
+      filterMultiple: false,
+      formatter({ cellValue }) {
+        return cellValue === true ? "启用" : "禁用";
+      },
+    },
+    { field: "createTime", title: "创建时间", sortable: true },
+    {
+      title: "操作",
+      width: "150px",
+      fixed: "right",
+      showOverflow: false,
+      slots: {
+        default: "column-operate",
+      },
+    },
+  ],
+  // 列配置信息
+  columnConfig: {
+    // 每一列是否启用列宽调整
+    resizable: true,
+  },
+  // 自定义列配置项
+  customConfig: {
+    // 是否允许列选中
+    checkMethod: ({ column }) => !["username"].includes(column.field),
+  },
+  // 复选框配置项
+  checkboxConfig: {
+    // 是否保留勾选状态（需要有 row-config.keyField）
+    // reserve: true,
+  },
+  // 展开行配置项（不支持虚拟滚动）
+  expandConfig: {
+    // 展开列显示的字段名，可以直接显示在单元格中
+    // labelField: "username",
+    // 每次只能展开一行
+    accordion: true,
+  },
+  // 行配置信息
+  rowConfig: {
+    // 自定义行数据唯一主键的字段名
+    keyField: "id",
+    // 当鼠标点击行时，是否要高亮当前行
+    isCurrent: true,
+  },
+  // 表单配置项
+  formConfig: {
+    // 项配置
+    items: [
+      {
+        span: 4,
+        field: "username",
+        title: "用户名",
+        // 前缀配置项
+        titlePrefix: {
+          useHTML: true,
+          content:
+            '点击链接：<a class="link" href="https://vxetable.cn/" target="_blank">vxe-table官网</a>',
+          icon: "vxe-icon-question-circle-fill",
+        },
+        // 项渲染器配置项
+        itemRender: {
+          // 渲染器名称
+          name: "VxeInput",
+          // 渲染的参数
+          props: {
+            type: "text",
+            clearable: true,
+            placeholder: "请输入用户名",
+          },
+        },
+      },
+      {
+        span: 4,
+        field: "roles",
+        title: "角色",
+        // 默认收起
+        folding: true,
+        itemRender: {
+          name: "VxeSelect",
+          props: {
+            multiple: true,
+            multiCharOverflow: -1,
+            filterable: true,
+            clearable: true,
+            options: [],
+            placeholder: "请选择角色",
+          },
+        },
+      },
+      // {
+      //   span: 4,
+      //   field: "roles",
+      //   title: "角色",
+      //   // 默认收起
+      //   folding: true,
+      //   // 插槽
+      //   slots: {
+      //     // 自定义表单项
+      //     default: "form-roles",
+      //   },
+      // },
+      {
+        collapseNode: true,
+        itemRender: {
+          name: "VxeButtonGroup",
+          options: [
+            {
+              type: "submit",
+              status: "primary",
+              icon: "vxe-icon-search",
+              content: "搜索",
+            },
+            { type: "reset", icon: "vxe-icon-refresh", content: "重置" },
+          ],
+        },
+      },
+    ],
+  },
+  // 工具栏配置
+  toolbarConfig: {
+    // 导入按钮配置（需要设置 "import-config"）
+    import: true,
+    // 导出按钮配置（需要设置 "export-config"）
+    export: true,
+    // 打印按钮配置（需要设置 "print-config"）
+    print: true,
+    // 刷新按钮配置
+    refresh: true,
+    // 是否允许最大化显示
+    zoom: true,
+    // 自定义列配置
+    custom: true,
+    //插槽
+    slots: {
+      // 按钮列表
+      buttons: "toolbar-btns",
+    },
+  },
+  // 导入配置项
+  importConfig: {},
+  // 导出配置项
+  exportConfig: {
+    // 指定列
+    columns: [{ field: "phone" }, { field: "email" }, { field: "status" }, { field: "createTime" }],
+  },
+  // 打印配置项
+  printConfig: {},
+  // 筛选配置项
+  filterConfig: {
+    // 所有列是否使用服务端筛选
+    remote: false,
+  },
+  // 排序配置项
+  sortConfig: {
+    // 所有列是否使用服务端排序
+    remote: false,
+    // 是否启用多列组合筛选
+    multiple: false,
+    // 只对 multiple 有效，是否按照先后触发顺序进行排序
+    chronological: true,
+  },
+  // 分页配置项
+  pagerConfig: {
+    enabled: true,
+    pageSize: 10,
+  },
+  // 数据代理配置项
+  proxyConfig: {
+    // 是否自动加载查询数据
+    autoLoad: true,
+    // 启用动态序号代理（分页之后索引自动计算为当前页的起始序号）
+    seq: true,
+    // 表单代理
+    form: true,
+    // 是否代理筛选（只对 filter-config.remote=true 时有效）
+    filter: true,
+    // 是否代理排序（只对 sort-config.remote=true 时有效）
+    sort: true,
+    // 获取响应的值配置
+    response: {
+      // 只对 pager-config 配置了有效，响应结果中获取数据列表的属性（分页场景）
+      result: "result",
+      // 只对 pager-config 配置了有效，响应结果中获取分页的属性（分页场景）
+      total: "total",
+    },
+    ajax: {
+      // 接收 Promise
+      query: ({ page: { currentPage, pageSize }, form, filters, sort, sorts }) => {
+        console.log({ currentPage, pageSize, form, filters, sort, sorts });
+        return new Promise<{ total: number; result: RowMeta[] }>((resolve) => {
+          setTimeout(() => {
+            const list = [
+              {
+                username: "Richard Clark",
+                roles: "editor",
+                phone: "18185826431",
+                email: "y.djf@xiswx.fk",
+                status: true,
+                createTime: "2010-04-17 12:39:20",
+                id: 810000201008060500,
+              },
+              {
+                username: "Robert Garcia",
+                roles: "admin",
+                phone: "18125716043",
+                email: "z.japgndxosu@inoudjxc.ie",
+                status: false,
+                createTime: "2020-01-02 11:51:58",
+                id: 130000201904129330,
+              },
+              {
+                username: "Thomas Moore",
+                roles: "admin",
+                phone: "18106622048",
+                email: "j.fvsgnjjutm@fmjw.se",
+                status: true,
+                createTime: "1983-10-12 10:06:41",
+                id: 420000198203053100,
+              },
+              {
+                username: "Dorothy Lewis",
+                roles: "admin",
+                phone: "13321357284",
+                email: "o.htso@iwxvehrs.tj",
+                status: true,
+                createTime: "1970-03-03 00:26:45",
+                id: 150000201803243100,
+              },
+              {
+                username: "George Rodriguez",
+                roles: "admin",
+                phone: "18158641167",
+                email: "x.sigizx@fwknokiqn.tr",
+                status: true,
+                createTime: "1988-03-16 14:46:26",
+                id: 610000199308265900,
+              },
+              {
+                username: "Angela Jackson",
+                roles: "admin",
+                phone: "19810721230",
+                email: "j.gqrdqaqtu@ipthgm.fj",
+                status: true,
+                createTime: "2006-09-26 12:53:37",
+                id: 350000197310101440,
+              },
+              {
+                username: "James Walker",
+                roles: "admin",
+                phone: "18123903251",
+                email: "k.axmdcsl@mcmeudog.cl",
+                status: true,
+                createTime: "1981-01-19 12:51:34",
+                id: 130000199308208900,
+              },
+              {
+                username: "Paul Garcia",
+                roles: "admin",
+                phone: "18617930381",
+                email: "c.glufsn@vwqntlllj.es",
+                status: false,
+                createTime: "2009-12-04 20:40:57",
+                id: 510000199212239200,
+              },
+              {
+                username: "Jeffrey Miller",
+                roles: "admin",
+                phone: "18145245413",
+                email: "u.poqrqw@arto.rw",
+                status: false,
+                createTime: "1991-04-01 05:16:52",
+                id: 330000198604109760,
+              },
+              {
+                username: "Donna Lewis",
+                roles: "editor",
+                phone: "19839835537",
+                email: "l.lmpeoupu@rujdlzdbk.gf",
+                status: true,
+                createTime: "1987-11-29 21:47:37",
+                id: 640000197005230500,
+              },
+              {
+                username: "Jennifer Smith",
+                roles: "editor",
+                phone: "18145245413",
+                email: "j.jqx@xjxqx.jp",
+                status: true,
+                createTime: "1991-04-01 05:16:52",
+                id: 640000197005230000,
+              },
+            ];
+            resolve({
+              result: list.slice((currentPage - 1) * pageSize, currentPage * pageSize),
+              total: list.length,
+            });
+          }, 500);
+        });
+      },
+    },
+  },
+});
+const gridEvents: VxeGridListeners<RowMeta> = {
+  // 只对 form-config 配置时有效，表单重置时会触发该事件
+  formReset() {
+    console.log("Form Reset");
+  },
+};
+// #endregion
+
+// #region vxe-modal
+const xModal = ref<VxeModalInstance>();
+const modalOptions = reactive<VxeModalProps>({
+  // 窗口的标题
+  title: "",
+  // 是否允许点击遮罩层关闭窗口
+  maskClosable: true,
+  // 是否允许按 Esc 键关闭窗口
+  escClosable: true,
+  // 在窗口隐藏之前执行
+  beforeHideMethod: () => {
+    xForm.value?.clearValidate();
+    return Promise.resolve();
+  },
+});
+// #endregion
+
+// #region vxe-form
+const xForm = ref<VxeFormInstance>();
+const formOptions = reactive<VxeFormProps>({
+  // 所有项的栅格占据的列数
+  span: 24,
+  // 所有项的标题宽度
+  titleWidth: 100,
+  // 表单数据
+  data: {
+    username: "",
+    password: "",
+  },
+  // 项列表
+  items: [
+    {
+      field: "username",
+      title: "用户名",
+      itemRender: {
+        name: "VxeInput",
+        props: {
+          placeholder: "请输入",
+        },
+      },
+    },
+    {
+      field: "password",
+      title: "密码",
+      itemRender: {
+        name: "VxeInput",
+        props: {
+          placeholder: "请输入",
+        },
+      },
+    },
+    {
+      align: "right",
+      itemRender: {
+        name: "$buttons",
+        children: [
+          {
+            props: {
+              content: "取消",
+            },
+            events: {
+              click: () => xModal.value?.close(),
+            },
+          },
+          {
+            props: {
+              type: "submit",
+              content: "确定",
+              status: "primary",
+            },
+            events: {
+              click: () => curd.onSubmitForm(),
+            },
+          },
+        ],
+      },
+    },
+  ],
+  /** 校验规则 */
+  rules: {
+    username: [
+      {
+        required: true,
+        validator: ({ itemValue }) => {
+          switch (true) {
+            case !itemValue:
+              return new Error("请输入");
+            case !itemValue.trim():
+              return new Error("空格无效");
+          }
+        },
+      },
+    ],
+    password: [
+      {
+        required: true,
+        validator: ({ itemValue }) => {
+          switch (true) {
+            case !itemValue:
+              return new Error("请输入");
+            case !itemValue.trim():
+              return new Error("空格无效");
+          }
+        },
+      },
+    ],
+  },
+});
+// #endregion
+
+const curd = {
+  commitQuery: () => xGrid.value?.commitProxy("query"),
+  onShowModal: (row?: RowMeta) => {
+    if (row) {
+      modalOptions.title = "修改用户";
+    } else {
+      modalOptions.title = "新增用户";
+    }
+    xModal.value?.open();
+  },
+  /** 确定并保存 */
+  onSubmitForm: () => {
+    console.log("提交表单");
+  },
+  onDelete: (row?: RowMeta) => {
+    let ids = [];
+    if (row === undefined) {
+      // 获取当前已选中的行数据
+      const selected = xGrid.value?.getCheckboxRecords();
+      if (!selected || selected.length === 0) {
+        VXETable.modal.message({
+          content: "请至少选择一条数据",
+          status: "warning",
+        });
+        return;
+      }
+      ids = selected.map((item) => item.id);
+    } else {
+      ids = [row.id];
+    }
+    VXETable.modal.confirm("确定要删除吗？").then((type) => {
+      if (type === "confirm") {
+        // 执行删除操作
+        console.log("删除的ID：", ids);
+      }
+    });
+  },
+};
+</script>
+
+<style scoped></style>

From 7abfa0ec4bc1a992f2cb6cd1723c9b49d288fc0c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 11 Jun 2025 23:44:31 +0800
Subject: [PATCH 416/497] =?UTF-8?q?fix:=20:bug:=20=E8=A7=A3=E5=86=B3WebSoc?=
 =?UTF-8?q?ket=E6=A8=A1=E5=9D=97=E5=AF=BC=E5=85=A5=E5=86=B2=E7=AA=81?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/websocket.ts        | 26 +-------------------------
 src/store/modules/user.store.ts | 12 +++---------
 2 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index b843aa12..692d457a 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,7 +1,6 @@
 import { useDictSync } from "@/composables/useDictSync";
 import { Auth } from "@/utils/auth";
-import { useUserStore } from "@/store";
-import { watch } from "vue";
+// 不直接导入 store 或 userStore
 
 // 全局 WebSocket 实例管理
 const websocketInstances = new Map<string, any>();
@@ -73,9 +72,6 @@ export function setupWebSocket() {
       // 在窗口关闭前断开WebSocket连接
       window.addEventListener("beforeunload", handleWindowClose);
 
-      // 监听用户注销事件
-      watchUserLogout();
-
       console.log("[WebSocketPlugin] WebSocket服务初始化完成");
       isInitialized = true;
     }, 1000); // 延迟1秒初始化
@@ -92,26 +88,6 @@ function handleWindowClose() {
   cleanupWebSocket();
 }
 
-/**
- * 监听用户注销
- */
-function watchUserLogout() {
-  const userStore = useUserStore();
-
-  // 监听用户信息变化，当用户信息被清空时断开连接
-  watch(
-    () => userStore.userInfo,
-    (newUserInfo, oldUserInfo) => {
-      // 从有用户信息变为无用户信息，说明用户注销了
-      if (oldUserInfo?.username && !newUserInfo?.username) {
-        console.log("[WebSocketPlugin] 检测到用户注销，断开WebSocket连接");
-        cleanupWebSocket();
-      }
-    },
-    { deep: true }
-  );
-}
-
 /**
  * 清理WebSocket连接
  */
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 8a0b1235..899897f6 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -7,6 +7,7 @@ import { Auth } from "@/utils/auth";
 import { usePermissionStoreHook } from "@/store/modules/permission.store";
 import { useDictStoreHook } from "@/store/modules/dict.store";
 import { useTagsViewStore } from "@/store";
+import { cleanupWebSocket } from "@/plugins/websocket";
 
 export const useUserStore = defineStore("user", () => {
   const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
@@ -91,15 +92,8 @@ export const useUserStore = defineStore("user", () => {
     useTagsViewStore().delAllViews();
 
     // 3. 清理 WebSocket 连接
-    // 动态导入避免循环依赖
-    import("@/plugins/websocket")
-      .then(({ cleanupWebSocket }) => {
-        cleanupWebSocket();
-        console.log("[UserStore] WebSocket connections cleaned up");
-      })
-      .catch((error) => {
-        console.error("[UserStore] Failed to cleanup WebSocket:", error);
-      });
+    cleanupWebSocket();
+    console.log("[UserStore] WebSocket connections cleaned up");
 
     return Promise.resolve();
   }

From 39ef1c82f1470cec871d7981912136753f5434b3 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 13 Jun 2025 17:33:37 +0800
Subject: [PATCH 417/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/BasicMenu.vue | 75 +++++++++++++----------
 1 file changed, 41 insertions(+), 34 deletions(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 494ee958..378f0161 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -4,21 +4,9 @@
     ref="menuRef"
     :default-active="activeMenuIndex"
     :collapse="!appStore.sidebar.opened"
-    :background-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-background']
-        : undefined
-    "
-    :text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-text']
-        : undefined
-    "
-    :active-text-color="
-      theme === 'dark' || sidebarColorScheme === SidebarColor.CLASSIC_BLUE
-        ? variables['menu-active-text']
-        : undefined
-    "
+    :background-color="menuThemeProps.backgroundColor"
+    :text-color="menuThemeProps.textColor"
+    :active-text-color="menuThemeProps.activeTextColor"
     :popper-effect="theme"
     :unique-opened="false"
     :collapse-transition="false"
@@ -78,6 +66,18 @@ const theme = computed(() => settingsStore.theme);
 // 获取浅色主题下的侧边栏配色方案
 const sidebarColorScheme = computed(() => settingsStore.sidebarColorScheme);
 
+// 菜单主题属性
+const menuThemeProps = computed(() => {
+  const isDarkOrClassicBlue =
+    theme.value === "dark" || sidebarColorScheme.value === SidebarColor.CLASSIC_BLUE;
+
+  return {
+    backgroundColor: isDarkOrClassicBlue ? variables["menu-background"] : undefined,
+    textColor: isDarkOrClassicBlue ? variables["menu-text"] : undefined,
+    activeTextColor: isDarkOrClassicBlue ? variables["menu-active-text"] : undefined,
+  };
+});
+
 // 计算当前激活的菜单项
 const activeMenuIndex = computed(() => {
   const currentPath = currentRoute.path;
@@ -228,34 +228,41 @@ watch(
 function updateParentMenuStyles() {
   if (!menuRef.value?.$el) return;
 
-  const menuEl = menuRef.value.$el as HTMLElement;
+  // 使用 nextTick 确保 DOM 已更新
+  nextTick(() => {
+    try {
+      const menuEl = menuRef.value?.$el as HTMLElement;
+      if (!menuEl) return;
 
-  // 移除所有现有的 has-active-child 类
-  const allSubMenus = menuEl.querySelectorAll(".el-sub-menu");
-  allSubMenus.forEach((subMenu) => {
-    subMenu.classList.remove("has-active-child");
-  });
+      // 移除所有现有的 has-active-child 类
+      const allSubMenus = menuEl.querySelectorAll(".el-sub-menu");
+      allSubMenus.forEach((subMenu) => {
+        subMenu.classList.remove("has-active-child");
+      });
 
-  // 查找当前激活的菜单项
-  const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
-  if (activeMenuItem) {
-    // 向上查找父级 el-sub-menu 元素
-    let parent = activeMenuItem.parentElement;
-    while (parent && parent !== menuEl) {
-      if (parent.classList.contains("el-sub-menu")) {
-        parent.classList.add("has-active-child");
+      // 查找当前激活的菜单项
+      const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
+      if (activeMenuItem) {
+        // 向上查找父级 el-sub-menu 元素
+        let parent = activeMenuItem.parentElement;
+        while (parent && parent !== menuEl) {
+          if (parent.classList.contains("el-sub-menu")) {
+            parent.classList.add("has-active-child");
+          }
+          parent = parent.parentElement;
+        }
       }
-      parent = parent.parentElement;
+    } catch (error) {
+      console.error("Error updating parent menu styles:", error);
     }
-  }
+  });
 }
 
 /**
  * 组件挂载后立即更新父菜单样式
  */
 onMounted(() => {
-  nextTick(() => {
-    updateParentMenuStyles();
-  });
+  // 确保在组件挂载后更新样式，不依赖于异步操作
+  updateParentMenuStyles();
 });
 </script>

From 7ea90f8276433857fb9a786a822b3993ed1a40d1 Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Tue, 17 Jun 2025 16:42:18 +0800
Subject: [PATCH 418/497] =?UTF-8?q?feat:=20:sparkles:=20=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=A0=B9=E6=8D=AE=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=86=85=E5=AE=B9=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

页面标题根据配置文件内容设置
---
 .env.development   | 3 ++-
 .env.production    | 4 ++--
 index.html         | 2 +-
 src/types/env.d.ts | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.env.development b/.env.development
index 55b854a1..8dbca7fd 100644
--- a/.env.development
+++ b/.env.development
@@ -1,6 +1,7 @@
 # 应用端口
 VITE_APP_PORT=3000
-
+# 项目名称
+VITE_APP_TITLE=vue3-element-admin
 # 代理前缀
 VITE_APP_BASE_API=/dev-api
 
diff --git a/.env.production b/.env.production
index 17729b65..cf3bf9a2 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
 # 代理前缀
 VITE_APP_BASE_API = '/prod-api'
-
-
+# 项目名称
+VITE_APP_TITLE=vue3-element-admin
 # WebSocket端点(可选)
 #VITE_APP_WS_ENDPOINT=wss://api.youlai.tech/ws 
diff --git a/index.html b/index.html
index 1c086a72..b20eb78e 100644
--- a/index.html
+++ b/index.html
@@ -9,7 +9,7 @@
       name="keywords"
       content="vue,element-plus,typescript,vue-element-admin,vue3-element-admin"
     />
-    <title>vue3-element-admin</title>
+    <title>%VITE_APP_TITLE%</title>
   </head>
 
   <body>
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index 301f03ea..1342f61e 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -4,6 +4,8 @@
 interface ImportMetaEnv {
   /** 应用端口 */
   VITE_APP_PORT: number;
+  /** 应用名称 */
+  VITE_APP_NAME: string;
   /** API 基础路径(代理前缀) */
   VITE_APP_BASE_API: string;
   /** API 地址 */

From a4c67fe576a4e9a7f78c22dd6053466ef5f33261 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 18 Jun 2025 16:21:34 +0800
Subject: [PATCH 419/497] =?UTF-8?q?fix:=20:bug:=20=E6=B7=B7=E5=90=88?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E4=B8=A2?=
 =?UTF-8?q?=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

closed #ICEVSD
---
 src/composables/useStomp.ts                |  4 +-
 src/layouts/components/Menu/MixTopMenu.vue | 77 +++++---------------
 src/layouts/components/Settings/index.vue  | 45 +-----------
 src/layouts/components/TagsView/index.vue  | 82 ++--------------------
 src/layouts/composables/useLayoutMenu.ts   | 18 -----
 src/layouts/views/LeftLayout.vue           |  6 +-
 src/layouts/views/MixLayout.vue            |  2 -
 src/plugins/permission.ts                  | 20 +-----
 src/store/modules/permission.store.ts      |  3 -
 src/views/dashboard/index.vue              |  5 +-
 10 files changed, 31 insertions(+), 231 deletions(-)

diff --git a/src/composables/useStomp.ts b/src/composables/useStomp.ts
index c2b8912b..c1c0b390 100644
--- a/src/composables/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -65,7 +65,7 @@ export function useStomp(options: UseStompOptions = {}) {
 
     // 检查WebSocket端点是否配置
     if (!brokerURL.value) {
-      console.error("WebSocket连接失败: 未配置WebSocket端点URL");
+      console.warn("WebSocket连接失败: 未配置WebSocket端点URL");
       return;
     }
 
@@ -74,7 +74,7 @@ export function useStomp(options: UseStompOptions = {}) {
 
     // 检查令牌是否为空，如果为空则不进行连接
     if (!currentToken) {
-      console.error("WebSocket连接失败：授权令牌为空，请先登录");
+      console.warn("WebSocket连接失败：授权令牌为空，请先登录");
       return;
     }
 
diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index 96b9eb00..4d40730c 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -85,47 +85,15 @@ const processedTopMenus = computed(() => {
   });
 });
 
-const route = useRoute();
-
-// 获取当前路由路径的顶部菜单路径
-const getActiveTopMenuPath = () => {
-  const pathSegments = route.path.split("/").filter(Boolean);
-  return pathSegments.length > 0 ? `/${pathSegments[0]}` : "/";
-};
-
-// 监听路由变化，更新活跃的顶部菜单
-watch(
-  () => route.path,
-  () => {
-    const newActiveTopMenuPath = getActiveTopMenuPath();
-    if (newActiveTopMenuPath !== appStore.activeTopMenuPath) {
-      appStore.activeTopMenu(newActiveTopMenuPath);
-    }
-  },
-  { immediate: true }
-);
-
 /**
  * 处理菜单点击事件，切换顶部菜单并加载对应的左侧菜单
  * @param routePath 点击的菜单路径
  */
 const handleMenuSelect = (routePath: string) => {
   appStore.activeTopMenu(routePath); // 设置激活的顶部菜单
-  activateFirstLevelMenu(routePath); // 激活一级菜单并设置左侧二级菜单
-};
-
-/**
- * 激活一级菜单并设置左侧二级菜单
- * @param routePath 点击的菜单路径
- */
-function activateFirstLevelMenu(routePath: string) {
   permissionStore.updateSideMenu(routePath); // 更新左侧菜单
-
-  // 使用 nextTick 确保侧边菜单更新完成后再跳转
-  nextTick(() => {
-    navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
-  });
-}
+  navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+};
 
 /**
  * 跳转到左侧第一个可访问的菜单
@@ -134,43 +102,34 @@ function activateFirstLevelMenu(routePath: string) {
 const navigateToFirstLeftMenu = (menus: RouteRecordRaw[]) => {
   if (menus.length === 0) return;
 
-  // 查找第一个可访问的菜单项
-  const findFirstAccessibleRoute = (routes: RouteRecordRaw[]): RouteRecordRaw | null => {
-    for (const route of routes) {
-      // 跳过隐藏的菜单项
-      if (route.meta?.hidden) continue;
-
-      // 如果有子菜单，递归查找
-      if (route.children && route.children.length > 0) {
-        const childRoute = findFirstAccessibleRoute(route.children);
-        if (childRoute) return childRoute;
-      } else if (route.name && route.path) {
-        // 找到第一个有名称和路径的菜单项
-        return route;
-      }
-    }
-    return null;
-  };
-
-  const firstRoute = findFirstAccessibleRoute(menus);
+  const [firstMenu] = menus;
 
-  if (firstRoute && firstRoute.name) {
-    console.log("🎯 Navigating to first menu:", firstRoute.name, firstRoute.path);
+  // 如果第一个菜单有子菜单，递归跳转到第一个子菜单
+  if (firstMenu.children && firstMenu.children.length > 0) {
+    navigateToFirstLeftMenu(firstMenu.children as RouteRecordRaw[]);
+  } else if (firstMenu.name) {
     router.push({
-      name: firstRoute.name,
+      name: firstMenu.name,
       query:
-        typeof firstRoute.meta?.params === "object"
-          ? (firstRoute.meta.params as LocationQueryRaw)
+        typeof firstMenu.meta?.params === "object"
+          ? (firstMenu.meta.params as LocationQueryRaw)
           : undefined,
     });
   }
 };
 
-// 当前激活的顶部菜单路径
+// 获取当前路由路径的顶部菜单路径
 const activeTopMenuPath = computed(() => appStore.activeTopMenuPath);
 
 onMounted(() => {
   topMenus.value = permissionStore.routes.filter((item) => !item.meta || !item.meta.hidden);
+  // 初始化顶部菜单
+  const currentTopMenuPath =
+    useRoute().path.split("/").filter(Boolean).length > 1
+      ? useRoute().path.match(/^\/[^/]+/)?.[0] || "/"
+      : "/";
+  appStore.activeTopMenu(currentTopMenuPath); // 设置激活的顶部菜单
+  permissionStore.updateSideMenu(currentTopMenuPath); // 更新左侧菜单
 });
 </script>
 
diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 121ac8a0..2ebb6bb5 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -149,7 +149,7 @@ import { DocumentCopy, RefreshLeft, Check } from "@element-plus/icons-vue";
 
 const { t } = useI18n();
 import { LayoutMode, SidebarColor, ThemeMode } from "@/enums";
-import { useSettingsStore, usePermissionStore, useAppStore } from "@/store";
+import { useSettingsStore } from "@/store";
 import { themeColorPresets } from "@/settings";
 
 // 按钮图标
@@ -176,10 +176,7 @@ const layoutOptions: LayoutOption[] = [
 // 使用统一的颜色预设配置
 const colorPresets = themeColorPresets;
 
-const route = useRoute();
-const appStore = useAppStore();
 const settingsStore = useSettingsStore();
-const permissionStore = usePermissionStore();
 
 const isDark = ref<boolean>(settingsStore.theme === ThemeMode.DARK);
 const sidebarColor = ref(settingsStore.sidebarColorScheme);
@@ -221,13 +218,6 @@ const handleLayoutChange = (layout: LayoutMode) => {
   if (settingsStore.layout === layout) return;
 
   settingsStore.updateLayout(layout);
-
-  if (layout === LayoutMode.MIX && route.name) {
-    const topLevelRoute = findTopLevelRoute(permissionStore.routes, route.name as string);
-    if (appStore.activeTopMenuPath !== topLevelRoute.path) {
-      appStore.activeTopMenu(topLevelRoute.path);
-    }
-  }
 };
 
 /**
@@ -313,39 +303,6 @@ const generateSettingsCode = (): string => {
 };`;
 };
 
-/**
- * 查找路由的顶层父路由
- *
- * @param tree 树形数据
- * @param findName 查找的名称
- */
-function findTopLevelRoute(tree: any[], findName: string) {
-  const parentMap: any = {};
-
-  function buildParentMap(node: any, parent: any) {
-    parentMap[node.name] = parent;
-
-    if (node.children) {
-      for (let i = 0; i < node.children.length; i++) {
-        buildParentMap(node.children[i], node);
-      }
-    }
-  }
-
-  for (let i = 0; i < tree.length; i++) {
-    buildParentMap(tree[i], null);
-  }
-
-  let currentNode = parentMap[findName];
-  while (currentNode) {
-    if (!parentMap[currentNode.name]) {
-      return currentNode;
-    }
-    currentNode = parentMap[currentNode.name];
-  }
-  return null;
-}
-
 /**
  * 关闭抽屉前的回调
  */
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 7aca352e..8e5cf1af 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -58,16 +58,15 @@
 import { useRoute, useRouter, type RouteRecordRaw } from "vue-router";
 import { resolve } from "path-browserify";
 import { translateRouteTitle } from "@/utils/i18n";
-import { usePermissionStore, useTagsViewStore, useSettingsStore, useAppStore } from "@/store";
+import { usePermissionStore, useTagsViewStore, useSettingsStore } from "@/store";
+import { LayoutMode } from "@/enums";
 
-// ========================= 类型定义 =========================
 interface ContextMenu {
   visible: boolean;
   x: number;
   y: number;
 }
 
-// ========================= 组合式 API =========================
 const instance = getCurrentInstance();
 const proxy = instance?.proxy;
 const router = useRouter();
@@ -77,9 +76,7 @@ const route = useRoute();
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
 const settingsStore = useSettingsStore();
-const appStore = useAppStore();
 
-// ========================= 响应式数据 =========================
 const { visitedViews } = storeToRefs(tagsViewStore);
 const layout = computed(() => settingsStore.layout);
 
@@ -96,7 +93,6 @@ const contextMenu = reactive<ContextMenu>({
 // 滚动条引用
 const scrollbarRef = ref();
 
-// ========================= 计算属性 =========================
 // 路由映射缓存，提升查找性能
 const routePathMap = computed(() => {
   const map = new Map<string, TagView>();
@@ -121,7 +117,6 @@ const isLastView = computed(() => {
   return selectedTag.value.fullPath === visitedViews.value[visitedViews.value.length - 1]?.fullPath;
 });
 
-// ========================= 核心函数 =========================
 /**
  * 递归提取固定标签
  */
@@ -155,45 +150,6 @@ const extractAffixTags = (routes: RouteRecordRaw[], basePath = "/"): TagView[] =
   return affixTags;
 };
 
-/**
- * 查找路由的顶级父节点
- */
-const findTopLevelParent = (
-  routes: RouteRecordRaw[],
-  targetName: string
-): RouteRecordRaw | null => {
-  // 构建父子关系映射
-  const parentMap = new Map<string, RouteRecordRaw>();
-
-  const buildMap = (routeList: RouteRecordRaw[], parent: RouteRecordRaw | null = null) => {
-    routeList.forEach((route) => {
-      if (parent) {
-        parentMap.set(route.name as string, parent);
-      }
-
-      if (route.children?.length) {
-        buildMap(route.children, route);
-      }
-    });
-  };
-
-  buildMap(routes);
-
-  // 向上查找顶级父节点
-  let current = parentMap.get(targetName);
-  let topLevel = current;
-
-  while (current) {
-    const parent = parentMap.get(current.name as string);
-    if (!parent) break;
-    topLevel = current;
-    current = parent;
-  }
-
-  return topLevel || null;
-};
-
-// ========================= 标签操作 =========================
 /**
  * 初始化固定标签
  */
@@ -225,7 +181,7 @@ const addCurrentTag = () => {
 };
 
 /**
- * 更新当前标签（优化版本）
+ * 更新当前标签
  */
 const updateCurrentTag = () => {
   nextTick(() => {
@@ -245,7 +201,6 @@ const updateCurrentTag = () => {
   });
 };
 
-// ========================= 事件处理 =========================
 /**
  * 处理中键点击
  */
@@ -270,7 +225,8 @@ const openContextMenu = (tag: TagView, event: MouseEvent) => {
   const leftPosition = event.clientX - offsetLeft + MENU_MARGIN;
 
   contextMenu.x = Math.min(leftPosition, maxLeft);
-  contextMenu.y = layout.value === "mix" ? event.clientY - 50 : event.clientY;
+  // 混合模式下，需要减去顶部菜单(fixed)的高度
+  contextMenu.y = layout.value === LayoutMode.MIX ? event.clientY - 50 : event.clientY;
   contextMenu.visible = true;
 
   selectedTag.value = tag;
@@ -301,7 +257,6 @@ const handleScroll = (event: WheelEvent) => {
   scrollbarRef.value.setScrollLeft(newScrollLeft);
 };
 
-// ========================= 标签管理 =========================
 /**
  * 刷新标签
  */
@@ -378,20 +333,7 @@ const closeAllTags = (tag: TagView | null) => {
   });
 };
 
-// ========================= 混合布局处理 =========================
-/**
- * 更新顶部菜单激活状态（混合布局）
- */
-const updateTopMenuActive = (routeName: string) => {
-  if (layout.value !== "mix") return;
-
-  const topParent = findTopLevelParent(permissionStore.routes, routeName);
-  if (topParent && appStore.activeTopMenuPath !== topParent.path) {
-    appStore.activeTopMenu(topParent.path);
-  }
-};
-
-// ========================= 组合式函数：右键菜单管理 =========================
+// 右键菜单管理
 const useContextMenuManager = () => {
   const handleOutsideClick = () => {
     closeContextMenu();
@@ -411,7 +353,6 @@ const useContextMenuManager = () => {
   });
 };
 
-// ========================= 监听器和生命周期 =========================
 // 监听路由变化
 watch(
   route,
@@ -422,17 +363,6 @@ watch(
   { immediate: true }
 );
 
-// 监听路由名变化（混合布局）
-watch(
-  () => route.name,
-  (newRouteName) => {
-    if (newRouteName) {
-      updateTopMenuActive(newRouteName as string);
-    }
-  },
-  { deep: true }
-);
-
 // 初始化
 onMounted(() => {
   initAffixTags();
diff --git a/src/layouts/composables/useLayoutMenu.ts b/src/layouts/composables/useLayoutMenu.ts
index 68d35e9a..850c707c 100644
--- a/src/layouts/composables/useLayoutMenu.ts
+++ b/src/layouts/composables/useLayoutMenu.ts
@@ -31,28 +31,10 @@ export function useLayoutMenu() {
     return path;
   });
 
-  // 监听顶部菜单路径变化，更新侧边菜单
-  watch(
-    () => activeTopMenuPath.value,
-    (newPath) => {
-      permissionStore.updateSideMenu(newPath);
-    },
-    { immediate: true }
-  );
-
-  /**
-   * 处理顶部菜单点击
-   * @param path 菜单路径
-   */
-  function handleTopMenuClick(path: string) {
-    appStore.activeTopMenu(path);
-  }
-
   return {
     routes,
     sideMenuRoutes,
     activeMenu,
     activeTopMenuPath,
-    handleTopMenuClick,
   };
 }
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/views/LeftLayout.vue
index b4ada9cb..aa62b317 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/views/LeftLayout.vue
@@ -38,14 +38,10 @@ import AppMain from "../components/AppMain/index.vue";
 import BasicMenu from "../components/Menu/BasicMenu.vue";
 
 // 布局相关参数
-const { isShowTagsView, isShowLogo, isSidebarOpen, isMobile } = useLayout();
+const { isShowTagsView, isShowLogo, isSidebarOpen } = useLayout();
 
 // 菜单相关
 const { routes } = useLayoutMenu();
-
-// 添加调试日志
-console.log("🔍 LeftLayout - isSidebarOpen:", isSidebarOpen.value);
-console.log("🔍 LeftLayout - isMobile:", isMobile.value);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 04d85bc9..27952b9c 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -108,8 +108,6 @@ function resolvePath(routePath: string) {
   // 否则拼接
   return `${activeTopMenuPath.value}/${routePath}`;
 }
-
-console.log("🎨 MixLayout rendered");
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 3fb045ae..361d0bb1 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -14,16 +14,12 @@ export function setupPermission() {
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
-    console.log("🚀 Route guard triggered:", { to: to.path, from: from.path });
 
     const isLoggedIn = Auth.isLoggedIn();
 
     if (isLoggedIn) {
-      console.log("✅ User is logged in");
-
       // 如果已登录但访问登录页，重定向到首页
       if (to.path === "/login") {
-        console.log("🔄 Redirecting from login to home");
         next({ path: "/" });
         return;
       }
@@ -44,8 +40,7 @@ export function setupPermission() {
   });
 
   // 后置守卫，确保进度条关闭
-  router.afterEach((to, from) => {
-    console.log("✅ Route navigation completed:", { to: to.path, from: from.path });
+  router.afterEach(() => {
     NProgress.done();
   });
 }
@@ -64,14 +59,11 @@ async function handleAuthenticatedUser(
   try {
     // 检查用户信息是否存在
     if (!userStore.userInfo.username) {
-      console.log("🔄 User info not found, fetching...");
       await userStore.getUserInfo();
     }
 
     // 检查路由是否已生成
     if (!permissionStore.routesLoaded) {
-      console.log("🔄 Routes not loaded, generating...");
-
       // 防止重复生成路由
       if (isGeneratingRoutes) {
         console.log("⏳ Routes already generating, waiting...");
@@ -82,14 +74,12 @@ async function handleAuthenticatedUser(
       }
 
       // 路由生成完成后，重新导航到目标路由
-      console.log("🔄 Routes generated, redirecting to:", to.path);
       next({ ...to, replace: true });
       return;
     }
 
     // 路由已加载，检查路由是否存在
     if (to.matched.length === 0) {
-      console.log("❌ Route not found, redirecting to 404");
       next("/404");
       return;
     }
@@ -100,7 +90,6 @@ async function handleAuthenticatedUser(
       to.meta.title = title;
     }
 
-    console.log("✅ Route access granted:", to.path);
     next();
   } catch (error) {
     console.error("❌ Route guard error:", error);
@@ -117,15 +106,12 @@ async function generateAndAddRoutes(permissionStore: any) {
   isGeneratingRoutes = true;
 
   try {
-    console.log("🔧 Generating dynamic routes...");
     const dynamicRoutes = await permissionStore.generateRoutes();
 
     // 添加路由到路由器
     dynamicRoutes.forEach((route: RouteRecordRaw) => {
       router.addRoute(route);
     });
-
-    console.log("✅ All dynamic routes generated and added");
   } finally {
     isGeneratingRoutes = false;
   }
@@ -141,12 +127,11 @@ async function waitForRoutesGeneration(permissionStore: any): Promise<void> {
         clearInterval(checkInterval);
         resolve();
       }
-    }, 50); // 每50ms检查一次
+    }, 50);
 
     // 超时保护，最多等待5秒
     setTimeout(() => {
       clearInterval(checkInterval);
-      console.warn("⚠️ Routes generation timeout");
       resolve();
     }, 5000);
   });
@@ -176,7 +161,6 @@ function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext)
   const queryString = params.toString();
   const redirect = queryString ? `${to.path}?${queryString}` : to.path;
 
-  console.log("🔄 Redirecting to login with redirect:", redirect);
   next(`/login?redirect=${encodeURIComponent(redirect)}`);
 }
 
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index ffc549f9..920adc25 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -22,8 +22,6 @@ export const usePermissionStore = defineStore("permission", () => {
    */
   function generateRoutes() {
     return new Promise<RouteRecordRaw[]>((resolve, reject) => {
-      console.log("🔧 Starting to generate routes...");
-
       MenuAPI.getRoutes()
         .then((data) => {
           const dynamicRoutes = parseDynamicRoutes(data);
@@ -31,7 +29,6 @@ export const usePermissionStore = defineStore("permission", () => {
           routes.value = [...constantRoutes, ...dynamicRoutes];
           routesLoaded.value = true;
 
-          console.log("✅ Routes generation completed successfully");
           resolve(dynamicRoutes);
         })
         .catch((error) => {
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 84bdc16f..c0677175 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -525,8 +525,6 @@ const fetchVisitTrendData = () => {
  * @param data - 访问趋势数据
  */
 const updateVisitTrendChartOptions = (data: VisitTrendVO) => {
-  console.log("Updating visit trend chart options");
-
   visitTrendChartOptions.value = {
     tooltip: {
       trigger: "axis",
@@ -610,8 +608,7 @@ const computeGrowthRateClass = (growthRate?: number): string => {
 // 监听访问趋势日期范围的变化，重新获取趋势数据
 watch(
   () => visitTrendDateRange.value,
-  (newVal) => {
-    console.log("Visit trend date range changed:", newVal);
+  () => {
     fetchVisitTrendData();
   },
   { immediate: true }

From 557acc9f92853d1aa2dd1b4bac1d4fecb83ee306 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 18 Jun 2025 17:29:42 +0800
Subject: [PATCH 420/497] =?UTF-8?q?fix:=20:bug:=20=E6=B7=B7=E5=90=88?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E9=A1=B5=E7=AD=BE=E5=92=8C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=81=94=E5=8A=A8=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/BasicMenu.vue  | 96 ++++++----------------
 src/layouts/components/Menu/MixTopMenu.vue | 37 ++++++++-
 src/layouts/views/MixLayout.vue            | 47 ++++++++++-
 3 files changed, 100 insertions(+), 80 deletions(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 378f0161..2bffc339 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -2,7 +2,7 @@
 <template>
   <el-menu
     ref="menuRef"
-    :default-active="activeMenuIndex"
+    :default-active="activeMenuPath"
     :collapse="!appStore.sidebar.opened"
     :background-color="menuThemeProps.backgroundColor"
     :text-color="menuThemeProps.textColor"
@@ -79,80 +79,16 @@ const menuThemeProps = computed(() => {
 });
 
 // 计算当前激活的菜单项
-const activeMenuIndex = computed(() => {
-  const currentPath = currentRoute.path;
+const activeMenuPath = computed((): string => {
+  const { meta, path } = currentRoute;
 
-  // 如果路由设置了 activeMenu，优先使用
-  if (currentRoute.meta?.activeMenu) {
-    return currentRoute.meta.activeMenu as string;
+  // 如果路由meta中设置了activeMenu，则使用它（用于处理一些特殊情况，如详情页）
+  if (meta?.activeMenu && typeof meta.activeMenu === "string") {
+    return meta.activeMenu;
   }
 
-  // 在水平模式下（顶部布局），需要找到匹配的顶级菜单
-  if (props.menuMode === "horizontal") {
-    // 首先尝试简单的路径前缀匹配
-    const pathSegments = currentPath.split("/").filter(Boolean);
-    if (pathSegments.length > 0) {
-      const topLevelPath = `/${pathSegments[0]}`;
-
-      // 检查是否有菜单项匹配这个顶级路径
-      const matchingMenu = props.data.find((menu) => {
-        const menuPath = resolveFullPath(menu.path);
-        return menuPath === topLevelPath;
-      });
-
-      if (matchingMenu) {
-        console.log("🎯 Top menu matched:", topLevelPath, "for route:", currentPath);
-        return topLevelPath;
-      }
-    }
-
-    // 如果简单匹配失败，使用详细匹配
-    const findMatchingTopMenu = (menus: RouteRecordRaw[], targetPath: string): string | null => {
-      for (const menu of menus) {
-        const menuPath = resolveFullPath(menu.path);
-
-        // 精确匹配
-        if (targetPath === menuPath) {
-          return menuPath;
-        }
-
-        // 路径前缀匹配（子路径匹配父菜单）
-        if (targetPath.startsWith(menuPath + "/")) {
-          return menuPath;
-        }
-
-        // 如果有子菜单，检查子菜单是否匹配
-        if (menu.children && menu.children.length > 0) {
-          const hasMatchingChild = menu.children.some((child) => {
-            // 对于子菜单，需要正确解析路径
-            let childPath;
-            if (child.path.startsWith("/")) {
-              // 如果子路径是绝对路径，直接使用
-              childPath = child.path;
-            } else {
-              // 如果是相对路径，基于父菜单路径解析
-              childPath = path.resolve(menuPath, child.path);
-            }
-            return targetPath === childPath || targetPath.startsWith(childPath + "/");
-          });
-
-          if (hasMatchingChild) {
-            return menuPath;
-          }
-        }
-      }
-      return null;
-    };
-
-    const matchedMenu = findMatchingTopMenu(props.data, currentPath);
-    if (matchedMenu) {
-      console.log("🎯 Detailed menu matched:", matchedMenu, "for route:", currentPath);
-      return matchedMenu;
-    }
-  }
-
-  // 默认返回当前路径
-  return currentPath;
+  // 否则使用当前路由路径
+  return path;
 });
 
 /**
@@ -213,7 +149,7 @@ watch(
  * 监听激活菜单变化，为包含激活子菜单的父菜单添加样式类
  */
 watch(
-  () => activeMenuIndex.value,
+  () => activeMenuPath.value,
   () => {
     nextTick(() => {
       updateParentMenuStyles();
@@ -222,6 +158,20 @@ watch(
   { immediate: true }
 );
 
+/**
+ * 监听路由变化，确保菜单能随TagsView切换而正确激活
+ */
+watch(
+  () => currentRoute.path,
+  (newPath) => {
+    console.log("🔍 Route changed in BasicMenu:", newPath);
+
+    nextTick(() => {
+      updateParentMenuStyles();
+    });
+  }
+);
+
 /**
  * 更新父菜单样式 - 为包含激活子菜单的父菜单添加 has-active-child 类
  */
diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index 4d40730c..0709f53b 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -90,9 +90,25 @@ const processedTopMenus = computed(() => {
  * @param routePath 点击的菜单路径
  */
 const handleMenuSelect = (routePath: string) => {
-  appStore.activeTopMenu(routePath); // 设置激活的顶部菜单
-  permissionStore.updateSideMenu(routePath); // 更新左侧菜单
-  navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+  updateMenuState(routePath);
+};
+
+/**
+ * 更新菜单状态 - 同时处理点击和路由变化情况
+ * @param topMenuPath 顶级菜单路径
+ * @param skipNavigation 是否跳过导航（路由变化时为true，点击菜单时为false）
+ */
+const updateMenuState = (topMenuPath: string, skipNavigation = false) => {
+  // 不相同才更新，避免重复操作
+  if (topMenuPath !== appStore.activeTopMenuPath) {
+    appStore.activeTopMenu(topMenuPath); // 设置激活的顶部菜单
+    permissionStore.updateSideMenu(topMenuPath); // 更新左侧菜单
+  }
+
+  // 如果是点击菜单且状态已变更，才进行导航
+  if (!skipNavigation) {
+    navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+  }
 };
 
 /**
@@ -131,6 +147,21 @@ onMounted(() => {
   appStore.activeTopMenu(currentTopMenuPath); // 设置激活的顶部菜单
   permissionStore.updateSideMenu(currentTopMenuPath); // 更新左侧菜单
 });
+
+// 监听路由变化，同步更新顶部菜单和左侧菜单的激活状态
+watch(
+  () => router.currentRoute.value.path,
+  (newPath) => {
+    if (newPath) {
+      // 提取顶级路径
+      const topMenuPath =
+        newPath.split("/").filter(Boolean).length > 1 ? newPath.match(/^\/[^/]+/)?.[0] || "/" : "/";
+
+      // 使用公共方法更新菜单状态，但跳过导航（因为路由已经变化）
+      updateMenuState(topMenuPath, true);
+    }
+  }
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 27952b9c..5756ec20 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -26,7 +26,7 @@
       <div class="layout__sidebar--left" :class="{ 'layout__sidebar--collapsed': !isSidebarOpen }">
         <el-scrollbar>
           <el-menu
-            :default-active="activeMenu"
+            :default-active="activeLeftMenuPath"
             :collapse="!isSidebarOpen"
             :collapse-transition="false"
             :unique-opened="false"
@@ -71,6 +71,9 @@ import AppMain from "../components/AppMain/index.vue";
 import MenuItem from "../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
+import { isExternal } from "@/utils/index";
+import { computed, watch } from "vue";
+import { useAppStore, usePermissionStore } from "@/store";
 
 const route = useRoute();
 
@@ -87,7 +90,7 @@ const { width } = useWindowSize();
 const isLogoCollapsed = computed(() => width.value < 768);
 
 // 当前激活的菜单
-const activeMenu = computed(() => {
+const activeLeftMenuPath = computed(() => {
   const { meta, path } = route;
   // 如果设置了activeMenu，则使用
   if (meta?.activeMenu && typeof meta.activeMenu === "string") {
@@ -101,13 +104,49 @@ const activeMenu = computed(() => {
  * 所以需要拼接顶级菜单路径
  */
 function resolvePath(routePath: string) {
-  // 如果已经是绝对路径，直接返回
+  if (isExternal(routePath)) {
+    return routePath;
+  }
+
   if (routePath.startsWith("/")) {
     return activeTopMenuPath.value + routePath;
   }
-  // 否则拼接
   return `${activeTopMenuPath.value}/${routePath}`;
 }
+
+// 监听路由变化，确保左侧菜单能随TagsView切换而正确激活
+watch(
+  () => route.path,
+  (newPath) => {
+    console.log("📍 Route changed in MixLayout:", newPath);
+
+    // 获取顶级路径
+    const topMenuPath =
+      newPath.split("/").filter(Boolean).length > 1 ? newPath.match(/^\/[^/]+/)?.[0] || "/" : "/";
+
+    // 如果当前路径属于当前激活的顶部菜单
+    if (newPath.startsWith(activeTopMenuPath.value)) {
+      console.log("📍 Route is under active top menu, ensuring menu item is activated");
+    }
+    // 如果路径改变了顶级菜单，确保顶部菜单和左侧菜单都更新
+    else if (topMenuPath !== activeTopMenuPath.value) {
+      console.log(
+        "📍 Top menu changed, updating active menu from:",
+        activeTopMenuPath.value,
+        "to:",
+        topMenuPath
+      );
+
+      // 主动更新顶部菜单和左侧菜单
+      const appStore = useAppStore();
+      const permissionStore = usePermissionStore();
+
+      appStore.activeTopMenu(topMenuPath);
+      permissionStore.updateSideMenu(topMenuPath);
+    }
+  },
+  { immediate: true }
+);
 </script>
 
 <style lang="scss" scoped>

From 52f1f9c6004944a3999d214cf50af616558b25b4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 18 Jun 2025 17:51:39 +0800
Subject: [PATCH 421/497] =?UTF-8?q?fix:=20:bug:=20=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E5=AD=90=E8=8F=9C=E5=8D=95=E9=80=89=E4=B8=AD?=
 =?UTF-8?q?=E7=88=B6=E8=8A=82=E7=82=B9=E6=B7=BB=E5=8A=A0=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/BasicMenu.vue     | 25 ++++++++++++++++---
 .../components/Menu/components/MenuItem.vue   |  2 +-
 src/layouts/views/TopLayout.vue               | 12 +++++++++
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 2bffc339..c9ddff26 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -163,9 +163,7 @@ watch(
  */
 watch(
   () => currentRoute.path,
-  (newPath) => {
-    console.log("🔍 Route changed in BasicMenu:", newPath);
-
+  () => {
     nextTick(() => {
       updateParentMenuStyles();
     });
@@ -178,7 +176,6 @@ watch(
 function updateParentMenuStyles() {
   if (!menuRef.value?.$el) return;
 
-  // 使用 nextTick 确保 DOM 已更新
   nextTick(() => {
     try {
       const menuEl = menuRef.value?.$el as HTMLElement;
@@ -192,6 +189,7 @@ function updateParentMenuStyles() {
 
       // 查找当前激活的菜单项
       const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
+
       if (activeMenuItem) {
         // 向上查找父级 el-sub-menu 元素
         let parent = activeMenuItem.parentElement;
@@ -201,6 +199,25 @@ function updateParentMenuStyles() {
           }
           parent = parent.parentElement;
         }
+      } else {
+        // 水平模式下可能需要特殊处理
+        if (props.menuMode === "horizontal") {
+          // 对于水平菜单，使用路径匹配来找到父菜单
+          const currentPath = activeMenuPath.value;
+
+          // 查找所有父菜单项，检查哪个包含当前路径
+          allSubMenus.forEach((subMenu) => {
+            const subMenuEl = subMenu as HTMLElement;
+            const subMenuPath =
+              subMenuEl.getAttribute("data-path") ||
+              subMenuEl.querySelector(".el-sub-menu__title")?.getAttribute("data-path");
+
+            // 如果找到包含当前路径的父菜单，则添加激活类
+            if (subMenuPath && currentPath.startsWith(subMenuPath)) {
+              subMenuEl.classList.add("has-active-child");
+            }
+          });
+        }
       }
     } catch (error) {
       console.error("Error updating parent menu styles:", error);
diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index 8734383c..fe7d9377 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -32,7 +32,7 @@
     </template>
 
     <!--【非叶子节点】显示含多个子节点的父菜单，或始终显示的单子节点 -->
-    <el-sub-menu v-else :index="resolvePath(item.path)" teleported>
+    <el-sub-menu v-else :index="resolvePath(item.path)" :data-path="item.path" teleported>
       <template #title>
         <MenuItemContent v-if="item.meta" :icon="item.meta.icon" :title="item.meta.title" />
       </template>
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/views/TopLayout.vue
index 6e6497b2..0359eb86 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/views/TopLayout.vue
@@ -102,6 +102,18 @@ const isLogoCollapsed = computed(() => width.value < 768);
           height: $navbar-height;
           line-height: $navbar-height;
         }
+
+        // 父菜单激活状态 - 水平布局专用
+        &.has-active-child {
+          .el-sub-menu__title {
+            color: var(--el-color-primary) !important;
+            border-bottom: 2px solid var(--el-color-primary) !important;
+
+            .menu-icon {
+              color: var(--el-color-primary) !important;
+            }
+          }
+        }
       }
 
       // 修复子菜单弹出位置

From d528db7eba289e8a51fb955716dbf95e75b14350 Mon Sep 17 00:00:00 2001
From: XFeng <2214857812@qq.com>
Date: Thu, 19 Jun 2025 17:03:16 +0800
Subject: [PATCH 422/497] =?UTF-8?q?feat:=20=E2=9C=A8=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=93=8D=E4=BD=9C=E5=88=97=E8=87=AA=E9=80=82?=
 =?UTF-8?q?=E5=BA=94=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/OperationColumn/index.vue |  91 +++++++++++++++++++++
 src/views/demo/auto-opreation-column.vue | 100 +++++++++++++++++++++++
 2 files changed, 191 insertions(+)
 create mode 100644 src/components/OperationColumn/index.vue
 create mode 100644 src/views/demo/auto-opreation-column.vue

diff --git a/src/components/OperationColumn/index.vue b/src/components/OperationColumn/index.vue
new file mode 100644
index 00000000..db532221
--- /dev/null
+++ b/src/components/OperationColumn/index.vue
@@ -0,0 +1,91 @@
+<template>
+  <el-table-column
+    :label="label"
+    :fixed="fixed"
+    :align="align"
+    :show-overflow-tooltip="showOverflowTooltip"
+    :width="finalWidth"
+  >
+    <template #default="{ row }">
+      <div v-auto-width class="operation-buttons">
+        <slot :row="row"></slot>
+      </div>
+    </template>
+  </el-table-column>
+</template>
+
+<script setup lang="ts">
+interface Props {
+  listDataLength: number;
+  prop?: string;
+  label?: string;
+  fixed?: string;
+  align?: string;
+  width?: number;
+  showOverflowTooltip?: boolean;
+  minWidth?: number;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  label: "操作",
+  fixed: "right",
+  align: "center",
+  minWidth: 80,
+});
+
+const count = ref(0);
+const operationWidth = ref(props.minWidth || 80);
+
+// 计算操作列宽度
+const calculateWidth = () => {
+  count.value++;
+
+  if (count.value !== props.listDataLength) return;
+  const maxWidth = getOperationMaxWidth();
+  operationWidth.value = Math.max(maxWidth, props.minWidth);
+  count.value = 0;
+};
+
+// 计算最终宽度
+const finalWidth = computed(() => {
+  return props.width || operationWidth.value || props.minWidth;
+});
+
+// 自适应宽度指令
+const vAutoWidth = {
+  mounted() {
+    // 初次挂载的时候计算一次
+    calculateWidth();
+  },
+  updated() {
+    // 数据更新时重新计算一次
+    calculateWidth();
+  },
+};
+
+/**
+ * 获取按钮数量和宽带来获取操作组的最大宽度
+ * 注意使用时需要使用 `class="operation-buttons"` 的标签包裹操作按钮
+ * @returns {number} 返回操作组的最大宽度
+ */
+const getOperationMaxWidth = () => {
+  const el = document.getElementsByClassName("operation-buttons");
+
+  // 取操作组的最大宽度
+  let maxWidth = 0;
+  let totalWidth: any = 0;
+  Array.prototype.forEach.call(el, (item) => {
+    // 获取每个item的dom
+    const buttons = item.querySelectorAll(".el-button");
+    // 获取每行按钮的总宽度
+    totalWidth = Array.from(buttons).reduce((acc, button: any) => {
+      return acc + button.scrollWidth + 22; // 每个按钮的宽度加上预留宽度
+    }, 0);
+
+    // 获取最大的宽度
+    if (totalWidth > maxWidth) maxWidth = totalWidth;
+  });
+
+  return maxWidth;
+};
+</script>
diff --git a/src/views/demo/auto-opreation-column.vue b/src/views/demo/auto-opreation-column.vue
new file mode 100644
index 00000000..fe71621e
--- /dev/null
+++ b/src/views/demo/auto-opreation-column.vue
@@ -0,0 +1,100 @@
+<!-- 文件上传组件示例 -->
+<template>
+  <div class="app-container">
+    <el-link
+      href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/auto-opreation-column.vue"
+      type="primary"
+      target="_blank"
+      class="mb-10"
+    >
+      示例源码 请点击>>>>
+    </el-link>
+
+    <div>
+      <h3>自适应表格操作列</h3>
+      <div class="text-14px color-#999">
+        该组件适用于含有操作列的表格。在某些情况下，按钮可能需要根据数据状态或其他条件动态展示，无法预设固定宽度。操作列组件能根据按钮数量自适应宽度，不需要再手动设置宽度。
+      </div>
+      <div class="mt-30px">
+        <el-checkbox v-model="checked1" label="查看" size="large" />
+        <el-checkbox v-model="checked2" label="超过了六个字会怎么样" size="large" />
+        <el-checkbox v-model="checked3" label="新增" size="large" />
+        <el-checkbox v-model="checked4" label="返回很多个字" size="large" />
+        <el-checkbox v-model="checked5" label="编辑" size="large" />
+      </div>
+
+      <el-table :data="tableData" style="width: 100%" border>
+        <el-table-column prop="date" label="Date" />
+        <el-table-column prop="name" label="Name" />
+        <el-table-column prop="state" label="State" />
+        <el-table-column prop="city" label="City" />
+        <el-table-column prop="address" label="Address" />
+        <el-table-column prop="zip" label="Zip" />
+        <OperationColumn :list-data-length="tableData.length">
+          <template #default="{ row }">
+            <el-button v-if="checked1" link type="primary" size="small">查看</el-button>
+            <el-button v-if="checked2" link type="primary" size="small">
+              超过了六个字会怎么样
+            </el-button>
+            <el-button v-if="checked3" link type="primary" size="small">新增</el-button>
+            <el-button v-if="checked4" link type="primary" size="small">返回很多个字</el-button>
+            <el-button v-if="checked5" link type="primary" size="small">编辑</el-button>
+            <el-button v-if="row.tag === 'Home'" link type="primary" size="small">默认</el-button>
+          </template>
+        </OperationColumn>
+      </el-table>
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import OperationColumn from "@/components/OperationColumn/index.vue";
+
+const checked1 = ref(true);
+const checked2 = ref(false);
+const checked3 = ref(false);
+const checked4 = ref(false);
+const checked5 = ref(false);
+
+const tableData = ref<any>([]);
+setTimeout(() => {
+  tableData.value = [
+    {
+      date: "2016-05-03",
+      name: "Tom",
+      state: "California",
+      city: "Los Angeles",
+      address: "No. 189, Grove St, Los Angeles",
+      zip: "CA 90036",
+      tag: "Home",
+    },
+    {
+      date: "2016-05-02",
+      name: "Tom",
+      state: "California",
+      city: "Los Angeles",
+      address: "No. 189, Grove St, Los Angeles",
+      zip: "CA 90036",
+      tag: "Office",
+    },
+    {
+      date: "2016-05-04",
+      name: "Tom",
+      state: "California",
+      city: "Los Angeles",
+      address: "No. 189, Grove St, Los Angeles",
+      zip: "CA 90036",
+      tag: "Home",
+    },
+    {
+      date: "2016-05-01",
+      name: "Tom",
+      state: "California",
+      city: "Los Angeles",
+      address: "No. 189, Grove St, Los Angeles",
+      zip: "CA 90036",
+      tag: "Office",
+    },
+  ];
+}, 300);
+</script>

From 59ada8e527d5fb77296e5b8f4c5ff69ec1ad4409 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 29 Jun 2025 20:45:52 +0800
Subject: [PATCH 423/497] =?UTF-8?q?chore:=20:hammer:=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 46 +++++++++++++++++++++++-----------------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 3ffa2a77..412842d2 100644
--- a/package.json
+++ b/package.json
@@ -52,12 +52,12 @@
     "@wangeditor-next/editor": "^5.6.34",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.9.0",
+    "axios": "^1.10.0",
     "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.9.11",
+    "element-plus": "^2.10.2",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -66,58 +66,58 @@
     "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
-    "vue": "^3.5.16",
+    "vue": "^3.5.17",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.5",
+    "vue-i18n": "^11.1.7",
     "vue-router": "^4.5.1",
     "vxe-table": "~4.6.25"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.28.0",
+    "@eslint/js": "^9.30.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.29",
+    "@types/node": "^22.15.34",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.33.1",
-    "@typescript-eslint/parser": "^8.33.1",
+    "@typescript-eslint/eslint-plugin": "^8.35.0",
+    "@typescript-eslint/parser": "^8.35.0",
     "@vitejs/plugin-vue": "^5.2.4",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
-    "cz-git": "^1.11.1",
-    "eslint": "^9.28.0",
+    "cz-git": "^1.11.2",
+    "eslint": "^9.30.0",
     "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.4.1",
-    "eslint-plugin-vue": "^10.1.0",
+    "eslint-plugin-prettier": "^5.5.1",
+    "eslint-plugin-vue": "^10.2.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.2",
-    "postcss": "^8.5.4",
+    "postcss": "^8.5.6",
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
-    "prettier": "^3.5.3",
-    "sass": "^1.89.1",
-    "stylelint": "^16.20.0",
+    "prettier": "^3.6.2",
+    "sass": "^1.89.2",
+    "stylelint": "^16.21.0",
     "stylelint-config-html": "^1.1.0",
-    "stylelint-config-recess-order": "^6.0.0",
+    "stylelint-config-recess-order": "^6.1.0",
     "stylelint-config-recommended": "^15.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
-    "stylelint-config-recommended-vue": "^1.6.0",
+    "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-prettier": "^5.0.3",
-    "terser": "^5.41.0",
+    "terser": "^5.43.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.33.1",
+    "typescript-eslint": "^8.35.0",
     "unocss": "65.4.3",
     "unplugin-auto-import": "^19.3.0",
-    "unplugin-vue-components": "^28.7.0",
+    "unplugin-vue-components": "^28.8.0",
     "vite": "^6.3.5",
-    "vite-plugin-mock-dev-server": "^1.8.7",
-    "vue-eslint-parser": "^10.1.3",
+    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vue-eslint-parser": "^10.1.4",
     "vue-tsc": "^2.2.10"
   },
   "engines": {

From 4f593711ee3dc1887a4a4cf81d33c627c52604e3 Mon Sep 17 00:00:00 2001
From: guo874758140 <guo874758140@noreply.gitcode.com>
Date: Tue, 1 Jul 2025 16:31:08 +0800
Subject: [PATCH 424/497] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: guo874758140 <guo874758140@noreply.gitcode.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e65f220f..af7861d2 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
   <img src="https://img.shields.io/badge/Vue-3.5.16-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.11-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.10.2-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>

From a1a501ef64b901311f4ff4be97ec813c767c128a Mon Sep 17 00:00:00 2001
From: Theo <971366405@qq.com>
Date: Tue, 1 Jul 2025 16:34:31 +0800
Subject: [PATCH 425/497] =?UTF-8?q?docs:=20:memo:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加注释
---
 src/api/system/config.api.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/api/system/config.api.ts b/src/api/system/config.api.ts
index 42ba7672..27327885 100644
--- a/src/api/system/config.api.ts
+++ b/src/api/system/config.api.ts
@@ -49,7 +49,7 @@ const ConfigAPI = {
       method: "delete",
     });
   },
-
+  /** 刷新系统配置缓存 */
   refreshCache() {
     return request({
       url: `${CONFIG_BASE_URL}/refresh`,

From 2465c90a8c8e6a53c848977a92840a4513aa078c Mon Sep 17 00:00:00 2001
From: lk512893708 <lk512893708@noreply.gitcode.com>
Date: Tue, 1 Jul 2025 16:46:44 +0800
Subject: [PATCH 426/497] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20README.md?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lk512893708 <lk512893708@noreply.gitcode.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index af7861d2..bd9907f0 100644
--- a/README.md
+++ b/README.md
@@ -203,6 +203,7 @@ server {
 
 
 Thanks to all the contributors!
+感谢所有的贡献者！
 
 [![contributors](https://contrib.rocks/image?repo=youlaitech/vue3-element-admin)](https://github.com/youlaitech/vue3-element-admin/graphs/contributors)
 

From c8792558b64a52e37267b115d5de05deeb7cc5cd Mon Sep 17 00:00:00 2001
From: wangtaocs <wangtaocs@outlook.com>
Date: Tue, 1 Jul 2025 16:50:49 +0800
Subject: [PATCH 427/497] =?UTF-8?q?update:=20=E6=9B=B4=E6=96=B0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=20README.md=20=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangtaocs <wangtaocs@outlook.com>
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index bd9907f0..39d3cd44 100644
--- a/README.md
+++ b/README.md
@@ -73,7 +73,6 @@
 | Node 后端 | [youlai-nest](https://gitee.com/youlaiorg/youlai-nest)       | [youlai-nest](https://github.com/haoxianrui/youlai-nest.git) |[youlai-nest](https://gitcode.com/youlai/youlai-nest.git)|
 
 
-
 ## 开发指南
 
 | 名称          | 地址     |

From 4f4b45e10ede13295e75be79a6f1ce19a261cb43 Mon Sep 17 00:00:00 2001
From: zhangyuanpeng <1016062422@qq.com>
Date: Tue, 1 Jul 2025 17:23:57 +0800
Subject: [PATCH 428/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=96=B0READ?=
 =?UTF-8?q?ME=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

增加系统功能模块说明
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 39d3cd44..c819a878 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@
 - **简洁易用**：基于 [vue-element-admin](https://gitee.com/panjiachen/vue-element-admin) 升级的 Vue3 版本，无过渡封装 ，易上手。
 - **数据交互**： 支持 `Mock` 数据和[线上接口文档](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5)，并提供配套的 [Java](https://gitee.com/youlaiorg/youlai-boot) 和 [Node](https://gitee.com/youlaiorg/youlai-nest) 后端源码。
 
-- **系统功能：** 提供用户管理、角色管理、菜单管理、部门管理、字典管理等功能模块。
+- **系统功能：** 提供用户管理、角色管理、菜单管理、部门管理、字典管理、系统配置、通知公告等功能模块。
 - **权限管理：** 支持动态路由、按钮权限、角色权限和数据权限等多种权限管理方式。
 
 - **基础设施：** 提供国际化、多布局、暗黑模式、全屏、水印、接口文档和代码生成器等功能。

From f79706607f5d89c9fc298f99fe20bdbabb09a789 Mon Sep 17 00:00:00 2001
From: f-404 <f-404@noreply.gitcode.com>
Date: Tue, 1 Jul 2025 18:07:33 +0800
Subject: [PATCH 429/497] =?UTF-8?q?=E6=9B=B4=E6=96=B0README.md=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: f-404 <f-404@noreply.gitcode.com>
---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c819a878..9bb662cf 100644
--- a/README.md
+++ b/README.md
@@ -88,7 +88,6 @@
 
 ## 项目启动
 
-
 - **环境准备**
 
 | 环境类型       | 名称                     |

From a913e7e2e57c1c00bbce529bc00274b4d9bf8f80 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 8 Jul 2025 23:57:26 +0800
Subject: [PATCH 430/497] =?UTF-8?q?chore:=20:hammer:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20npm=20=E4=BE=9D=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 412842d2..3c1be45b 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.1.1",
     "@vueuse/core": "^12.8.2",
-    "@wangeditor-next/editor": "^5.6.34",
+    "@wangeditor-next/editor": "^5.6.35",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
     "axios": "^1.10.0",
@@ -57,7 +57,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.10.2",
+    "element-plus": "^2.10.3",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -68,32 +68,32 @@
     "sortablejs": "^1.15.6",
     "vue": "^3.5.17",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.7",
+    "vue-i18n": "^11.1.9",
     "vue-router": "^4.5.1",
     "vxe-table": "~4.6.25"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.30.0",
+    "@eslint/js": "^9.30.1",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.15.34",
+    "@types/node": "^22.16.0",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.35.0",
-    "@typescript-eslint/parser": "^8.35.0",
+    "@typescript-eslint/eslint-plugin": "^8.36.0",
+    "@typescript-eslint/parser": "^8.36.0",
     "@vitejs/plugin-vue": "^5.2.4",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.11.2",
-    "eslint": "^9.30.0",
+    "eslint": "^9.30.1",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.5.1",
-    "eslint-plugin-vue": "^10.2.0",
+    "eslint-plugin-vue": "^10.3.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.2",
@@ -102,7 +102,7 @@
     "postcss-scss": "^4.0.9",
     "prettier": "^3.6.2",
     "sass": "^1.89.2",
-    "stylelint": "^16.21.0",
+    "stylelint": "^16.21.1",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.1.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -111,14 +111,14 @@
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.43.1",
     "typescript": "^5.8.3",
-    "typescript-eslint": "^8.35.0",
+    "typescript-eslint": "^8.36.0",
     "unocss": "65.4.3",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.8.0",
     "vite": "^6.3.5",
     "vite-plugin-mock-dev-server": "^1.9.1",
-    "vue-eslint-parser": "^10.1.4",
-    "vue-tsc": "^2.2.10"
+    "vue-eslint-parser": "^10.2.0",
+    "vue-tsc": "^2.2.12"
   },
   "engines": {
     "node": ">=18.0.0"

From d1ba70f4da74292f1eda30a12361dc9782f155a4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 9 Jul 2025 00:03:12 +0800
Subject: [PATCH 431/497] =?UTF-8?q?docs:=20:memo:=20=E8=AF=B4=E6=98=8E?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=E4=BF=AE=E6=94=B9=E4=BE=9D=E8=B5=96=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 4 ++--
 README.md       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index 921a9def..a31682db 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.16-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.17-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.9.11-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.10.3-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/README.md b/README.md
index 9bb662cf..a7363673 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.16-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.17-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.10.2-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.10.3-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>

From 78630789122d7cc9f568dcd3621078b32bed7223 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 14 Jul 2025 23:58:43 +0800
Subject: [PATCH 432/497] =?UTF-8?q?chore:=20=E5=8D=87=E7=BA=A7=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 3c1be45b..ee514fb5 100644
--- a/package.json
+++ b/package.json
@@ -49,7 +49,7 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.1.1",
     "@vueuse/core": "^12.8.2",
-    "@wangeditor-next/editor": "^5.6.35",
+    "@wangeditor-next/editor": "^5.6.36",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
     "axios": "^1.10.0",
@@ -57,7 +57,7 @@
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.10.3",
+    "element-plus": "^2.10.4",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -75,11 +75,11 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.30.1",
+    "@eslint/js": "^9.31.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.16.0",
+    "@types/node": "^22.16.3",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
@@ -89,8 +89,8 @@
     "@vitejs/plugin-vue": "^5.2.4",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
-    "cz-git": "^1.11.2",
-    "eslint": "^9.30.1",
+    "cz-git": "^1.12.0",
+    "eslint": "^9.31.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-prettier": "^5.5.1",
     "eslint-plugin-vue": "^10.3.0",

From 879a3b64044b232796371bc7cd69660abd673dd1 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 11:31:02 +0800
Subject: [PATCH 433/497] =?UTF-8?q?build:=20:package:=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=20vite=207=20=E4=BB=A5=E5=8F=8A=E5=85=BC=E5=AE=B9=E6=80=A7?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md    | 13 ++++++-------
 package.json | 40 ++++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index a7363673..08c55a52 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.17-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.10.3-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.18-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-7.0.6-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.10.5-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
@@ -90,11 +90,10 @@
 
 - **环境准备**
 
-| 环境类型       | 名称                     |
-|----------------|-----------------------------|
+| 环境类型       | 名称                     |     备注          |
+|----------------|---------------|----------- |
 | **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download) |
-| **运行环境**   | Node 18 + (推荐[22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
-> ⚠️ 注意：Node.js 20.6.0版本存在兼容性问题，请勿使用
+| **运行环境**   | ^20.19.0 || >=22.12.0  |    20.19.0+ 或 22.12.0 及以上版本   |
 
 
 - **快速开始**
diff --git a/package.json b/package.json
index ee514fb5..a507a3bd 100644
--- a/package.json
+++ b/package.json
@@ -49,15 +49,15 @@
     "@element-plus/icons-vue": "^2.3.1",
     "@stomp/stompjs": "^7.1.1",
     "@vueuse/core": "^12.8.2",
-    "@wangeditor-next/editor": "^5.6.36",
+    "@wangeditor-next/editor": "^5.6.42",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.10.0",
+    "axios": "^1.11.0",
     "codemirror": "^5.65.19",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.10.4",
+    "element-plus": "^2.10.5",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -66,34 +66,34 @@
     "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
-    "vue": "^3.5.17",
+    "vue": "^3.5.18",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.9",
+    "vue-i18n": "^11.1.11",
     "vue-router": "^4.5.1",
     "vxe-table": "~4.6.25"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.31.0",
+    "@eslint/js": "^9.32.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.16.3",
+    "@types/node": "^22.17.0",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.36.0",
-    "@typescript-eslint/parser": "^8.36.0",
-    "@vitejs/plugin-vue": "^5.2.4",
+    "@typescript-eslint/eslint-plugin": "^8.38.0",
+    "@typescript-eslint/parser": "^8.38.0",
+    "@vitejs/plugin-vue": "^6.0.1",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.12.0",
-    "eslint": "^9.31.0",
-    "eslint-config-prettier": "^10.1.5",
-    "eslint-plugin-prettier": "^5.5.1",
-    "eslint-plugin-vue": "^10.3.0",
+    "eslint": "^9.32.0",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.3",
+    "eslint-plugin-vue": "^10.4.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.2",
@@ -102,7 +102,7 @@
     "postcss-scss": "^4.0.9",
     "prettier": "^3.6.2",
     "sass": "^1.89.2",
-    "stylelint": "^16.21.1",
+    "stylelint": "^16.23.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.1.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -110,18 +110,18 @@
     "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.43.1",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.36.0",
-    "unocss": "65.4.3",
+    "typescript": "^5.9.2",
+    "typescript-eslint": "^8.38.0",
+    "unocss": "^66.4.0",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.8.0",
-    "vite": "^6.3.5",
+    "vite": "^7.0.6",
     "vite-plugin-mock-dev-server": "^1.9.1",
     "vue-eslint-parser": "^10.2.0",
     "vue-tsc": "^2.2.12"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": "^20.19.0 || >=22.12.0"
   },
   "repository": "https://gitee.com/youlaiorg/vue3-element-admin.git",
   "author": "有来开源组织",

From 2e0db524fec2e050873d98485b2d6a8d7da27782 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 11:35:16 +0800
Subject: [PATCH 434/497] =?UTF-8?q?docs:=20:memo:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E7=9A=84=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 1e45fca7..0c41ff0f 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -203,18 +203,11 @@ async function handleLoginSubmit() {
     await userStore.getUserInfo();
 
     // 4. 登录成功，让路由守卫处理跳转逻辑
-    // 解析目标地址，但不直接跳转
     const redirect = resolveRedirectTarget(route.query);
-    console.log("🎉 Login successful, target redirect:", redirect);
 
-    // 通过替换当前路由触发路由守卫，让守卫处理后续的路由生成和跳转
     await router.replace(redirect);
-
-    // 5. 记住我功能已实现，根据用户选择决定token的存储方式:
-    // - 选中"记住我": token存储在localStorage中，浏览器关闭后仍然有效
-    // - 未选中"记住我": token存储在sessionStorage中，浏览器关闭后失效
   } catch (error) {
-    // 6. 统一错误处理
+    // 5. 统一错误处理
     getCaptcha(); // 刷新验证码
     console.error("登录失败:", error);
   } finally {

From 1d329f8e1e0188f537afa85fcf70314d6628b0b4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 11:37:45 +0800
Subject: [PATCH 435/497] chore(package.json): :hammer: bump version to 3.1.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a507a3bd..fd21c049 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "private": true,
   "type": "module",
   "scripts": {

From 3d31d4899ea43c2e3a5c0bc942a75b34fb076d8d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 11:58:39 +0800
Subject: [PATCH 436/497] fix: :bug: set moduleResolution='bundler' to resolve
 plugin-vue ESM types

---
 tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index c50ab871..475a9e32 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "target": "esnext",
     "module": "esnext",
-    "moduleResolution": "node",
+    "moduleResolution": "bundler",
     "lib": ["esnext", "dom"],
     "baseUrl": ".",
     "paths": {

From 4a224bbd0e2475e9eabdf98f36b6413df12d1ce6 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 13:19:31 +0800
Subject: [PATCH 437/497] =?UTF-8?q?fix:=20:bug:=20=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=20PluginOption=20=E7=B1=BB=E5=9E=8B=E5=A3=B0?=
 =?UTF-8?q?=E6=98=8E=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/vite.config.ts b/vite.config.ts
index 5c0c5192..8bab8390 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,5 +1,5 @@
 import vue from "@vitejs/plugin-vue";
-import { type ConfigEnv, loadEnv, defineConfig } from "vite";
+import { type ConfigEnv, type UserConfig, loadEnv, defineConfig, PluginOption } from "vite";
 
 import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
@@ -20,7 +20,7 @@ const __APP_INFO__ = {
 const pathSrc = resolve(__dirname, "src");
 
 // Vite配置  https://cn.vitejs.dev/config
-export default defineConfig(({ mode }: ConfigEnv) => {
+export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
   const env = loadEnv(mode, process.cwd());
   const isProduction = mode === "production";
 
@@ -49,13 +49,13 @@ export default defineConfig(({ mode }: ConfigEnv) => {
           changeOrigin: true,
           // 代理目标地址：https://api.youlai.tech
           target: env.VITE_APP_API_URL,
-          rewrite: (path) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
+          rewrite: (path: string) => path.replace(new RegExp("^" + env.VITE_APP_BASE_API), ""),
         },
       },
     },
     plugins: [
       vue(),
-      env.VITE_MOCK_DEV_SERVER === "true" ? mockDevServerPlugin() : null,
+      ...(env.VITE_MOCK_DEV_SERVER === "true" ? [mockDevServerPlugin()] : []),
       UnoCSS(),
       // API 自动导入
       AutoImport({
@@ -87,7 +87,7 @@ export default defineConfig(({ mode }: ConfigEnv) => {
         dts: false,
         // dts: "src/types/components.d.ts",
       }),
-    ],
+    ] as PluginOption[],
     // 预加载项目必需的组件
     optimizeDeps: {
       include: [

From 0179b5c4702833a14ccf7819a5ade236616f24ff Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 15:04:11 +0800
Subject: [PATCH 438/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=88=90=E5=8A=9F=E8=B7=AF=E7=94=B1=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=E5=92=8C=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/Menu/MixTopMenu.vue |   6 +-
 src/layouts/composables/useLayoutMenu.ts   |   3 +-
 src/layouts/views/MixLayout.vue            |   2 +-
 src/plugins/permission.ts                  | 190 ++++++---------------
 src/store/modules/permission.store.ts      |  78 ++++-----
 src/views/login/components/Login.vue       |  35 +---
 vite.config.ts                             |   1 -
 7 files changed, 95 insertions(+), 220 deletions(-)

diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index 0709f53b..a3b2620e 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -102,12 +102,12 @@ const updateMenuState = (topMenuPath: string, skipNavigation = false) => {
   // 不相同才更新，避免重复操作
   if (topMenuPath !== appStore.activeTopMenuPath) {
     appStore.activeTopMenu(topMenuPath); // 设置激活的顶部菜单
-    permissionStore.updateSideMenu(topMenuPath); // 更新左侧菜单
+    permissionStore.setMixLayoutSideMenus(topMenuPath); // 设置混合布局左侧菜单
   }
 
   // 如果是点击菜单且状态已变更，才进行导航
   if (!skipNavigation) {
-    navigateToFirstLeftMenu(permissionStore.sideMenuRoutes); // 跳转到左侧第一个菜单
+    navigateToFirstLeftMenu(permissionStore.mixLayoutSideMenus); // 跳转到左侧第一个菜单
   }
 };
 
@@ -145,7 +145,7 @@ onMounted(() => {
       ? useRoute().path.match(/^\/[^/]+/)?.[0] || "/"
       : "/";
   appStore.activeTopMenu(currentTopMenuPath); // 设置激活的顶部菜单
-  permissionStore.updateSideMenu(currentTopMenuPath); // 更新左侧菜单
+  permissionStore.setMixLayoutSideMenus(currentTopMenuPath); // 设置混合布局左侧菜单
 });
 
 // 监听路由变化，同步更新顶部菜单和左侧菜单的激活状态
diff --git a/src/layouts/composables/useLayoutMenu.ts b/src/layouts/composables/useLayoutMenu.ts
index 850c707c..cebe15fa 100644
--- a/src/layouts/composables/useLayoutMenu.ts
+++ b/src/layouts/composables/useLayoutMenu.ts
@@ -1,4 +1,3 @@
-import { computed, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useAppStore, usePermissionStore } from "@/store";
 
@@ -17,7 +16,7 @@ export function useLayoutMenu() {
   const routes = computed(() => permissionStore.routes);
 
   // 混合布局左侧菜单路由
-  const sideMenuRoutes = computed(() => permissionStore.sideMenuRoutes);
+  const sideMenuRoutes = computed(() => permissionStore.mixLayoutSideMenus);
 
   // 当前激活的菜单
   const activeMenu = computed(() => {
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/views/MixLayout.vue
index 5756ec20..7f9c111f 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/views/MixLayout.vue
@@ -142,7 +142,7 @@ watch(
       const permissionStore = usePermissionStore();
 
       appStore.activeTopMenu(topMenuPath);
-      permissionStore.updateSideMenu(topMenuPath);
+      permissionStore.setMixLayoutSideMenus(topMenuPath);
     }
   },
   { immediate: true }
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 361d0bb1..2890b6df 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,167 +1,85 @@
-import type { NavigationGuardNext, RouteLocationNormalized, RouteRecordRaw } from "vue-router";
+import type { RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
 import { Auth } from "@/utils/auth";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 import { ROLE_ROOT } from "@/constants";
 
-// 路由生成锁，防止重复生成
-let isGeneratingRoutes = false;
-
 export function setupPermission() {
-  // 白名单路由
-  const whiteList = ["/login"];
+  const whiteList = ["/login"]; // 无需登录的页面
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
 
-    const isLoggedIn = Auth.isLoggedIn();
+    try {
+      const isLoggedIn = Auth.isLoggedIn();
+
+      // 未登录处理
+      if (!isLoggedIn) {
+        if (whiteList.includes(to.path)) {
+          next();
+        } else {
+          next(`/login?redirect=${encodeURIComponent(to.fullPath)}`);
+          NProgress.done();
+        }
+        return;
+      }
 
-    if (isLoggedIn) {
-      // 如果已登录但访问登录页，重定向到首页
+      // 已登录且访问登录页，重定向到首页
       if (to.path === "/login") {
         next({ path: "/" });
         return;
       }
 
-      // 处理已登录用户的路由访问
-      await handleAuthenticatedUser(to, from, next);
-    } else {
-      console.log("❌ User not logged in");
+      // 已登录用户的正常访问
+      const permissionStore = usePermissionStore();
+      const userStore = useUserStore();
 
-      // 未登录用户的处理
-      if (whiteList.includes(to.path)) {
-        next();
-      } else {
-        redirectToLogin(to, next);
-        NProgress.done();
+      // 确保用户信息已加载
+      if (!userStore.userInfo.username) {
+        await userStore.getUserInfo();
       }
-    }
-  });
-
-  // 后置守卫，确保进度条关闭
-  router.afterEach(() => {
-    NProgress.done();
-  });
-}
 
-/**
- * 处理已登录用户的路由访问
- */
-async function handleAuthenticatedUser(
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-  next: NavigationGuardNext
-) {
-  const permissionStore = usePermissionStore();
-  const userStore = useUserStore();
-
-  try {
-    // 检查用户信息是否存在
-    if (!userStore.userInfo.username) {
-      await userStore.getUserInfo();
-    }
-
-    // 检查路由是否已生成
-    if (!permissionStore.routesLoaded) {
-      // 防止重复生成路由
-      if (isGeneratingRoutes) {
-        console.log("⏳ Routes already generating, waiting...");
-        // 等待当前路由生成完成
-        await waitForRoutesGeneration(permissionStore);
-      } else {
-        await generateAndAddRoutes(permissionStore);
+      // 确保动态路由已生成
+      if (!permissionStore.isDynamicRoutesGenerated) {
+        const dynamicRoutes = await permissionStore.generateRoutes();
+        dynamicRoutes.forEach((route: RouteRecordRaw) => {
+          router.addRoute(route);
+        });
+        // 路由刚生成，重新导航
+        next({ ...to, replace: true });
+        return;
       }
 
-      // 路由生成完成后，重新导航到目标路由
-      next({ ...to, replace: true });
-      return;
-    }
-
-    // 路由已加载，检查路由是否存在
-    if (to.matched.length === 0) {
-      next("/404");
-      return;
-    }
-
-    // 动态设置页面标题
-    const title = (to.params.title as string) || (to.query.title as string);
-    if (title) {
-      to.meta.title = title;
-    }
-
-    next();
-  } catch (error) {
-    console.error("❌ Route guard error:", error);
-
-    // 出错时重置状态并重定向到登录页
-    await resetUserStateAndRedirect(to, next);
-  }
-}
-
-/**
- * 生成并添加动态路由
- */
-async function generateAndAddRoutes(permissionStore: any) {
-  isGeneratingRoutes = true;
-
-  try {
-    const dynamicRoutes = await permissionStore.generateRoutes();
-
-    // 添加路由到路由器
-    dynamicRoutes.forEach((route: RouteRecordRaw) => {
-      router.addRoute(route);
-    });
-  } finally {
-    isGeneratingRoutes = false;
-  }
-}
+      // 检查路由是否存在
+      if (to.matched.length === 0) {
+        next("/404");
+        return;
+      }
 
-/**
- * 等待路由生成完成
- */
-async function waitForRoutesGeneration(permissionStore: any): Promise<void> {
-  return new Promise((resolve) => {
-    const checkInterval = setInterval(() => {
-      if (!isGeneratingRoutes && permissionStore.routesLoaded) {
-        clearInterval(checkInterval);
-        resolve();
+      // 设置页面标题
+      const title = (to.params.title as string) || (to.query.title as string);
+      if (title) {
+        to.meta.title = title;
       }
-    }, 50);
 
-    // 超时保护，最多等待5秒
-    setTimeout(() => {
-      clearInterval(checkInterval);
-      resolve();
-    }, 5000);
+      next();
+    } catch (error) {
+      console.error("❌ Route guard error:", error);
+      // 出错时清理状态并重定向到登录页
+      try {
+        await useUserStore().resetAllState();
+      } catch (resetError) {
+        console.error("❌ Failed to reset user state:", resetError);
+      }
+      next("/login");
+      NProgress.done();
+    }
   });
-}
 
-/**
- * 重置用户状态并重定向到登录页
- */
-async function resetUserStateAndRedirect(to: RouteLocationNormalized, next: NavigationGuardNext) {
-  try {
-    await useUserStore().resetAllState();
-    redirectToLogin(to, next);
-  } catch (resetError) {
-    console.error("❌ Failed to reset user state:", resetError);
-    // 强制跳转到登录页
-    next("/login");
-  } finally {
+  router.afterEach(() => {
     NProgress.done();
-  }
-}
-
-/**
- * 重定向到登录页
- */
-function redirectToLogin(to: RouteLocationNormalized, next: NavigationGuardNext) {
-  const params = new URLSearchParams(to.query as Record<string, string>);
-  const queryString = params.toString();
-  const redirect = queryString ? `${to.path}?${queryString}` : to.path;
-
-  next(`/login?redirect=${encodeURIComponent(redirect)}`);
+  });
 }
 
 /** 判断是否有权限 */
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index 920adc25..315a9254 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -8,78 +8,64 @@ const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layouts/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
-  // 存储所有路由，包括静态路由和动态路由
+  // 所有路由（静态路由 + 动态路由）
   const routes = ref<RouteRecordRaw[]>([]);
-  // 混合模式左侧菜单路由
-  const sideMenuRoutes = ref<RouteRecordRaw[]>([]);
-  // 路由是否加载完成
-  const routesLoaded = ref(false);
+  // 混合布局的左侧菜单路由
+  const mixLayoutSideMenus = ref<RouteRecordRaw[]>([]);
+  // 动态路由是否已生成
+  const isDynamicRoutesGenerated = ref(false);
 
   /**
-   * 获取后台动态路由数据，解析并注册到全局路由
-   *
-   * @returns Promise<RouteRecordRaw[]> 解析后的动态路由列表
+   * 生成动态路由
    */
-  function generateRoutes() {
-    return new Promise<RouteRecordRaw[]>((resolve, reject) => {
-      MenuAPI.getRoutes()
-        .then((data) => {
-          const dynamicRoutes = parseDynamicRoutes(data);
-
-          routes.value = [...constantRoutes, ...dynamicRoutes];
-          routesLoaded.value = true;
-
-          resolve(dynamicRoutes);
-        })
-        .catch((error) => {
-          console.error("❌ Failed to generate routes:", error);
-
-          // 即使失败也要设置状态，避免无限重试
-          routesLoaded.value = false;
-
-          reject(error);
-        });
-    });
+  async function generateRoutes(): Promise<RouteRecordRaw[]> {
+    try {
+      const data = await MenuAPI.getRoutes();
+      const dynamicRoutes = parseDynamicRoutes(data);
+
+      routes.value = [...constantRoutes, ...dynamicRoutes];
+      isDynamicRoutesGenerated.value = true;
+
+      return dynamicRoutes;
+    } catch (error) {
+      console.error("❌ Failed to generate routes:", error);
+      isDynamicRoutesGenerated.value = false;
+      throw error;
+    }
   }
 
   /**
-   * 根据父菜单路径设置侧边菜单
-   *
-   * @param parentPath 父菜单的路径，用于查找对应的菜单项
+   * 设置混合布局的左侧菜单
    */
-  const updateSideMenu = (parentPath: string) => {
-    const matchedItem = routes.value.find((item) => item.path === parentPath);
-    if (matchedItem && matchedItem.children) {
-      sideMenuRoutes.value = matchedItem.children;
-    }
+  const setMixLayoutSideMenus = (parentPath: string) => {
+    const parentMenu = routes.value.find((item) => item.path === parentPath);
+    mixLayoutSideMenus.value = parentMenu?.children || [];
   };
 
   /**
-   * 重置路由
+   * 重置路由状态
    */
   const resetRouter = () => {
-    // 创建常量路由名称集合，用于O(1)时间复杂度的查找
+    // 移除动态路由
     const constantRouteNames = new Set(constantRoutes.map((route) => route.name).filter(Boolean));
-
-    // 从 router 实例中移除动态路由
     routes.value.forEach((route) => {
       if (route.name && !constantRouteNames.has(route.name)) {
         router.removeRoute(route.name);
       }
     });
 
-    // 重置为仅包含常量路由
+    // 重置状态
     routes.value = [...constantRoutes];
-    sideMenuRoutes.value = [];
-    routesLoaded.value = false;
+    mixLayoutSideMenus.value = [];
+    isDynamicRoutesGenerated.value = false;
   };
 
   return {
     routes,
-    sideMenuRoutes,
-    routesLoaded,
+    mixLayoutSideMenus,
+    isDynamicRoutesGenerated,
     generateRoutes,
-    updateSideMenu,
+    setMixLayoutSideMenus,
     resetRouter,
   };
 });
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 0c41ff0f..d55e6291 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -111,8 +111,6 @@
 </template>
 <script setup lang="ts">
 import type { FormInstance } from "element-plus";
-import { LocationQuery, RouteLocationRaw, useRoute } from "vue-router";
-import { useI18n } from "vue-i18n";
 import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import router from "@/router";
 import { useUserStore } from "@/store";
@@ -202,10 +200,11 @@ async function handleLoginSubmit() {
     // 3. 获取用户信息（包含用户角色，用于路由生成）
     await userStore.getUserInfo();
 
-    // 4. 登录成功，让路由守卫处理跳转逻辑
-    const redirect = resolveRedirectTarget(route.query);
+    // 4. 登录成功，简单跳转，让路由守卫处理后续逻辑
+    const redirectPath = (route.query.redirect as string) || "/";
 
-    await router.replace(redirect);
+    // 使用push而不是replace，避免与路由守卫冲突
+    await router.push(decodeURIComponent(redirectPath));
   } catch (error) {
     // 5. 统一错误处理
     getCaptcha(); // 刷新验证码
@@ -215,32 +214,6 @@ async function handleLoginSubmit() {
   }
 }
 
-/**
- * 解析重定向目标
- *
- * @param query 路由查询参数
- * @returns 标准化后的路由地址
- */
-function resolveRedirectTarget(query: LocationQuery): RouteLocationRaw {
-  // 默认跳转路径
-  const defaultPath = "/";
-
-  // 获取原始重定向路径
-  const rawRedirect = (query.redirect as string) || defaultPath;
-
-  try {
-    // 6. 使用Vue Router解析路径
-    const resolved = router.resolve(rawRedirect);
-    return {
-      path: resolved.path,
-      query: resolved.query,
-    };
-  } catch {
-    // 7. 异常处理：返回安全路径
-    return { path: defaultPath };
-  }
-}
-
 // 检查输入大小写
 function checkCapsLock(event: KeyboardEvent) {
   // 防止浏览器密码自动填充时报错
diff --git a/vite.config.ts b/vite.config.ts
index 8bab8390..03f02469 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -34,7 +34,6 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
       preprocessorOptions: {
         // 定义全局 SCSS 变量
         scss: {
-          api: "modern-compiler",
           additionalData: `@use "@/styles/variables.scss" as *;`,
         },
       },

From 0c2dff802afd9793bf29802e07202fc50a9de1d2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 4 Aug 2025 15:08:25 +0800
Subject: [PATCH 439/497] =?UTF-8?q?docs:=20:memo:=20=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E4=B8=AD?=
 =?UTF-8?q?=E8=8B=B1=E6=96=87=E6=96=87=E6=A1=A3=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.en-US.md | 12 ++++++------
 README.md       |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index a31682db..d87a2d85 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.17-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-6.3.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.10.3-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.18-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-7.0.6-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.10.5-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
@@ -32,7 +32,7 @@
 
 ## Introduction
 
-[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) is a minimalist enterprise-level backend management frontend template built with Vue3, Vite, TypeScript, and Element-Plus. It comes with complementary Java backend [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) and Node backend [youlai-nest](https://gitee.com/youlaiorg/youlai-nest). A simplified version [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) and a JavaScript version [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) are also available for developers to quickly start development.
+[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) is a minimalist enterprise-level backend management frontend template built with Vue3, Vite7, TypeScript, and Element-Plus. It comes with complementary Java backend [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) and Node backend [youlai-nest](https://gitee.com/youlaiorg/youlai-nest). A simplified version [vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) and a JavaScript version [vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) are also available for developers to quickly start development.
 
 
 ## Project Features
@@ -95,8 +95,8 @@
 | Environment Type | Name                     |
 |----------------|-----------------------------|
 | **Development Tool**   | [Visual Studio Code](https://code.visualstudio.com/Download) |
-| **Runtime Environment**   | Node 18 + (Recommended [22.9.0](https://npmmirror.com/mirrors/node/v22.9.0/))  |
-> ⚠️ Note: Node.js version 20.6.0 has compatibility issues, please don't use it
+| **Runtime Environment**   |  ^20.19.0 || >=22.12.0  |
+
 
 
 - **Quick Start**
diff --git a/README.md b/README.md
index 08c55a52..ae020a1b 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@
 
 ## 项目简介
 
-[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 基于 Vue3、Vite、TypeScript 和 Element-Plus 搭建的极简开箱即用企业级后台管理前端模板。 配套 Java 后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) 和 Node 后端 [youlai-nest](https://gitee.com/youlaiorg/youlai-nest) 。 提供开发简版[vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) 和 JS 版本[vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) 供开发者快速开发。
+[vue3-element-admin](https://gitcode.com/youlai/vue3-element-admin) 基于 Vue3、Vite7、TypeScript 和 Element-Plus 搭建的极简开箱即用企业级后台管理前端模板。 配套 Java 后端 [youlai-boot](https://gitee.com/youlaiorg/youlai-boot) 和 Node 后端 [youlai-nest](https://gitee.com/youlaiorg/youlai-nest) 。 提供开发简版[vue3-element-template](https://gitee.com/youlaiorg/vue3-element-template) 和 JS 版本[vue3-element-admin-js](https://gitee.com/youlaiorg/vue3-element-admin) 供开发者快速开发。
 
 
 ## 项目特色

From 79521c4807f42fe58b76359e818652d86b00d21d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 7 Aug 2025 12:26:13 +0800
Subject: [PATCH 440/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=B4=E5=83=8F=E5=90=8E=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9C=80=E6=96=B0=E7=9A=84=E5=A4=B4=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除在 permission.ts 中的冗余用户信息检查

- 刷新页面确保获取最新的用户信息

- 更新 profile 页面中用户头像的显示逻辑

- 在头像上传成功后同步更新用户信息

#ICRONO
---
 src/plugins/permission.ts   | 8 +++-----
 src/views/profile/index.vue | 9 ++++++---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 2890b6df..0493511a 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -35,13 +35,11 @@ export function setupPermission() {
       const permissionStore = usePermissionStore();
       const userStore = useUserStore();
 
-      // 确保用户信息已加载
-      if (!userStore.userInfo.username) {
-        await userStore.getUserInfo();
-      }
-
       // 确保动态路由已生成
       if (!permissionStore.isDynamicRoutesGenerated) {
+        /** 先获取最新的用户信息 */
+        await userStore.getUserInfo();
+
         const dynamicRoutes = await permissionStore.generateRoutes();
         dynamicRoutes.forEach((route: RouteRecordRaw) => {
           router.addRoute(route);
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 947bb2fe..835db2f8 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -6,7 +6,7 @@
         <el-card class="user-card">
           <div class="user-info">
             <div class="avatar-wrapper">
-              <el-avatar :src="http://github.com/userProfile.avatar" :size="100" />
+              <el-avatar :src="http://github.com/userStore.userInfo.avatar" :size="100" />
               <el-button
                 type="info"
                 class="avatar-edit-btn"
@@ -227,9 +227,12 @@ import UserAPI, {
 } from "@/api/system/user.api";
 
 import FileAPI from "@/api/file.api";
+import { useUserStoreHook } from "@/store";
 
 import { Camera } from "@element-plus/icons-vue";
 
+const userStore = useUserStoreHook();
+
 const userProfile = ref<UserProfileVO>({});
 
 const enum DialogType {
@@ -443,12 +446,12 @@ const handleFileChange = async (event: Event) => {
     // 调用文件上传API
     try {
       const data = await FileAPI.uploadFile(file);
-      // 更新用户头像
-      userProfile.value.avatar = data.url;
       // 更新用户信息
       await UserAPI.updateProfile({
         avatar: data.url,
       });
+      // 更新用户头像
+      userStore.userInfo.avatar = data.url;
     } catch (error) {
       console.error("头像上传失败：" + error);
       ElMessage.error("头像上传失败");

From 1d0fc3119b7709276f57ca1de51cbbb4ff73c921 Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Tue, 12 Aug 2025 10:31:16 +0800
Subject: [PATCH 441/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=80=89=E4=B8=AD=E6=97=B6=EF=BC=8C=E5=90=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=9D=9E=E5=8F=B6=E5=AD=90=E8=8F=9C=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复菜单选中时，同级非叶子菜单样式展示不对的问题
---
 src/layouts/components/Menu/BasicMenu.vue           | 13 ++++++++-----
 src/layouts/components/Menu/components/MenuItem.vue |  6 +++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index c9ddff26..c98458f7 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -121,6 +121,7 @@ function resolveFullPath(routePath: string) {
  */
 const onMenuOpen = (index: string) => {
   expandedMenuIndexes.value.push(index);
+  updateParentMenuStyles();
 };
 
 /**
@@ -130,6 +131,7 @@ const onMenuOpen = (index: string) => {
  */
 const onMenuClose = (index: string) => {
   expandedMenuIndexes.value = expandedMenuIndexes.value.filter((item) => item !== index);
+  updateParentMenuStyles();
 };
 
 /**
@@ -164,9 +166,9 @@ watch(
 watch(
   () => currentRoute.path,
   () => {
-    nextTick(() => {
-      updateParentMenuStyles();
-    });
+    // nextTick(() => {
+    //   updateParentMenuStyles();
+    // });
   }
 );
 
@@ -189,12 +191,13 @@ function updateParentMenuStyles() {
 
       // 查找当前激活的菜单项
       const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
-
+      console.log("activeMenuItem", activeMenuItem);
       if (activeMenuItem) {
         // 向上查找父级 el-sub-menu 元素
         let parent = activeMenuItem.parentElement;
         while (parent && parent !== menuEl) {
-          if (parent.classList.contains("el-sub-menu")) {
+          if (parent.classList.contains("el-sub-menu") && parent.classList.contains("is-active")) {
+            console.log("parent", parent);
             parent.classList.add("has-active-child");
           }
           parent = parent.parentElement;
diff --git a/src/layouts/components/Menu/components/MenuItem.vue b/src/layouts/components/Menu/components/MenuItem.vue
index fe7d9377..fc2f9d4a 100644
--- a/src/layouts/components/Menu/components/MenuItem.vue
+++ b/src/layouts/components/Menu/components/MenuItem.vue
@@ -194,7 +194,7 @@ html.sidebar-color-blue {
 // 父菜单激活状态样式 - 当子菜单激活时，父菜单显示激活状态
 .el-sub-menu {
   // 当父菜单包含激活子菜单时的样式
-  &.has-active-child .el-sub-menu__title {
+  &.has-active-child > .el-sub-menu__title {
     color: var(--el-color-primary) !important;
     background-color: var(--el-color-primary-light-9) !important;
 
@@ -205,7 +205,7 @@ html.sidebar-color-blue {
 
   // 深色主题下的父菜单激活状态
   html.dark & {
-    &.has-active-child .el-sub-menu__title {
+    &.has-active-child > .el-sub-menu__title {
       color: var(--el-color-primary-light-3) !important;
       background-color: rgba(64, 128, 255, 0.15) !important;
 
@@ -217,7 +217,7 @@ html.sidebar-color-blue {
 
   // 深蓝色侧边栏配色下的父菜单激活状态
   html.sidebar-color-blue & {
-    &.has-active-child .el-sub-menu__title {
+    &.has-active-child > .el-sub-menu__title {
       color: var(--el-color-primary-light-3) !important;
       background-color: rgba(64, 128, 255, 0.2) !important;
 

From 3c010168dfde0e7df7f297c495c5c14de2dace80 Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Tue, 12 Aug 2025 10:54:02 +0800
Subject: [PATCH 442/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=BE=93=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

优化逻辑，删除日志输出
---
 src/layouts/components/Menu/BasicMenu.vue | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index c98458f7..1f9be972 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -121,7 +121,6 @@ function resolveFullPath(routePath: string) {
  */
 const onMenuOpen = (index: string) => {
   expandedMenuIndexes.value.push(index);
-  updateParentMenuStyles();
 };
 
 /**
@@ -131,9 +130,18 @@ const onMenuOpen = (index: string) => {
  */
 const onMenuClose = (index: string) => {
   expandedMenuIndexes.value = expandedMenuIndexes.value.filter((item) => item !== index);
-  updateParentMenuStyles();
 };
 
+/**
+ * 监听展开的菜单项变化，更新父菜单样式
+ */
+watch(
+  () => expandedMenuIndexes.value,
+  () => {
+    updateParentMenuStyles();
+  }
+);
+
 /**
  * 监听菜单模式变化：当菜单模式切换为水平模式时，关闭所有展开的菜单项，
  * 避免在水平模式下菜单项显示错位。
@@ -166,9 +174,9 @@ watch(
 watch(
   () => currentRoute.path,
   () => {
-    // nextTick(() => {
-    //   updateParentMenuStyles();
-    // });
+    nextTick(() => {
+      updateParentMenuStyles();
+    });
   }
 );
 
@@ -191,13 +199,12 @@ function updateParentMenuStyles() {
 
       // 查找当前激活的菜单项
       const activeMenuItem = menuEl.querySelector(".el-menu-item.is-active");
-      console.log("activeMenuItem", activeMenuItem);
+
       if (activeMenuItem) {
         // 向上查找父级 el-sub-menu 元素
         let parent = activeMenuItem.parentElement;
         while (parent && parent !== menuEl) {
-          if (parent.classList.contains("el-sub-menu") && parent.classList.contains("is-active")) {
-            console.log("parent", parent);
+          if (parent.classList.contains("el-sub-menu")) {
             parent.classList.add("has-active-child");
           }
           parent = parent.parentElement;

From 1b3025b05fa95fb0cb5627e8913ee854e2dc9334 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 14 Aug 2025 09:17:11 +0800
Subject: [PATCH 443/497] =?UTF-8?q?feat:=20:sparkles:=20=E6=95=B4=E5=90=88?=
 =?UTF-8?q?`vue-pdf-embed`=E5=AE=9E=E7=8E=B0PDF=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   |   3 +-
 src/views/demo/pdf-preview.vue | 564 +++++++++++++++++++++++++++++++++
 2 files changed, 566 insertions(+), 1 deletion(-)
 create mode 100644 src/views/demo/pdf-preview.vue

diff --git a/package.json b/package.json
index fd21c049..43f5dc8e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.1.0",
+  "version": "3.2.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -69,6 +69,7 @@
     "vue": "^3.5.18",
     "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "^11.1.11",
+    "vue-pdf-embed": "^2.1.3",
     "vue-router": "^4.5.1",
     "vxe-table": "~4.6.25"
   },
diff --git a/src/views/demo/pdf-preview.vue b/src/views/demo/pdf-preview.vue
new file mode 100644
index 00000000..d22b4acb
--- /dev/null
+++ b/src/views/demo/pdf-preview.vue
@@ -0,0 +1,564 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card">
+      <template #header>
+        <div class="card-header flex justify-between items-center">
+          <div class="flex items-center gap-2">
+            <span>PDF预览组件演示</span>
+            <el-tag type="info">vue-pdf-embed</el-tag>
+          </div>
+          <el-link
+            :icon="Link"
+            href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/pdf-preview.vue"
+            type="primary"
+            target="_blank"
+          >
+            源码
+          </el-link>
+        </div>
+      </template>
+
+      <div class="pdf-layout">
+        <!-- 左侧：控制面板 + 工具栏 + 设置 -->
+        <div class="side-panel">
+          <!-- 控制面板 -->
+          <div class="control-panel mb-4">
+            <el-row :gutter="16">
+              <el-col :span="24">
+                <el-form-item label="选择PDF文件:">
+                  <el-select v-model="selectedPdf" placeholder="请选择PDF文件" style="width: 100%">
+                    <el-option
+                      v-for="pdf in pdfOptions"
+                      :key="pdf.value"
+                      :label="pdf.label"
+                      :value="pdf.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="自定义PDF链接:">
+                  <el-input
+                    v-model="customPdfUrl"
+                    placeholder="请输入PDF链接"
+                    @keyup.enter="loadCustomPdf"
+                  >
+                    <template #append>
+                      <el-button @click="loadCustomPdf">加载</el-button>
+                    </template>
+                  </el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- PDF工具栏 -->
+          <div class="pdf-toolbar mb-4">
+            <el-row :gutter="12" class="items-center">
+              <el-col :span="24">
+                <div class="flex items-center gap-2 mb-2">
+                  <el-button
+                    type="primary"
+                    :icon="ZoomIn"
+                    size="small"
+                    :disabled="!pdfSrc"
+                    @click="zoomIn"
+                  >
+                    放大
+                  </el-button>
+                  <el-button
+                    type="primary"
+                    :icon="ZoomOut"
+                    size="small"
+                    :disabled="!pdfSrc"
+                    @click="zoomOut"
+                  >
+                    缩小
+                  </el-button>
+                  <el-button size="small" :disabled="!pdfSrc" @click="resetZoom">
+                    重置缩放
+                  </el-button>
+                </div>
+                <div class="flex items-center gap-2">
+                  <el-button
+                    type="primary"
+                    size="small"
+                    :disabled="currentPage <= 1"
+                    @click="prevPage"
+                  >
+                    上一页
+                  </el-button>
+                  <el-input-number
+                    v-model="currentPage"
+                    :min="minPage"
+                    :max="maxPage"
+                    size="small"
+                    style="width: 120px"
+                    :disabled="!pdfSrc"
+                    @change="handlePageNumberChange"
+                  />
+                  <span class="text-sm text-gray-500">/ {{ totalPages }}</span>
+                  <el-button
+                    type="primary"
+                    size="small"
+                    :disabled="currentPage >= totalPages"
+                    @click="nextPage"
+                  >
+                    下一页
+                  </el-button>
+                </div>
+                <div class="flex items-center justify-between mt-2">
+                  <span class="text-sm text-gray-500">缩放: {{ Math.round(scale * 100) }}%</span>
+                  <el-button
+                    type="success"
+                    :icon="Download"
+                    size="small"
+                    :disabled="!pdfSrc"
+                    @click="downloadPdf"
+                  >
+                    下载
+                  </el-button>
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+
+          <!-- 设置面板 -->
+          <div class="settings-panel">
+            <el-row :gutter="16">
+              <el-col :span="24">
+                <el-form-item label="显示缩略图:">
+                  <el-switch v-model="showThumbnails" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="24">
+                <el-form-item label="旋转角度:">
+                  <el-select v-model="rotation" style="width: 100%">
+                    <el-option label="0°" :value="0" />
+                    <el-option label="90°" :value="90" />
+                    <el-option label="180°" :value="180" />
+                    <el-option label="270°" :value="270" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+        </div>
+
+        <!-- 中间：预览区域 -->
+        <div class="preview-panel">
+          <div
+            ref="previewWrapRef"
+            v-loading="loading"
+            class="pdf-container"
+            element-loading-text="PDF加载中..."
+            element-loading-background="rgba(255,255,255,0.6)"
+          >
+            <div v-if="error" class="error-container">
+              <el-result icon="error" title="PDF加载失败" :sub-title="error">
+                <template #extra>
+                  <el-button type="primary" @click="retryLoad">重试</el-button>
+                </template>
+              </el-result>
+            </div>
+
+            <div v-else-if="!pdfSrc" class="empty-container">
+              <el-empty description="请选择要预览的PDF文件" />
+            </div>
+
+            <div v-else class="pdf-viewer">
+              <VuePdfEmbed
+                ref="pdfRef"
+                :source="pdfSrc"
+                :page="currentPage"
+                :width="pageWidth"
+                :rotation="rotation"
+                class="pdf-embed"
+                @loaded="onPdfLoaded"
+                @loading-failed="onLoadingFailed"
+                @page-loaded="onPageLoaded"
+                @password-requested="onPasswordRequested"
+              />
+            </div>
+          </div>
+        </div>
+
+        <!-- 右侧：竖向缩略图栏 -->
+        <div v-if="showThumbnails && pdfSrc" class="thumb-panel">
+          <div class="thumbs-wrap">
+            <div
+              v-for="pageNum in totalPages"
+              :key="pageNum"
+              :class="['thumb-item', { active: pageNum === currentPage }]"
+              @click="goToPage(pageNum)"
+            >
+              <VuePdfEmbed :source="pdfSrc" :page="pageNum" :scale="0.2" class="thumbnail-pdf" />
+              <div class="thumb-label">{{ pageNum }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup lang="ts">
+import VuePdfEmbed from "vue-pdf-embed";
+import { ZoomIn, ZoomOut, Download, Link } from "@element-plus/icons-vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+
+defineOptions({
+  name: "PdfPreview",
+  inheritAttrs: false,
+});
+
+// PDF源文件
+const pdfSrc = ref<string>("");
+const selectedPdf = ref<string>("");
+const customPdfUrl = ref<string>("");
+
+// PDF状态
+const loading = ref(false);
+const error = ref<string>("");
+const totalPages = ref(0);
+const currentPage = ref(1);
+const scale = ref(1.0);
+const rotation = ref(0);
+// 确保 InputNumber 的 min <= max
+const minPage = computed(() => 1);
+const maxPage = computed(() => Math.max(totalPages.value, 1));
+
+// 设置选项
+const showThumbnails = ref(false);
+
+// PDF引用
+const pdfRef = ref();
+const previewWrapRef = ref<HTMLElement | null>(null);
+
+// 缩放以“容器宽度”为基准：pageWidth = containerWidth * scale
+const pageWidth = ref<number | undefined>(undefined);
+const updatePageWidth = () => {
+  const wrap = previewWrapRef.value;
+  if (!wrap) return;
+  // 预留左右 padding
+  const containerWidth = Math.max(200, wrap.clientWidth - 40);
+  pageWidth.value = Math.round(containerWidth * scale.value);
+};
+
+// 预设PDF选项
+const pdfOptions = [
+  {
+    label: "示例PDF文档",
+    value: "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
+  },
+];
+
+// 监听选中的PDF变化
+watch(selectedPdf, (newVal) => {
+  if (newVal) loadPdf(newVal);
+});
+
+// 默认选中第一个示例并加载
+onMounted(() => {
+  if (!selectedPdf.value && pdfOptions.length > 0) {
+    selectedPdf.value = pdfOptions[0].value;
+  }
+  // 初始计算
+  nextTick(updatePageWidth);
+  window.addEventListener("resize", updatePageWidth);
+});
+
+onBeforeUnmount(() => {
+  window.removeEventListener("resize", updatePageWidth);
+});
+
+// 加载PDF
+const loadPdf = async (url: string) => {
+  loading.value = true;
+  error.value = "";
+  pdfSrc.value = url;
+  currentPage.value = 1;
+  scale.value = 1.0;
+  rotation.value = 0;
+  nextTick(updatePageWidth);
+};
+
+// 加载自定义PDF
+const loadCustomPdf = () => {
+  if (!customPdfUrl.value.trim()) return ElMessage.warning("请输入PDF链接");
+  if (!customPdfUrl.value.toLowerCase().endsWith(".pdf"))
+    return ElMessage.warning("请输入有效的PDF链接");
+  loadPdf(customPdfUrl.value.trim());
+};
+
+// 仅在首次/切换 source 时提示加载完成
+const lastLoadedSrc = ref<string>("");
+const onPdfLoaded = (pdf: any) => {
+  loading.value = false;
+  totalPages.value = pdf.numPages;
+  if (pdfSrc.value !== lastLoadedSrc.value) {
+    lastLoadedSrc.value = pdfSrc.value;
+    ElMessage.success(`PDF加载成功，共 ${pdf.numPages} 页`);
+  }
+};
+
+// PDF加载失败
+const onLoadingFailed = (error: any) => {
+  loading.value = false;
+  error.value = error.message || "PDF加载失败";
+  ElMessage.error("PDF加载失败: " + error.value);
+};
+
+// 页面加载完成
+const onPageLoaded = () => {};
+
+// 密码保护的PDF
+const onPasswordRequested = async (callback: any) => {
+  try {
+    const { value: password } = await ElMessageBox.prompt(
+      "此PDF文件受密码保护，请输入密码",
+      "密码验证",
+      {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        inputType: "password",
+      }
+    );
+    callback(password);
+  } catch {
+    callback(null);
+  }
+};
+
+// 重试加载
+const retryLoad = () => {
+  if (pdfSrc.value) loadPdf(pdfSrc.value);
+};
+
+// 放大/缩小/重置
+const zoomIn = () => {
+  scale.value = Math.min(scale.value + 0.25, 3.0);
+  updatePageWidth();
+};
+const zoomOut = () => {
+  scale.value = Math.max(scale.value - 0.25, 0.25);
+  updatePageWidth();
+};
+const resetZoom = () => {
+  scale.value = 1.0;
+  updatePageWidth();
+};
+
+// 上一页/下一页
+const prevPage = () => {
+  if (currentPage.value > 1) currentPage.value--;
+};
+const nextPage = () => {
+  if (currentPage.value < totalPages.value) currentPage.value++;
+};
+
+// 跳转到指定页（用于按钮/缩略图）
+const goToPage = (page: number) => {
+  if (typeof page !== "number") return;
+  if (page >= 1 && page <= totalPages.value) currentPage.value = page;
+};
+
+// 处理 el-input-number 的 @change 回调签名 (cur, prev)
+const handlePageNumberChange = (cur?: number) => {
+  if (typeof cur !== "number") return;
+  goToPage(cur);
+};
+
+// 下载PDF
+const downloadPdf = () => {
+  if (!pdfSrc.value) return;
+  const src = pdfSrc.value as string;
+
+  // 如果是 http(s) 链接，用 fetch 以 Blob 下载，确保进入浏览器下载管理器
+  if (/^https?:/i.test(src)) {
+    (async () => {
+      try {
+        const response = await fetch(src, { mode: "cors" });
+        const blob = await response.blob();
+
+        // 从响应头或 URL 推断文件名
+        const getFileName = () => {
+          const cd = response.headers.get("content-disposition") || "";
+          const m = cd.match(/filename\*=UTF-8''([^;]+)|filename="?([^";]+)"?/i);
+          if (m) return decodeURIComponent(m[1] || m[2]);
+          try {
+            const u = new URL(src, window.location.href);
+            const name = u.pathname.split("/").pop() || "";
+            return name || `document-${Date.now()}.pdf`;
+          } catch {
+            return `document-${Date.now()}.pdf`;
+          }
+        };
+
+        const fileName = getFileName();
+        const url = URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = fileName.endsWith(".pdf") ? fileName : `${fileName}.pdf`;
+        document.body.appendChild(a);
+        a.click();
+        a.remove();
+        URL.revokeObjectURL(url);
+        ElMessage.success("已开始下载");
+      } catch {
+        // 回退到组件内置下载
+        try {
+          await (pdfRef.value as any)?.download?.(`document-${Date.now()}.pdf`);
+        } catch {
+          ElMessage.error("下载失败");
+        }
+      }
+    })();
+    return;
+  }
+
+  // 其他来源（如 base64、本地 Blob 等）使用组件自带方法
+  try {
+    (pdfRef.value as any)?.download?.(`document-${Date.now()}.pdf`);
+  } catch {
+    // 最后兜底：创建本地链接
+    const link = document.createElement("a");
+    link.href = src;
+    link.download = `document-${Date.now()}.pdf`;
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  .card-header {
+    font-weight: 600;
+  }
+
+  .pdf-layout {
+    display: flex;
+    gap: 16px;
+  }
+
+  .side-panel {
+    position: sticky;
+    top: 0;
+    flex-shrink: 0;
+    align-self: flex-start;
+    width: 320px;
+  }
+
+  .control-panel {
+    padding: 16px;
+    background-color: var(--el-bg-color-page);
+    border-radius: 6px;
+  }
+
+  .pdf-toolbar {
+    padding: 12px;
+    background-color: var(--el-fill-color-lighter);
+    border: 1px solid var(--el-border-color-light);
+    border-radius: 6px;
+  }
+
+  .preview-panel {
+    flex: 1;
+    min-width: 0;
+  }
+
+  .pdf-container {
+    position: relative;
+    min-height: 400px;
+    max-height: 80vh; /* 预览区域上限高度，超出出现滚动条 */
+    overflow: auto; /* 允许横向滚动以展示放大效果 */
+    background-color: #f5f5f5;
+    border: 1px solid var(--el-border-color);
+    border-radius: 6px;
+
+    .loading-container,
+    .error-container,
+    .empty-container {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      height: 400px;
+    }
+
+    .pdf-viewer {
+      display: flex;
+      justify-content: flex-start; /* 放大后从左侧开始，避免被居中压缩 */
+      padding: 20px;
+
+      .pdf-embed {
+        border: 1px solid #ddd;
+        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+        :deep(canvas) {
+          display: block;
+          max-width: none !important; /* 允许超出容器按实际像素渲染 */
+        }
+        /* 让 overlay 图层不参与流式高度计算 */
+        :deep(.textLayer),
+        :deep(.annotationLayer) {
+          position: absolute !important;
+          top: 0;
+          right: 0;
+          bottom: 0;
+          left: 0;
+          pointer-events: auto;
+        }
+      }
+    }
+  }
+
+  /* 右侧缩略图栏 */
+  .thumb-panel {
+    flex-shrink: 0;
+    align-self: flex-start;
+    width: 220px;
+  }
+  .thumbs-wrap {
+    max-height: 80vh;
+    padding: 8px;
+    overflow-y: auto;
+    background: var(--el-bg-color-page);
+    border: 1px solid var(--el-border-color-light);
+    border-radius: 6px;
+  }
+  .thumb-item {
+    position: relative;
+    padding: 8px;
+    margin-bottom: 8px;
+    cursor: pointer;
+    border: 2px solid transparent;
+    border-radius: 4px;
+    transition: all 0.2s ease;
+    &:hover {
+      background-color: var(--el-color-primary-light-9);
+      border-color: var(--el-color-primary);
+    }
+    &.active {
+      background-color: var(--el-color-primary-light-8);
+      border-color: var(--el-color-primary);
+    }
+    .thumbnail-pdf {
+      width: 100%;
+      border: 1px solid #ddd;
+    }
+    .thumb-label {
+      margin-top: 4px;
+      font-size: 12px;
+      color: var(--el-text-color-regular);
+      text-align: center;
+    }
+  }
+
+  .settings-panel {
+    padding: 16px;
+    background-color: var(--el-bg-color-page);
+    border-radius: 6px;
+  }
+}
+</style>

From f557f2e5adcf5c18c9150e9080ae8cb53356e86d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 14 Aug 2025 09:38:21 +0800
Subject: [PATCH 444/497] =?UTF-8?q?feat:=20:sparkles:=20(components)?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20`KeepCache`=20=E7=BB=84=E4=BB=B6=E7=94=A8?=
 =?UTF-8?q?=E4=BA=8E=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/KeepCache/index.vue | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/components/KeepCache/index.vue

diff --git a/src/components/KeepCache/index.vue b/src/components/KeepCache/index.vue
new file mode 100644
index 00000000..1deaabe6
--- /dev/null
+++ b/src/components/KeepCache/index.vue
@@ -0,0 +1,18 @@
+<template>
+  <router-view>
+    <template #default="{ Component, route }">
+      <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
+        <keep-alive :include="tagsViewStore.cachedViews">
+          <component :is="Component" :key="route.path" />
+        </keep-alive>
+      </transition>
+    </template>
+  </router-view>
+</template>
+<script setup lang="ts">
+defineOptions({ name: "KeepCache" });
+
+import { useTagsViewStore } from "@/store";
+
+const tagsViewStore = useTagsViewStore();
+</script>

From d90ccb248cd0818c1d99affa124b7a4b6b1bcec5 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 14 Aug 2025 09:40:48 +0800
Subject: [PATCH 445/497] =?UTF-8?q?feat:=20:sparkles:=20(keep-alive)?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2=E7=BC=93=E5=AD=98=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 重构 AppMain 组件，引入 KeepCache 组件实现统一缓存

- 新增 DemoDetail 组件作为缓存测试页面

- 更新 TagsView 组件，优化缓存路由逻辑

- 修改 permission.store.ts，增加 allCacheRoutes 状态管理

- 更新 tags-view.store.ts，实现缓存路由的动态设置

- 调整多级菜单示例，支持缓存功能
---
 src/layouts/components/AppMain/index.vue      | 15 ++----
 src/layouts/components/TagsView/index.vue     | 12 ++++-
 src/router/index.ts                           |  6 +++
 src/store/modules/permission.store.ts         | 49 +++++++++++++++++++
 src/store/modules/tags-view.store.ts          | 34 ++++++++++++-
 src/views/demo/detail.vue                     | 17 +++++++
 .../multi-level/children/children/detail.ts   | 34 +++++++++++++
 .../children/children/level3-1.vue            | 11 ++++-
 .../children/children/level3-2.vue            | 11 ++++-
 .../demo/multi-level/children/level2.vue      | 11 +++--
 src/views/demo/multi-level/level1.vue         | 13 +++--
 11 files changed, 189 insertions(+), 24 deletions(-)
 create mode 100644 src/views/demo/detail.vue
 create mode 100644 src/views/demo/multi-level/children/children/detail.ts

diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 8510dc64..4a2ae912 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -1,23 +1,14 @@
 <template>
   <section class="app-main" :style="{ height: appMainHeight }">
-    <router-view>
-      <template #default="{ Component, route }">
-        <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
-          <keep-alive :include="cachedViews">
-            <component :is="Component" :key="route.path" />
-          </keep-alive>
-        </transition>
-      </template>
-    </router-view>
+    <KeepCache />
   </section>
 </template>
 
 <script setup lang="ts">
-import { useSettingsStore, useTagsViewStore } from "@/store";
+import { useSettingsStore } from "@/store";
 import variables from "@/styles/variables.module.scss";
+import KeepCache from "@/components/KeepCache/index.vue";
 
-// 缓存页面集合
-const cachedViews = computed(() => useTagsViewStore().cachedViews);
 const appMainHeight = computed(() => {
   if (useSettingsStore().showTagsView) {
     return `calc(100vh - ${variables["navbar-height"]} - ${variables["tags-view-height"]})`;
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 8e5cf1af..c1a3fd58 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -77,7 +77,17 @@ const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
 const settingsStore = useSettingsStore();
 
-const { visitedViews } = storeToRefs(tagsViewStore);
+// const { visitedViews } = storeToRefs(tagsViewStore);
+
+const visitedViews = ref<TagView[]>([]);
+
+watchEffect(() => {
+  visitedViews.value = tagsViewStore.visitedViews;
+  const names = visitedViews.value.map((item) => item.name).filter(Boolean);
+
+  tagsViewStore.setCacheRoutes(names, permissionStore.allCacheRoutes);
+});
+
 const layout = computed(() => settingsStore.layout);
 
 // 当前选中的标签
diff --git a/src/router/index.ts b/src/router/index.ts
index 38bf3e60..2f156190 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -64,6 +64,12 @@ export const constantRoutes: RouteRecordRaw[] = [
         component: () => import("@/views/system/notice/components/MyNotice.vue"),
         meta: { title: "我的通知", icon: "user", hidden: true },
       },
+      {
+        path: "/detail/:id(\\d+)",
+        name: "DemoDetail",
+        component: () => import("@/views/demo/detail.vue"),
+        meta: { title: "详情页缓存", icon: "user", hidden: true, keepAlive: true },
+      },
     ],
   },
 ];
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index 315a9254..f0675d23 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -15,6 +15,8 @@ export const usePermissionStore = defineStore("permission", () => {
   // 动态路由是否已生成
   const isDynamicRoutesGenerated = ref(false);
 
+  const allCacheRoutes = ref<string[][]>([]);
+
   /**
    * 生成动态路由
    */
@@ -24,6 +26,8 @@ export const usePermissionStore = defineStore("permission", () => {
       const dynamicRoutes = parseDynamicRoutes(data);
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
+
+      setAllCacheRoutes(routes.value);
       isDynamicRoutesGenerated.value = true;
 
       return dynamicRoutes;
@@ -60,10 +64,33 @@ export const usePermissionStore = defineStore("permission", () => {
     isDynamicRoutesGenerated.value = false;
   };
 
+  /**
+   * 获取所有的缓存路由
+   * @param userRoutes 用户路由配置
+   */
+  const setAllCacheRoutes = (userRoutes: RouteRecordRaw[]) => {
+    if (!userRoutes?.length) {
+      allCacheRoutes.value = [];
+
+      return;
+    }
+
+    const result: string[][] = [];
+
+    userRoutes.forEach((route) => {
+      if (route.children?.length) {
+        traverseRoutes(route.children, [], result);
+      }
+    });
+
+    allCacheRoutes.value = result;
+  };
+
   return {
     routes,
     mixLayoutSideMenus,
     isDynamicRoutesGenerated,
+    allCacheRoutes,
     generateRoutes,
     setMixLayoutSideMenus,
     resetRouter,
@@ -100,6 +127,28 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
   return parsedRoutes;
 };
 
+/**
+ * 遍历路由树收集缓存路由
+ * @param nodes 路由节点
+ * @param path 当前路径
+ * @param result 结果数组
+ */
+const traverseRoutes = (nodes: RouteRecordRaw[], path: string[], result: string[][]) => {
+  nodes.forEach((node) => {
+    const newPath: string[] = node.name ? [...path, String(node.name)] : [...path];
+
+    // 叶子节点且需要缓存
+    if (!node.children?.length && node.meta?.keepAlive) {
+      result.push(newPath);
+    }
+
+    // 递归处理子节点
+    if (node.children?.length) {
+      traverseRoutes(node.children, newPath, result);
+    }
+  });
+};
+
 /**
  * 导出此hook函数用于在非组件环境(如其他store、工具函数等)中获取权限store实例
  *
diff --git a/src/store/modules/tags-view.store.ts b/src/store/modules/tags-view.store.ts
index 7a39ffb8..d2b2724d 100644
--- a/src/store/modules/tags-view.store.ts
+++ b/src/store/modules/tags-view.store.ts
@@ -12,7 +12,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     if (view.path.startsWith("/redirect")) {
       return;
     }
-    if (visitedViews.value.some((v) => v.name === view.name)) {
+    if (visitedViews.value.some((v) => v.path === view.path)) {
       return;
     }
     // 如果视图是固定的（affix），则在已访问的视图列表的开头添加
@@ -232,6 +232,37 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     }
   }
 
+  const setCacheRoutes = (names: string[], allCacheRoutes: string[][]) => {
+    if (!names?.length) {
+      cachedViews.value = [];
+
+      return;
+    }
+
+    cachedViews.value = findAndMergeRouteArrays(allCacheRoutes, names);
+  };
+
+  /**
+   * 查找并合并路由数组
+   * @param data 所有缓存路由数据
+   * @param elements 目标元素
+   * @returns 合并后的路由数组
+   */
+  const findAndMergeRouteArrays = (data: string[][], elements: string[]): string[] => {
+    const foundArrays = elements
+      .map((element) => data.find((arr) => arr.includes(element)))
+      .filter(Boolean) as string[][];
+
+    // 使用Set去重并合并
+    const mergedSet = new Set<string>();
+
+    foundArrays.forEach((arr) => {
+      arr.forEach((item) => mergedSet.add(item));
+    });
+
+    return Array.from(mergedSet);
+  };
+
   return {
     visitedViews,
     cachedViews,
@@ -253,5 +284,6 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     closeCurrentView,
     isActive,
     toLastView,
+    setCacheRoutes,
   };
 });
diff --git a/src/views/demo/detail.vue b/src/views/demo/detail.vue
new file mode 100644
index 00000000..e4cc0f6f
--- /dev/null
+++ b/src/views/demo/detail.vue
@@ -0,0 +1,17 @@
+<template>
+  <div p-5 flex flex-col gap="20px">
+    <div>params: {{ route.params }}</div>
+    <div>query: {{ route.query }}</div>
+    <el-input v-model="value" placeholder="缓存测试" />
+  </div>
+</template>
+<script lang="ts" setup>
+defineOptions({
+  name: "DemoDetail",
+});
+
+const route = useRoute();
+console.log(route);
+
+const value = ref("");
+</script>
diff --git a/src/views/demo/multi-level/children/children/detail.ts b/src/views/demo/multi-level/children/children/detail.ts
new file mode 100644
index 00000000..aee29298
--- /dev/null
+++ b/src/views/demo/multi-level/children/children/detail.ts
@@ -0,0 +1,34 @@
+import router from "@/router";
+import { ElButton } from "element-plus";
+
+export default defineComponent({
+  name: "ToDetail",
+  setup() {
+    // 跳转详情
+    const navigateToDetail = async (id: number) => {
+      await router.push({
+        path: "/detail/" + id,
+        query: { mes: `msg${id}` },
+      });
+    };
+    return () =>
+      h("div", null, [
+        h(
+          ElButton,
+          {
+            type: "primary",
+            onClick: () => navigateToDetail(1),
+          },
+          "跳转详情1"
+        ),
+        h(
+          ElButton,
+          {
+            type: "success",
+            onClick: () => navigateToDetail(2),
+          },
+          "跳转详情2"
+        ),
+      ]);
+  },
+});
diff --git a/src/views/demo/multi-level/children/children/level3-1.vue b/src/views/demo/multi-level/children/children/level3-1.vue
index 888f58e9..246ace76 100644
--- a/src/views/demo/multi-level/children/children/level3-1.vue
+++ b/src/views/demo/multi-level/children/children/level3-1.vue
@@ -1,5 +1,14 @@
 <template>
-  <div style="padding: 30px">
+  <div flex flex-col gap-20px>
     <el-alert :closable="false" title="菜单三级-1" type="error" />
+    <el-input v-model="value" placeholder="缓存测试" />
+    <ToDetail />
   </div>
 </template>
+<script lang="ts" setup>
+import ToDetail from "./detail";
+
+defineOptions({ name: "MultiLevel31" });
+
+const value = ref("");
+</script>
diff --git a/src/views/demo/multi-level/children/children/level3-2.vue b/src/views/demo/multi-level/children/children/level3-2.vue
index a99c98e9..5e1beae4 100644
--- a/src/views/demo/multi-level/children/children/level3-2.vue
+++ b/src/views/demo/multi-level/children/children/level3-2.vue
@@ -1,5 +1,14 @@
 <template>
-  <div style="padding: 30px">
+  <div flex flex-col gap-20px>
     <el-alert :closable="false" title="菜单三级-2" type="warning" />
+    <el-input v-model="value" placeholder="缓存测试" />
+    <ToDetail />
   </div>
 </template>
+
+<script lang="ts" setup>
+import ToDetail from "./detail";
+
+defineOptions({ name: "MultiLevel32" });
+const value = ref("");
+</script>
diff --git a/src/views/demo/multi-level/children/level2.vue b/src/views/demo/multi-level/children/level2.vue
index abcc3a7e..f3de974f 100644
--- a/src/views/demo/multi-level/children/level2.vue
+++ b/src/views/demo/multi-level/children/level2.vue
@@ -1,7 +1,10 @@
 <template>
-  <div style="padding: 30px">
-    <el-alert :closable="false" title="菜单二级" type="success">
-      <router-view />
-    </el-alert>
+  <div flex flex-col gap-20px>
+    <el-alert :closable="false" title="菜单二级" type="success" />
+    <KeepCache />
   </div>
 </template>
+<script setup lang="ts">
+import KeepCache from "@/components/KeepCache/index.vue";
+defineOptions({ name: "MultiLevel2" });
+</script>
diff --git a/src/views/demo/multi-level/level1.vue b/src/views/demo/multi-level/level1.vue
index 6264f9f2..dc451f0d 100644
--- a/src/views/demo/multi-level/level1.vue
+++ b/src/views/demo/multi-level/level1.vue
@@ -1,5 +1,5 @@
 <template>
-  <div style="padding: 30px">
+  <div p-30px>
     <el-link
       href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/multi-level/level1.vue"
       type="primary"
@@ -9,8 +9,13 @@
       示例源码 请点击>>>>
     </el-link>
 
-    <el-alert :closable="false" title="菜单一级">
-      <router-view />
-    </el-alert>
+    <div flex flex-col gap-20px>
+      <el-alert :closable="false" title="菜单一级" />
+      <KeepCache />
+    </div>
   </div>
 </template>
+<script setup lang="ts">
+import KeepCache from "@/components/KeepCache/index.vue";
+defineOptions({ name: "MultiLevel1" });
+</script>

From c7b797278a1293c1ce2ea997bbecc16afe73996d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 14 Aug 2025 09:59:23 +0800
Subject: [PATCH 446/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AF=A6=E6=83=85=E9=A1=B5=E8=B7=AF=E7=94=B1?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/demo/multi-level/children/children/detail.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/demo/multi-level/children/children/detail.ts b/src/views/demo/multi-level/children/children/detail.ts
index aee29298..21c9ea2f 100644
--- a/src/views/demo/multi-level/children/children/detail.ts
+++ b/src/views/demo/multi-level/children/children/detail.ts
@@ -8,7 +8,7 @@ export default defineComponent({
     const navigateToDetail = async (id: number) => {
       await router.push({
         path: "/detail/" + id,
-        query: { mes: `msg${id}` },
+        query: { message: `msg${id}` },
       });
     };
     return () =>

From b77ea4ebf74e99aba617243a39614d97fc3787ca Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 14 Aug 2025 10:07:16 +0800
Subject: [PATCH 447/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=A4=9A=E7=BA=A7=E8=B7=AF=E7=94=B1=E7=BB=84=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E6=8C=89=E9=92=AE=E6=8F=92=E6=A7=BD=E8=AD=A6=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 multi-level 组件的 detail.ts 文件中，将按钮的文本内容改为使用默认插槽的方式渲染
---
 src/views/demo/multi-level/children/children/detail.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/demo/multi-level/children/children/detail.ts b/src/views/demo/multi-level/children/children/detail.ts
index 21c9ea2f..29549a7c 100644
--- a/src/views/demo/multi-level/children/children/detail.ts
+++ b/src/views/demo/multi-level/children/children/detail.ts
@@ -19,7 +19,7 @@ export default defineComponent({
             type: "primary",
             onClick: () => navigateToDetail(1),
           },
-          "跳转详情1"
+          { default: () => "跳转详情1" }
         ),
         h(
           ElButton,
@@ -27,7 +27,7 @@ export default defineComponent({
             type: "success",
             onClick: () => navigateToDetail(2),
           },
-          "跳转详情2"
+          { default: () => "跳转详情2" }
         ),
       ]);
   },

From 9b8299e89558dd2d5e747905ad68141d01a4c4c3 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 14 Aug 2025 16:40:51 +0800
Subject: [PATCH 448/497] =?UTF-8?q?refactor:=20:recycle:=20(layouts)?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84=E6=A0=87=E7=AD=BE=E9=A1=B5=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20`TagsView`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 el-tag 组件替换自定义标签样式

- 改进右键菜单功能，使用 Teleport 组件优化显示位置，修复在混合布局下的位置显示错误

- 移除未使用的 layout 计算属性和冗余代码
---
 src/layouts/components/TagsView/index.vue | 258 ++++++++--------------
 1 file changed, 88 insertions(+), 170 deletions(-)

diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index c1a3fd58..7689b157 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -1,56 +1,69 @@
 <template>
   <div class="tags-container">
     <!-- 水平滚动容器 -->
-    <el-scrollbar ref="scrollbarRef" class="scroll-container" @wheel="handleScroll">
-      <router-link
-        v-for="tag in visitedViews"
-        ref="tagRef"
-        :key="tag.fullPath"
-        :class="['tags-item', { active: tagsViewStore.isActive(tag) }]"
-        :to="{ path: tag.path, query: tag.query }"
-        @click.middle="handleMiddleClick(tag)"
-        @contextmenu.prevent="(event: MouseEvent) => openContextMenu(tag, event)"
-      >
-        <!-- 标签文本 -->
-        <span class="tag-text">{{ translateRouteTitle(tag.title) }}</span>
-        <!-- 关闭按钮，固定标签不显示 -->
-        <span v-if="!tag.affix" class="tag-close-btn" @click.prevent.stop="closeSelectedTag(tag)">
-          ×
-        </span>
-      </router-link>
+    <el-scrollbar
+      ref="scrollbarRef"
+      class="scroll-container"
+      :view-style="{ height: '100%' }"
+      @wheel="handleScroll"
+    >
+      <div h-full flex-y-center gap-8px>
+        <el-tag
+          v-for="tag in visitedViews"
+          :key="tag.fullPath"
+          h-26px
+          cursor-pointer
+          :closable="!tag.affix"
+          :effect="tagsViewStore.isActive(tag) ? 'dark' : 'light'"
+          :type="tagsViewStore.isActive(tag) ? 'primary' : 'info'"
+          @click.middle="handleMiddleClick(tag)"
+          @contextmenu.prevent="(event: MouseEvent) => openContextMenu(tag, event)"
+          @close="closeSelectedTag(tag)"
+          @click="
+            router.push({
+              path: tag.fullPath,
+              query: tag.query,
+            })
+          "
+        >
+          {{ translateRouteTitle(tag.title) }}
+        </el-tag>
+      </div>
     </el-scrollbar>
 
     <!-- 标签右键菜单 -->
-    <ul
-      v-show="contextMenu.visible"
-      class="contextmenu"
-      :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
-    >
-      <li @click="refreshSelectedTag(selectedTag)">
-        <div class="i-svg:refresh" />
-        刷新
-      </li>
-      <li v-if="!selectedTag?.affix" @click="closeSelectedTag(selectedTag)">
-        <div class="i-svg:close" />
-        关闭
-      </li>
-      <li @click="closeOtherTags">
-        <div class="i-svg:close_other" />
-        关闭其它
-      </li>
-      <li v-if="!isFirstView" @click="closeLeftTags">
-        <div class="i-svg:close_left" />
-        关闭左侧
-      </li>
-      <li v-if="!isLastView" @click="closeRightTags">
-        <div class="i-svg:close_right" />
-        关闭右侧
-      </li>
-      <li @click="closeAllTags(selectedTag)">
-        <div class="i-svg:close_all" />
-        关闭所有
-      </li>
-    </ul>
+    <Teleport to="body">
+      <ul
+        v-show="contextMenu.visible"
+        class="contextmenu"
+        :style="{ left: contextMenu.x + 'px', top: contextMenu.y + 'px' }"
+      >
+        <li @click="refreshSelectedTag(selectedTag)">
+          <div class="i-svg:refresh" />
+          刷新
+        </li>
+        <li v-if="!selectedTag?.affix" @click="closeSelectedTag(selectedTag)">
+          <div class="i-svg:close" />
+          关闭
+        </li>
+        <li @click="closeOtherTags">
+          <div class="i-svg:close_other" />
+          关闭其它
+        </li>
+        <li v-if="!isFirstView" @click="closeLeftTags">
+          <div class="i-svg:close_left" />
+          关闭左侧
+        </li>
+        <li v-if="!isLastView" @click="closeRightTags">
+          <div class="i-svg:close_right" />
+          关闭右侧
+        </li>
+        <li @click="closeAllTags(selectedTag)">
+          <div class="i-svg:close_all" />
+          关闭所有
+        </li>
+      </ul>
+    </Teleport>
   </div>
 </template>
 
@@ -58,8 +71,7 @@
 import { useRoute, useRouter, type RouteRecordRaw } from "vue-router";
 import { resolve } from "path-browserify";
 import { translateRouteTitle } from "@/utils/i18n";
-import { usePermissionStore, useTagsViewStore, useSettingsStore } from "@/store";
-import { LayoutMode } from "@/enums";
+import { usePermissionStore, useTagsViewStore } from "@/store";
 
 interface ContextMenu {
   visible: boolean;
@@ -67,17 +79,12 @@ interface ContextMenu {
   y: number;
 }
 
-const instance = getCurrentInstance();
-const proxy = instance?.proxy;
 const router = useRouter();
 const route = useRoute();
 
 // 状态管理
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
-const settingsStore = useSettingsStore();
-
-// const { visitedViews } = storeToRefs(tagsViewStore);
 
 const visitedViews = ref<TagView[]>([]);
 
@@ -88,8 +95,6 @@ watchEffect(() => {
   tagsViewStore.setCacheRoutes(names, permissionStore.allCacheRoutes);
 });
 
-const layout = computed(() => settingsStore.layout);
-
 // 当前选中的标签
 const selectedTag = ref<TagView | null>(null);
 
@@ -224,19 +229,8 @@ const handleMiddleClick = (tag: TagView) => {
  * 打开右键菜单
  */
 const openContextMenu = (tag: TagView, event: MouseEvent) => {
-  const MENU_MIN_WIDTH = 105;
-  const MENU_MARGIN = 15;
-
-  const containerRect = proxy?.$el.getBoundingClientRect();
-  const offsetLeft = containerRect?.left || 0;
-  const containerWidth = proxy?.$el.offsetWidth || 0;
-
-  const maxLeft = containerWidth - MENU_MIN_WIDTH;
-  const leftPosition = event.clientX - offsetLeft + MENU_MARGIN;
-
-  contextMenu.x = Math.min(leftPosition, maxLeft);
-  // 混合模式下，需要减去顶部菜单(fixed)的高度
-  contextMenu.y = layout.value === LayoutMode.MIX ? event.clientY - 50 : event.clientY;
+  contextMenu.x = event.clientX;
+  contextMenu.y = event.clientY;
   contextMenu.visible = true;
 
   selectedTag.value = tag;
@@ -386,113 +380,37 @@ useContextMenuManager();
 .tags-container {
   width: 100%;
   height: $tags-view-height;
-  background-color: var(--el-bg-color);
-  border: 1px solid var(--el-border-color-light);
-  box-shadow: 0 1px 1px var(--el-box-shadow-light);
+  padding: 0 15px;
+  border-top: 1px solid var(--el-border-color-light);
 
   .scroll-container {
     white-space: nowrap;
   }
-
-  .tags-item {
-    position: relative;
-    display: inline-flex;
+}
+.contextmenu {
+  position: absolute;
+  z-index: 3000;
+  padding: 5px 0;
+  margin: 0;
+  font-size: 12px;
+  font-weight: 400;
+  color: var(--el-text-color-primary);
+  list-style-type: none;
+  background: var(--el-bg-color);
+  border-radius: 4px;
+  box-shadow: var(--el-box-shadow-light);
+
+  li {
+    display: flex;
+    gap: 8px;
     align-items: center;
-    height: 26px;
-    padding: 0 8px;
-    margin-top: 4px;
-    margin-left: 5px;
-    font-size: 12px;
-    line-height: 26px;
-    color: var(--el-text-color-primary);
-    background: var(--el-bg-color);
-    border: 1px solid var(--el-border-color);
-    transition: all 0.2s ease;
-
-    &:first-of-type {
-      margin-left: 15px;
-    }
-    &:last-of-type {
-      margin-right: 15px;
-    }
-
-    .tag-text {
-      display: inline-block;
-      vertical-align: middle;
-    }
-
-    .tag-close-btn {
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      width: 16px;
-      height: 16px;
-      margin-left: 5px;
-      font-size: 12px;
-      font-weight: bold;
-      color: var(--el-text-color-secondary);
-      cursor: pointer;
-      border-radius: 50%;
-      transition: all 0.2s ease;
-
-      &:hover {
-        color: var(--el-color-white);
-        background-color: var(--el-text-color-placeholder);
-      }
-    }
-
-    &.active {
-      color: var(--el-color-white);
-      background-color: var(--el-color-primary);
-      border-color: var(--el-color-primary);
-
-      &::before {
-        position: relative;
-        display: inline-block;
-        width: 8px;
-        height: 8px;
-        margin-right: 2px;
-        content: "";
-        background: var(--el-color-white);
-        border-radius: 50%;
-      }
-
-      .tag-close-btn {
-        color: var(--el-color-white);
-
-        &:hover {
-          color: var(--el-color-white);
-          background-color: rgba(255, 255, 255, 0.3);
-        }
-      }
-    }
-  }
-
-  .contextmenu {
-    position: absolute;
-    z-index: 3000;
-    padding: 5px 0;
+    padding: 7px 16px;
     margin: 0;
-    font-size: 12px;
-    font-weight: 400;
-    color: var(--el-text-color-primary);
-    list-style-type: none;
-    background: var(--el-bg-color);
-    border-radius: 4px;
-    box-shadow: var(--el-box-shadow-light);
-
-    li {
-      display: flex;
-      gap: 8px;
-      align-items: center;
-      padding: 7px 16px;
-      margin: 0;
-      cursor: pointer;
-      transition: background-color 0.2s;
-
-      &:hover {
-        background: var(--el-fill-color-light);
-      }
+    cursor: pointer;
+    transition: background-color 0.2s;
+
+    &:hover {
+      background: var(--el-fill-color-light);
     }
   }
 }

From d9b2f55a5eb119587fec49152011333f556313ef Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 14 Aug 2025 18:34:56 +0800
Subject: [PATCH 449/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=92=8C=E8=B7=AF=E7=94=B1=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugins/permission.ts             | 13 +++++++------
 src/store/modules/permission.store.ts |  2 +-
 src/store/modules/user.store.ts       |  1 +
 src/utils/auth.ts                     |  8 --------
 src/views/login/components/Login.vue  |  7 +------
 5 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 0493511a..33d4d601 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -1,6 +1,5 @@
 import type { RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
-import { Auth } from "@/utils/auth";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
 import { ROLE_ROOT } from "@/constants";
@@ -12,7 +11,8 @@ export function setupPermission() {
     NProgress.start();
 
     try {
-      const isLoggedIn = Auth.isLoggedIn();
+      // 使用 store 暴露的登录态，便于后续扩展（如基于过期时间等）
+      const isLoggedIn = useUserStore().isLoggedIn();
 
       // 未登录处理
       if (!isLoggedIn) {
@@ -35,16 +35,17 @@ export function setupPermission() {
       const permissionStore = usePermissionStore();
       const userStore = useUserStore();
 
-      // 确保动态路由已生成
+      // 路由未生成则生成
       if (!permissionStore.isDynamicRoutesGenerated) {
-        /** 先获取最新的用户信息 */
-        await userStore.getUserInfo();
+        if (!userStore.userInfo?.roles?.length) {
+          await userStore.getUserInfo();
+        }
 
         const dynamicRoutes = await permissionStore.generateRoutes();
         dynamicRoutes.forEach((route: RouteRecordRaw) => {
           router.addRoute(route);
         });
-        // 路由刚生成，重新导航
+
         next({ ...to, replace: true });
         return;
       }
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission.store.ts
index f0675d23..3365ac8c 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission.store.ts
@@ -22,7 +22,7 @@ export const usePermissionStore = defineStore("permission", () => {
    */
   async function generateRoutes(): Promise<RouteRecordRaw[]> {
     try {
-      const data = await MenuAPI.getRoutes();
+      const data = await MenuAPI.getRoutes(); // 获取当前登录人拥有的菜单路由
       const dynamicRoutes = parseDynamicRoutes(data);
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 899897f6..7d714b8d 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -137,6 +137,7 @@ export const useUserStore = defineStore("user", () => {
   return {
     userInfo,
     rememberMe,
+    isLoggedIn: () => !!Auth.getAccessToken(),
     getUserInfo,
     login,
     logout,
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index db0a7403..ff354916 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -9,14 +9,6 @@ import { AUTH_KEYS } from "@/constants";
  * - 记住我功能的状态管理
  */
 export class Auth {
-  /**
-   * 判断用户是否已登录
-   * @returns 是否已登录
-   */
-  static isLoggedIn(): boolean {
-    return !!Auth.getAccessToken();
-  }
-
   /**
    * 获取当前有效的访问令牌
    * 会根据"记住我"状态从适当的存储位置获取
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index d55e6291..5c1b54d4 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -197,16 +197,11 @@ async function handleLoginSubmit() {
     // 2. 执行登录
     await userStore.login(loginFormData.value);
 
-    // 3. 获取用户信息（包含用户角色，用于路由生成）
-    await userStore.getUserInfo();
-
-    // 4. 登录成功，简单跳转，让路由守卫处理后续逻辑
     const redirectPath = (route.query.redirect as string) || "/";
 
-    // 使用push而不是replace，避免与路由守卫冲突
     await router.push(decodeURIComponent(redirectPath));
   } catch (error) {
-    // 5. 统一错误处理
+    // 4. 统一错误处理
     getCaptcha(); // 刷新验证码
     console.error("登录失败:", error);
   } finally {

From a5da8d5788154931e76e5097cf7721a592b52222 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 15 Aug 2025 09:35:58 +0800
Subject: [PATCH 450/497] =?UTF-8?q?refactor:=20:recycle:=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=86=8D=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E6=8C=81=E4=B9=85=E5=8C=96=EF=BC=8C=E6=94=B9=E4=B8=BA=E5=86=85?=
 =?UTF-8?q?=E5=AD=98=E6=80=81=EF=BC=9A=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=90=8E=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=AF=B7=E6=B1=82?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                         |  2 +-
 src/composables/useOnlineCount.ts    |  2 +-
 src/composables/useStomp.ts          |  2 +-
 src/plugins/websocket.ts             |  2 +-
 src/store/modules/user.store.ts      | 17 ++++----
 src/utils/auth.ts                    | 61 ++++++----------------------
 src/utils/request.ts                 |  6 +--
 src/views/login/components/Login.vue |  4 +-
 8 files changed, 31 insertions(+), 65 deletions(-)

diff --git a/package.json b/package.json
index 43f5dc8e..2da53666 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.2.0",
+  "version": "3.2.2",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/composables/useOnlineCount.ts b/src/composables/useOnlineCount.ts
index 906278c6..504f98cc 100644
--- a/src/composables/useOnlineCount.ts
+++ b/src/composables/useOnlineCount.ts
@@ -1,7 +1,7 @@
 import { ref, onMounted, onUnmounted, watch, getCurrentInstance } from "vue";
 import { useStomp } from "./useStomp";
 import { registerWebSocketInstance } from "@/plugins/websocket";
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 
 // 全局单例实例
 let globalInstance: ReturnType<typeof createOnlineCountHook> | null = null;
diff --git a/src/composables/useStomp.ts b/src/composables/useStomp.ts
index c1c0b390..b0dbe313 100644
--- a/src/composables/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -1,5 +1,5 @@
 import { Client, type IMessage, type StompSubscription } from "@stomp/stompjs";
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 
 export interface UseStompOptions {
   /** WebSocket 地址，不传时使用 VITE_APP_WS_ENDPOINT 环境变量 */
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index 692d457a..a7224ac2 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,5 +1,5 @@
 import { useDictSync } from "@/composables/useDictSync";
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 // 不直接导入 store 或 userStore
 
 // 全局 WebSocket 实例管理
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user.store.ts
index 7d714b8d..0a40fddc 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user.store.ts
@@ -3,16 +3,17 @@ import { store } from "@/store";
 import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import UserAPI, { type UserInfo } from "@/api/system/user.api";
 
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 import { usePermissionStoreHook } from "@/store/modules/permission.store";
 import { useDictStoreHook } from "@/store/modules/dict.store";
 import { useTagsViewStore } from "@/store";
 import { cleanupWebSocket } from "@/plugins/websocket";
 
 export const useUserStore = defineStore("user", () => {
-  const userInfo = useStorage<UserInfo>("userInfo", {} as UserInfo);
+  // 用户信息
+  const userInfo = ref<UserInfo>({} as UserInfo);
   // 记住我状态
-  const rememberMe = ref(Auth.getRememberMe());
+  const rememberMe = ref(AuthStorage.getRememberMe());
 
   /**
    * 登录
@@ -27,7 +28,7 @@ export const useUserStore = defineStore("user", () => {
           const { accessToken, refreshToken } = data;
           // 保存记住我状态和token
           rememberMe.value = LoginFormData.rememberMe;
-          Auth.setTokens(accessToken, refreshToken, rememberMe.value);
+          AuthStorage.setTokens(accessToken, refreshToken, rememberMe.value);
           resolve();
         })
         .catch((error) => {
@@ -104,7 +105,7 @@ export const useUserStore = defineStore("user", () => {
    */
   function resetUserState() {
     // 清除用户凭证
-    Auth.clearAuth();
+    AuthStorage.clearAuth();
     // 重置用户信息
     userInfo.value = {} as UserInfo;
   }
@@ -113,7 +114,7 @@ export const useUserStore = defineStore("user", () => {
    * 刷新 token
    */
   function refreshToken() {
-    const refreshToken = Auth.getRefreshToken();
+    const refreshToken = AuthStorage.getRefreshToken();
 
     if (!refreshToken) {
       return Promise.reject(new Error("没有有效的刷新令牌"));
@@ -124,7 +125,7 @@ export const useUserStore = defineStore("user", () => {
         .then((data) => {
           const { accessToken, refreshToken: newRefreshToken } = data;
           // 更新令牌，保持当前记住我状态
-          Auth.setTokens(accessToken, newRefreshToken, Auth.getRememberMe());
+          AuthStorage.setTokens(accessToken, newRefreshToken, AuthStorage.getRememberMe());
           resolve();
         })
         .catch((error) => {
@@ -137,7 +138,7 @@ export const useUserStore = defineStore("user", () => {
   return {
     userInfo,
     rememberMe,
-    isLoggedIn: () => !!Auth.getAccessToken(),
+    isLoggedIn: () => !!AuthStorage.getAccessToken(),
     getUserInfo,
     login,
     logout,
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index ff354916..c3f67531 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,78 +1,43 @@
 import { Storage } from "./storage";
 import { AUTH_KEYS } from "@/constants";
 
-/**
- * 身份验证工具类
- * 集中管理所有与认证相关的功能，包括：
- * - 登录状态判断
- * - Token 的存取
- * - 记住我功能的状态管理
- */
-export class Auth {
-  /**
-   * 获取当前有效的访问令牌
-   * 会根据"记住我"状态从适当的存储位置获取
-   * @returns 当前有效的访问令牌
-   */
-  static getAccessToken(): string {
+// 更语义化的命名：仅负责本地凭证与偏好的读写
+export const AuthStorage = {
+  getAccessToken(): string {
     const isRememberMe = Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
-    // 根据"记住我"状态决定从哪个存储位置获取token
     return isRememberMe
       ? Storage.get(AUTH_KEYS.ACCESS_TOKEN, "")
       : Storage.sessionGet(AUTH_KEYS.ACCESS_TOKEN, "");
-  }
+  },
 
-  /**
-   * 获取刷新令牌
-   * @returns 当前有效的刷新令牌
-   */
-  static getRefreshToken(): string {
+  getRefreshToken(): string {
     const isRememberMe = Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
     return isRememberMe
       ? Storage.get(AUTH_KEYS.REFRESH_TOKEN, "")
       : Storage.sessionGet(AUTH_KEYS.REFRESH_TOKEN, "");
-  }
+  },
 
-  /**
-   * 设置访问令牌和刷新令牌
-   * @param accessToken 访问令牌
-   * @param refreshToken 刷新令牌
-   * @param rememberMe 是否记住我
-   */
-  static setTokens(accessToken: string, refreshToken: string, rememberMe: boolean): void {
-    // 保存"记住我"状态
+  setTokens(accessToken: string, refreshToken: string, rememberMe: boolean): void {
     Storage.set(AUTH_KEYS.REMEMBER_ME, rememberMe);
-
     if (rememberMe) {
-      // 使用localStorage长期保存
       Storage.set(AUTH_KEYS.ACCESS_TOKEN, accessToken);
       Storage.set(AUTH_KEYS.REFRESH_TOKEN, refreshToken);
     } else {
-      // 使用sessionStorage临时保存
       Storage.sessionSet(AUTH_KEYS.ACCESS_TOKEN, accessToken);
       Storage.sessionSet(AUTH_KEYS.REFRESH_TOKEN, refreshToken);
-      // 清除localStorage中可能存在的token
       Storage.remove(AUTH_KEYS.ACCESS_TOKEN);
       Storage.remove(AUTH_KEYS.REFRESH_TOKEN);
     }
-  }
+  },
 
-  /**
-   * 清除所有身份验证相关的数据
-   */
-  static clearAuth(): void {
+  clearAuth(): void {
     Storage.remove(AUTH_KEYS.ACCESS_TOKEN);
     Storage.remove(AUTH_KEYS.REFRESH_TOKEN);
     Storage.sessionRemove(AUTH_KEYS.ACCESS_TOKEN);
     Storage.sessionRemove(AUTH_KEYS.REFRESH_TOKEN);
-    // 不清除记住我设置，保留用户偏好
-  }
+  },
 
-  /**
-   * 获取"记住我"状态
-   * @returns 是否记住我
-   */
-  static getRememberMe(): boolean {
+  getRememberMe(): boolean {
     return Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
-  }
-}
+  },
+};
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 4baf361f..9af2061e 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -2,7 +2,7 @@ import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axio
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user.store";
 import { ResultEnum } from "@/enums/api/result.enum";
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 import router from "@/router";
 
 /**
@@ -20,7 +20,7 @@ const httpRequest = axios.create({
  */
 httpRequest.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
-    const accessToken = Auth.getAccessToken();
+    const accessToken = AuthStorage.getAccessToken();
 
     // 如果 Authorization 设置为 no-auth，则不携带 Token
     if (config.headers.Authorization !== "no-auth" && accessToken) {
@@ -104,7 +104,7 @@ async function refreshTokenAndRetry(config: InternalAxiosRequestConfig): Promise
   return new Promise((resolve, reject) => {
     // 封装需要重试的请求
     const retryRequest = () => {
-      const newToken = Auth.getAccessToken();
+      const newToken = AuthStorage.getAccessToken();
       if (newToken && config.headers) {
         config.headers.Authorization = `Bearer ${newToken}`;
       }
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index 5c1b54d4..fa125c1c 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -115,7 +115,7 @@ import AuthAPI, { type LoginFormData } from "@/api/auth.api";
 import router from "@/router";
 import { useUserStore } from "@/store";
 import CommonWrapper from "@/components/CommonWrapper/index.vue";
-import { Auth } from "@/utils/auth";
+import { AuthStorage } from "@/utils/auth";
 
 const { t } = useI18n();
 const userStore = useUserStore();
@@ -130,7 +130,7 @@ const isCapsLock = ref(false);
 // 验证码图片Base64字符串
 const captchaBase64 = ref();
 // 记住我
-const rememberMe = Auth.getRememberMe();
+const rememberMe = AuthStorage.getRememberMe();
 
 const loginFormData = ref<LoginFormData>({
   username: "admin",

From 54d1621dc5c4482120ad58539a80122cc60adb0f Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 15 Aug 2025 09:42:25 +0800
Subject: [PATCH 451/497] =?UTF-8?q?fix:=20:bug:=20=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E6=9B=B4=E6=94=B9=E5=85=A8=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/useOnlineCount.ts | 6 +++---
 src/composables/useStomp.ts       | 2 +-
 src/plugins/websocket.ts          | 4 ++--
 src/utils/auth.ts                 | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/composables/useOnlineCount.ts b/src/composables/useOnlineCount.ts
index 504f98cc..119c2290 100644
--- a/src/composables/useOnlineCount.ts
+++ b/src/composables/useOnlineCount.ts
@@ -105,8 +105,8 @@ function createOnlineCountHook() {
       return;
     }
 
-    // 使用 Auth.getAccessToken() 获取令牌，确保获取到最新的
-    const accessToken = Auth.getAccessToken();
+    // 使用 AuthStorage.getAccessToken() 获取令牌，确保获取到最新的
+    const accessToken = AuthStorage.getAccessToken();
     if (!accessToken) {
       console.log("[useOnlineCount] 没有检测到有效令牌，不尝试WebSocket连接");
       return;
@@ -129,7 +129,7 @@ function createOnlineCountHook() {
         closeWebSocket();
         setTimeout(() => {
           // 再次检查令牌有效性
-          if (Auth.getAccessToken()) {
+          if (AuthStorage.getAccessToken()) {
             initWebSocket();
           } else {
             console.log("[useOnlineCount] 令牌无效，放弃重连");
diff --git a/src/composables/useStomp.ts b/src/composables/useStomp.ts
index b0dbe313..1f27872c 100644
--- a/src/composables/useStomp.ts
+++ b/src/composables/useStomp.ts
@@ -70,7 +70,7 @@ export function useStomp(options: UseStompOptions = {}) {
     }
 
     // 每次连接前重新获取最新令牌，不依赖之前的token值
-    const currentToken = Auth.getAccessToken();
+    const currentToken = AuthStorage.getAccessToken();
 
     // 检查令牌是否为空，如果为空则不进行连接
     if (!currentToken) {
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index a7224ac2..a2017999 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -43,8 +43,8 @@ export function setupWebSocket() {
     return;
   }
 
-  // 检查是否已登录
-  if (!Auth.isLoggedIn()) {
+  // 检查是否已登录（基于是否存在访问令牌）
+  if (!AuthStorage.getAccessToken()) {
     console.warn(
       "[WebSocketPlugin] 未找到访问令牌，WebSocket初始化已跳过。用户登录后将自动重新连接。"
     );
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index c3f67531..9b3193ff 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,7 +1,7 @@
 import { Storage } from "./storage";
 import { AUTH_KEYS } from "@/constants";
 
-// 更语义化的命名：仅负责本地凭证与偏好的读写
+// 负责本地凭证与偏好的读写
 export const AuthStorage = {
   getAccessToken(): string {
     const isRememberMe = Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);

From 72b89e289457b528d30418907c09fa6768eba55e Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Fri, 15 Aug 2025 17:06:04 +0800
Subject: [PATCH 452/497] =?UTF-8?q?fix:=20:bug:=20=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A4=B4=E5=83=8F=E5=8F=AA=E5=85=81=E8=AE=B8=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

用户头像只允许上传图片
---
 src/views/profile/index.vue | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index 835db2f8..eed67c53 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -15,7 +15,13 @@
                 size="small"
                 @click="triggerFileUpload"
               />
-              <input ref="fileInput" type="file" style="display: none" @change="handleFileChange" />
+              <input
+                ref="fileInput"
+                type="file"
+                style="display: none"
+                accept="image/*"
+                @change="handleFileChange"
+              />
             </div>
             <div class="user-name">
               <span class="nickname">{{ userProfile.nickname }}</span>

From 07206576a8d9e5278d2d20640581dc2b88ece173 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 21 Aug 2025 18:28:38 +0800
Subject: [PATCH 453/497] =?UTF-8?q?feat(codegen):=20:sparkles:=20=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E7=94=9F=E6=88=90=E6=94=AF=E6=8C=81=E6=9C=AC=E5=9C=B0?=
 =?UTF-8?q?=E5=86=99=E5=85=A5=E5=92=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   2 +-
 src/api/{auth.api.ts => auth-api.ts}          |   0
 src/api/{codegen.api.ts => codegen-api.ts}    |  12 +-
 src/api/{file.api.ts => file-api.ts}          |  41 +-
 .../system/{config.api.ts => config-api.ts}   |  45 +-
 src/api/system/dept-api.ts                    |  75 +++
 src/api/system/dept.api.ts                    | 130 ----
 src/api/system/dict-api.ts                    | 145 +++++
 src/api/system/dict.api.ts                    | 310 ----------
 src/api/system/{log.api.ts => log-api.ts}     |  40 +-
 src/api/system/{menu.api.ts => menu-api.ts}   | 112 +---
 src/api/system/notice-api.ts                  | 121 ++++
 src/api/system/notice.api.ts                  | 199 -------
 src/api/system/role-api.ts                    |  79 +++
 src/api/system/role.api.ts                    | 138 -----
 src/api/system/{user.api.ts => user-api.ts}   |   0
 src/components/LangSelect/index.vue           |   2 +-
 src/components/Notification/index.vue         |   2 +-
 src/components/SizeSelect/index.vue           |   2 +-
 src/components/Upload/FileUpload.vue          |   2 +-
 src/components/Upload/MultiImageUpload.vue    |   2 +-
 src/components/Upload/SingleImageUpload.vue   |   2 +-
 src/components/WangEditor/index.vue           |   2 +-
 src/composables/useDictSync.ts                |   2 +-
 src/lang/index.ts                             |   2 +-
 src/store/index.ts                            |  12 +-
 .../modules/{app.store.ts => app-store.ts}    |   0
 .../modules/{dict.store.ts => dict-store.ts}  |   2 +-
 ...ermission.store.ts => permission-store.ts} |   2 +-
 .../{settings.store.ts => settings-store.ts}  |   0
 ...{tags-view.store.ts => tags-view-store.ts} |   0
 .../modules/{user.store.ts => user-store.ts}  |   8 +-
 src/utils/request.ts                          |   2 +-
 src/views/codegen/index.vue                   | 559 ++++++++++++++++--
 src/views/dashboard/index.vue                 |   4 +-
 src/views/demo/curd/config/add.ts             |   2 +-
 src/views/demo/curd/config/content.ts         |   6 +-
 src/views/demo/curd/config/edit.ts            |   2 +-
 src/views/demo/curd/config/options.ts         |   4 +-
 src/views/demo/curd/config2/add.ts            |   2 +-
 src/views/demo/curd/index.vue                 |   2 +-
 src/views/demo/dict-sync.vue                  |   4 +-
 src/views/demo/signature.vue                  |   2 +-
 src/views/demo/table-select/config/select.ts  |   2 +-
 src/views/demo/websocket.vue                  |   2 +-
 src/views/login/components/Login.vue          |   2 +-
 src/views/login/components/Register.vue       |   2 +-
 src/views/profile/index.vue                   |   4 +-
 src/views/system/config/index.vue             |   2 +-
 src/views/system/dept/index.vue               |   2 +-
 src/views/system/dict/dict-item.vue           |   2 +-
 src/views/system/dict/index.vue               |   2 +-
 src/views/system/log/index.vue                |   2 +-
 src/views/system/menu/index.vue               |   4 +-
 .../system/notice/components/MyNotice.vue     |   2 +-
 src/views/system/notice/index.vue             |   4 +-
 src/views/system/role/index.vue               |   6 +-
 src/views/system/user/components/DeptTree.vue |   2 +-
 .../system/user/components/UserImport.vue     |   2 +-
 src/views/system/user/index.vue               |   8 +-
 vite.config.ts                                |   2 +
 61 files changed, 1045 insertions(+), 1087 deletions(-)
 rename src/api/{auth.api.ts => auth-api.ts} (100%)
 rename src/api/{codegen.api.ts => codegen-api.ts} (90%)
 rename src/api/{file.api.ts => file-api.ts} (63%)
 rename src/api/system/{config.api.ts => config-api.ts} (62%)
 create mode 100644 src/api/system/dept-api.ts
 delete mode 100644 src/api/system/dept.api.ts
 create mode 100644 src/api/system/dict-api.ts
 delete mode 100644 src/api/system/dict.api.ts
 rename src/api/system/{log.api.ts => log-api.ts} (78%)
 rename src/api/system/{menu.api.ts => menu-api.ts} (58%)
 create mode 100644 src/api/system/notice-api.ts
 delete mode 100644 src/api/system/notice.api.ts
 create mode 100644 src/api/system/role-api.ts
 delete mode 100644 src/api/system/role.api.ts
 rename src/api/system/{user.api.ts => user-api.ts} (100%)
 rename src/store/modules/{app.store.ts => app-store.ts} (100%)
 rename src/store/modules/{dict.store.ts => dict-store.ts} (96%)
 rename src/store/modules/{permission.store.ts => permission-store.ts} (98%)
 rename src/store/modules/{settings.store.ts => settings-store.ts} (100%)
 rename src/store/modules/{tags-view.store.ts => tags-view-store.ts} (100%)
 rename src/store/modules/{user.store.ts => user-store.ts} (94%)

diff --git a/package.json b/package.json
index 2da53666..79eb427e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.2.2",
+  "version": "3.3.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/api/auth.api.ts b/src/api/auth-api.ts
similarity index 100%
rename from src/api/auth.api.ts
rename to src/api/auth-api.ts
diff --git a/src/api/codegen.api.ts b/src/api/codegen-api.ts
similarity index 90%
rename from src/api/codegen.api.ts
rename to src/api/codegen-api.ts
index cddee813..e9863d39 100644
--- a/src/api/codegen.api.ts
+++ b/src/api/codegen-api.ts
@@ -30,10 +30,11 @@ const GeneratorAPI = {
   },
 
   /** 获取代码生成预览数据 */
-  getPreviewData(tableName: string) {
+  getPreviewData(tableName: string, pageType?: "classic" | "curd") {
     return request<any, GeneratorPreviewVO[]>({
       url: `${GENERATOR_BASE_URL}/${tableName}/preview`,
       method: "get",
+      params: pageType ? { pageType } : undefined,
     });
   },
 
@@ -50,10 +51,11 @@ const GeneratorAPI = {
    * @param url
    * @param fileName
    */
-  download(tableName: string) {
+  download(tableName: string, pageType?: "classic" | "curd") {
     return request({
       url: `${GENERATOR_BASE_URL}/${tableName}/download`,
       method: "get",
+      params: pageType ? { pageType } : undefined,
       responseType: "blob",
     }).then((response) => {
       const fileName = decodeURI(
@@ -140,6 +142,12 @@ export interface GenConfigForm {
 
   /** 字段配置列表 */
   fieldConfigs?: FieldConfig[];
+
+  /** 页面类型 classic|curd */
+  pageType?: "classic" | "curd";
+
+  /** 要移除的表前缀，如 sys_ */
+  removeTablePrefix?: string;
 }
 
 /** 字段配置 */
diff --git a/src/api/file.api.ts b/src/api/file-api.ts
similarity index 63%
rename from src/api/file.api.ts
rename to src/api/file-api.ts
index 504d916e..826698ef 100644
--- a/src/api/file.api.ts
+++ b/src/api/file-api.ts
@@ -1,25 +1,17 @@
 import request from "@/utils/request";
 
 const FileAPI = {
-  /**
-   * 上传文件
-   *
-   * @param formData
-   */
+  /** 上传文件 */
   upload(formData: FormData) {
     return request<any, FileInfo>({
       url: "/api/v1/files",
       method: "post",
       data: formData,
-      headers: {
-        "Content-Type": "multipart/form-data",
-      },
+      headers: { "Content-Type": "multipart/form-data" },
     });
   },
 
-  /**
-   * 上传文件
-   */
+  /** 上传文件（传入 File） */
   uploadFile(file: File) {
     const formData = new FormData();
     formData.append("file", file);
@@ -27,17 +19,11 @@ const FileAPI = {
       url: "/api/v1/files",
       method: "post",
       data: formData,
-      headers: {
-        "Content-Type": "multipart/form-data",
-      },
+      headers: { "Content-Type": "multipart/form-data" },
     });
   },
 
-  /**
-   * 删除文件
-   *
-   * @param filePath 文件完整路径
-   */
+  /** 删除文件 */
   delete(filePath?: string) {
     return request({
       url: "/api/v1/files",
@@ -46,11 +32,7 @@ const FileAPI = {
     });
   },
 
-  /**
-   * 下载文件
-   * @param url
-   * @param fileName
-   */
+  /** 下载文件 */
   download(url: string, fileName?: string) {
     return request({
       url,
@@ -59,23 +41,18 @@ const FileAPI = {
     }).then((res) => {
       const blob = new Blob([res.data]);
       const a = document.createElement("a");
-      const url = window.URL.createObjectURL(blob);
-      a.href = url;
+      const urlObject = window.URL.createObjectURL(blob);
+      a.href = urlObject;
       a.download = fileName || "下载文件";
       a.click();
-      window.URL.revokeObjectURL(url);
+      window.URL.revokeObjectURL(urlObject);
     });
   },
 };
 
 export default FileAPI;
 
-/**
- * 文件API类型声明
- */
 export interface FileInfo {
-  /** 文件名 */
   name: string;
-  /** 文件路径 */
   url: string;
 }
diff --git a/src/api/system/config.api.ts b/src/api/system/config-api.ts
similarity index 62%
rename from src/api/system/config.api.ts
rename to src/api/system/config-api.ts
index 27327885..39437691 100644
--- a/src/api/system/config.api.ts
+++ b/src/api/system/config-api.ts
@@ -3,7 +3,7 @@ import request from "@/utils/request";
 const CONFIG_BASE_URL = "/api/v1/config";
 
 const ConfigAPI = {
-  /** 系统配置分页 */
+  /** 获取配置分页数据 */
   getPage(queryParams?: ConfigPageQuery) {
     return request<any, PageResult<ConfigPageVO[]>>({
       url: `${CONFIG_BASE_URL}/page`,
@@ -11,62 +11,38 @@ const ConfigAPI = {
       params: queryParams,
     });
   },
-
-  /** 系统配置表单数据 */
+  /** 获取配置表单数据 */
   getFormData(id: string) {
     return request<any, ConfigForm>({
       url: `${CONFIG_BASE_URL}/${id}/form`,
       method: "get",
     });
   },
-
-  /** 新增系统配置 */
+  /** 新增配置 */
   create(data: ConfigForm) {
-    return request({
-      url: `${CONFIG_BASE_URL}`,
-      method: "post",
-      data,
-    });
+    return request({ url: `${CONFIG_BASE_URL}`, method: "post", data });
   },
-
-  /** 更新系统配置 */
+  /** 修改配置 */
   update(id: string, data: ConfigForm) {
-    return request({
-      url: `${CONFIG_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
+    return request({ url: `${CONFIG_BASE_URL}/${id}`, method: "put", data });
   },
-
-  /**
-   * 删除系统配置
-   *
-   * @param ids 系统配置ID
-   */
+  /** 删除配置 */
   deleteById(id: string) {
-    return request({
-      url: `${CONFIG_BASE_URL}/${id}`,
-      method: "delete",
-    });
+    return request({ url: `${CONFIG_BASE_URL}/${id}`, method: "delete" });
   },
-  /** 刷新系统配置缓存 */
+  /** 刷新配置缓存 */
   refreshCache() {
-    return request({
-      url: `${CONFIG_BASE_URL}/refresh`,
-      method: "PUT",
-    });
+    return request({ url: `${CONFIG_BASE_URL}/refresh`, method: "PUT" });
   },
 };
 
 export default ConfigAPI;
 
-/** $系统配置分页查询参数 */
 export interface ConfigPageQuery extends PageQuery {
   /** 搜索关键字 */
   keywords?: string;
 }
 
-/** 系统配置表单对象 */
 export interface ConfigForm {
   /** 主键 */
   id?: string;
@@ -80,7 +56,6 @@ export interface ConfigForm {
   remark?: string;
 }
 
-/** 系统配置分页对象 */
 export interface ConfigPageVO {
   /** 主键 */
   id?: string;
diff --git a/src/api/system/dept-api.ts b/src/api/system/dept-api.ts
new file mode 100644
index 00000000..fcd6608d
--- /dev/null
+++ b/src/api/system/dept-api.ts
@@ -0,0 +1,75 @@
+import request from "@/utils/request";
+
+const DEPT_BASE_URL = "/api/v1/dept";
+
+const DeptAPI = {
+  /** 获取部门树形列表 */
+  getList(queryParams?: DeptQuery) {
+    return request<any, DeptVO[]>({ url: `${DEPT_BASE_URL}`, method: "get", params: queryParams });
+  },
+  /** 获取部门下拉数据源 */
+  getOptions() {
+    return request<any, OptionType[]>({ url: `${DEPT_BASE_URL}/options`, method: "get" });
+  },
+  /** 获取部门表单数据 */
+  getFormData(id: string) {
+    return request<any, DeptForm>({ url: `${DEPT_BASE_URL}/${id}/form`, method: "get" });
+  },
+  /** 新增部门 */
+  create(data: DeptForm) {
+    return request({ url: `${DEPT_BASE_URL}`, method: "post", data });
+  },
+  /** 修改部门 */
+  update(id: string, data: DeptForm) {
+    return request({ url: `${DEPT_BASE_URL}/${id}`, method: "put", data });
+  },
+  /** 批量删除部门，多个以英文逗号(,)分割 */
+  deleteByIds(ids: string) {
+    return request({ url: `${DEPT_BASE_URL}/${ids}`, method: "delete" });
+  },
+};
+
+export default DeptAPI;
+
+export interface DeptQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+  /** 状态 */
+  status?: number;
+}
+
+export interface DeptVO {
+  /** 子部门 */
+  children?: DeptVO[];
+  /** 创建时间 */
+  createTime?: Date;
+  /** 部门ID */
+  id?: string;
+  /** 部门名称 */
+  name?: string;
+  /** 部门编号 */
+  code?: string;
+  /** 父部门ID */
+  parentid?: string;
+  /** 排序 */
+  sort?: number;
+  /** 状态(1:启用；0:禁用) */
+  status?: number;
+  /** 修改时间 */
+  updateTime?: Date;
+}
+
+export interface DeptForm {
+  /** 部门ID(新增不填) */
+  id?: string;
+  /** 部门名称 */
+  name?: string;
+  /** 部门编号 */
+  code?: string;
+  /** 父部门ID */
+  parentId: string;
+  /** 排序 */
+  sort?: number;
+  /** 状态(1:启用；0：禁用) */
+  status?: number;
+}
diff --git a/src/api/system/dept.api.ts b/src/api/system/dept.api.ts
deleted file mode 100644
index 6182a555..00000000
--- a/src/api/system/dept.api.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import request from "@/utils/request";
-
-const DEPT_BASE_URL = "/api/v1/dept";
-
-const DeptAPI = {
-  /**
-   * 获取部门列表
-   *
-   * @param queryParams 查询参数（可选）
-   * @returns 部门树形表格数据
-   */
-  getList(queryParams?: DeptQuery) {
-    return request<any, DeptVO[]>({
-      url: `${DEPT_BASE_URL}`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /** 获取部门下拉列表 */
-  getOptions() {
-    return request<any, OptionType[]>({
-      url: `${DEPT_BASE_URL}/options`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 获取部门表单数据
-   *
-   * @param id 部门ID
-   * @returns 部门表单数据
-   */
-  getFormData(id: string) {
-    return request<any, DeptForm>({
-      url: `${DEPT_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 新增部门
-   *
-   * @param data 部门表单数据
-   * @returns 请求结果
-   */
-  create(data: DeptForm) {
-    return request({
-      url: `${DEPT_BASE_URL}`,
-      method: "post",
-      data,
-    });
-  },
-
-  /**
-   * 修改部门
-   *
-   * @param id 部门ID
-   * @param data 部门表单数据
-   * @returns 请求结果
-   */
-  update(id: string, data: DeptForm) {
-    return request({
-      url: `${DEPT_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 删除部门
-   *
-   * @param ids 部门ID，多个以英文逗号(,)分隔
-   * @returns 请求结果
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${DEPT_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-};
-
-export default DeptAPI;
-
-/** 部门查询参数 */
-export interface DeptQuery {
-  /** 搜索关键字 */
-  keywords?: string;
-  /** 状态 */
-  status?: number;
-}
-
-/** 部门类型 */
-export interface DeptVO {
-  /** 子部门 */
-  children?: DeptVO[];
-  /** 创建时间 */
-  createTime?: Date;
-  /** 部门ID */
-  id?: string;
-  /** 部门名称 */
-  name?: string;
-  /** 部门编号 */
-  code?: string;
-  /** 父部门ID */
-  parentid?: string;
-  /** 排序 */
-  sort?: number;
-  /** 状态(1:启用；0:禁用) */
-  status?: number;
-  /** 修改时间 */
-  updateTime?: Date;
-}
-
-/** 部门表单类型 */
-export interface DeptForm {
-  /** 部门ID(新增不填) */
-  id?: string;
-  /** 部门名称 */
-  name?: string;
-  /** 部门编号 */
-  code?: string;
-  /** 父部门ID */
-  parentId: string;
-  /** 排序 */
-  sort?: number;
-  /** 状态(1:启用；0：禁用) */
-  status?: number;
-}
diff --git a/src/api/system/dict-api.ts b/src/api/system/dict-api.ts
new file mode 100644
index 00000000..3976b8d4
--- /dev/null
+++ b/src/api/system/dict-api.ts
@@ -0,0 +1,145 @@
+import request from "@/utils/request";
+
+const DICT_BASE_URL = "/api/v1/dicts";
+
+const DictAPI = {
+  /** 字典分页列表 */
+  getPage(queryParams: DictPageQuery) {
+    return request<any, PageResult<DictPageVO[]>>({
+      url: `${DICT_BASE_URL}/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+  /** 字典列表 */
+  getList() {
+    return request<any, OptionType[]>({ url: `${DICT_BASE_URL}`, method: "get" });
+  },
+  /** 字典表单数据 */
+  getFormData(id: string) {
+    return request<any, DictForm>({ url: `${DICT_BASE_URL}/${id}/form`, method: "get" });
+  },
+  /** 新增字典 */
+  create(data: DictForm) {
+    return request({ url: `${DICT_BASE_URL}`, method: "post", data });
+  },
+  /** 修改字典 */
+  update(id: string, data: DictForm) {
+    return request({ url: `${DICT_BASE_URL}/${id}`, method: "put", data });
+  },
+  /** 删除字典 */
+  deleteByIds(ids: string) {
+    return request({ url: `${DICT_BASE_URL}/${ids}`, method: "delete" });
+  },
+
+  /** 获取字典项分页列表 */
+  getDictItemPage(dictCode: string, queryParams: DictItemPageQuery) {
+    return request<any, PageResult<DictItemPageVO[]>>({
+      url: `${DICT_BASE_URL}/${dictCode}/items/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+  /** 获取字典项列表 */
+  getDictItems(dictCode: string) {
+    return request<any, DictItemOption[]>({
+      url: `${DICT_BASE_URL}/${dictCode}/items`,
+      method: "get",
+    });
+  },
+  /** 新增字典项 */
+  createDictItem(dictCode: string, data: DictItemForm) {
+    return request({ url: `${DICT_BASE_URL}/${dictCode}/items`, method: "post", data });
+  },
+  /** 获取字典项表单数据 */
+  getDictItemFormData(dictCode: string, id: string) {
+    return request<any, DictItemForm>({
+      url: `${DICT_BASE_URL}/${dictCode}/items/${id}/form`,
+      method: "get",
+    });
+  },
+  /** 修改字典项 */
+  updateDictItem(dictCode: string, id: string, data: DictItemForm) {
+    return request({ url: `${DICT_BASE_URL}/${dictCode}/items/${id}`, method: "put", data });
+  },
+  /** 删除字典项 */
+  deleteDictItems(dictCode: string, ids: string) {
+    return request({ url: `${DICT_BASE_URL}/${dictCode}/items/${ids}`, method: "delete" });
+  },
+};
+
+export default DictAPI;
+
+export interface DictPageQuery extends PageQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+  /** 状态(1:启用;0:禁用) */
+  status?: number;
+}
+export interface DictPageVO {
+  /** 字典ID */
+  id: string;
+  /** 字典名称 */
+  name: string;
+  /** 字典编码 */
+  dictCode: string;
+  /** 状态(1:启用;0:禁用) */
+  status: number;
+}
+export interface DictForm {
+  /** 字典ID(新增不填) */
+  id?: string;
+  /** 字典名称 */
+  name?: string;
+  /** 字典编码 */
+  dictCode?: string;
+  /** 状态(1:启用;0:禁用) */
+  status?: number;
+  /** 备注 */
+  remark?: string;
+}
+export interface DictItemPageQuery extends PageQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+  /** 字典编码 */
+  dictCode?: string;
+}
+export interface DictItemPageVO {
+  /** 字典项ID */
+  id: string;
+  /** 字典编码 */
+  dictCode: string;
+  /** 字典项值 */
+  value: string;
+  /** 字典项标签 */
+  label: string;
+  /** 状态(1:启用;0:禁用) */
+  status: number;
+  /** 排序 */
+  sort?: number;
+}
+export interface DictItemForm {
+  /** 字典项ID(新增不填) */
+  id?: string;
+  /** 字典编码 */
+  dictCode?: string;
+  /** 字典项值 */
+  value?: string;
+  /** 字典项标签 */
+  label?: string;
+  /** 状态(1:启用;0:禁用) */
+  status?: number;
+  /** 排序 */
+  sort?: number;
+  /** 标签类型 */
+  tagType?: "success" | "warning" | "info" | "primary" | "danger" | "";
+}
+export interface DictItemOption {
+  /** 值 */
+  value: number | string;
+  /** 标签 */
+  label: string;
+  /** 标签类型 */
+  tagType?: "" | "success" | "info" | "warning" | "danger";
+  [key: string]: any;
+}
diff --git a/src/api/system/dict.api.ts b/src/api/system/dict.api.ts
deleted file mode 100644
index 0f8a4fd5..00000000
--- a/src/api/system/dict.api.ts
+++ /dev/null
@@ -1,310 +0,0 @@
-import request from "@/utils/request";
-
-const DICT_BASE_URL = "/api/v1/dicts";
-
-const DictAPI = {
-  //---------------------------------------------------
-  // 字典相关接口
-  //---------------------------------------------------
-
-  /**
-   * 字典分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典分页结果
-   */
-  getPage(queryParams: DictPageQuery) {
-    return request<any, PageResult<DictPageVO[]>>({
-      url: `${DICT_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /**
-   * 字典列表
-   *
-   * @returns 字典列表
-   */
-  getList() {
-    return request<any, OptionType[]>({
-      url: `${DICT_BASE_URL}`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 字典表单数据
-   *
-   * @param id 字典ID
-   * @returns 字典表单数据
-   */
-  getFormData(id: string) {
-    return request<any, DictForm>({
-      url: `${DICT_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 新增字典
-   *
-   * @param data 字典表单数据
-   */
-  create(data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}`,
-      method: "post",
-      data,
-    });
-  },
-
-  /**
-   * 修改字典
-   *
-   * @param id 字典ID
-   * @param data 字典表单数据
-   */
-  update(id: string, data: DictForm) {
-    return request({
-      url: `${DICT_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 删除字典
-   *
-   * @param ids 字典ID，多个以英文逗号(,)分隔
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${DICT_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-
-  //---------------------------------------------------
-  // 字典项相关接口
-  //---------------------------------------------------
-  /**
-   * 获取字典分页列表
-   *
-   * @param queryParams 查询参数
-   * @returns 字典分页结果
-   */
-  getDictItemPage(dictCode: string, queryParams: DictItemPageQuery) {
-    return request<any, PageResult<DictItemPageVO[]>>({
-      url: `${DICT_BASE_URL}/${dictCode}/items/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /**
-   * 获取字典项列表
-   */
-  getDictItems(dictCode: string) {
-    return request<any, DictItemOption[]>({
-      url: `${DICT_BASE_URL}/${dictCode}/items`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 新增字典项
-   */
-  createDictItem(dictCode: string, data: DictItemForm) {
-    return request({
-      url: `${DICT_BASE_URL}/${dictCode}/items`,
-      method: "post",
-      data,
-    });
-  },
-
-  /**
-   * 获取字典项表单数据
-   *
-   * @param id 字典项ID
-   * @returns 字典项表单数据
-   */
-  getDictItemFormData(dictCode: string, id: string) {
-    return request<any, DictItemForm>({
-      url: `${DICT_BASE_URL}/${dictCode}/items/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 修改字典项
-   */
-  updateDictItem(dictCode: string, id: string, data: DictItemForm) {
-    return request({
-      url: `${DICT_BASE_URL}/${dictCode}/items/${id}`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 删除字典项
-   */
-  deleteDictItems(dictCode: string, ids: string) {
-    return request({
-      url: `${DICT_BASE_URL}/${dictCode}/items/${ids}`,
-      method: "delete",
-    });
-  },
-};
-
-export default DictAPI;
-
-/**
- * 字典查询参数
- */
-export interface DictPageQuery extends PageQuery {
-  /**
-   * 关键字(字典名称/编码)
-   */
-  keywords?: string;
-
-  /**
-   * 字典状态（1:启用，0:禁用）
-   */
-  status?: number;
-}
-
-/**
- * 字典分页对象
- */
-export interface DictPageVO {
-  /**
-   * 字典ID
-   */
-  id: string;
-  /**
-   * 字典名称
-   */
-  name: string;
-  /**
-   * 字典编码
-   */
-  dictCode: string;
-  /**
-   * 字典状态（1:启用，0:禁用）
-   */
-  status: number;
-}
-
-/**
- * 字典
- */
-export interface DictForm {
-  /**
-   * 字典ID
-   */
-  id?: string;
-  /**
-   * 字典名称
-   */
-  name?: string;
-  /**
-   * 字典编码
-   */
-  dictCode?: string;
-  /**
-   * 字典状态（1-启用，0-禁用）
-   */
-  status?: number;
-  /**
-   * 备注
-   */
-  remark?: string;
-}
-
-/**
- * 字典查询参数
- */
-export interface DictItemPageQuery extends PageQuery {
-  /** 关键字(字典数据值/标签) */
-  keywords?: string;
-
-  /** 字典编码 */
-  dictCode?: string;
-}
-
-/**
- * 字典分页对象
- */
-export interface DictItemPageVO {
-  /**
-   * 字典ID
-   */
-  id: string;
-  /**
-   * 字典编码
-   */
-  dictCode: string;
-  /**
-   * 字典数据值
-   */
-  value: string;
-  /**
-   * 字典数据标签
-   */
-  label: string;
-  /**
-   * 状态（1:启用，0:禁用)
-   */
-  status: number;
-  /**
-   * 字典排序
-   */
-  sort?: number;
-}
-
-/**
- * 字典
- */
-export interface DictItemForm {
-  /**
-   * 字典ID
-   */
-  id?: string;
-  /**
-   * 字典编码
-   */
-  dictCode?: string;
-  /**
-   * 字典数据值
-   */
-  value?: string;
-  /**
-   * 字典数据标签
-   */
-  label?: string;
-  /**
-   * 状态（1:启用，0:禁用)
-   */
-  status?: number;
-  /**
-   * 字典排序
-   */
-  sort?: number;
-
-  /**
-   * 标签类型
-   */
-  tagType?: "success" | "warning" | "info" | "primary" | "danger" | "";
-}
-
-/**
- * 字典项下拉选项
- */
-export interface DictItemOption {
-  value: number | string;
-  label: string;
-  tagType?: "" | "success" | "info" | "warning" | "danger";
-  [key: string]: any;
-}
diff --git a/src/api/system/log.api.ts b/src/api/system/log-api.ts
similarity index 78%
rename from src/api/system/log.api.ts
rename to src/api/system/log-api.ts
index 402478ad..3e98698e 100644
--- a/src/api/system/log.api.ts
+++ b/src/api/system/log-api.ts
@@ -3,11 +3,7 @@ import request from "@/utils/request";
 const LOG_BASE_URL = "/api/v1/logs";
 
 const LogAPI = {
-  /**
-   * 获取日志分页列表
-   *
-   * @param queryParams 查询参数
-   */
+  /** 获取日志分页列表 */
   getPage(queryParams: LogPageQuery) {
     return request<any, PageResult<LogPageVO[]>>({
       url: `${LOG_BASE_URL}/page`,
@@ -15,13 +11,7 @@ const LogAPI = {
       params: queryParams,
     });
   },
-
-  /**
-   * 获取访问趋势
-   *
-   * @param queryParams
-   * @returns
-   */
+  /** 获取访问趋势 */
   getVisitTrend(queryParams: VisitTrendQuery) {
     return request<any, VisitTrendVO>({
       url: `${LOG_BASE_URL}/visit-trend`,
@@ -29,36 +19,20 @@ const LogAPI = {
       params: queryParams,
     });
   },
-
-  /**
-   * 获取访问统计
-   *
-   * @param queryParams
-   * @returns
-   */
+  /** 获取访问统计 */
   getVisitStats() {
-    return request<any, VisitStatsVO>({
-      url: `${LOG_BASE_URL}/visit-stats`,
-      method: "get",
-    });
+    return request<any, VisitStatsVO>({ url: `${LOG_BASE_URL}/visit-stats`, method: "get" });
   },
 };
 
 export default LogAPI;
 
-/**
- * 日志分页查询对象
- */
 export interface LogPageQuery extends PageQuery {
   /** 搜索关键字 */
   keywords?: string;
   /** 操作时间 */
   createTime?: [string, string];
 }
-
-/**
- * 系统日志分页VO
- */
 export interface LogPageVO {
   /** 主键 */
   id: string;
@@ -83,8 +57,6 @@ export interface LogPageVO {
   /** 操作人 */
   operator: string;
 }
-
-/**  访问趋势视图对象 */
 export interface VisitTrendVO {
   /** 日期列表 */
   dates: string[];
@@ -95,16 +67,12 @@ export interface VisitTrendVO {
   /** IP数 */
   ipList: number[];
 }
-
-/** 访问趋势查询参数 */
 export interface VisitTrendQuery {
   /** 开始日期 */
   startDate: string;
   /** 结束日期 */
   endDate: string;
 }
-
-/**  访问统计 */
 export interface VisitStatsVO {
   /** 今日访客数(UV) */
   todayUvCount: number;
diff --git a/src/api/system/menu.api.ts b/src/api/system/menu-api.ts
similarity index 58%
rename from src/api/system/menu.api.ts
rename to src/api/system/menu-api.ts
index 45f95b3c..4e55d077 100644
--- a/src/api/system/menu.api.ts
+++ b/src/api/system/menu-api.ts
@@ -1,41 +1,16 @@
 import request from "@/utils/request";
-// 菜单基础URL
 const MENU_BASE_URL = "/api/v1/menus";
 
 const MenuAPI = {
-  /**
-   * 获取当前用户的路由列表
-   * <p/>
-   * 无需传入角色，后端解析token获取角色自行判断是否拥有路由的权限
-   *
-   * @returns 路由列表
-   */
+  /** 获取当前用户的路由列表 */
   getRoutes() {
-    return request<any, RouteVO[]>({
-      url: `${MENU_BASE_URL}/routes`,
-      method: "get",
-    });
+    return request<any, RouteVO[]>({ url: `${MENU_BASE_URL}/routes`, method: "get" });
   },
-
-  /**
-   * 获取菜单树形列表
-   *
-   * @param queryParams 查询参数
-   * @returns 菜单树形列表
-   */
+  /** 获取菜单树形列表 */
   getList(queryParams: MenuQuery) {
-    return request<any, MenuVO[]>({
-      url: `${MENU_BASE_URL}`,
-      method: "get",
-      params: queryParams,
-    });
+    return request<any, MenuVO[]>({ url: `${MENU_BASE_URL}`, method: "get", params: queryParams });
   },
-
-  /**
-   * 获取菜单下拉数据源
-   *
-   * @returns 菜单下拉数据源
-   */
+  /** 获取菜单下拉数据源 */
   getOptions(onlyParent?: boolean) {
     return request<any, OptionType[]>({
       url: `${MENU_BASE_URL}/options`,
@@ -43,73 +18,31 @@ const MenuAPI = {
       params: { onlyParent },
     });
   },
-
-  /**
-   * 获取菜单表单数据
-   *
-   * @param id 菜单ID
-   */
+  /** 获取菜单表单数据 */
   getFormData(id: string) {
-    return request<any, MenuForm>({
-      url: `${MENU_BASE_URL}/${id}/form`,
-      method: "get",
-    });
+    return request<any, MenuForm>({ url: `${MENU_BASE_URL}/${id}/form`, method: "get" });
   },
-
-  /**
-   * 添加菜单
-   *
-   * @param data 菜单表单数据
-   * @returns 请求结果
-   */
+  /** 新增菜单 */
   create(data: MenuForm) {
-    return request({
-      url: `${MENU_BASE_URL}`,
-      method: "post",
-      data,
-    });
+    return request({ url: `${MENU_BASE_URL}`, method: "post", data });
   },
-
-  /**
-   * 修改菜单
-   *
-   * @param id 菜单ID
-   * @param data 菜单表单数据
-   * @returns 请求结果
-   */
+  /** 修改菜单 */
   update(id: string, data: MenuForm) {
-    return request({
-      url: `${MENU_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
+    return request({ url: `${MENU_BASE_URL}/${id}`, method: "put", data });
   },
-
-  /**
-   * 删除菜单
-   *
-   * @param id 菜单ID
-   * @returns 请求结果
-   */
+  /** 删除菜单 */
   deleteById(id: string) {
-    return request({
-      url: `${MENU_BASE_URL}/${id}`,
-      method: "delete",
-    });
+    return request({ url: `${MENU_BASE_URL}/${id}`, method: "delete" });
   },
 };
 
 export default MenuAPI;
 
-import type { MenuTypeEnum } from "@/enums/system/menu.enum";
-
-/** 菜单查询参数 */
 export interface MenuQuery {
   /** 搜索关键字 */
   keywords?: string;
 }
-
-/** 菜单视图对象 */
+export type MenuTypeEnum = 0 | 1 | 2;
 export interface MenuVO {
   /** 子菜单 */
   children?: MenuVO[];
@@ -133,13 +66,11 @@ export interface MenuVO {
   routePath?: string;
   /** 菜单排序(数字越小排名越靠前) */
   sort?: number;
-  /** 菜单 */
+  /** 菜单类型 */
   type?: MenuTypeEnum;
-  /** 菜单是否可见(1:显示;0:隐藏) */
+  /** 是否可见(1:显示;0:隐藏) */
   visible?: number;
 }
-
-/** 菜单表单对象 */
 export interface MenuForm {
   /** 菜单ID */
   id?: string;
@@ -147,7 +78,7 @@ export interface MenuForm {
   parentId?: string;
   /** 菜单名称 */
   name?: string;
-  /** 菜单是否可见(1-是 0-否) */
+  /** 是否可见(1-是 0-否) */
   visible: number;
   /** ICON */
   icon?: string;
@@ -161,7 +92,7 @@ export interface MenuForm {
   component?: string;
   /** 跳转路由路径 */
   redirect?: string;
-  /** 菜单 */
+  /** 菜单类型 */
   type?: MenuTypeEnum;
   /** 权限标识 */
   perm?: string;
@@ -169,16 +100,13 @@ export interface MenuForm {
   keepAlive?: number;
   /** 【目录】只有一个子路由是否始终显示 */
   alwaysShow?: number;
-  /** 参数 */
+  /** 其他参数 */
   params?: KeyValue[];
 }
-
 interface KeyValue {
   key: string;
   value: string;
 }
-
-/** RouteVO，路由对象 */
 export interface RouteVO {
   /** 子路由列表 */
   children: RouteVO[];
@@ -193,8 +121,6 @@ export interface RouteVO {
   /** 跳转链接 */
   redirect?: string;
 }
-
-/** Meta，路由属性 */
 export interface Meta {
   /** 【目录】只有一个子路由是否始终显示 */
   alwaysShow?: boolean;
diff --git a/src/api/system/notice-api.ts b/src/api/system/notice-api.ts
new file mode 100644
index 00000000..fbac939e
--- /dev/null
+++ b/src/api/system/notice-api.ts
@@ -0,0 +1,121 @@
+import request from "@/utils/request";
+
+const NOTICE_BASE_URL = "/api/v1/notices";
+
+const NoticeAPI = {
+  /** 获取通知公告分页数据 */
+  getPage(queryParams?: NoticePageQuery) {
+    return request<any, PageResult<NoticePageVO[]>>({
+      url: `${NOTICE_BASE_URL}/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+  /** 获取通知公告表单数据 */
+  getFormData(id: string) {
+    return request<any, NoticeForm>({ url: `${NOTICE_BASE_URL}/${id}/form`, method: "get" });
+  },
+  /** 添加通知公告 */
+  create(data: NoticeForm) {
+    return request({ url: `${NOTICE_BASE_URL}`, method: "post", data });
+  },
+  /** 更新通知公告 */
+  update(id: string, data: NoticeForm) {
+    return request({ url: `${NOTICE_BASE_URL}/${id}`, method: "put", data });
+  },
+  /** 批量删除通知公告，多个以英文逗号(,)分割 */
+  deleteByIds(ids: string) {
+    return request({ url: `${NOTICE_BASE_URL}/${ids}`, method: "delete" });
+  },
+  /** 发布通知 */
+  publish(id: string) {
+    return request({ url: `${NOTICE_BASE_URL}/${id}/publish`, method: "put" });
+  },
+  /** 撤回通知 */
+  revoke(id: string) {
+    return request({ url: `${NOTICE_BASE_URL}/${id}/revoke`, method: "put" });
+  },
+  /** 查看通知 */
+  getDetail(id: string) {
+    return request<any, NoticeDetailVO>({ url: `${NOTICE_BASE_URL}/${id}/detail`, method: "get" });
+  },
+  /** 全部已读 */
+  readAll() {
+    return request({ url: `${NOTICE_BASE_URL}/read-all`, method: "put" });
+  },
+  /** 获取我的通知分页列表 */
+  getMyNoticePage(queryParams?: NoticePageQuery) {
+    return request<any, PageResult<NoticePageVO[]>>({
+      url: `${NOTICE_BASE_URL}/my-page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+};
+
+export default NoticeAPI;
+
+export interface NoticePageQuery extends PageQuery {
+  /** 标题 */
+  title?: string;
+  /** 发布状态(0:草稿;1:已发布;2:已撤回) */
+  publishStatus?: number;
+  /** 是否已读(1:是;0:否) */
+  isRead?: number;
+}
+export interface NoticeForm {
+  /** 通知ID(新增不填) */
+  id?: string;
+  /** 标题 */
+  title?: string;
+  /** 内容 */
+  content?: string;
+  /** 类型 */
+  type?: number;
+  /** 优先级/级别 */
+  level?: string;
+  /** 目标类型 */
+  targetType?: number;
+  /** 目标用户ID(多个以英文逗号(,)分割) */
+  targetUserIds?: string;
+}
+export interface NoticePageVO {
+  /** 通知ID */
+  id: string;
+  /** 标题 */
+  title?: string;
+  /** 内容 */
+  content?: string;
+  /** 类型 */
+  type?: number;
+  /** 发布人ID */
+  publisherId?: bigint;
+  /** 优先级 */
+  priority?: number;
+  /** 目标类型 */
+  targetType?: number;
+  /** 发布状态 */
+  publishStatus?: number;
+  /** 发布时间 */
+  publishTime?: Date;
+  /** 撤回时间 */
+  revokeTime?: Date;
+}
+export interface NoticeDetailVO {
+  /** 通知ID */
+  id?: string;
+  /** 标题 */
+  title?: string;
+  /** 内容 */
+  content?: string;
+  /** 类型 */
+  type?: number;
+  /** 发布人名称 */
+  publisherName?: string;
+  /** 优先级/级别 */
+  level?: string;
+  /** 发布时间 */
+  publishTime?: Date;
+  /** 发布状态 */
+  publishStatus?: number;
+}
diff --git a/src/api/system/notice.api.ts b/src/api/system/notice.api.ts
deleted file mode 100644
index 471c5e7b..00000000
--- a/src/api/system/notice.api.ts
+++ /dev/null
@@ -1,199 +0,0 @@
-import request from "@/utils/request";
-
-const NOTICE_BASE_URL = "/api/v1/notices";
-
-const NoticeAPI = {
-  /** 获取通知公告分页数据 */
-  getPage(queryParams?: NoticePageQuery) {
-    return request<any, PageResult<NoticePageVO[]>>({
-      url: `${NOTICE_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /**
-   * 获取通知公告表单数据
-   *
-   * @param id 通知
-   * @returns 通知表单数据
-   */
-  getFormData(id: string) {
-    return request<any, NoticeForm>({
-      url: `${NOTICE_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 添加通知公告
-   *
-   * @param data 通知表单数据
-   * @returns
-   */
-  create(data: NoticeForm) {
-    return request({
-      url: `${NOTICE_BASE_URL}`,
-      method: "post",
-      data,
-    });
-  },
-
-  /**
-   * 更新通知公告
-   *
-   * @param id 通知ID
-   * @param data 通知表单数据
-   */
-  update(id: string, data: NoticeForm) {
-    return request({
-      url: `${NOTICE_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 批量删除通知公告，多个以英文逗号(,)分割
-   *
-   * @param ids 通知公告ID字符串，多个以英文逗号(,)分割
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${NOTICE_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-
-  /**
-   * 发布通知
-   *
-   * @param id 被发布的通知公告id
-   * @returns
-   */
-  publish(id: string) {
-    return request({
-      url: `${NOTICE_BASE_URL}/${id}/publish`,
-      method: "put",
-    });
-  },
-
-  /**
-   * 撤回通知
-   *
-   * @param id 撤回的通知id
-   * @returns
-   */
-  revoke(id: string) {
-    return request({
-      url: `${NOTICE_BASE_URL}/${id}/revoke`,
-      method: "put",
-    });
-  },
-  /**
-   * 查看通知
-   *
-   * @param id
-   */
-  getDetail(id: string) {
-    return request<any, NoticeDetailVO>({
-      url: `${NOTICE_BASE_URL}/${id}/detail`,
-      method: "get",
-    });
-  },
-
-  /* 全部已读 */
-  readAll() {
-    return request({
-      url: `${NOTICE_BASE_URL}/read-all`,
-      method: "put",
-    });
-  },
-
-  /** 获取我的通知分页列表 */
-  getMyNoticePage(queryParams?: NoticePageQuery) {
-    return request<any, PageResult<NoticePageVO[]>>({
-      url: `${NOTICE_BASE_URL}/my-page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-};
-
-export default NoticeAPI;
-
-/** 通知公告分页查询参数 */
-export interface NoticePageQuery extends PageQuery {
-  /** 标题 */
-  title?: string;
-  /** 发布状态(0：未发布，1：已发布，-1：已撤回) */
-  publishStatus?: number;
-
-  isRead?: number;
-}
-
-/** 通知公告表单对象 */
-export interface NoticeForm {
-  id?: string;
-  /** 通知标题 */
-  title?: string;
-  /** 通知内容 */
-  content?: string;
-  /** 通知类型 */
-  type?: number;
-  /** 优先级(L：低，M：中，H：高) */
-  level?: string;
-  /** 目标类型(1-全体 2-指定) */
-  targetType?: number;
-  /** 目标ID合集，以,分割 */
-  targetUserIds?: string;
-}
-
-/** 通知公告分页对象 */
-export interface NoticePageVO {
-  id: string;
-  /** 通知标题 */
-  title?: string;
-  /** 通知内容 */
-  content?: string;
-  /** 通知类型 */
-  type?: number;
-  /** 发布人 */
-  publisherId?: bigint;
-  /** 优先级(0-低 1-中 2-高) */
-  priority?: number;
-  /** 目标类型(0-全体 1-指定) */
-  targetType?: number;
-  /** 发布状态(0-未发布 1已发布 2已撤回) */
-  publishStatus?: number;
-  /** 发布时间 */
-  publishTime?: Date;
-  /** 撤回时间 */
-  revokeTime?: Date;
-}
-
-export interface NoticeDetailVO {
-  /** 通知ID */
-  id?: string;
-
-  /** 通知标题 */
-  title?: string;
-
-  /** 通知内容 */
-  content?: string;
-
-  /** 通知类型 */
-  type?: number;
-
-  /** 发布人 */
-  publisherName?: string;
-
-  /** 优先级(L-低 M-中 H-高) */
-  level?: string;
-
-  /** 发布时间 */
-  publishTime?: Date;
-
-  /** 发布状态 */
-  publishStatus?: number;
-}
diff --git a/src/api/system/role-api.ts b/src/api/system/role-api.ts
new file mode 100644
index 00000000..bf713b99
--- /dev/null
+++ b/src/api/system/role-api.ts
@@ -0,0 +1,79 @@
+import request from "@/utils/request";
+
+const ROLE_BASE_URL = "/api/v1/roles";
+
+const RoleAPI = {
+  /** 获取角色分页数据 */
+  getPage(queryParams?: RolePageQuery) {
+    return request<any, PageResult<RolePageVO[]>>({
+      url: `${ROLE_BASE_URL}/page`,
+      method: "get",
+      params: queryParams,
+    });
+  },
+  /** 获取角色下拉数据源 */
+  getOptions() {
+    return request<any, OptionType[]>({ url: `${ROLE_BASE_URL}/options`, method: "get" });
+  },
+  /** 获取角色的菜单ID集合 */
+  getRoleMenuIds(roleId: string) {
+    return request<any, string[]>({ url: `${ROLE_BASE_URL}/${roleId}/menuIds`, method: "get" });
+  },
+  /** 分配菜单权限 */
+  updateRoleMenus(roleId: string, data: number[]) {
+    return request({ url: `${ROLE_BASE_URL}/${roleId}/menus`, method: "put", data });
+  },
+  /** 获取角色表单数据 */
+  getFormData(id: string) {
+    return request<any, RoleForm>({ url: `${ROLE_BASE_URL}/${id}/form`, method: "get" });
+  },
+  /** 新增角色 */
+  create(data: RoleForm) {
+    return request({ url: `${ROLE_BASE_URL}`, method: "post", data });
+  },
+  /** 更新角色 */
+  update(id: string, data: RoleForm) {
+    return request({ url: `${ROLE_BASE_URL}/${id}`, method: "put", data });
+  },
+  /** 批量删除角色，多个以英文逗号(,)分割 */
+  deleteByIds(ids: string) {
+    return request({ url: `${ROLE_BASE_URL}/${ids}`, method: "delete" });
+  },
+};
+
+export default RoleAPI;
+
+export interface RolePageQuery extends PageQuery {
+  /** 搜索关键字 */
+  keywords?: string;
+}
+export interface RolePageVO {
+  /** 角色ID */
+  id?: string;
+  /** 角色编码 */
+  code?: string;
+  /** 角色名称 */
+  name?: string;
+  /** 排序 */
+  sort?: number;
+  /** 角色状态 */
+  status?: number;
+  /** 创建时间 */
+  createTime?: Date;
+  /** 修改时间 */
+  updateTime?: Date;
+}
+export interface RoleForm {
+  /** 角色ID */
+  id?: string;
+  /** 角色编码 */
+  code?: string;
+  /** 数据权限 */
+  dataScope?: number;
+  /** 角色名称 */
+  name?: string;
+  /** 排序 */
+  sort?: number;
+  /** 角色状态(1-正常；0-停用) */
+  status?: number;
+}
diff --git a/src/api/system/role.api.ts b/src/api/system/role.api.ts
deleted file mode 100644
index 6a822efb..00000000
--- a/src/api/system/role.api.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-import request from "@/utils/request";
-
-const ROLE_BASE_URL = "/api/v1/roles";
-
-const RoleAPI = {
-  /** 获取角色分页数据 */
-  getPage(queryParams?: RolePageQuery) {
-    return request<any, PageResult<RolePageVO[]>>({
-      url: `${ROLE_BASE_URL}/page`,
-      method: "get",
-      params: queryParams,
-    });
-  },
-
-  /** 获取角色下拉数据源 */
-  getOptions() {
-    return request<any, OptionType[]>({
-      url: `${ROLE_BASE_URL}/options`,
-      method: "get",
-    });
-  },
-  /**
-   * 获取角色的菜单ID集合
-   *
-   * @param roleId 角色ID
-   * @returns 角色的菜单ID集合
-   */
-  getRoleMenuIds(roleId: string) {
-    return request<any, string[]>({
-      url: `${ROLE_BASE_URL}/${roleId}/menuIds`,
-      method: "get",
-    });
-  },
-
-  /**
-   * 分配菜单权限
-   *
-   * @param roleId 角色ID
-   * @param data 菜单ID集合
-   */
-  updateRoleMenus(roleId: string, data: number[]) {
-    return request({
-      url: `${ROLE_BASE_URL}/${roleId}/menus`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 获取角色表单数据
-   *
-   * @param id 角色ID
-   * @returns 角色表单数据
-   */
-  getFormData(id: string) {
-    return request<any, RoleForm>({
-      url: `${ROLE_BASE_URL}/${id}/form`,
-      method: "get",
-    });
-  },
-
-  /** 添加角色 */
-  create(data: RoleForm) {
-    return request({
-      url: `${ROLE_BASE_URL}`,
-      method: "post",
-      data,
-    });
-  },
-
-  /**
-   * 更新角色
-   *
-   * @param id 角色ID
-   * @param data 角色表单数据
-   */
-  update(id: string, data: RoleForm) {
-    return request({
-      url: `${ROLE_BASE_URL}/${id}`,
-      method: "put",
-      data,
-    });
-  },
-
-  /**
-   * 批量删除角色，多个以英文逗号(,)分割
-   *
-   * @param ids 角色ID字符串，多个以英文逗号(,)分割
-   */
-  deleteByIds(ids: string) {
-    return request({
-      url: `${ROLE_BASE_URL}/${ids}`,
-      method: "delete",
-    });
-  },
-};
-
-export default RoleAPI;
-
-/** 角色分页查询参数 */
-export interface RolePageQuery extends PageQuery {
-  /** 搜索关键字 */
-  keywords?: string;
-}
-
-/** 角色分页对象 */
-export interface RolePageVO {
-  /** 角色ID */
-  id?: string;
-  /** 角色编码 */
-  code?: string;
-  /** 角色名称 */
-  name?: string;
-  /** 排序 */
-  sort?: number;
-  /** 角色状态 */
-  status?: number;
-  /** 创建时间 */
-  createTime?: Date;
-  /** 修改时间 */
-  updateTime?: Date;
-}
-
-/** 角色表单对象 */
-export interface RoleForm {
-  /** 角色ID */
-  id?: string;
-  /** 角色编码 */
-  code?: string;
-  /** 数据权限 */
-  dataScope?: number;
-  /** 角色名称 */
-  name?: string;
-  /** 排序 */
-  sort?: number;
-  /** 角色状态(1-正常；0-停用) */
-  status?: number;
-}
diff --git a/src/api/system/user.api.ts b/src/api/system/user-api.ts
similarity index 100%
rename from src/api/system/user.api.ts
rename to src/api/system/user-api.ts
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index fab9e71c..3c366bcb 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -17,7 +17,7 @@
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from "@/store/modules/app.store";
+import { useAppStore } from "@/store/modules/app-store";
 import { LanguageEnum } from "@/enums/settings/locale.enum";
 
 defineProps({
diff --git a/src/components/Notification/index.vue b/src/components/Notification/index.vue
index 49f636cd..8d6ab2be 100644
--- a/src/components/Notification/index.vue
+++ b/src/components/Notification/index.vue
@@ -79,7 +79,7 @@
 </template>
 
 <script setup lang="ts">
-import NoticeAPI, { NoticePageVO, NoticeDetailVO } from "@/api/system/notice.api";
+import NoticeAPI, { NoticePageVO, NoticeDetailVO } from "@/api/system/notice-api";
 import router from "@/router";
 
 const noticeList = ref<NoticePageVO[]>([]);
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index de58d3cf..d24fe776 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -21,7 +21,7 @@
 
 <script setup lang="ts">
 import { ComponentSize } from "@/enums/settings/layout.enum";
-import { useAppStore } from "@/store/modules/app.store";
+import { useAppStore } from "@/store/modules/app-store";
 
 const { t } = useI18n();
 const sizeOptions = computed(() => {
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 1b3466c4..6857acec 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -51,7 +51,7 @@ import {
   UploadRequestOptions,
 } from "element-plus";
 
-import FileAPI, { FileInfo } from "@/api/file.api";
+import FileAPI, { FileInfo } from "@/api/file-api";
 
 const props = defineProps({
   /**
diff --git a/src/components/Upload/MultiImageUpload.vue b/src/components/Upload/MultiImageUpload.vue
index aeb26671..082b6945 100644
--- a/src/components/Upload/MultiImageUpload.vue
+++ b/src/components/Upload/MultiImageUpload.vue
@@ -40,7 +40,7 @@
 </template>
 <script setup lang="ts">
 import { UploadRawFile, UploadRequestOptions, UploadUserFile } from "element-plus";
-import FileAPI, { FileInfo } from "@/api/file.api";
+import FileAPI, { FileInfo } from "@/api/file-api";
 
 const props = defineProps({
   /**
diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index cda5cfd3..72e7551d 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -25,7 +25,7 @@
 
 <script setup lang="ts">
 import { UploadRawFile, UploadRequestOptions } from "element-plus";
-import FileAPI, { FileInfo } from "@/api/file.api";
+import FileAPI, { FileInfo } from "@/api/file-api";
 
 const props = defineProps({
   /**
diff --git a/src/components/WangEditor/index.vue b/src/components/WangEditor/index.vue
index 8b704c11..53ca563f 100644
--- a/src/components/WangEditor/index.vue
+++ b/src/components/WangEditor/index.vue
@@ -34,7 +34,7 @@ import { Toolbar, Editor } from "@wangeditor-next/editor-for-vue";
 import { IToolbarConfig, IEditorConfig } from "@wangeditor-next/editor";
 
 // 文件上传 API
-import FileAPI from "@/api/file.api";
+import FileAPI from "@/api/file-api";
 
 // 上传图片回调函数类型
 type InsertFnType = (_url: string, _alt: string, _href: string) => void;
diff --git a/src/composables/useDictSync.ts b/src/composables/useDictSync.ts
index ca9551b6..c84c7297 100644
--- a/src/composables/useDictSync.ts
+++ b/src/composables/useDictSync.ts
@@ -1,4 +1,4 @@
-import { useDictStoreHook } from "@/store/modules/dict.store";
+import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useStomp } from "./useStomp";
 import type { IMessage } from "@stomp/stompjs";
 import { ref } from "vue";
diff --git a/src/lang/index.ts b/src/lang/index.ts
index c16f4c87..2a8685c4 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -1,6 +1,6 @@
 import type { App } from "vue";
 import { createI18n } from "vue-i18n";
-import { useAppStoreHook } from "@/store/modules/app.store";
+import { useAppStoreHook } from "@/store/modules/app-store";
 // 本地语言包
 import enLocale from "./package/en";
 import zhCnLocale from "./package/zh-cn";
diff --git a/src/store/index.ts b/src/store/index.ts
index 92361551..9e6d43bf 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -8,10 +8,10 @@ export function setupStore(app: App<Element>) {
   app.use(store);
 }
 
-export * from "./modules/app.store";
-export * from "./modules/permission.store";
-export * from "./modules/settings.store";
-export * from "./modules/tags-view.store";
-export * from "./modules/user.store";
-export * from "./modules/dict.store";
+export * from "./modules/app-store";
+export * from "./modules/permission-store";
+export * from "./modules/settings-store";
+export * from "./modules/tags-view-store";
+export * from "./modules/user-store";
+export * from "./modules/dict-store";
 export { store };
diff --git a/src/store/modules/app.store.ts b/src/store/modules/app-store.ts
similarity index 100%
rename from src/store/modules/app.store.ts
rename to src/store/modules/app-store.ts
diff --git a/src/store/modules/dict.store.ts b/src/store/modules/dict-store.ts
similarity index 96%
rename from src/store/modules/dict.store.ts
rename to src/store/modules/dict-store.ts
index 84f7ff56..d6dac2b5 100644
--- a/src/store/modules/dict.store.ts
+++ b/src/store/modules/dict-store.ts
@@ -1,5 +1,5 @@
 import { store } from "@/store";
-import DictAPI, { type DictItemOption } from "@/api/system/dict.api";
+import DictAPI, { type DictItemOption } from "@/api/system/dict-api";
 
 export const useDictStore = defineStore("dict", () => {
   // 字典数据缓存
diff --git a/src/store/modules/permission.store.ts b/src/store/modules/permission-store.ts
similarity index 98%
rename from src/store/modules/permission.store.ts
rename to src/store/modules/permission-store.ts
index 3365ac8c..4a3187c2 100644
--- a/src/store/modules/permission.store.ts
+++ b/src/store/modules/permission-store.ts
@@ -3,7 +3,7 @@ import { constantRoutes } from "@/router";
 import { store } from "@/store";
 import router from "@/router";
 
-import MenuAPI, { type RouteVO } from "@/api/system/menu.api";
+import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layouts/index.vue");
 
diff --git a/src/store/modules/settings.store.ts b/src/store/modules/settings-store.ts
similarity index 100%
rename from src/store/modules/settings.store.ts
rename to src/store/modules/settings-store.ts
diff --git a/src/store/modules/tags-view.store.ts b/src/store/modules/tags-view-store.ts
similarity index 100%
rename from src/store/modules/tags-view.store.ts
rename to src/store/modules/tags-view-store.ts
diff --git a/src/store/modules/user.store.ts b/src/store/modules/user-store.ts
similarity index 94%
rename from src/store/modules/user.store.ts
rename to src/store/modules/user-store.ts
index 0a40fddc..410cfffa 100644
--- a/src/store/modules/user.store.ts
+++ b/src/store/modules/user-store.ts
@@ -1,11 +1,11 @@
 import { store } from "@/store";
 
-import AuthAPI, { type LoginFormData } from "@/api/auth.api";
-import UserAPI, { type UserInfo } from "@/api/system/user.api";
+import AuthAPI, { type LoginFormData } from "@/api/auth-api";
+import UserAPI, { type UserInfo } from "@/api/system/user-api";
 
 import { AuthStorage } from "@/utils/auth";
-import { usePermissionStoreHook } from "@/store/modules/permission.store";
-import { useDictStoreHook } from "@/store/modules/dict.store";
+import { usePermissionStoreHook } from "@/store/modules/permission-store";
+import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useTagsViewStore } from "@/store";
 import { cleanupWebSocket } from "@/plugins/websocket";
 
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 9af2061e..ae585b2e 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,6 +1,6 @@
 import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
-import { useUserStoreHook } from "@/store/modules/user.store";
+import { useUserStoreHook } from "@/store/modules/user-store";
 import { ResultEnum } from "@/enums/api/result.enum";
 import { AuthStorage } from "@/utils/auth";
 import router from "@/router";
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index 7bd3dfb2..d4c281a7 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -144,6 +144,22 @@
             </el-col>
           </el-row>
 
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="移除表前缀">
+                <el-input v-model="genConfigFormData.removeTablePrefix" placeholder="如: sys_" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="页面类型">
+                <el-radio-group v-model="genConfigFormData.pageType">
+                  <el-radio-button label="classic">普通</el-radio-button>
+                  <el-radio-button label="curd">封装(CURD)</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+          </el-row>
+
           <el-row>
             <el-col :span="12">
               <el-form-item>
@@ -180,6 +196,38 @@
         </el-form>
 
         <div v-show="active == 1" class="elTableCustom">
+          <div class="mb-2 flex-y-center gap-2">
+            <el-tag size="small" type="info">批量设置</el-tag>
+            <el-space size="small">
+              <el-dropdown>
+                <el-button size="small" type="primary" plain>查询</el-button>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item @click="bulkSet('isShowInQuery', 1)">全选</el-dropdown-item>
+                    <el-dropdown-item @click="bulkSet('isShowInQuery', 0)">全不选</el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
+              <el-dropdown>
+                <el-button size="small" type="success" plain>列表</el-button>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item @click="bulkSet('isShowInList', 1)">全选</el-dropdown-item>
+                    <el-dropdown-item @click="bulkSet('isShowInList', 0)">全不选</el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
+              <el-dropdown>
+                <el-button size="small" type="warning" plain>表单</el-button>
+                <template #dropdown>
+                  <el-dropdown-menu>
+                    <el-dropdown-item @click="bulkSet('isShowInForm', 1)">全选</el-dropdown-item>
+                    <el-dropdown-item @click="bulkSet('isShowInForm', 0)">全不选</el-dropdown-item>
+                  </el-dropdown-menu>
+                </template>
+              </el-dropdown>
+            </el-space>
+          </div>
           <el-table
             v-loading="loading"
             row-key="id"
@@ -227,51 +275,19 @@
               </template>
             </el-table-column>
 
-            <el-table-column width="70">
-              <template #header>
-                <div class="flex-y-center">
-                  <span>查询</span>
-                  <el-checkbox
-                    v-model="isCheckAllQuery"
-                    class="ml-1"
-                    @change="toggleCheckAll('isShowInQuery', isCheckAllQuery)"
-                  />
-                </div>
-              </template>
+            <el-table-column width="70" label="查询">
               <template #default="scope">
                 <el-checkbox v-model="scope.row.isShowInQuery" :true-value="1" :false-value="0" />
               </template>
             </el-table-column>
 
-            <el-table-column width="70">
-              <template #header>
-                <div class="flex-y-center">
-                  <span>列表</span>
-                  <el-checkbox
-                    v-model="isCheckAllList"
-                    class="ml-1"
-                    @change="toggleCheckAll('isShowInList', isCheckAllList)"
-                  />
-                </div>
-              </template>
-
+            <el-table-column width="70" label="列表">
               <template #default="scope">
                 <el-checkbox v-model="scope.row.isShowInList" :true-value="1" :false-value="0" />
               </template>
             </el-table-column>
 
-            <el-table-column width="70">
-              <template #header>
-                <div class="flex-y-center">
-                  <span>表单</span>
-                  <el-checkbox
-                    v-model="isCheckAllForm"
-                    class="ml-1"
-                    @change="toggleCheckAll('isShowInForm', isCheckAllForm)"
-                  />
-                </div>
-              </template>
-
+            <el-table-column width="70" label="表单">
               <template #default="scope">
                 <el-checkbox v-model="scope.row.isShowInForm" :true-value="1" :false-value="0" />
               </template>
@@ -347,10 +363,26 @@
         </div>
 
         <el-row v-show="active == 2">
+          <el-col :span="24" class="mb-2">
+            <div class="flex-y-center gap-3">
+              <span class="text-sm color-#909399">预览范围</span>
+              <el-radio-group v-model="previewScope" size="small">
+                <el-radio-button label="all">全部</el-radio-button>
+                <el-radio-button label="frontend">前端</el-radio-button>
+                <el-radio-button label="backend">后端</el-radio-button>
+              </el-radio-group>
+              <span class="ml-3 text-sm color-#909399">类型</span>
+              <el-checkbox-group v-model="previewTypes" size="small">
+                <el-checkbox-button v-for="t in previewTypeOptions" :key="t" :label="t">
+                  {{ t }}
+                </el-checkbox-button>
+              </el-checkbox-group>
+            </div>
+          </el-col>
           <el-col :span="6">
             <el-scrollbar max-height="72vh">
               <el-tree
-                :data="treeData"
+                :data="filteredTreeData"
                 default-expand-all
                 highlight-current
                 @node-click="handleFileTreeNodeClick"
@@ -403,8 +435,79 @@
             <Download />
           </el-icon>
         </el-button>
+        <el-button
+          v-if="active === 2"
+          :disabled="!supportsFSAccess"
+          type="primary"
+          plain
+          @click="openWriteDialog"
+        >
+          <template #icon>
+            <el-icon><FolderOpened /></el-icon>
+          </template>
+          写入本地
+        </el-button>
       </template>
     </el-drawer>
+    <!-- 写入本地对话框 -->
+    <el-dialog v-model="writeDialog.visible" title="写入本地" width="820px">
+      <div class="space-y-3">
+        <el-alert
+          v-if="!supportsFSAccess"
+          title="当前浏览器不支持 File System Access API，建议使用 Chrome/Edge 最新版"
+          type="warning"
+          show-icon
+          :closable="false"
+        />
+
+        <el-form :label-width="110">
+          <el-form-item label="前端根目录">
+            <div class="flex-y-center gap-2">
+              <el-input v-model="frontendDirPath" placeholder="请选择前端根目录" readonly />
+              <el-button :disabled="!supportsFSAccess" @click="pickFrontendDir">选择</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="后端根目录">
+            <div class="flex-y-center gap-2">
+              <el-input v-model="backendDirPath" placeholder="请选择后端根目录" readonly />
+              <el-button :disabled="!supportsFSAccess" @click="pickBackendDir">选择</el-button>
+            </div>
+          </el-form-item>
+          <el-form-item label="写入范围">
+            <el-radio-group v-model="writeScope">
+              <el-radio-button label="all">全部</el-radio-button>
+              <el-radio-button label="frontend">仅前端</el-radio-button>
+              <el-radio-button label="backend">仅后端</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="覆盖策略">
+            <el-radio-group v-model="overwriteMode">
+              <el-radio-button label="overwrite">覆盖</el-radio-button>
+              <el-radio-button label="skip">跳过已存在</el-radio-button>
+              <el-radio-button label="ifChanged">仅变更覆盖</el-radio-button>
+            </el-radio-group>
+          </el-form-item>
+        </el-form>
+
+        <div v-if="writeProgress.total > 0" class="mt-2">
+          <el-progress :text-inside="true" :stroke-width="16" :percentage="writeProgress.percent" />
+          <div class="mt-1 text-sm color-#909399">
+            {{ writeProgress.done }}/{{ writeProgress.total }} {{ writeProgress.current }}
+          </div>
+        </div>
+      </div>
+
+      <template #footer>
+        <el-button @click="writeDialog.visible = false">取 消</el-button>
+        <el-button
+          type="primary"
+          :disabled="!canWriteToLocal || writeRunning"
+          @click="confirmWrite"
+        >
+          写 入
+        </el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
@@ -427,10 +530,11 @@ import GeneratorAPI, {
   GenConfigForm,
   TablePageQuery,
   FieldConfig,
-} from "@/api/codegen.api";
+} from "@/api/codegen-api";
+import { ElLoading } from "element-plus";
 
-import DictAPI from "@/api/system/dict.api";
-import MenuAPI from "@/api/system/menu.api";
+import DictAPI from "@/api/system/dict-api";
+import MenuAPI from "@/api/system/menu-api";
 
 interface TreeNode {
   label: string;
@@ -438,6 +542,41 @@ interface TreeNode {
   children?: TreeNode[];
 }
 const treeData = ref<TreeNode[]>([]);
+const previewScope = ref<"all" | "frontend" | "backend">("all");
+const previewTypeOptions = ["ts", "vue", "java", "xml"];
+const previewTypes = ref<string[]>([...previewTypeOptions]);
+
+const filteredTreeData = computed<TreeNode[]>(() => {
+  if (!treeData.value.length) return [];
+  // 基于原树按 scope/types 过滤叶子节点
+  const match = (label: string, parentPath: string[]): boolean => {
+    // scope 过滤：根据路径初步判断
+    const pathStr = parentPath.join("/");
+    if (previewScope.value !== "all") {
+      const isBackend = /(^|\/)src\/main\//.test(pathStr) || /(^|\/)java\//.test(pathStr);
+      const scopeOfNode = isBackend ? "backend" : "frontend";
+      if (scopeOfNode !== previewScope.value) return false;
+    }
+    // 类型过滤：根据后缀
+    const ext = label.split(".").pop() || "";
+    return previewTypes.value.includes(ext);
+  };
+
+  const cloneFilter = (node: TreeNode, parents: string[] = []): TreeNode | null => {
+    if (!node.children || node.children.length === 0) {
+      return match(node.label, parents) ? { ...node } : null;
+    }
+    const nextParents = [...parents, node.label];
+    const children = (node.children || [])
+      .map((c) => cloneFilter(c, nextParents))
+      .filter(Boolean) as TreeNode[];
+    if (!children.length) return null;
+    return { label: node.label, children };
+  };
+
+  const filtered = treeData.value.map((n) => cloneFilter(n)).filter(Boolean) as TreeNode[];
+  return filtered;
+});
 
 const queryFormRef = ref();
 const queryParams = reactive<TablePageQuery>({
@@ -457,6 +596,7 @@ const dictOptions = ref<OptionType[]>();
 const menuOptions = ref<OptionType[]>([]);
 const genConfigFormData = ref<GenConfigForm>({
   fieldConfigs: [],
+  pageType: "classic",
 });
 
 const genConfigFormRules = {
@@ -472,6 +612,24 @@ const dialog = reactive({
   title: "",
 });
 
+// 页面风格使用后端持久化字段 genConfigFormData.ui
+watch(
+  () => genConfigFormData.value.removeTablePrefix,
+  (prefix) => {
+    const table = genConfigFormData.value.tableName;
+    if (!table) return;
+    const p = prefix || "";
+    const base = table.startsWith(p) ? table.slice(p.length) : table;
+    // 将下划线分隔的表名转为帕斯卡命名
+    const camel = base
+      .split("_")
+      .filter(Boolean)
+      .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
+      .join("");
+    genConfigFormData.value.entityName = camel;
+  }
+);
+
 const { copy, copied } = useClipboard();
 const code = ref();
 const cmRef = ref<CmComponentRef>();
@@ -485,6 +643,28 @@ const active = ref(0);
 const currentTableName = ref("");
 const sortFlag = ref<object>();
 
+// ================= 本地写盘（可选） =================
+const supportsFSAccess = typeof (window as any).showDirectoryPicker === "function";
+const outputMode = ref<"zip" | "local">("zip");
+const frontendDirHandle = ref<any>(null);
+const backendDirHandle = ref<any>(null);
+const frontendDirName = ref("");
+const backendDirName = ref("");
+// 预览的原始文件列表（用于写盘）
+const lastPreviewFiles = ref<{ path: string; fileName: string; content: string }[]>([]);
+const needFrontend = computed(() =>
+  lastPreviewFiles.value.some((f) => resolveRootForPath(f.path) === "frontend")
+);
+const needBackend = computed(() =>
+  lastPreviewFiles.value.some((f) => resolveRootForPath(f.path) === "backend")
+);
+const canWriteToLocal = computed(() => {
+  if (!lastPreviewFiles.value.length) return false;
+  const frontOk = needFrontend.value ? !!frontendDirHandle.value : true;
+  const backOk = needBackend.value ? !!backendDirHandle.value : true;
+  return frontOk && backOk;
+});
+
 // 查询是否全选
 const isCheckAllQuery = ref(false);
 // 列表是否全选
@@ -623,7 +803,9 @@ function handleNextClick() {
         ElMessage.error("表名不能为空");
         return;
       }
-      GeneratorAPI.download(tableName);
+      if (outputMode.value === "zip" || !supportsFSAccess) {
+        GeneratorAPI.download(tableName, (genConfigFormData.value.pageType as any) || "classic");
+      }
     }
   }
 }
@@ -699,15 +881,15 @@ function handleResetConfig(tableName: string) {
 type FieldConfigKey = "isShowInQuery" | "isShowInList" | "isShowInForm";
 
 /** 全选 */
-const toggleCheckAll = (key: FieldConfigKey, value: boolean) => {
-  const fieldConfigs = genConfigFormData.value?.fieldConfigs;
+// 单列全选开关已移除，改为顶部“批量设置”入口；保留方法时会触发未使用告警，故删除。
 
-  if (fieldConfigs) {
-    fieldConfigs.forEach((row: FieldConfig) => {
-      row[key] = value ? 1 : 0;
-    });
-  }
-};
+function bulkSet(key: FieldConfigKey, value: 0 | 1) {
+  const list = genConfigFormData.value?.fieldConfigs || [];
+  list.forEach((row: any) => {
+    // 只改已有字段，保持响应式
+    row[key] = value;
+  });
+}
 
 const checkAllSelected = (key: keyof FieldConfig, isCheckAllRef: any) => {
   const fieldConfigs = genConfigFormData.value?.fieldConfigs || [];
@@ -717,12 +899,15 @@ const checkAllSelected = (key: keyof FieldConfig, isCheckAllRef: any) => {
 /** 获取生成预览 */
 function handlePreview(tableName: string) {
   treeData.value = [];
-  GeneratorAPI.getPreviewData(tableName)
+  GeneratorAPI.getPreviewData(tableName, (genConfigFormData.value.pageType as any) || "classic")
     .then((data) => {
       dialog.title = `代码生成 ${tableName}`;
       // 组装树形结构完善代码
       const tree = buildTree(data);
-      treeData.value = [tree];
+      // 缓存原始数据用于写盘
+      lastPreviewFiles.value = data || [];
+      // 去掉根节点“前后端代码”，直接展示其 children 作为一级目录
+      treeData.value = tree?.children ? [...tree.children] : [];
 
       // 默认选中第一个叶子节点并设置 code 值
       const firstLeafNode = findFirstLeafNode(tree);
@@ -858,6 +1043,280 @@ const handleCopyCode = () => {
   }
 };
 
+// =============== 目录选择与写入 ===============
+const pickFrontendDir = async () => {
+  try {
+    // @ts-ignore
+    frontendDirHandle.value = await (window as any).showDirectoryPicker();
+    frontendDirName.value = frontendDirHandle.value?.name || "";
+    ElMessage.success("前端目录选择成功");
+  } catch {
+    // 用户取消或浏览器不支持
+  }
+};
+
+const pickBackendDir = async () => {
+  try {
+    // @ts-ignore
+    backendDirHandle.value = await (window as any).showDirectoryPicker();
+    backendDirName.value = backendDirHandle.value?.name || "";
+    ElMessage.success("后端目录选择成功");
+  } catch {
+    // 用户取消或浏览器不支持
+  }
+};
+
+async function ensureDir(root: any, path: string[], force = true) {
+  let current = root;
+  for (const segment of path) {
+    try {
+      // @ts-ignore
+      current = await current.getDirectoryHandle(segment, { create: true });
+    } catch (err: any) {
+      // 若同名文件阻塞目录创建，尝试强制删除后重建
+      if (force && err?.name === "TypeMismatchError") {
+        try {
+          // @ts-ignore
+          await current.removeEntry(segment, { recursive: true });
+          // @ts-ignore
+          current = await current.getDirectoryHandle(segment, { create: true });
+        } catch {
+          throw err;
+        }
+      } else {
+        throw err;
+      }
+    }
+  }
+  return current;
+}
+
+async function writeFile(dirHandle: any, filePath: string, content: string) {
+  const normalized = filePath.replace(/\\/g, "/");
+  const parts = normalized.split("/").filter(Boolean);
+  const fileName = parts.pop()!;
+  const folderSegments = parts;
+  const targetDir = await ensureDir(dirHandle, folderSegments, true);
+  // @ts-ignore
+  let fileHandle;
+  try {
+    // @ts-ignore
+    fileHandle = await targetDir.getFileHandle(fileName, { create: true });
+  } catch (err: any) {
+    if (err?.name === "TypeMismatchError") {
+      // 存在同名目录，尝试删除后重建文件
+      try {
+        // @ts-ignore
+        await targetDir.removeEntry(fileName, { recursive: true });
+        // @ts-ignore
+        fileHandle = await targetDir.getFileHandle(fileName, { create: true });
+      } catch {
+        throw err;
+      }
+    } else {
+      throw err;
+    }
+  }
+  // @ts-ignore
+  const writable = await fileHandle.createWritable();
+  await writable.write(content ?? "");
+  await writable.close();
+}
+
+async function pathExists(dirHandle: any, filePath: string): Promise<boolean> {
+  try {
+    const normalized = filePath.replace(/\\/g, "/");
+    const parts = normalized.split("/").filter(Boolean);
+    const fileName = parts.pop()!;
+    const targetDir = await ensureDir(dirHandle, parts, false);
+    // @ts-ignore
+    await targetDir.getFileHandle(fileName, { create: false });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+async function isSameFile(dirHandle: any, filePath: string, content: string): Promise<boolean> {
+  try {
+    const normalized = filePath.replace(/\\/g, "/");
+    const parts = normalized.split("/").filter(Boolean);
+    const fileName = parts.pop()!;
+    const targetDir = await ensureDir(dirHandle, parts, false);
+    // @ts-ignore
+    const fileHandle = await targetDir.getFileHandle(fileName, { create: false });
+    // @ts-ignore
+    const file = await fileHandle.getFile();
+    const text = await file.text();
+    return text === (content ?? "");
+  } catch {
+    return false;
+  }
+}
+
+// 将模板中的 path 映射到前端/后端根目录
+function resolveRootForPath(p: string) {
+  const normalized = p.replace(/\\/g, "/");
+  const frontApp = genConfigFormData.value.frontendAppName;
+  const backApp = genConfigFormData.value.backendAppName;
+  if (
+    (backApp && normalized.startsWith(`${backApp}/`)) ||
+    normalized.includes("/src/main/") ||
+    normalized.startsWith("src/main/") ||
+    normalized.startsWith("java/")
+  ) {
+    return "backend" as const;
+  }
+  if ((frontApp && normalized.startsWith(`${frontApp}/`)) || normalized.startsWith("src/")) {
+    return "frontend" as const;
+  }
+  // 默认前端
+  return "frontend" as const;
+}
+
+function stripProjectRoot(p: string) {
+  const normalized = p.replace(/\\/g, "/");
+  const frontApp = genConfigFormData.value.frontendAppName;
+  const backApp = genConfigFormData.value.backendAppName;
+  let rel = normalized;
+  if (frontApp && normalized.startsWith(`${frontApp}/`)) {
+    rel = normalized.slice(frontApp.length + 1);
+  } else if (backApp && normalized.startsWith(`${backApp}/`)) {
+    rel = normalized.slice(backApp.length + 1);
+  } else {
+    const idx = normalized.indexOf("/src/");
+    if (idx > -1) {
+      rel = normalized.slice(idx + 1); // 保留 'src/...'
+    } else if (normalized.startsWith("src/")) {
+      rel = normalized;
+    }
+  }
+  return rel;
+}
+
+const writeGeneratedCode = async () => {
+  if (!supportsFSAccess) {
+    ElMessage.warning("当前浏览器不支持本地写入，请选择下载ZIP");
+    return;
+  }
+  if (
+    (needFrontend.value && !frontendDirHandle.value) ||
+    (needBackend.value && !backendDirHandle.value)
+  ) {
+    ElMessage.warning("请先选择所需的前端/后端目录");
+    return;
+  }
+  if (!lastPreviewFiles.value.length) {
+    ElMessage.warning("请先生成预览");
+    return;
+  }
+  loading.value = true;
+  const loadingSvc = ElLoading.service({
+    lock: true,
+    text: "正在写入代码...",
+  });
+  writeRunning.value = true;
+  let frontCount = 0;
+  let backCount = 0;
+  const failed: string[] = [];
+  const files = lastPreviewFiles.value.filter((f) => {
+    const root = resolveRootForPath(f.path);
+    return writeScope.value === "all" || root === writeScope.value;
+  });
+  writeProgress.total = files.length;
+  writeProgress.done = 0;
+  writeProgress.percent = 0;
+  writeProgress.current = "";
+
+  const concurrency = 4;
+  const queue = files.slice();
+  const workers: Promise<void>[] = [];
+
+  async function worker() {
+    while (queue.length) {
+      const item = queue.shift()!;
+      try {
+        const root = resolveRootForPath(item.path);
+        const relativePath = stripProjectRoot(`${item.path}/${item.fileName}`);
+        writeProgress.current = relativePath;
+        if (overwriteMode.value === "ifChanged") {
+          // 简单差异：已有文件内容与待写内容相同则跳过
+          // @ts-ignore
+          const targetRoot = root === "frontend" ? frontendDirHandle.value : backendDirHandle.value;
+          const existsSame = await isSameFile(targetRoot, relativePath, item.content || "");
+          if (existsSame) {
+            // 视作成功但不写
+            writeProgress.done++;
+            writeProgress.percent = Math.round((writeProgress.done / writeProgress.total) * 100);
+            continue;
+          }
+        }
+        if (overwriteMode.value === "skip") {
+          // @ts-ignore
+          const targetRoot = root === "frontend" ? frontendDirHandle.value : backendDirHandle.value;
+          const exists = await pathExists(targetRoot, relativePath);
+          if (exists) {
+            writeProgress.done++;
+            writeProgress.percent = Math.round((writeProgress.done / writeProgress.total) * 100);
+            continue;
+          }
+        }
+        if (root === "frontend") {
+          await writeFile(frontendDirHandle.value, relativePath, item.content || "");
+          frontCount++;
+        } else {
+          await writeFile(backendDirHandle.value, relativePath, item.content || "");
+          backCount++;
+        }
+      } catch (err) {
+        console.error("写入失败:", item.path, err);
+        failed.push(item.path);
+      } finally {
+        writeProgress.done++;
+        writeProgress.percent = Math.round((writeProgress.done / writeProgress.total) * 100);
+      }
+    }
+  }
+
+  for (let i = 0; i < concurrency; i++) {
+    workers.push(worker());
+  }
+  await Promise.all(workers);
+  loading.value = false;
+  loadingSvc.close();
+  writeRunning.value = false;
+  if (failed.length) {
+    ElMessage.warning(
+      `部分文件写入失败：${failed.length} 个，成功 前端 ${frontCount} 个/后端 ${backCount} 个。打开控制台查看详情`
+    );
+  } else {
+    ElMessage.success(`写入完成：前端 ${frontCount} 个文件，后端 ${backCount} 个文件`);
+  }
+};
+
+const writeDialog = reactive({ visible: false });
+const frontendDirPath = ref("");
+const backendDirPath = ref("");
+const writeScope = ref<"all" | "frontend" | "backend">("all");
+const overwriteMode = ref<"overwrite" | "skip" | "ifChanged">("overwrite");
+const writeProgress = reactive({ total: 0, done: 0, percent: 0, current: "" });
+const writeRunning = ref(false);
+
+// 提示文本已取消展示，保留逻辑意义不大，移除。
+
+function openWriteDialog() {
+  writeDialog.visible = true;
+}
+
+// 同步展示路径
+watch(frontendDirName, (v) => (frontendDirPath.value = v));
+watch(backendDirName, (v) => (backendDirPath.value = v));
+
+async function confirmWrite() {
+  await writeGeneratedCode();
+  writeDialog.visible = false;
+}
+
 /** 组件挂载后执行 */
 onMounted(() => {
   handleQuery();
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index c0677175..8125bcf4 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -354,8 +354,8 @@ defineOptions({
 });
 
 import { dayjs } from "element-plus";
-import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log.api";
-import { useUserStore } from "@/store/modules/user.store";
+import LogAPI, { VisitStatsVO, VisitTrendVO } from "@/api/system/log-api";
+import { useUserStore } from "@/store/modules/user-store";
 import { formatGrowthRate } from "@/utils";
 import { useTransition, useDateFormat } from "@vueuse/core";
 import { Connection, Failed } from "@element-plus/icons-vue";
diff --git a/src/views/demo/curd/config/add.ts b/src/views/demo/curd/config/add.ts
index 972861c2..6d24fb6c 100644
--- a/src/views/demo/curd/config/add.ts
+++ b/src/views/demo/curd/config/add.ts
@@ -1,4 +1,4 @@
-import UserAPI, { type UserForm } from "@/api/system/user.api";
+import UserAPI, { type UserForm } from "@/api/system/user-api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { deptArr, roleArr } from "./options";
 
diff --git a/src/views/demo/curd/config/content.ts b/src/views/demo/curd/config/content.ts
index 871dfc78..88d26a1b 100644
--- a/src/views/demo/curd/config/content.ts
+++ b/src/views/demo/curd/config/content.ts
@@ -1,6 +1,6 @@
-import UserAPI from "@/api/system/user.api";
-import RoleAPI from "@/api/system/role.api";
-import type { UserPageQuery } from "@/api/system/user.api";
+import UserAPI from "@/api/system/user-api";
+import RoleAPI from "@/api/system/role-api";
+import type { UserPageQuery } from "@/api/system/user-api";
 import type { IContentConfig } from "@/components/CURD/types";
 
 const contentConfig: IContentConfig<UserPageQuery> = {
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 2d5444a6..94726b54 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,4 +1,4 @@
-import UserAPI, { type UserForm } from "@/api/system/user.api";
+import UserAPI, { type UserForm } from "@/api/system/user-api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { useAppStore } from "@/store";
diff --git a/src/views/demo/curd/config/options.ts b/src/views/demo/curd/config/options.ts
index 3f7bd82b..c154bd4b 100644
--- a/src/views/demo/curd/config/options.ts
+++ b/src/views/demo/curd/config/options.ts
@@ -1,6 +1,6 @@
 /** 公共下载数据，减少重复请求次数 */
-import DeptAPI from "@/api/system/dept.api";
-import RoleAPI from "@/api/system/role.api";
+import DeptAPI from "@/api/system/dept-api";
+import RoleAPI from "@/api/system/role-api";
 
 interface OptionType {
   label: string;
diff --git a/src/views/demo/curd/config2/add.ts b/src/views/demo/curd/config2/add.ts
index 374b4e96..0e27288a 100644
--- a/src/views/demo/curd/config2/add.ts
+++ b/src/views/demo/curd/config2/add.ts
@@ -1,4 +1,4 @@
-import type { UserForm } from "@/api/system/user.api";
+import type { UserForm } from "@/api/system/user-api";
 import type { IModalConfig } from "@/components/CURD/types";
 import { deptArr } from "../config/options";
 
diff --git a/src/views/demo/curd/index.vue b/src/views/demo/curd/index.vue
index 4ed75e73..6f5b1fd3 100644
--- a/src/views/demo/curd/index.vue
+++ b/src/views/demo/curd/index.vue
@@ -113,7 +113,7 @@
 </template>
 
 <script setup lang="ts">
-import UserAPI from "@/api/system/user.api";
+import UserAPI from "@/api/system/user-api";
 import type { IObject, IOperateData, PageModalInstance } from "@/components/CURD/types";
 import usePage from "@/components/CURD/usePage";
 import addModalConfig from "./config/add";
diff --git a/src/views/demo/dict-sync.vue b/src/views/demo/dict-sync.vue
index 31bc55b8..dd3d8738 100644
--- a/src/views/demo/dict-sync.vue
+++ b/src/views/demo/dict-sync.vue
@@ -139,9 +139,9 @@
 </template>
 
 <script setup lang="ts">
-import { useDictStoreHook } from "@/store/modules/dict.store";
+import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useDateFormat } from "@vueuse/core";
-import DictAPI, { DictItemForm } from "@/api/system/dict.api";
+import DictAPI, { DictItemForm } from "@/api/system/dict-api";
 import { useDictSync, DictMessage } from "@/composables/useDictSync";
 
 // 性别字典编码
diff --git a/src/views/demo/signature.vue b/src/views/demo/signature.vue
index 52e4a1ec..d61e1eee 100644
--- a/src/views/demo/signature.vue
+++ b/src/views/demo/signature.vue
@@ -21,7 +21,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import FileAPI from "@/api/file.api";
+import FileAPI from "@/api/file-api";
 
 const imgUrl = ref("");
 const canvas = ref();
diff --git a/src/views/demo/table-select/config/select.ts b/src/views/demo/table-select/config/select.ts
index e043e66c..98200d22 100644
--- a/src/views/demo/table-select/config/select.ts
+++ b/src/views/demo/table-select/config/select.ts
@@ -1,4 +1,4 @@
-import UserAPI from "@/api/system/user.api";
+import UserAPI from "@/api/system/user-api";
 import type { ISelectConfig } from "@/components/TableSelect/index.vue";
 
 const selectConfig: ISelectConfig = {
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index bf40b163..5ae54bb8 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -98,7 +98,7 @@
 
 <script setup lang="ts">
 import { useStomp } from "@/composables/useStomp";
-import { useUserStoreHook } from "@/store/modules/user.store";
+import { useUserStoreHook } from "@/store/modules/user-store";
 
 const userStore = useUserStoreHook();
 // 用于手动调整 WebSocket 地址
diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index fa125c1c..d9100a63 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -111,7 +111,7 @@
 </template>
 <script setup lang="ts">
 import type { FormInstance } from "element-plus";
-import AuthAPI, { type LoginFormData } from "@/api/auth.api";
+import AuthAPI, { type LoginFormData } from "@/api/auth-api";
 import router from "@/router";
 import { useUserStore } from "@/store";
 import CommonWrapper from "@/components/CommonWrapper/index.vue";
diff --git a/src/views/login/components/Register.vue b/src/views/login/components/Register.vue
index 787e9f1b..0358474a 100644
--- a/src/views/login/components/Register.vue
+++ b/src/views/login/components/Register.vue
@@ -98,7 +98,7 @@
 import type { FormInstance } from "element-plus";
 import { Lock } from "@element-plus/icons-vue";
 import { useI18n } from "vue-i18n";
-import AuthAPI, { type LoginFormData } from "@/api/auth.api";
+import AuthAPI, { type LoginFormData } from "@/api/auth-api";
 
 const { t } = useI18n();
 
diff --git a/src/views/profile/index.vue b/src/views/profile/index.vue
index eed67c53..ab5bdfd9 100644
--- a/src/views/profile/index.vue
+++ b/src/views/profile/index.vue
@@ -230,9 +230,9 @@ import UserAPI, {
   MobileUpdateForm,
   EmailUpdateForm,
   UserProfileForm,
-} from "@/api/system/user.api";
+} from "@/api/system/user-api";
 
-import FileAPI from "@/api/file.api";
+import FileAPI from "@/api/file-api";
 import { useUserStoreHook } from "@/store";
 
 import { Camera } from "@element-plus/icons-vue";
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index eca97221..3035806a 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -141,7 +141,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config.api";
+import ConfigAPI, { ConfigPageVO, ConfigForm, ConfigPageQuery } from "@/api/system/config-api";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { useDebounceFn } from "@vueuse/core";
 
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 02eb938b..fd92b8b1 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -163,7 +163,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/system/dept.api";
+import DeptAPI, { DeptVO, DeptForm, DeptQuery } from "@/api/system/dept-api";
 
 const queryFormRef = ref();
 const deptFormRef = ref();
diff --git a/src/views/system/dict/dict-item.vue b/src/views/system/dict/dict-item.vue
index 43f2eced..7ba92fcf 100644
--- a/src/views/system/dict/dict-item.vue
+++ b/src/views/system/dict/dict-item.vue
@@ -155,7 +155,7 @@
 
 <script setup lang="ts">
 import type { TagProps } from "element-plus";
-import DictAPI, { DictItemPageQuery, DictItemPageVO, DictItemForm } from "@/api/system/dict.api";
+import DictAPI, { DictItemPageQuery, DictItemPageVO, DictItemForm } from "@/api/system/dict-api";
 
 const route = useRoute();
 
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index fa2c3844..43542b0f 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -137,7 +137,7 @@ defineOptions({
   inherititems: false,
 });
 
-import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict.api";
+import DictAPI, { DictPageQuery, DictPageVO, DictForm } from "@/api/system/dict-api";
 
 import router from "@/router";
 
diff --git a/src/views/system/log/index.vue b/src/views/system/log/index.vue
index 028040aa..532ca3a4 100644
--- a/src/views/system/log/index.vue
+++ b/src/views/system/log/index.vue
@@ -68,7 +68,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import LogAPI, { LogPageVO, LogPageQuery } from "@/api/system/log.api";
+import LogAPI, { LogPageVO, LogPageQuery } from "@/api/system/log-api";
 
 const queryFormRef = ref();
 
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index ef47f888..2a7e1482 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -340,10 +340,10 @@
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from "@/store/modules/app.store";
+import { useAppStore } from "@/store/modules/app-store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 
-import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu.api";
+import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu-api";
 import { MenuTypeEnum } from "@/enums/system/menu.enum";
 
 defineOptions({
diff --git a/src/views/system/notice/components/MyNotice.vue b/src/views/system/notice/components/MyNotice.vue
index a9cf7105..1048508a 100644
--- a/src/views/system/notice/components/MyNotice.vue
+++ b/src/views/system/notice/components/MyNotice.vue
@@ -115,7 +115,7 @@ defineOptions({
   inheritAttrs: false,
 });
 
-import NoticeAPI, { NoticePageVO, NoticePageQuery, NoticeDetailVO } from "@/api/system/notice.api";
+import NoticeAPI, { NoticePageVO, NoticePageQuery, NoticeDetailVO } from "@/api/system/notice-api";
 
 const queryFormRef = ref();
 const pageData = ref<NoticePageVO[]>([]);
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 4fd364f2..6b88f3dd 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -265,8 +265,8 @@ import NoticeAPI, {
   NoticeForm,
   NoticePageQuery,
   NoticeDetailVO,
-} from "@/api/system/notice.api";
-import UserAPI from "@/api/system/user.api";
+} from "@/api/system/notice-api";
+import UserAPI from "@/api/system/user-api";
 
 const queryFormRef = ref();
 const dataFormRef = ref();
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 00267847..9c5829bf 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -212,11 +212,11 @@
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from "@/store/modules/app.store";
+import { useAppStore } from "@/store/modules/app-store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 
-import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role.api";
-import MenuAPI from "@/api/system/menu.api";
+import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role-api";
+import MenuAPI from "@/api/system/menu-api";
 
 defineOptions({
   name: "Role",
diff --git a/src/views/system/user/components/DeptTree.vue b/src/views/system/user/components/DeptTree.vue
index fca23070..19e41dbf 100644
--- a/src/views/system/user/components/DeptTree.vue
+++ b/src/views/system/user/components/DeptTree.vue
@@ -21,7 +21,7 @@
 </template>
 
 <script setup lang="ts">
-import DeptAPI from "@/api/system/dept.api";
+import DeptAPI from "@/api/system/dept-api";
 const props = defineProps({
   modelValue: {
     type: [String, Number],
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 666bce7e..7dafa52b 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -89,7 +89,7 @@
 
 <script lang="ts" setup>
 import { ElMessage, type UploadUserFile } from "element-plus";
-import UserAPI from "@/api/system/user.api";
+import UserAPI from "@/api/system/user-api";
 import { ResultEnum } from "@/enums/api/result.enum";
 
 const emit = defineEmits(["import-success"]);
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ae943cbe..f8c4d58e 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -244,12 +244,12 @@
 </template>
 
 <script setup lang="ts">
-import { useAppStore } from "@/store/modules/app.store";
+import { useAppStore } from "@/store/modules/app-store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 
-import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user.api";
-import DeptAPI from "@/api/system/dept.api";
-import RoleAPI from "@/api/system/role.api";
+import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user-api";
+import DeptAPI from "@/api/system/dept-api";
+import RoleAPI from "@/api/system/role-api";
 
 import DeptTree from "./components/DeptTree.vue";
 import UserImport from "./components/UserImport.vue";
diff --git a/vite.config.ts b/vite.config.ts
index 03f02469..8c4cdcaa 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -185,6 +185,8 @@ export default defineConfig(({ mode }: ConfigEnv): UserConfig => {
         "element-plus/es/components/tree/style/index",
         "element-plus/es/components/upload/style/index",
         "element-plus/es/components/watermark/style/index",
+        "element-plus/es/components/checkbox-button/style/index",
+        "element-plus/es/components/space/style/index",
       ],
     },
     // 构建配置

From e37a6c5aa4d31244c0fc4b1a852433908165658c Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 22 Aug 2025 09:34:43 +0800
Subject: [PATCH 454/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=B1=BB=E5=9E=8B=E6=89=93=E5=8C=85=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json               | 2 +-
 src/api/system/menu-api.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 79eb427e..0530bf2d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.3.0",
+  "version": "3.3.1",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/api/system/menu-api.ts b/src/api/system/menu-api.ts
index 4e55d077..b4be9d35 100644
--- a/src/api/system/menu-api.ts
+++ b/src/api/system/menu-api.ts
@@ -42,7 +42,7 @@ export interface MenuQuery {
   /** 搜索关键字 */
   keywords?: string;
 }
-export type MenuTypeEnum = 0 | 1 | 2;
+import type { MenuTypeEnum } from "@/enums/system/menu.enum";
 export interface MenuVO {
   /** 子菜单 */
   children?: MenuVO[];

From ab829060f1a4a8c0adbe95a7f7741c831d2478ac Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Thu, 28 Aug 2025 11:59:15 +0800
Subject: [PATCH 455/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E4=BA=86=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=EF=BC=8C?=
 =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=B8=8D?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构了文件上传，解决文件上传不显示进度条的问题，现在多选文件上传时，每个文件有单独的进度条
---
 src/api/file-api.ts                  | 10 ++++-
 src/components/Upload/FileUpload.vue | 66 ++++++++++++----------------
 2 files changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/api/file-api.ts b/src/api/file-api.ts
index 826698ef..b899c447 100644
--- a/src/api/file-api.ts
+++ b/src/api/file-api.ts
@@ -1,13 +1,19 @@
 import request from "@/utils/request";
 
 const FileAPI = {
-  /** 上传文件 */
-  upload(formData: FormData) {
+  /** 上传文件 （传入 FormData，上传进度回调） */
+  upload(formData: FormData, onProgress?: (percent: number) => void) {
     return request<any, FileInfo>({
       url: "/api/v1/files",
       method: "post",
       data: formData,
       headers: { "Content-Type": "multipart/form-data" },
+      onUploadProgress: (progressEvent) => {
+        if (progressEvent.total) {
+          const percent = Math.round((progressEvent.loaded * 100) / progressEvent.total);
+          onProgress?.(percent);
+        }
+      },
     });
   },
 
diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index 6857acec..baa88a67 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -6,7 +6,6 @@
       :style="props.style"
       :before-upload="handleBeforeUpload"
       :http-request="handleUpload"
-      :on-progress="handleProgress"
       :on-success="handleSuccess"
       :on-error="handleError"
       :accept="props.accept"
@@ -20,25 +19,24 @@
 
       <!-- 文件列表 -->
       <template #file="{ file }">
-        <div class="el-upload-list__item-info">
-          <a class="el-upload-list__item-name" @click="handleDownload(file)">
-            <el-icon><Document /></el-icon>
-            <span class="el-upload-list__item-file-name">{{ file.name }}</span>
-            <span class="el-icon--close" @click.stop="handleRemove(file.url!)">
-              <el-icon><Close /></el-icon>
-            </span>
-          </a>
-        </div>
+        <template v-if="file.status === 'success'">
+          <div class="el-upload-list__item-info">
+            <a class="el-upload-list__item-name" @click="handleDownload(file)">
+              <el-icon><Document /></el-icon>
+              <span class="el-upload-list__item-file-name">{{ file.name }}</span>
+              <span class="el-icon--close" @click.stop="handleRemove(file.url!)">
+                <el-icon><Close /></el-icon>
+              </span>
+            </a>
+          </div>
+        </template>
+        <template v-else>
+          <div class="el-upload-list__item-info">
+            <el-progress style="display: inline-flex" :percentage="file.percentage" />
+          </div>
+        </template>
       </template>
     </el-upload>
-
-    <el-progress
-      :style="{
-        display: showProgress ? 'inline-flex' : 'none',
-        width: '100%',
-      }"
-      :percentage="progressPercent"
-    />
   </div>
 </template>
 <script lang="ts" setup>
@@ -47,7 +45,6 @@ import {
   UploadUserFile,
   UploadFile,
   UploadFiles,
-  UploadProgressEvent,
   UploadRequestOptions,
 } from "element-plus";
 
@@ -111,7 +108,6 @@ const props = defineProps({
     },
   },
 });
-
 const modelValue = defineModel("modelValue", {
   type: [Array] as PropType<FileInfo[]>,
   required: true,
@@ -120,9 +116,6 @@ const modelValue = defineModel("modelValue", {
 
 const fileList = ref([] as UploadFile[]);
 
-const showProgress = ref(false);
-const progressPercent = ref(0);
-
 // 监听 modelValue 转换用于显示的 fileList
 watch(
   modelValue,
@@ -160,7 +153,6 @@ function handleBeforeUpload(file: UploadRawFile) {
 function handleUpload(options: UploadRequestOptions) {
   return new Promise((resolve, reject) => {
     const file = options.file;
-
     const formData = new FormData();
     formData.append(props.name, file);
 
@@ -168,26 +160,22 @@ function handleUpload(options: UploadRequestOptions) {
     Object.keys(props.data).forEach((key) => {
       formData.append(key, props.data[key]);
     });
-
-    FileAPI.upload(formData)
-      .then((data) => {
-        resolve(data);
+    FileAPI.upload(formData, (percent) => {
+      const uid = file.uid;
+      const fileItem = fileList.value.find((file) => file.uid === uid);
+      if (fileItem) {
+        fileItem.percentage = percent;
+      }
+    })
+      .then((res) => {
+        resolve(res);
       })
-      .catch((error) => {
-        reject(error);
+      .catch((err) => {
+        reject(err);
       });
   });
 }
 
-/**
- * 上传进度
- *
- * @param event
- */
-const handleProgress = (event: UploadProgressEvent) => {
-  progressPercent.value = event.percent;
-};
-
 /**
  * 上传成功
  */

From cc3750c128dab13982326f25c41739119bda8717 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 1 Sep 2025 11:11:45 +0800
Subject: [PATCH 456/497] =?UTF-8?q?fix:=20:bug:=20(keep-alive)=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E7=BC=93=E5=AD=98=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 KeepCache 组件，直接在 AppMain 中实现缓存逻辑

- 将 fullPath 做为组件缓存的 name
---
 src/components/KeepCache/index.vue            | 18 -----
 src/layouts/components/AppMain/index.vue      | 51 +++++++++++++-
 src/layouts/components/TagsView/index.vue     |  9 +--
 src/store/modules/permission-store.ts         | 70 +++++++------------
 src/store/modules/tags-view-store.ts          | 56 ++++-----------
 .../children/children/level3-1.vue            | 17 +++--
 .../children/children/level3-2.vue            | 17 +++--
 .../demo/multi-level/children/level2.vue      | 13 ++--
 src/views/demo/multi-level/level1.vue         | 21 ++----
 9 files changed, 129 insertions(+), 143 deletions(-)
 delete mode 100644 src/components/KeepCache/index.vue

diff --git a/src/components/KeepCache/index.vue b/src/components/KeepCache/index.vue
deleted file mode 100644
index 1deaabe6..00000000
--- a/src/components/KeepCache/index.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <router-view>
-    <template #default="{ Component, route }">
-      <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
-        <keep-alive :include="tagsViewStore.cachedViews">
-          <component :is="Component" :key="route.path" />
-        </keep-alive>
-      </transition>
-    </template>
-  </router-view>
-</template>
-<script setup lang="ts">
-defineOptions({ name: "KeepCache" });
-
-import { useTagsViewStore } from "@/store";
-
-const tagsViewStore = useTagsViewStore();
-</script>
diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 4a2ae912..1ec6249c 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -1,13 +1,58 @@
 <template>
   <section class="app-main" :style="{ height: appMainHeight }">
-    <KeepCache />
+    <router-view>
+      <template #default="{ Component, route }">
+        <transition enter-active-class="animate__animated animate__fadeIn" mode="out-in">
+          <keep-alive :include="cachedViews">
+            <component :is="currentComponent(Component, route)" :key="route.fullPath" />
+          </keep-alive>
+        </transition>
+      </template>
+    </router-view>
   </section>
 </template>
 
 <script setup lang="ts">
-import { useSettingsStore } from "@/store";
+import { type RouteLocationNormalized } from "vue-router";
+import { useSettingsStore, useTagsViewStore } from "@/store";
 import variables from "@/styles/variables.module.scss";
-import KeepCache from "@/components/KeepCache/index.vue";
+import Error404 from "@/views/error/404.vue";
+
+const { cachedViews } = toRefs(useTagsViewStore());
+
+// 当前组件
+const wrapperMap = new Map<string, Component>();
+const currentComponent = (component: Component, route: RouteLocationNormalized) => {
+  if (!component) return;
+
+  const { fullPath: componentName } = route; // 使用路由路径作为组件名称
+  let wrapper = wrapperMap.get(componentName);
+
+  if (!wrapper) {
+    wrapper = {
+      name: componentName,
+      render: () => {
+        try {
+          return h(component);
+        } catch (error) {
+          console.error(`Error rendering component for route: ${componentName}`, error);
+          return h(Error404);
+        }
+      },
+    };
+    wrapperMap.set(componentName, wrapper);
+  }
+
+  // 添加组件数量限制
+  if (wrapperMap.size > 100) {
+    const firstKey = wrapperMap.keys().next().value;
+    if (firstKey) {
+      wrapperMap.delete(firstKey);
+    }
+  }
+
+  return h(wrapper);
+};
 
 const appMainHeight = computed(() => {
   if (useSettingsStore().showTagsView) {
diff --git a/src/layouts/components/TagsView/index.vue b/src/layouts/components/TagsView/index.vue
index 7689b157..4950fa29 100644
--- a/src/layouts/components/TagsView/index.vue
+++ b/src/layouts/components/TagsView/index.vue
@@ -86,14 +86,7 @@ const route = useRoute();
 const permissionStore = usePermissionStore();
 const tagsViewStore = useTagsViewStore();
 
-const visitedViews = ref<TagView[]>([]);
-
-watchEffect(() => {
-  visitedViews.value = tagsViewStore.visitedViews;
-  const names = visitedViews.value.map((item) => item.name).filter(Boolean);
-
-  tagsViewStore.setCacheRoutes(names, permissionStore.allCacheRoutes);
-});
+const { visitedViews } = storeToRefs(tagsViewStore);
 
 // 当前选中的标签
 const selectedTag = ref<TagView | null>(null);
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index 4a3187c2..34a6d824 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -15,21 +15,20 @@ export const usePermissionStore = defineStore("permission", () => {
   // 动态路由是否已生成
   const isDynamicRoutesGenerated = ref(false);
 
-  const allCacheRoutes = ref<string[][]>([]);
-
   /**
    * 生成动态路由
    */
   async function generateRoutes(): Promise<RouteRecordRaw[]> {
     try {
       const data = await MenuAPI.getRoutes(); // 获取当前登录人拥有的菜单路由
-      const dynamicRoutes = parseDynamicRoutes(data);
+      const dynamicRoutes = parseDynamicRoutes(processRoutes(data));
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
 
-      setAllCacheRoutes(routes.value);
       isDynamicRoutesGenerated.value = true;
 
+      console.log("dynamicRoutes", dynamicRoutes);
+
       return dynamicRoutes;
     } catch (error) {
       console.error("❌ Failed to generate routes:", error);
@@ -64,33 +63,10 @@ export const usePermissionStore = defineStore("permission", () => {
     isDynamicRoutesGenerated.value = false;
   };
 
-  /**
-   * 获取所有的缓存路由
-   * @param userRoutes 用户路由配置
-   */
-  const setAllCacheRoutes = (userRoutes: RouteRecordRaw[]) => {
-    if (!userRoutes?.length) {
-      allCacheRoutes.value = [];
-
-      return;
-    }
-
-    const result: string[][] = [];
-
-    userRoutes.forEach((route) => {
-      if (route.children?.length) {
-        traverseRoutes(route.children, [], result);
-      }
-    });
-
-    allCacheRoutes.value = result;
-  };
-
   return {
     routes,
     mixLayoutSideMenus,
     isDynamicRoutesGenerated,
-    allCacheRoutes,
     generateRoutes,
     setMixLayoutSideMenus,
     resetRouter,
@@ -109,12 +85,13 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
   rawRoutes.forEach((route) => {
     const normalizedRoute = { ...route } as RouteRecordRaw;
 
+    // console.log();
+
     // 处理组件路径
     normalizedRoute.component =
       normalizedRoute.component?.toString() === "Layout"
         ? Layout
-        : modules[`../../views/${normalizedRoute.component}.vue`] ||
-          modules["../../views/error-page/404.vue"];
+        : modules[`../../views/${normalizedRoute.component}.vue`];
 
     // 递归解析子路由
     if (normalizedRoute.children) {
@@ -128,24 +105,31 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
 };
 
 /**
- * 遍历路由树收集缓存路由
- * @param nodes 路由节点
- * @param path 当前路径
- * @param result 结果数组
+ * 去除中间层的路由 `component` 属性
+ * @param routes 路由数组
+ * @param isTopLevel 是否是顶层路由
  */
-const traverseRoutes = (nodes: RouteRecordRaw[], path: string[], result: string[][]) => {
-  nodes.forEach((node) => {
-    const newPath: string[] = node.name ? [...path, String(node.name)] : [...path];
-
-    // 叶子节点且需要缓存
-    if (!node.children?.length && node.meta?.keepAlive) {
-      result.push(newPath);
+const processRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteVO[] => {
+  return routes.map((route) => {
+    // 创建新对象
+    const newRoute: RouteVO = {
+      path: route.path,
+      name: route.name,
+      children: route.children,
+      meta: { ...route.meta },
+    };
+
+    // 如果是顶层或者component不是"Layout"，保留component属性
+    if (isTopLevel || route.component !== "Layout") {
+      newRoute.component = route.component;
     }
 
-    // 递归处理子节点
-    if (node.children?.length) {
-      traverseRoutes(node.children, newPath, result);
+    // 递归处理children，标记为非顶层
+    if (route.children && route.children.length > 0) {
+      newRoute.children = processRoutes(route.children, false);
     }
+
+    return newRoute;
   });
 };
 
diff --git a/src/store/modules/tags-view-store.ts b/src/store/modules/tags-view-store.ts
index d2b2724d..718aae08 100644
--- a/src/store/modules/tags-view-store.ts
+++ b/src/store/modules/tags-view-store.ts
@@ -27,16 +27,15 @@ export const useTagsViewStore = defineStore("tagsView", () => {
   /**
    * 添加缓存视图到缓存视图列表中
    */
-  function addCachedView(view: TagView) {
-    const viewName = view.name;
+  function addCachedView({ fullPath, keepAlive }: TagView) {
     // 如果缓存视图名称已经存在于缓存视图列表中，则不再添加
-    if (cachedViews.value.includes(viewName)) {
+    if (cachedViews.value.includes(fullPath)) {
       return;
     }
 
     // 如果视图需要缓存（keepAlive），则将其路由名称添加到缓存视图列表中
-    if (view.keepAlive) {
-      cachedViews.value.push(viewName);
+    if (keepAlive) {
+      cachedViews.value.push(fullPath);
     }
   }
 
@@ -57,9 +56,9 @@ export const useTagsViewStore = defineStore("tagsView", () => {
   }
 
   function delCachedView(view: TagView) {
-    const viewName = view.name;
+    const { fullPath } = view;
     return new Promise((resolve) => {
-      const index = cachedViews.value.indexOf(viewName);
+      const index = cachedViews.value.indexOf(fullPath);
       if (index > -1) {
         cachedViews.value.splice(index, 1);
       }
@@ -76,9 +75,9 @@ export const useTagsViewStore = defineStore("tagsView", () => {
   }
 
   function delOtherCachedViews(view: TagView) {
-    const viewName = view.name as string;
+    const { fullPath } = view;
     return new Promise((resolve) => {
-      const index = cachedViews.value.indexOf(viewName);
+      const index = cachedViews.value.indexOf(fullPath);
       if (index > -1) {
         cachedViews.value = cachedViews.value.slice(index, index + 1);
       } else {
@@ -136,7 +135,7 @@ export const useTagsViewStore = defineStore("tagsView", () => {
           return true;
         }
 
-        const cacheIndex = cachedViews.value.indexOf(item.name);
+        const cacheIndex = cachedViews.value.indexOf(item.fullPath);
         if (cacheIndex > -1) {
           cachedViews.value.splice(cacheIndex, 1);
         }
@@ -158,6 +157,11 @@ export const useTagsViewStore = defineStore("tagsView", () => {
         if (index <= currIndex || item?.affix) {
           return true;
         }
+        const cacheIndex = cachedViews.value.indexOf(item.fullPath);
+        if (cacheIndex > -1) {
+          cachedViews.value.splice(cacheIndex, 1);
+        }
+        return false;
       });
       resolve({
         visitedViews: [...visitedViews.value],
@@ -232,37 +236,6 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     }
   }
 
-  const setCacheRoutes = (names: string[], allCacheRoutes: string[][]) => {
-    if (!names?.length) {
-      cachedViews.value = [];
-
-      return;
-    }
-
-    cachedViews.value = findAndMergeRouteArrays(allCacheRoutes, names);
-  };
-
-  /**
-   * 查找并合并路由数组
-   * @param data 所有缓存路由数据
-   * @param elements 目标元素
-   * @returns 合并后的路由数组
-   */
-  const findAndMergeRouteArrays = (data: string[][], elements: string[]): string[] => {
-    const foundArrays = elements
-      .map((element) => data.find((arr) => arr.includes(element)))
-      .filter(Boolean) as string[][];
-
-    // 使用Set去重并合并
-    const mergedSet = new Set<string>();
-
-    foundArrays.forEach((arr) => {
-      arr.forEach((item) => mergedSet.add(item));
-    });
-
-    return Array.from(mergedSet);
-  };
-
   return {
     visitedViews,
     cachedViews,
@@ -284,6 +257,5 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     closeCurrentView,
     isActive,
     toLastView,
-    setCacheRoutes,
   };
 });
diff --git a/src/views/demo/multi-level/children/children/level3-1.vue b/src/views/demo/multi-level/children/children/level3-1.vue
index 246ace76..cd84a28d 100644
--- a/src/views/demo/multi-level/children/children/level3-1.vue
+++ b/src/views/demo/multi-level/children/children/level3-1.vue
@@ -1,14 +1,23 @@
 <template>
-  <div flex flex-col gap-20px>
-    <el-alert :closable="false" title="菜单三级-1" type="error" />
-    <el-input v-model="value" placeholder="缓存测试" />
-    <ToDetail />
+  <div class="app-container">
+    <div flex flex-col gap-20px>
+      <MultiLevel1 />
+      <MultiLevel2 />
+      <el-alert :closable="false" title="菜单三级-1" type="error" />
+      <el-input v-model="value" placeholder="缓存测试" />
+      <ToDetail />
+    </div>
   </div>
 </template>
 <script lang="ts" setup>
 import ToDetail from "./detail";
+import MultiLevel1 from "../../level1.vue";
+import MultiLevel2 from "../level2.vue";
 
 defineOptions({ name: "MultiLevel31" });
 
 const value = ref("");
+onMounted(() => {
+  console.log("Multilevel31 onMounted");
+});
 </script>
diff --git a/src/views/demo/multi-level/children/children/level3-2.vue b/src/views/demo/multi-level/children/children/level3-2.vue
index 5e1beae4..f20d3502 100644
--- a/src/views/demo/multi-level/children/children/level3-2.vue
+++ b/src/views/demo/multi-level/children/children/level3-2.vue
@@ -1,14 +1,23 @@
 <template>
-  <div flex flex-col gap-20px>
-    <el-alert :closable="false" title="菜单三级-2" type="warning" />
-    <el-input v-model="value" placeholder="缓存测试" />
-    <ToDetail />
+  <div class="app-container">
+    <div flex flex-col gap-20px>
+      <MultiLevel1 />
+      <MultiLevel2 />
+      <el-alert :closable="false" title="菜单三级-2" type="warning" />
+      <el-input v-model="value" placeholder="缓存测试" />
+      <ToDetail />
+    </div>
   </div>
 </template>
 
 <script lang="ts" setup>
 import ToDetail from "./detail";
+import MultiLevel1 from "../../level1.vue";
+import MultiLevel2 from "../level2.vue";
 
 defineOptions({ name: "MultiLevel32" });
 const value = ref("");
+onMounted(() => {
+  console.log("Multilevel32 onMounted");
+});
 </script>
diff --git a/src/views/demo/multi-level/children/level2.vue b/src/views/demo/multi-level/children/level2.vue
index f3de974f..8c9d9513 100644
--- a/src/views/demo/multi-level/children/level2.vue
+++ b/src/views/demo/multi-level/children/level2.vue
@@ -1,10 +1,13 @@
 <template>
-  <div flex flex-col gap-20px>
-    <el-alert :closable="false" title="菜单二级" type="success" />
-    <KeepCache />
-  </div>
+  <el-alert :closable="false" title="菜单二级" type="success" />
+  <el-input v-model="value" placeholder="缓存测试" />
 </template>
 <script setup lang="ts">
-import KeepCache from "@/components/KeepCache/index.vue";
 defineOptions({ name: "MultiLevel2" });
+
+const value = ref("");
+
+onMounted(() => {
+  console.log("MultiLevel2 mounted");
+});
 </script>
diff --git a/src/views/demo/multi-level/level1.vue b/src/views/demo/multi-level/level1.vue
index dc451f0d..caf7a960 100644
--- a/src/views/demo/multi-level/level1.vue
+++ b/src/views/demo/multi-level/level1.vue
@@ -1,21 +1,10 @@
 <template>
-  <div p-30px>
-    <el-link
-      href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/multi-level/level1.vue"
-      type="primary"
-      target="_blank"
-      class="mb-10"
-    >
-      示例源码 请点击>>>>
-    </el-link>
-
-    <div flex flex-col gap-20px>
-      <el-alert :closable="false" title="菜单一级" />
-      <KeepCache />
-    </div>
-  </div>
+  <el-alert :closable="false" title="菜单一级" />
 </template>
 <script setup lang="ts">
-import KeepCache from "@/components/KeepCache/index.vue";
 defineOptions({ name: "MultiLevel1" });
+
+onMounted(() => {
+  console.log("MultiLevel1 mounted");
+});
 </script>

From 7c1d5f65528924a8f4851c20d87e6a4e0b42042e Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 1 Sep 2025 14:33:24 +0800
Subject: [PATCH 457/497] =?UTF-8?q?feat:=20:sparkles:=20(store)=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=AF=B9=E6=9C=AA=E5=AE=9A=E4=B9=89=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=A4=84=E7=90=86=EF=BC=8C=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A1=B5=E7=AD=BE=E5=90=8D=E7=A7=B0=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在多级菜单详情示例中使用了新的标签名称
---
 src/store/modules/permission-store.ts         | 20 ++++++++++---------
 src/store/modules/tags-view-store.ts          | 14 +++++++++++++
 .../multi-level/children/children/detail.ts   |  6 ++++++
 3 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index 34a6d824..bf67da4e 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -27,8 +27,6 @@ export const usePermissionStore = defineStore("permission", () => {
 
       isDynamicRoutesGenerated.value = true;
 
-      console.log("dynamicRoutes", dynamicRoutes);
-
       return dynamicRoutes;
     } catch (error) {
       console.error("❌ Failed to generate routes:", error);
@@ -85,13 +83,17 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
   rawRoutes.forEach((route) => {
     const normalizedRoute = { ...route } as RouteRecordRaw;
 
-    // console.log();
-
-    // 处理组件路径
-    normalizedRoute.component =
-      normalizedRoute.component?.toString() === "Layout"
-        ? Layout
-        : modules[`../../views/${normalizedRoute.component}.vue`];
+    if (!normalizedRoute.component) {
+      // 如果没有组件，则将组件设置为 undefined 防止404 例如(多级菜单的父菜单)
+      normalizedRoute.component = undefined;
+    } else {
+      // 处理组件路径
+      normalizedRoute.component =
+        normalizedRoute.component?.toString() === "Layout"
+          ? Layout
+          : modules[`../../views/${normalizedRoute.component}.vue`] ||
+            modules[`../../views/error/404.vue`]; // 找不到页面时，返回404页面
+    }
 
     // 递归解析子路由
     if (normalizedRoute.children) {
diff --git a/src/store/modules/tags-view-store.ts b/src/store/modules/tags-view-store.ts
index 718aae08..310f2cce 100644
--- a/src/store/modules/tags-view-store.ts
+++ b/src/store/modules/tags-view-store.ts
@@ -97,6 +97,19 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     }
   }
 
+  /**
+   * 根据路径更新标签名称
+   * @param fullPath 路径
+   * @param title 标签名称
+   */
+  function updateTagName(fullPath: string, title: string) {
+    const tag = visitedViews.value.find((tag: TagView) => tag.fullPath === fullPath);
+
+    if (tag) {
+      tag.title = title;
+    }
+  }
+
   function addView(view: TagView) {
     addVisitedView(view);
     addCachedView(view);
@@ -257,5 +270,6 @@ export const useTagsViewStore = defineStore("tagsView", () => {
     closeCurrentView,
     isActive,
     toLastView,
+    updateTagName,
   };
 });
diff --git a/src/views/demo/multi-level/children/children/detail.ts b/src/views/demo/multi-level/children/children/detail.ts
index 29549a7c..39207250 100644
--- a/src/views/demo/multi-level/children/children/detail.ts
+++ b/src/views/demo/multi-level/children/children/detail.ts
@@ -1,15 +1,21 @@
 import router from "@/router";
 import { ElButton } from "element-plus";
+import { useTagsViewStore } from "@/store";
 
 export default defineComponent({
   name: "ToDetail",
   setup() {
+    const route = useRoute();
+    const tagsViewStore = useTagsViewStore();
+
     // 跳转详情
     const navigateToDetail = async (id: number) => {
       await router.push({
         path: "/detail/" + id,
         query: { message: `msg${id}` },
       });
+      // 更改标题
+      tagsViewStore.updateTagName(route.fullPath, `详情页缓存(id=${id})`);
     };
     return () =>
       h("div", null, [

From 236ac3c97eaefed4b1dfbad5bd837b20e0949896 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 1 Sep 2025 14:58:04 +0800
Subject: [PATCH 458/497] =?UTF-8?q?refactor:=20:recycle:=20(mock)=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E5=A4=9A=E7=BA=A7=E8=8F=9C=E5=8D=95=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=92=8C=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 multi-level1 和 multi-level2 的组件路径改为 Layout

- 将菜单项类型从 MENU 改为 CATALOG
---
 mock/menu.mock.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/mock/menu.mock.ts b/mock/menu.mock.ts
index 6d7b8495..bbf134bc 100644
--- a/mock/menu.mock.ts
+++ b/mock/menu.mock.ts
@@ -244,7 +244,7 @@ export default defineMock([
           children: [
             {
               path: "multi-level1",
-              component: "demo/multi-level/level1",
+              component: "Layout",
               name: "MultiLevel1",
               meta: {
                 title: "菜单一级",
@@ -256,7 +256,7 @@ export default defineMock([
               children: [
                 {
                   path: "multi-level2",
-                  component: "demo/multi-level/children/level2",
+                  component: "Layout",
                   name: "MultiLevel2",
                   meta: {
                     title: "菜单二级",
@@ -1317,10 +1317,10 @@ export default defineMock([
               id: 21,
               parentId: 20,
               name: "菜单一级",
-              type: "MENU",
+              type: "CATALOG",
               routeName: null,
               routePath: "multi-level1",
-              component: "demo/multi-level/level1",
+              component: "Layout",
               sort: 1,
               visible: 1,
               icon: "",
@@ -1331,10 +1331,10 @@ export default defineMock([
                   id: 22,
                   parentId: 21,
                   name: "菜单二级",
-                  type: "MENU",
+                  type: "CATALOG",
                   routeName: null,
                   routePath: "multi-level2",
-                  component: "demo/multi-level/children/level2",
+                  component: "Layout",
                   sort: 1,
                   visible: 1,
                   icon: "",

From f4b3db4fea0d15978e7f9715354f0a4bcd252914 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Wed, 3 Sep 2025 08:48:34 +0800
Subject: [PATCH 459/497] =?UTF-8?q?build:=20:package:=20(eslint)=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20`ESLint`=20=E9=85=8D=E7=BD=AE=E4=BB=A5=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=20`TypeScript`=20=E5=92=8C=20`Prettier`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加 TypeScript 支持，包括 tsconfigRootDir 设置

- 集成 Prettier 插件，将 Prettier 输出作为 ESLint 问题报告

#ICVVIH
---
 eslint.config.ts | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/eslint.config.ts b/eslint.config.ts
index 7e3fb4c4..20aade82 100644
--- a/eslint.config.ts
+++ b/eslint.config.ts
@@ -1,11 +1,16 @@
 // https://eslint.org/docs/latest/use/configure/configuration-files-new
 
+// 基础ESLint配置
 import eslint from "@eslint/js";
-import pluginVue from "eslint-plugin-vue";
+import globals from "globals";
+// TypeScript支持
 import * as typescriptEslint from "typescript-eslint";
+// Vue支持
+import pluginVue from "eslint-plugin-vue";
 import vueParser from "vue-eslint-parser";
-import globals from "globals";
+// 代码风格与格式化
 import configPrettier from "eslint-config-prettier";
+import prettierPlugin from "eslint-plugin-prettier";
 
 // 解析自动导入配置
 import fs from "node:fs";
@@ -132,6 +137,7 @@ export default [
         sourceType: "module",
         parser: typescriptEslint.parser,
         extraFileExtensions: [".vue"],
+        tsconfigRootDir: __dirname,
       },
     },
     rules: {
@@ -174,8 +180,10 @@ export default [
     languageOptions: {
       parser: typescriptEslint.parser,
       parserOptions: {
-        project: true,
-        tsconfigRootDir: import.meta.dirname,
+        ecmaVersion: "latest",
+        sourceType: "module",
+        project: "./tsconfig.json",
+        tsconfigRootDir: __dirname,
       },
     },
     rules: {
@@ -212,5 +220,15 @@ export default [
   },
 
   // Prettier 集成（必须放在最后）
-  configPrettier,
+  {
+    plugins: {
+      prettier: prettierPlugin, // 将 Prettier 的输出作为 ESLint 的问题来报告
+    },
+    rules: {
+      ...configPrettier.rules,
+      "prettier/prettier": ["error", {}, { usePrettierrc: true }],
+      "arrow-body-style": "off",
+      "prefer-arrow-callback": "off",
+    },
+  },
 ];

From 3208edbb18edfcae3e67ba35c216afbced5934ac Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Wed, 3 Sep 2025 13:17:15 +0800
Subject: [PATCH 460/497] =?UTF-8?q?refactor:=20:recycle:=20(store)?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1=E5=A4=84=E7=90=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=AE=8C=E6=95=B4=E8=BF=94=E5=9B=9E=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/permission-store.ts | 28 ++++++++-------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index bf67da4e..b980176d 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -107,31 +107,19 @@ const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
 };
 
 /**
- * 去除中间层的路由 `component` 属性
+ * 路由处理函数
+ *  - 去除中间层路由 `component: Layout` 的 `component` 属性
  * @param routes 路由数组
  * @param isTopLevel 是否是顶层路由
  */
 const processRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteVO[] => {
-  return routes.map((route) => {
-    // 创建新对象
-    const newRoute: RouteVO = {
-      path: route.path,
-      name: route.name,
-      children: route.children,
-      meta: { ...route.meta },
+  return routes.map(({ component, children, ...args }) => {
+    return {
+      ...args,
+      component: isTopLevel || component !== "Layout" ? component : undefined,
+      // 递归处理children，标记为非顶层
+      children: children && children.length > 0 ? processRoutes(children, false) : [],
     };
-
-    // 如果是顶层或者component不是"Layout"，保留component属性
-    if (isTopLevel || route.component !== "Layout") {
-      newRoute.component = route.component;
-    }
-
-    // 递归处理children，标记为非顶层
-    if (route.children && route.children.length > 0) {
-      newRoute.children = processRoutes(route.children, false);
-    }
-
-    return newRoute;
   });
 };
 

From 6cce9581fb3e47ed4fb2b346db6567d98231d4b1 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 4 Sep 2025 16:23:40 +0800
Subject: [PATCH 461/497] =?UTF-8?q?style:=20:lipstick:=20(settings)?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E5=92=8C=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将底部按钮放入footer插槽中，保留原有的样式

#ICWDUU
---
 src/layouts/components/Settings/index.vue | 106 ++++++++--------------
 1 file changed, 38 insertions(+), 68 deletions(-)

diff --git a/src/layouts/components/Settings/index.vue b/src/layouts/components/Settings/index.vue
index 2ebb6bb5..7c26f240 100644
--- a/src/layouts/components/Settings/index.vue
+++ b/src/layouts/components/Settings/index.vue
@@ -107,40 +107,35 @@
     </div>
 
     <!-- 操作按钮区域 - 固定到底部 -->
-    <div class="action-footer">
-      <div class="action-divider"></div>
-      <div class="action-card">
-        <div class="action-buttons">
-          <el-tooltip
-            content="复制配置将生成当前设置的代码，覆盖 src/settings.ts 下的 defaultSettings 变量"
-            placement="top"
+    <template #footer>
+      <div class="action-buttons">
+        <el-tooltip
+          content="复制配置将生成当前设置的代码，覆盖 src/settings.ts 下的 defaultSettings 变量"
+          placement="top"
+        >
+          <el-button
+            type="primary"
+            size="default"
+            :icon="copyIcon"
+            :loading="copyLoading"
+            @click="handleCopySettings"
           >
-            <el-button
-              type="primary"
-              size="default"
-              :icon="copyIcon"
-              :loading="copyLoading"
-              class="action-btn"
-              @click="handleCopySettings"
-            >
-              {{ copyLoading ? "复制中..." : t("settings.copyConfig") }}
-            </el-button>
-          </el-tooltip>
-          <el-tooltip content="重置将恢复所有设置为默认值" placement="top">
-            <el-button
-              type="warning"
-              size="default"
-              :icon="resetIcon"
-              :loading="resetLoading"
-              class="action-btn"
-              @click="handleResetSettings"
-            >
-              {{ resetLoading ? "重置中..." : t("settings.resetConfig") }}
-            </el-button>
-          </el-tooltip>
-        </div>
+            {{ copyLoading ? "复制中..." : t("settings.copyConfig") }}
+          </el-button>
+        </el-tooltip>
+        <el-tooltip content="重置将恢复所有设置为默认值" placement="top">
+          <el-button
+            type="warning"
+            size="default"
+            :icon="resetIcon"
+            :loading="resetLoading"
+            @click="handleResetSettings"
+          >
+            {{ resetLoading ? "重置中..." : t("settings.resetConfig") }}
+          </el-button>
+        </el-tooltip>
       </div>
-    </div>
+    </template>
   </el-drawer>
 </template>
 
@@ -326,47 +321,22 @@ const handleCloseDrawer = () => {
 .settings-content {
   height: calc(100vh - 120px); /* 减去头部和底部按钮的高度 */
   padding: 20px;
-  padding-bottom: 20px;
   overflow-y: auto;
 }
 
 /* 底部操作区域样式 */
-.action-footer {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  left: 0;
-  z-index: 10;
-  padding: 0;
-  background: var(--el-bg-color);
-  border-top: 1px solid var(--el-border-color-light);
-
-  .action-divider {
-    display: none; /* 移除重复的分割线 */
-  }
+.action-buttons {
+  display: flex;
 
-  .action-card {
-    padding: 16px 20px;
-    margin: 0;
-    background: var(--el-fill-color-extra-light);
-    border: none;
-    border-radius: 0;
-
-    .action-buttons {
-      display: flex;
-      gap: 12px;
-
-      .action-btn {
-        flex: 1;
-        font-size: 14px;
-        border-radius: 8px;
-        transition: all 0.3s ease;
-
-        &:hover {
-          box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
-          transform: translateY(-2px);
-        }
-      }
+  & > .el-button {
+    flex: 1;
+    font-size: 14px;
+    border-radius: 8px;
+    transition: all 0.3s ease;
+
+    &:hover {
+      box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+      transform: translateY(-2px);
     }
   }
 }

From 328e0936127f139efcf8d840bdfc4e6d73f4570d Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 4 Sep 2025 20:39:38 +0800
Subject: [PATCH 462/497] =?UTF-8?q?refactor:=20:recycle:=20(.vscode/settin?=
 =?UTF-8?q?gs.json)=E6=9B=B4=E6=96=B0=20`i18n-ally`=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 localesPaths 为 "src/lang/package"
---
 .vscode/settings.json | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e655d767..302ead28 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -63,19 +63,9 @@
     "**/dist/**": true,
     "**/yarn.lock": true
   },
-  "i18n-ally.keystyle": "nested",
-  "i18n-ally.sortKeys": true,
-  "i18n-ally.namespace": false,
-  "i18n-ally.pathMatcher": "{namespaces}/{locale}.{ext}",
-  "i18n-ally.enabledParsers": ["ts"],
-  "i18n-ally.sourceLanguage": "en",
-  "i18n-ally.displayLanguage": "zh-CN",
-  "i18n-ally.enabledFrameworks": [
-    "vue",
-    "react"
-  ],
   "i18n-ally.localesPaths": [
-    "src/lang"
+    "src/lang/package"
   ],
-  "scss.lint.unknownAtRules": "ignore"
+  "scss.lint.unknownAtRules": "ignore",
+  "i18n-ally.keystyle": "nested"
 }

From 39f967628881619f724a7efeee9ab30d44616a3b Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Thu, 4 Sep 2025 20:41:48 +0800
Subject: [PATCH 463/497] =?UTF-8?q?refactor:=20:recycle:=20(i18n/lang)?=
 =?UTF-8?q?=E5=B0=86=E8=AF=AD=E8=A8=80=E5=8C=85=E4=BB=8E=20`TypeScript`=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=81=E7=A7=BB=E5=88=B0=20`JSON`=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将 en.ts 和 zh-cn.ts 文件分别重命名为 en.json 和 zh-cn.json

- 更新导入路径以使用新的 JSON 文件

- 删除旧的 TypeScript 语言包文件

#ICWF9O
---
 src/lang/index.ts           |  4 +-
 src/lang/package/en.json    | 91 ++++++++++++++++++++++++++++++++++
 src/lang/package/en.ts      | 96 ------------------------------------
 src/lang/package/zh-cn.json | 94 +++++++++++++++++++++++++++++++++++
 src/lang/package/zh-cn.ts   | 97 -------------------------------------
 5 files changed, 187 insertions(+), 195 deletions(-)
 create mode 100644 src/lang/package/en.json
 delete mode 100644 src/lang/package/en.ts
 create mode 100644 src/lang/package/zh-cn.json
 delete mode 100644 src/lang/package/zh-cn.ts

diff --git a/src/lang/index.ts b/src/lang/index.ts
index 2a8685c4..efa06e98 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -2,8 +2,8 @@ import type { App } from "vue";
 import { createI18n } from "vue-i18n";
 import { useAppStoreHook } from "@/store/modules/app-store";
 // 本地语言包
-import enLocale from "./package/en";
-import zhCnLocale from "./package/zh-cn";
+import enLocale from "./package/en.json";
+import zhCnLocale from "./package/zh-cn.json";
 
 const appStore = useAppStoreHook();
 
diff --git a/src/lang/package/en.json b/src/lang/package/en.json
new file mode 100644
index 00000000..021e409f
--- /dev/null
+++ b/src/lang/package/en.json
@@ -0,0 +1,91 @@
+{
+  "route": {
+    "dashboard": "Dashboard",
+    "document": "Document"
+  },
+  "login": {
+    "themeToggle": "Theme Switch",
+    "languageToggle": "Language Switch",
+    "dark": "Dark",
+    "light": "Light",
+    "username": "Username",
+    "password": "Password",
+    "login": "Login",
+    "captchaCode": "Verify Code",
+    "capsLock": "Caps Lock is On",
+    "rememberMe": "Remember Me",
+    "forgetPassword": "Forget Password?",
+    "message": {
+      "username": {
+        "required": "Please enter Username"
+      },
+      "password": {
+        "required": "Please enter Password",
+        "min": "The password can not be less than 6 digits",
+        "confirm": "Please confirm the password again",
+        "inconformity": "The two password entries are inconsistent"
+      },
+      "captchaCode": {
+        "required": "Please enter Verify Code"
+      }
+    },
+    "otherLoginMethods": "Other",
+    "resetPassword": "Reset password",
+    "thinkOfPasswd": "Remember your password?",
+    "register": "Register account",
+    "agree": "I have read and agree to the",
+    "userAgreement": "User Agreement",
+    "haveAccount": "Already have an account?",
+    "noAccount": "Don't have an account?",
+    "quickFill": "Quick fill",
+    "reg": "Register"
+  },
+  "navbar": {
+    "dashboard": "Dashboard",
+    "logout": "Logout",
+    "document": "Document",
+    "gitee": "Gitee",
+    "profile": "User Profile"
+  },
+  "sizeSelect": {
+    "tooltip": "Layout Size",
+    "default": "Default",
+    "large": "Large",
+    "small": "Small",
+    "message": {
+      "success": "Switch Layout Size Successful!"
+    }
+  },
+  "langSelect": {
+    "message": {
+      "success": "Switch Language Successful!"
+    }
+  },
+  "settings": {
+    "project": "Project Settings",
+    "theme": "Theme",
+    "interface": "Interface",
+    "navigation": "Navigation",
+    "themeColor": "Theme Color",
+    "showTagsView": "Show Tags View",
+    "showAppLogo": "Show App Logo",
+    "sidebarColorScheme": "Sidebar Color Scheme",
+    "showWatermark": "Show Watermark",
+    "classicBlue": "Classic Blue",
+    "minimalWhite": "Minimal White",
+    "copyConfig": "Copy Config",
+    "resetConfig": "Reset Default",
+    "copySuccess": "Configuration copied to clipboard",
+    "resetSuccess": "Reset to default configuration",
+    "copyDescription": "Copy config will generate current settings code, reset will restore all settings to default",
+    "confirmReset": "Are you sure to reset all settings to default? This operation cannot be undone.",
+    "applyToFile": "Apply to File",
+    "onlyCopy": "Only Copy",
+    "leftLayout": "Left Mode",
+    "topLayout": "Top Mode",
+    "mixLayout": "Mix Mode",
+    "configManagement": "Config Management",
+    "copyConfigDescription": "Generate current settings code and copy to clipboard, then overwrite src/settings.ts file",
+    "resetConfigDescription": "Restore all settings to system default values"
+  }
+}
diff --git a/src/lang/package/en.ts b/src/lang/package/en.ts
deleted file mode 100644
index 2a863c73..00000000
--- a/src/lang/package/en.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-export default {
-  // 菜单国际化
-  route: {
-    dashboard: "Dashboard",
-    document: "Document",
-  },
-  // 登录页面国际化
-  login: {
-    themeToggle: "Theme Switch",
-    languageToggle: "Language Switch",
-    dark: "Dark",
-    light: "Light",
-    username: "Username",
-    password: "Password",
-    login: "Login",
-    captchaCode: "Verify Code",
-    capsLock: "Caps Lock is On",
-    rememberMe: "Remember Me",
-    forgetPassword: "Forget Password?",
-    message: {
-      username: {
-        required: "Please enter Username",
-      },
-      password: {
-        required: "Please enter Password",
-        min: "The password can not be less than 6 digits",
-        confirm: "Please confirm the password again",
-        inconformity: "The two password entries are inconsistent",
-      },
-      captchaCode: {
-        required: "Please enter Verify Code",
-      },
-    },
-    otherLoginMethods: "Other",
-    resetPassword: "Reset password",
-    thinkOfPasswd: "Remember your password?",
-    register: "Register account",
-    agree: "I have read and agree to the",
-    userAgreement: "User Agreement",
-    haveAccount: "Already have an account?",
-    noAccount: "Don't have an account?",
-    quickFill: "Quick fill",
-    reg: "Register",
-  },
-  // 导航栏国际化
-  navbar: {
-    dashboard: "Dashboard",
-    logout: "Logout",
-    document: "Document",
-    gitee: "Gitee",
-    profile: "User Profile",
-  },
-  sizeSelect: {
-    tooltip: "Layout Size",
-    default: "Default",
-    large: "Large",
-    small: "Small",
-    message: {
-      success: "Switch Layout Size Successful!",
-    },
-  },
-  langSelect: {
-    message: {
-      success: "Switch Language Successful!",
-    },
-  },
-  settings: {
-    project: "Project Settings",
-    theme: "Theme",
-    interface: "Interface",
-    navigation: "Navigation",
-    themeColor: "Theme Color",
-    showTagsView: "Show Tags View",
-    showAppLogo: "Show App Logo",
-    sidebarColorScheme: "Sidebar Color Scheme",
-    showWatermark: "Show Watermark",
-    classicBlue: "Classic Blue",
-    minimalWhite: "Minimal White",
-    copyConfig: "Copy Config",
-    resetConfig: "Reset Default",
-    copySuccess: "Configuration copied to clipboard",
-    resetSuccess: "Reset to default configuration",
-    copyDescription:
-      "Copy config will generate current settings code, reset will restore all settings to default",
-    confirmReset: "Are you sure to reset all settings to default? This operation cannot be undone.",
-    applyToFile: "Apply to File",
-    onlyCopy: "Only Copy",
-    leftLayout: "Left Mode",
-    topLayout: "Top Mode",
-    mixLayout: "Mix Mode",
-    configManagement: "Config Management",
-    copyConfigDescription:
-      "Generate current settings code and copy to clipboard, then overwrite src/settings.ts file",
-    resetConfigDescription: "Restore all settings to system default values",
-  },
-};
diff --git a/src/lang/package/zh-cn.json b/src/lang/package/zh-cn.json
new file mode 100644
index 00000000..3346ce08
--- /dev/null
+++ b/src/lang/package/zh-cn.json
@@ -0,0 +1,94 @@
+{
+  "route": {
+    "dashboard": "首页",
+    "document": "项目文档"
+  },
+  "login": {
+    "themeToggle": "主题切换",
+    "languageToggle": "语言切换",
+    "dark": "暗黑",
+    "light": "明亮",
+    "username": "用户名",
+    "password": "密码",
+    "login": "登 录",
+    "captchaCode": "验证码",
+    "capsLock": "大写锁定已打开",
+    "rememberMe": "记住我",
+    "forgetPassword": "忘记密码？",
+    "message": {
+      "username": {
+        "required": "请输入用户名"
+      },
+      "password": {
+        "required": "请输入密码",
+        "min": "密码不能少于6位",
+        "confirm": "请再次确认密码",
+        "inconformity": "两次密码输入不一致"
+      },
+      "captchaCode": {
+        "required": "请输入验证码"
+      }
+    },
+    "otherLoginMethods": "其他",
+    "resetPassword": "重置密码",
+    "thinkOfPasswd": "想起密码？",
+    "register": "注册账号",
+    "agree": "我已同意并阅读",
+    "userAgreement": "用户协议",
+    "haveAccount": "已有账号？",
+    "noAccount": "您没有账号？",
+    "quickFill": "快速填写",
+    "reg": "注 册"
+  },
+  "navbar": {
+    "dashboard": "首页",
+    "logout": "退出登录",
+    "document": "项目文档",
+    "gitee": "项目地址",
+    "profile": "个人中心"
+  },
+  "sizeSelect": {
+    "tooltip": "布局大小",
+    "default": "默认",
+    "large": "大型",
+    "small": "小型",
+    "message": {
+      "success": "切换布局大小成功！"
+    }
+  },
+  "langSelect": {
+    "message": {
+      "success": "切换语言成功！"
+    }
+  },
+  "settings": {
+    "project": "项目配置",
+    "theme": "主题设置",
+    "interface": "界面设置",
+    "navigation": "导航设置",
+    "themeColor": "主题颜色",
+    "themeColorTip": "主题颜色",
+    "darkMode": "暗黑模式",
+    "layoutSetting": "布局设置",
+    "sidebarColorScheme": "侧边栏配色",
+    "showTagsView": "显示页签",
+    "showAppLogo": "显示Logo",
+    "showWatermark": "显示水印",
+    "classicBlue": "经典蓝",
+    "minimalWhite": "极简白",
+    "copyConfig": "复制配置",
+    "resetConfig": "重置默认",
+    "copySuccess": "配置已复制到剪贴板",
+    "resetSuccess": "已重置为默认配置",
+    "copyDescription": "复制配置将生成当前设置的代码，重置将恢复所有设置为默认值",
+    "confirmReset": "确定要重置所有设置为默认值吗？此操作不可恢复。",
+    "applyToFile": "应用到文件",
+    "onlyCopy": "仅复制",
+    "leftLayout": "左侧模式",
+    "topLayout": "顶部模式",
+    "mixLayout": "混合模式",
+    "configManagement": "配置管理",
+    "copyConfigDescription": "生成当前设置的代码并复制到剪贴板，然后覆盖 src/settings.ts 文件",
+    "resetConfigDescription": "恢复所有设置为系统默认值"
+  }
+}
diff --git a/src/lang/package/zh-cn.ts b/src/lang/package/zh-cn.ts
deleted file mode 100644
index f1f9cb2e..00000000
--- a/src/lang/package/zh-cn.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-export default {
-  // 菜单国际化
-  route: {
-    dashboard: "首页",
-    document: "项目文档",
-  },
-  // 登录页面国际化
-  login: {
-    themeToggle: "主题切换",
-    languageToggle: "语言切换",
-    dark: "暗黑",
-    light: "明亮",
-    username: "用户名",
-    password: "密码",
-    login: "登 录",
-    captchaCode: "验证码",
-    capsLock: "大写锁定已打开",
-    rememberMe: "记住我",
-    forgetPassword: "忘记密码？",
-    message: {
-      username: {
-        required: "请输入用户名",
-      },
-      password: {
-        required: "请输入密码",
-        min: "密码不能少于6位",
-        confirm: "请再次确认密码",
-        inconformity: "两次密码输入不一致",
-      },
-      captchaCode: {
-        required: "请输入验证码",
-      },
-    },
-    otherLoginMethods: "其他",
-    resetPassword: "重置密码",
-    thinkOfPasswd: "想起密码？",
-    register: "注册账号",
-    agree: "我已同意并阅读",
-    userAgreement: "用户协议",
-    haveAccount: "已有账号？",
-    noAccount: "您没有账号？",
-    quickFill: "快速填写",
-    reg: "注 册",
-  },
-  // 导航栏国际化
-  navbar: {
-    dashboard: "首页",
-    logout: "退出登录",
-    document: "项目文档",
-    gitee: "项目地址",
-    profile: "个人中心",
-  },
-  sizeSelect: {
-    tooltip: "布局大小",
-    default: "默认",
-    large: "大型",
-    small: "小型",
-    message: {
-      success: "切换布局大小成功！",
-    },
-  },
-  langSelect: {
-    message: {
-      success: "切换语言成功！",
-    },
-  },
-  settings: {
-    project: "项目配置",
-    theme: "主题设置",
-    interface: "界面设置",
-    navigation: "导航设置",
-    themeColor: "主题颜色",
-    themeColorTip: "主题颜色",
-    darkMode: "暗黑模式",
-    layoutSetting: "布局设置",
-    sidebarColorScheme: "侧边栏配色",
-    showTagsView: "显示页签",
-    showAppLogo: "显示Logo",
-    showWatermark: "显示水印",
-    classicBlue: "经典蓝",
-    minimalWhite: "极简白",
-    copyConfig: "复制配置",
-    resetConfig: "重置默认",
-    copySuccess: "配置已复制到剪贴板",
-    resetSuccess: "已重置为默认配置",
-    copyDescription: "复制配置将生成当前设置的代码，重置将恢复所有设置为默认值",
-    confirmReset: "确定要重置所有设置为默认值吗？此操作不可恢复。",
-    applyToFile: "应用到文件",
-    onlyCopy: "仅复制",
-    leftLayout: "左侧模式",
-    topLayout: "顶部模式",
-    mixLayout: "混合模式",
-    configManagement: "配置管理",
-    copyConfigDescription: "生成当前设置的代码并复制到剪贴板，然后覆盖 src/settings.ts 文件",
-    resetConfigDescription: "恢复所有设置为系统默认值",
-  },
-};

From 121d88a889469123fbbb38b1f7d3030410602752 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Fri, 5 Sep 2025 08:18:03 +0800
Subject: [PATCH 464/497] =?UTF-8?q?refactor:=20:recycle:=20(i18n)=E7=AE=80?=
 =?UTF-8?q?=E5=8C=96=E8=AF=AD=E8=A8=80=E9=85=8D=E7=BD=AE=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 zh-cn 和 en 对象中的展开操作符
---
 src/lang/index.ts | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/lang/index.ts b/src/lang/index.ts
index efa06e98..436f1230 100644
--- a/src/lang/index.ts
+++ b/src/lang/index.ts
@@ -8,12 +8,8 @@ import zhCnLocale from "./package/zh-cn.json";
 const appStore = useAppStoreHook();
 
 const messages = {
-  "zh-cn": {
-    ...zhCnLocale,
-  },
-  en: {
-    ...enLocale,
-  },
+  "zh-cn": zhCnLocale,
+  en: enLocale,
 };
 
 const i18n = createI18n({

From bb512388b8ad26340cd65fb9b2217661aa963ee0 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Fri, 5 Sep 2025 08:31:01 +0800
Subject: [PATCH 465/497] =?UTF-8?q?chore:=20:hammer:=20(vscode)=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=20`i18n-ally`=20=E7=9A=84=20`keystyle`=20=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 302ead28..507df255 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -66,6 +66,5 @@
   "i18n-ally.localesPaths": [
     "src/lang/package"
   ],
-  "scss.lint.unknownAtRules": "ignore",
-  "i18n-ally.keystyle": "nested"
+  "scss.lint.unknownAtRules": "ignore"
 }

From ec84ad863a229db2157f2fd15544e3b46385b2c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=90=8C=E7=8B=BC=E8=93=9D=E5=A4=A9?= <mllt9920@qq.com>
Date: Sun, 7 Sep 2025 21:37:57 +0800
Subject: [PATCH 466/497] =?UTF-8?q?fix(user):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=88=A0=E9=99=A4=E6=97=B6=E7=9A=84=E5=AE=89?=
 =?UTF-8?q?=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 添加了防止删除当前登录用户的逻辑
- 在批量删除时检查是否包含当前用户，确保当前用户不会被删除
---
 src/views/system/user/index.vue | 41 ++++++++++++++++++++++++++++++---
 1 file changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index f8c4d58e..2f31eb24 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -253,7 +253,8 @@ import RoleAPI from "@/api/system/role-api";
 
 import DeptTree from "./components/DeptTree.vue";
 import UserImport from "./components/UserImport.vue";
-
+import { useUserStore } from "@/store";
+const userStore = useUserStore();
 defineOptions({
   name: "User",
   inheritAttrs: false,
@@ -425,6 +426,33 @@ const handleSubmit = useDebounceFn(() => {
   });
 }, 1000);
 
+/**
+ * 检查是否删除当前登录用户
+ * @param singleId 单个删除的用户ID
+ * @param selectedIds 批量删除的用户ID数组
+ * @param currentUserInfo 当前用户信息
+ * @returns 是否包含当前用户
+ */
+function isDeletingCurrentUser(
+  singleId?: number,
+  selectedIds: number[] = [],
+  currentUserInfo?: any
+): boolean {
+  if (!currentUserInfo?.userId) return false;
+
+  // 单个删除检查
+  if (singleId && singleId.toString() === currentUserInfo.userId) {
+    return true;
+  }
+
+  // 批量删除检查
+  if (!singleId && selectedIds.length > 0) {
+    return selectedIds.map(String).includes(currentUserInfo.userId);
+  }
+
+  return false;
+}
+
 /**
  * 删除用户
  *
@@ -437,12 +465,19 @@ function handleDelete(id?: number) {
     return;
   }
 
+  // 安全检查：防止删除当前登录用户
+  const currentUserInfo = userStore.userInfo;
+  if (isDeletingCurrentUser(id, selectIds.value, currentUserInfo)) {
+    ElMessage.error("不能删除当前登录用户");
+    return;
+  }
+
   ElMessageBox.confirm("确认删除用户?", "警告", {
     confirmButtonText: "确定",
     cancelButtonText: "取消",
     type: "warning",
   }).then(
-    function () {
+    () => {
       loading.value = true;
       UserAPI.deleteByIds(userIds)
         .then(() => {
@@ -451,7 +486,7 @@ function handleDelete(id?: number) {
         })
         .finally(() => (loading.value = false));
     },
-    function () {
+    () => {
       ElMessage.info("已取消删除");
     }
   );

From e84d87d403a732d1a6036b9633707685987c44c0 Mon Sep 17 00:00:00 2001
From: zimo493 <2081182432@qq.com>
Date: Mon, 8 Sep 2025 09:09:17 +0800
Subject: [PATCH 467/497] =?UTF-8?q?fix:=20:bug:=20(route)=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=88=B6=E7=BA=A7=E8=8F=9C=E5=8D=95=20`alwaysShow`=20?=
 =?UTF-8?q?=E6=97=A0=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 processRoutes 函数，如果 children 为 undefined，则原样返回
---
 src/store/modules/permission-store.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index b980176d..a4088f7f 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -21,7 +21,8 @@ export const usePermissionStore = defineStore("permission", () => {
   async function generateRoutes(): Promise<RouteRecordRaw[]> {
     try {
       const data = await MenuAPI.getRoutes(); // 获取当前登录人拥有的菜单路由
-      const dynamicRoutes = parseDynamicRoutes(processRoutes(data));
+      const processRouteList = processRoutes(data); // 处理后的路由数据
+      const dynamicRoutes = parseDynamicRoutes(processRouteList);
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
 
@@ -117,8 +118,8 @@ const processRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteVO[]
     return {
       ...args,
       component: isTopLevel || component !== "Layout" ? component : undefined,
-      // 递归处理children，标记为非顶层
-      children: children && children.length > 0 ? processRoutes(children, false) : [],
+      //  递归处理children，标记为非顶层  todo 原样返回 children（undefined）
+      children: children && children.length > 0 ? processRoutes(children, false) : children,
     };
   });
 };

From 070a43d540e59d46ca96cc17284a3060f8877a59 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 9 Sep 2025 11:03:27 +0800
Subject: [PATCH 468/497] =?UTF-8?q?refactor:=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E5=AD=98=E5=82=A8=E9=94=AE=E5=91=BD=E5=90=8D=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/index.ts              | 120 +++++++++++++++++++++++++++-
 src/constants/storage-keys.ts       |  53 ------------
 src/store/modules/app-store.ts      |  11 +--
 src/store/modules/dict-store.ts     |   3 +-
 src/store/modules/settings-store.ts |  40 ++++++----
 5 files changed, 148 insertions(+), 79 deletions(-)
 delete mode 100644 src/constants/storage-keys.ts

diff --git a/src/constants/index.ts b/src/constants/index.ts
index f8be9d9d..c9797b4e 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1,4 +1,118 @@
-export const ROLE_ROOT = "ROOT";
+/**
+ * 项目常量统一管理
+ *
+ * 存储键命名规范：
+ * - 使用小写 + 冒号分隔 + 名称空间
+ * - 格式：myapp:user:token
+ * - 便于清理和避免冲突
+ * - 当需要版本升级、兼容旧数据，可在 key 中加入版本如 myapp:v2:user:token。
+ */
 
-// 🔗 导出所有存储键常量
-export * from "./storage-keys";
+// 🏷️ 应用前缀常量
+export const APP_PREFIX = "vea";
+
+// 📦 存储键统一管理
+export const STORAGE_KEYS = {
+  // 🔐 用户认证相关
+  ACCESS_TOKEN: `${APP_PREFIX}:auth:access_token`, // JWT 访问令牌，用于 API 请求认证
+  REFRESH_TOKEN: `${APP_PREFIX}:auth:refresh_token`, // JWT 刷新令牌，用于获取新的访问令牌
+  REMEMBER_ME: `${APP_PREFIX}:auth:remember_me`, // 记住登录状态，控制登录持久化
+
+  // 🏗️ 系统核心相关
+  DICT_CACHE: `${APP_PREFIX}:system:dict_cache`, // 字典数据缓存，存储系统字典配置信息
+
+  // 🎨 系统设置相关
+  SHOW_TAGS_VIEW: `${APP_PREFIX}:ui:show_tags_view`, // 是否显示标签页视图
+  SHOW_APP_LOGO: `${APP_PREFIX}:ui:show_app_logo`, // 是否显示应用 Logo
+  SHOW_WATERMARK: `${APP_PREFIX}:ui:show_watermark`, // 是否显示水印
+  LAYOUT: `${APP_PREFIX}:ui:layout`, // 布局模式：vertical(垂直) | horizontal(水平) | mix(混合)
+  SIDEBAR_COLOR_SCHEME: `${APP_PREFIX}:ui:sidebar_color_scheme`, // 侧边栏颜色方案：light(浅色) | dark(深色)
+  THEME: `${APP_PREFIX}:ui:theme`, // 主题模式：light(浅色) | dark(深色) | auto(自动)
+  THEME_COLOR: `${APP_PREFIX}:ui:theme_color`, // 主题色，用于自定义主题色彩
+
+  // 📱 应用状态相关
+  DEVICE: `${APP_PREFIX}:app:device`, // 设备类型：desktop(桌面) | mobile(移动端) | tablet(平板)
+  SIZE: `${APP_PREFIX}:app:size`, // 屏幕尺寸：large(大) | medium(中) | small(小)
+  LANGUAGE: `${APP_PREFIX}:app:language`, // 应用语言：zh-CN(中文) | en-US(英文) 等
+  SIDEBAR_STATUS: `${APP_PREFIX}:app:sidebar_status`, // 侧边栏状态：opened(展开) | closed(收起)
+  ACTIVE_TOP_MENU_PATH: `${APP_PREFIX}:app:active_top_menu_path`, // 当前激活的顶部菜单路径
+} as const;
+
+// 🎯 功能分组的键映射对象（向后兼容）
+// 这些分组对象提供了按功能分类的存储键访问方式，便于在特定场景下批量操作
+
+// 👤 用户角色相关
+export const ROLE_ROOT = "ROOT"; // 超级管理员角色标识
+
+// 🔐 认证相关键集合
+// 包含所有与用户认证、授权相关的存储键
+export const AUTH_KEYS = {
+  ACCESS_TOKEN: STORAGE_KEYS.ACCESS_TOKEN, // JWT 访问令牌
+  REFRESH_TOKEN: STORAGE_KEYS.REFRESH_TOKEN, // JWT 刷新令牌
+  REMEMBER_ME: STORAGE_KEYS.REMEMBER_ME, // 记住登录状态
+} as const;
+
+// 🏗️ 系统核心相关键集合
+// 包含系统核心功能相关的存储键
+export const SYSTEM_KEYS = {
+  DICT_CACHE: STORAGE_KEYS.DICT_CACHE, // 字典数据缓存
+} as const;
+
+// 🎨 设置相关键集合
+// 包含所有用户界面设置和主题相关的存储键
+export const SETTINGS_KEYS = {
+  SHOW_TAGS_VIEW: STORAGE_KEYS.SHOW_TAGS_VIEW, // 是否显示标签页视图
+  SHOW_APP_LOGO: STORAGE_KEYS.SHOW_APP_LOGO, // 是否显示应用 Logo
+  SHOW_WATERMARK: STORAGE_KEYS.SHOW_WATERMARK, // 是否显示水印
+  SIDEBAR_COLOR_SCHEME: STORAGE_KEYS.SIDEBAR_COLOR_SCHEME, // 侧边栏颜色方案
+  LAYOUT: STORAGE_KEYS.LAYOUT, // 布局模式
+  THEME_COLOR: STORAGE_KEYS.THEME_COLOR, // 主题色
+  THEME: STORAGE_KEYS.THEME, // 主题模式
+} as const;
+
+// 📱 应用状态相关键集合
+// 包含应用运行时状态相关的存储键
+export const APP_KEYS = {
+  DEVICE: STORAGE_KEYS.DEVICE, // 设备类型
+  SIZE: STORAGE_KEYS.SIZE, // 屏幕尺寸
+  LANGUAGE: STORAGE_KEYS.LANGUAGE, // 应用语言
+  SIDEBAR_STATUS: STORAGE_KEYS.SIDEBAR_STATUS, // 侧边栏状态
+  ACTIVE_TOP_MENU_PATH: STORAGE_KEYS.ACTIVE_TOP_MENU_PATH, // 当前激活的顶部菜单路径
+} as const;
+
+// 📦 所有存储键的统一集合
+// 包含所有存储键的完整映射，用于批量操作或遍历
+export const ALL_STORAGE_KEYS = {
+  ...AUTH_KEYS, // 认证相关键
+  ...SYSTEM_KEYS, // 系统核心键
+  ...SETTINGS_KEYS, // 设置相关键
+  ...APP_KEYS, // 应用状态键
+} as const;
+
+// 🔧 类型定义
+export type StorageKey = (typeof STORAGE_KEYS)[keyof typeof STORAGE_KEYS];
+
+// 🧹 存储清理工具
+export const STORAGE_UTILS = {
+  // 清理所有项目相关的存储
+  clearAll: () => {
+    const keys = Object.values(STORAGE_KEYS);
+    keys.forEach((key) => {
+      localStorage.removeItem(key);
+      sessionStorage.removeItem(key);
+    });
+  },
+
+  // 清理特定分类的存储
+  clearByCategory: (category: "auth" | "system" | "ui" | "app") => {
+    const prefix = `${APP_PREFIX}:${category}:`;
+    const keys = Object.values(STORAGE_KEYS).filter((key) => key.startsWith(prefix));
+    keys.forEach((key) => {
+      localStorage.removeItem(key);
+      sessionStorage.removeItem(key);
+    });
+  },
+
+  // 获取所有项目相关的存储键
+  getAllKeys: () => Object.values(STORAGE_KEYS),
+} as const;
diff --git a/src/constants/storage-keys.ts b/src/constants/storage-keys.ts
deleted file mode 100644
index 8f2b95dc..00000000
--- a/src/constants/storage-keys.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * 存储键常量统一管理
- * 包括 localStorage、sessionStorage 等各种存储的键名
- */
-
-// 🔐 用户认证相关
-export const ACCESS_TOKEN_KEY = "access_token";
-export const REFRESH_TOKEN_KEY = "refresh_token";
-export const REMEMBER_ME_KEY = "remember_me";
-
-// 📊 数据缓存相关
-export const DICT_CACHE_KEY = "dict_cache";
-
-// 🎨 系统设置相关
-export const SHOW_TAGS_VIEW_KEY = "showTagsView";
-export const SHOW_APP_LOGO_KEY = "showAppLogo";
-export const SHOW_WATERMARK_KEY = "showWatermark";
-export const LAYOUT_KEY = "layout";
-export const SIDEBAR_COLOR_SCHEME_KEY = "sidebarColorScheme";
-export const THEME_KEY = "theme";
-export const THEME_COLOR_KEY = "themeColor";
-
-// 🎯 功能分组的键映射对象
-
-// 认证相关键集合
-export const AUTH_KEYS = {
-  ACCESS_TOKEN: ACCESS_TOKEN_KEY,
-  REFRESH_TOKEN: REFRESH_TOKEN_KEY,
-  REMEMBER_ME: REMEMBER_ME_KEY,
-} as const;
-
-// 缓存相关键集合
-export const CACHE_KEYS = {
-  DICT_CACHE: DICT_CACHE_KEY,
-} as const;
-
-// 设置相关键集合
-export const SETTINGS_KEYS = {
-  SHOW_TAGS_VIEW: SHOW_TAGS_VIEW_KEY,
-  SHOW_APP_LOGO: SHOW_APP_LOGO_KEY,
-  SHOW_WATERMARK: SHOW_WATERMARK_KEY,
-  SIDEBAR_COLOR_SCHEME: SIDEBAR_COLOR_SCHEME_KEY,
-  LAYOUT: LAYOUT_KEY,
-  THEME_COLOR: THEME_COLOR_KEY,
-  THEME: THEME_KEY,
-} as const;
-
-// 📦 所有存储键的统一集合
-export const ALL_STORAGE_KEYS = {
-  ...AUTH_KEYS,
-  ...CACHE_KEYS,
-  ...SETTINGS_KEYS,
-} as const;
diff --git a/src/store/modules/app-store.ts b/src/store/modules/app-store.ts
index 4ddec187..21ed6e1a 100644
--- a/src/store/modules/app-store.ts
+++ b/src/store/modules/app-store.ts
@@ -6,23 +6,24 @@ import en from "element-plus/es/locale/lang/en";
 import { store } from "@/store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 import { SidebarStatus } from "@/enums/settings/layout.enum";
+import { STORAGE_KEYS } from "@/constants";
 
 export const useAppStore = defineStore("app", () => {
   // 设备类型
-  const device = useStorage("device", DeviceEnum.DESKTOP);
+  const device = useStorage(STORAGE_KEYS.DEVICE, DeviceEnum.DESKTOP);
   // 布局大小
-  const size = useStorage("size", defaultSettings.size);
+  const size = useStorage(STORAGE_KEYS.SIZE, defaultSettings.size);
   // 语言
-  const language = useStorage("language", defaultSettings.language);
+  const language = useStorage(STORAGE_KEYS.LANGUAGE, defaultSettings.language);
   // 侧边栏状态
-  const sidebarStatus = useStorage("sidebarStatus", SidebarStatus.CLOSED);
+  const sidebarStatus = useStorage(STORAGE_KEYS.SIDEBAR_STATUS, SidebarStatus.CLOSED);
   const sidebar = reactive({
     opened: sidebarStatus.value === SidebarStatus.OPENED,
     withoutAnimation: false,
   });
 
   // 顶部菜单激活路径
-  const activeTopMenuPath = useStorage("activeTopMenuPath", "");
+  const activeTopMenuPath = useStorage(STORAGE_KEYS.ACTIVE_TOP_MENU_PATH, "");
 
   /**
    * 根据语言标识读取对应的语言包
diff --git a/src/store/modules/dict-store.ts b/src/store/modules/dict-store.ts
index d6dac2b5..34d8acaf 100644
--- a/src/store/modules/dict-store.ts
+++ b/src/store/modules/dict-store.ts
@@ -1,9 +1,10 @@
 import { store } from "@/store";
 import DictAPI, { type DictItemOption } from "@/api/system/dict-api";
+import { STORAGE_KEYS } from "@/constants";
 
 export const useDictStore = defineStore("dict", () => {
   // 字典数据缓存
-  const dictCache = useStorage<Record<string, DictItemOption[]>>("dict_cache", {});
+  const dictCache = useStorage<Record<string, DictItemOption[]>>(STORAGE_KEYS.DICT_CACHE, {});
 
   // 请求队列（防止重复请求）
   const requestQueue: Record<string, Promise<void>> = {};
diff --git a/src/store/modules/settings-store.ts b/src/store/modules/settings-store.ts
index 4263eaf6..092e948f 100644
--- a/src/store/modules/settings-store.ts
+++ b/src/store/modules/settings-store.ts
@@ -2,7 +2,7 @@ import { defaultSettings } from "@/settings";
 import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
 import type { LayoutMode } from "@/enums/settings/layout.enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
-import { SETTINGS_KEYS } from "@/constants";
+import { STORAGE_KEYS } from "@/constants";
 
 // 🎯 设置项类型定义
 interface SettingsState {
@@ -26,34 +26,40 @@ type MutableSetting = Exclude<keyof SettingsState, "settingsVisible">;
 type SettingValue<K extends MutableSetting> = SettingsState[K];
 
 export const useSettingsStore = defineStore("setting", () => {
-  // 🎯 基础设置 - 非持久化
+  // 设置面板可见性
   const settingsVisible = ref<boolean>(false);
 
-  // 🎯 持久化设置 - 使用分组常量
+  // 是否显示标签页视图
   const showTagsView = useStorage<boolean>(
-    SETTINGS_KEYS.SHOW_TAGS_VIEW,
+    STORAGE_KEYS.SHOW_TAGS_VIEW,
     defaultSettings.showTagsView
   );
 
-  const showAppLogo = useStorage<boolean>(SETTINGS_KEYS.SHOW_APP_LOGO, defaultSettings.showAppLogo);
+  // 是否显示应用Logo
+  const showAppLogo = useStorage<boolean>(STORAGE_KEYS.SHOW_APP_LOGO, defaultSettings.showAppLogo);
 
+  // 是否显示水印
   const showWatermark = useStorage<boolean>(
-    SETTINGS_KEYS.SHOW_WATERMARK,
+    STORAGE_KEYS.SHOW_WATERMARK,
     defaultSettings.showWatermark
   );
 
+  // 侧边栏配色方案
   const sidebarColorScheme = useStorage<string>(
-    SETTINGS_KEYS.SIDEBAR_COLOR_SCHEME,
+    STORAGE_KEYS.SIDEBAR_COLOR_SCHEME,
     defaultSettings.sidebarColorScheme
   );
 
-  const layout = useStorage<LayoutMode>(SETTINGS_KEYS.LAYOUT, defaultSettings.layout as LayoutMode);
+  // 布局模式
+  const layout = useStorage<LayoutMode>(STORAGE_KEYS.LAYOUT, defaultSettings.layout as LayoutMode);
 
-  const themeColor = useStorage<string>(SETTINGS_KEYS.THEME_COLOR, defaultSettings.themeColor);
+  // 主题颜色
+  const themeColor = useStorage<string>(STORAGE_KEYS.THEME_COLOR, defaultSettings.themeColor);
 
-  const theme = useStorage<ThemeMode>(SETTINGS_KEYS.THEME, defaultSettings.theme);
+  // 主题模式（亮色/暗色）
+  const theme = useStorage<ThemeMode>(STORAGE_KEYS.THEME, defaultSettings.theme);
 
-  // 🎯 设置项映射
+  // 设置项映射，用于统一管理
   const settingsMap = {
     showTagsView,
     showAppLogo,
@@ -62,7 +68,7 @@ export const useSettingsStore = defineStore("setting", () => {
     layout,
   } as const;
 
-  // 🎯 监听器 - 主题变化
+  // 监听主题变化，自动应用样式
   watch(
     [theme, themeColor],
     ([newTheme, newThemeColor]) => {
@@ -73,7 +79,7 @@ export const useSettingsStore = defineStore("setting", () => {
     { immediate: true }
   );
 
-  // 🎯 监听器 - 侧边栏配色方案变化
+  // 监听侧边栏配色变化
   watch(
     [sidebarColorScheme],
     ([newSidebarColorScheme]) => {
@@ -82,7 +88,7 @@ export const useSettingsStore = defineStore("setting", () => {
     { immediate: true }
   );
 
-  // 🎯 统一的设置更新方法 - 类型安全
+  // 通用设置更新方法
   function updateSetting<K extends keyof typeof settingsMap>(key: K, value: SettingValue<K>): void {
     const setting = settingsMap[key];
     if (setting) {
@@ -90,7 +96,7 @@ export const useSettingsStore = defineStore("setting", () => {
     }
   }
 
-  // 🎯 主题相关的专用更新方法
+  // 主题更新方法
   function updateTheme(newTheme: ThemeMode): void {
     theme.value = newTheme;
   }
@@ -107,7 +113,7 @@ export const useSettingsStore = defineStore("setting", () => {
     layout.value = newLayout;
   }
 
-  // 🎯 设置面板显示控制
+  // 设置面板控制
   function toggleSettingsPanel(): void {
     settingsVisible.value = !settingsVisible.value;
   }
@@ -120,7 +126,7 @@ export const useSettingsStore = defineStore("setting", () => {
     settingsVisible.value = false;
   }
 
-  // 🎯 批量重置设置
+  // 重置所有设置
   function resetSettings(): void {
     showTagsView.value = defaultSettings.showTagsView;
     showAppLogo.value = defaultSettings.showAppLogo;

From 6730608920c9d538d47ab703de557b80a4e10db5 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 12 Sep 2025 18:00:54 +0800
Subject: [PATCH 469/497] =?UTF-8?q?refactor:=20=E7=BB=84=E5=90=88=E5=BC=8F?=
 =?UTF-8?q?=E5=87=BD=E6=95=B0=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Notification/index.vue         |  4 ++--
 src/composables/index.ts                      | 16 +++++---------
 .../layout}/useLayout.ts                      |  0
 .../layout}/useLayoutMenu.ts                  |  0
 .../layout}/useLayoutResponsive.ts            | 22 +++++++++++--------
 .../{ => websocket}/useDictSync.ts            |  2 +-
 .../{ => websocket}/useOnlineCount.ts         |  3 ++-
 src/composables/{ => websocket}/useStomp.ts   |  0
 src/layouts/index.vue                         |  8 +++++--
 src/layouts/{views => layouts}/BaseLayout.vue |  5 ++---
 src/layouts/{views => layouts}/LeftLayout.vue |  4 ++--
 src/layouts/{views => layouts}/MixLayout.vue  |  4 +---
 src/layouts/{views => layouts}/TopLayout.vue  |  4 ++--
 src/plugins/websocket.ts                      |  4 ++--
 src/views/dashboard/index.vue                 |  2 +-
 src/views/demo/dict-sync.vue                  |  2 +-
 src/views/demo/websocket.vue                  |  2 +-
 17 files changed, 42 insertions(+), 40 deletions(-)
 rename src/{layouts/composables => composables/layout}/useLayout.ts (100%)
 rename src/{layouts/composables => composables/layout}/useLayoutMenu.ts (100%)
 rename src/{layouts/composables => composables/layout}/useLayoutResponsive.ts (50%)
 rename src/composables/{ => websocket}/useDictSync.ts (100%)
 rename src/composables/{ => websocket}/useOnlineCount.ts (98%)
 rename src/composables/{ => websocket}/useStomp.ts (100%)
 rename src/layouts/{views => layouts}/BaseLayout.vue (84%)
 rename src/layouts/{views => layouts}/LeftLayout.vue (95%)
 rename src/layouts/{views => layouts}/MixLayout.vue (98%)
 rename src/layouts/{views => layouts}/TopLayout.vue (96%)

diff --git a/src/components/Notification/index.vue b/src/components/Notification/index.vue
index 8d6ab2be..8d3babaf 100644
--- a/src/components/Notification/index.vue
+++ b/src/components/Notification/index.vue
@@ -86,14 +86,14 @@ const noticeList = ref<NoticePageVO[]>([]);
 const noticeDialogVisible = ref(false);
 const noticeDetail = ref<NoticeDetailVO | null>(null);
 
-import { useStomp } from "@/composables/useStomp";
+import { useStomp } from "@/composables/websocket/useStomp";
 const { subscribe, unsubscribe, isConnected } = useStomp();
 
 watch(
   () => isConnected.value,
   (connected) => {
     if (connected) {
-      subscribe("/user/queue/message", (message) => {
+      subscribe("/user/queue/message", (message: any) => {
         console.log("收到通知消息：", message);
         const data = JSON.parse(message.body);
         const id = data.id;
diff --git a/src/composables/index.ts b/src/composables/index.ts
index c848f9ef..2a2a9a8f 100644
--- a/src/composables/index.ts
+++ b/src/composables/index.ts
@@ -1,11 +1,7 @@
-/**
- * 全局组合式函数入口文件
- * 导出所有可用的组合式函数
- */
+export { useStomp } from "./websocket/useStomp";
+export { useDictSync } from "./websocket/useDictSync";
+export { useOnlineCount } from "./websocket/useOnlineCount";
 
-// 导出核心组合式函数
-export { useStomp } from "./useStomp";
-
-// 导出业务服务组合式函数
-export { useDictSync } from "./useDictSync";
-export { useOnlineCount } from "./useOnlineCount";
+export { useLayout } from "./layout/useLayout";
+export { useLayoutMenu } from "./layout/useLayoutMenu";
+export { useLayoutResponsive } from "./layout/useLayoutResponsive";
diff --git a/src/layouts/composables/useLayout.ts b/src/composables/layout/useLayout.ts
similarity index 100%
rename from src/layouts/composables/useLayout.ts
rename to src/composables/layout/useLayout.ts
diff --git a/src/layouts/composables/useLayoutMenu.ts b/src/composables/layout/useLayoutMenu.ts
similarity index 100%
rename from src/layouts/composables/useLayoutMenu.ts
rename to src/composables/layout/useLayoutMenu.ts
diff --git a/src/layouts/composables/useLayoutResponsive.ts b/src/composables/layout/useLayoutResponsive.ts
similarity index 50%
rename from src/layouts/composables/useLayoutResponsive.ts
rename to src/composables/layout/useLayoutResponsive.ts
index b8dd9ada..83554505 100644
--- a/src/layouts/composables/useLayoutResponsive.ts
+++ b/src/composables/layout/useLayoutResponsive.ts
@@ -4,25 +4,29 @@ import { useAppStore } from "@/store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 
 /**
- * 布局响应式处理逻辑
+ * 响应式布局处理
+ * 监听屏幕尺寸变化，自动调整设备类型和侧边栏状态
  */
 export function useLayoutResponsive() {
   const appStore = useAppStore();
   const { width } = useWindowSize();
 
-  // 定义响应式断点
-  const WIDTH_DESKTOP = 992; // 桌面设备断点 (>=992px)
+  // 桌面设备断点
+  const DESKTOP_BREAKPOINT = 992;
 
-  // 设置当前设备类型并调整侧边栏状态
+  // 计算设备类型
+  const isDesktop = computed(() => width.value >= DESKTOP_BREAKPOINT);
+  const isMobile = computed(() => appStore.device === DeviceEnum.MOBILE);
+
+  // 监听屏幕尺寸变化，自动调整设备类型和侧边栏状态
   watchEffect(() => {
-    const isDesktop = width.value >= WIDTH_DESKTOP;
-    const deviceType = isDesktop ? DeviceEnum.DESKTOP : DeviceEnum.MOBILE;
+    const deviceType = isDesktop.value ? DeviceEnum.DESKTOP : DeviceEnum.MOBILE;
 
     // 更新设备类型
     appStore.toggleDevice(deviceType);
 
     // 根据设备类型调整侧边栏状态
-    if (isDesktop) {
+    if (isDesktop.value) {
       appStore.openSideBar();
     } else {
       appStore.closeSideBar();
@@ -30,7 +34,7 @@ export function useLayoutResponsive() {
   });
 
   return {
-    isDesktop: computed(() => width.value >= WIDTH_DESKTOP),
-    isMobile: computed(() => appStore.device === DeviceEnum.MOBILE),
+    isDesktop,
+    isMobile,
   };
 }
diff --git a/src/composables/useDictSync.ts b/src/composables/websocket/useDictSync.ts
similarity index 100%
rename from src/composables/useDictSync.ts
rename to src/composables/websocket/useDictSync.ts
index c84c7297..d1efb85d 100644
--- a/src/composables/useDictSync.ts
+++ b/src/composables/websocket/useDictSync.ts
@@ -1,7 +1,7 @@
+import { ref } from "vue";
 import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useStomp } from "./useStomp";
 import type { IMessage } from "@stomp/stompjs";
-import { ref } from "vue";
 
 // 字典消息类型
 export interface DictMessage {
diff --git a/src/composables/useOnlineCount.ts b/src/composables/websocket/useOnlineCount.ts
similarity index 98%
rename from src/composables/useOnlineCount.ts
rename to src/composables/websocket/useOnlineCount.ts
index 119c2290..ae4e46bb 100644
--- a/src/composables/useOnlineCount.ts
+++ b/src/composables/websocket/useOnlineCount.ts
@@ -1,7 +1,8 @@
-import { ref, onMounted, onUnmounted, watch, getCurrentInstance } from "vue";
+import { ref, watch, onMounted, onUnmounted, getCurrentInstance } from "vue";
 import { useStomp } from "./useStomp";
 import { registerWebSocketInstance } from "@/plugins/websocket";
 import { AuthStorage } from "@/utils/auth";
+import { ElMessage } from "element-plus";
 
 // 全局单例实例
 let globalInstance: ReturnType<typeof createOnlineCountHook> | null = null;
diff --git a/src/composables/useStomp.ts b/src/composables/websocket/useStomp.ts
similarity index 100%
rename from src/composables/useStomp.ts
rename to src/composables/websocket/useStomp.ts
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index 9b9a0706..d5e28f63 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -9,7 +9,8 @@
 
 <script setup lang="ts">
 import { computed } from "vue";
-import { useLayout } from "./composables/useLayout";
+import { useRoute } from "vue-router";
+import { useLayout } from "@/composables/layout/useLayout";
 import LeftLayout from "./views/LeftLayout.vue";
 import TopLayout from "./views/TopLayout.vue";
 import MixLayout from "./views/MixLayout.vue";
@@ -18,10 +19,13 @@ import { LayoutMode } from "@/enums/settings/layout.enum";
 import { defaultSettings } from "@/settings";
 
 const { currentLayout } = useLayout();
+const route = useRoute();
 
 // 根据当前布局模式选择对应的组件
 const currentLayoutComponent = computed(() => {
-  switch (currentLayout.value) {
+  const override = route.meta?.layout as LayoutMode | undefined;
+  const layoutToUse = override ?? currentLayout.value;
+  switch (layoutToUse) {
     case LayoutMode.TOP:
       return TopLayout;
     case LayoutMode.MIX:
diff --git a/src/layouts/views/BaseLayout.vue b/src/layouts/layouts/BaseLayout.vue
similarity index 84%
rename from src/layouts/views/BaseLayout.vue
rename to src/layouts/layouts/BaseLayout.vue
index 3e305016..ca96d927 100644
--- a/src/layouts/views/BaseLayout.vue
+++ b/src/layouts/layouts/BaseLayout.vue
@@ -14,13 +14,12 @@
 </template>
 
 <script setup lang="ts">
-import { useLayout } from "../composables/useLayout";
-import { useLayoutResponsive } from "../composables/useLayoutResponsive";
+import { useLayout, useLayoutResponsive } from "@/composables";
 
 // 布局相关
 const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
 
-// 响应式处理
+// 响应式布局
 const { isMobile } = useLayoutResponsive();
 </script>
 
diff --git a/src/layouts/views/LeftLayout.vue b/src/layouts/layouts/LeftLayout.vue
similarity index 95%
rename from src/layouts/views/LeftLayout.vue
rename to src/layouts/layouts/LeftLayout.vue
index aa62b317..9fa94cee 100644
--- a/src/layouts/views/LeftLayout.vue
+++ b/src/layouts/layouts/LeftLayout.vue
@@ -28,8 +28,8 @@
 </template>
 
 <script setup lang="ts">
-import { useLayout } from "../composables/useLayout";
-import { useLayoutMenu } from "../composables/useLayoutMenu";
+import { useLayout } from "@/composables/layout/useLayout";
+import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import AppLogo from "../components/AppLogo/index.vue";
 import NavBar from "../components/NavBar/index.vue";
diff --git a/src/layouts/views/MixLayout.vue b/src/layouts/layouts/MixLayout.vue
similarity index 98%
rename from src/layouts/views/MixLayout.vue
rename to src/layouts/layouts/MixLayout.vue
index 7f9c111f..6ca8f664 100644
--- a/src/layouts/views/MixLayout.vue
+++ b/src/layouts/layouts/MixLayout.vue
@@ -60,8 +60,7 @@
 <script setup lang="ts">
 import { useRoute } from "vue-router";
 import { useWindowSize } from "@vueuse/core";
-import { useLayout } from "../composables/useLayout";
-import { useLayoutMenu } from "../composables/useLayoutMenu";
+import { useLayout, useLayoutMenu } from "@/composables";
 import BaseLayout from "./BaseLayout.vue";
 import AppLogo from "../components/AppLogo/index.vue";
 import MixTopMenu from "../components/Menu/MixTopMenu.vue";
@@ -72,7 +71,6 @@ import MenuItem from "../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 import { isExternal } from "@/utils/index";
-import { computed, watch } from "vue";
 import { useAppStore, usePermissionStore } from "@/store";
 
 const route = useRoute();
diff --git a/src/layouts/views/TopLayout.vue b/src/layouts/layouts/TopLayout.vue
similarity index 96%
rename from src/layouts/views/TopLayout.vue
rename to src/layouts/layouts/TopLayout.vue
index 0359eb86..485c41fc 100644
--- a/src/layouts/views/TopLayout.vue
+++ b/src/layouts/layouts/TopLayout.vue
@@ -25,8 +25,8 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import { useWindowSize } from "@vueuse/core";
-import { useLayout } from "../composables/useLayout";
-import { useLayoutMenu } from "../composables/useLayoutMenu";
+import { useLayout } from "@/composables/layout/useLayout";
+import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
 import BaseLayout from "./BaseLayout.vue";
 import AppLogo from "../components/AppLogo/index.vue";
 import BasicMenu from "../components/Menu/BasicMenu.vue";
diff --git a/src/plugins/websocket.ts b/src/plugins/websocket.ts
index a2017999..ef39248b 100644
--- a/src/plugins/websocket.ts
+++ b/src/plugins/websocket.ts
@@ -1,4 +1,4 @@
-import { useDictSync } from "@/composables/useDictSync";
+import { useDictSync } from "@/composables";
 import { AuthStorage } from "@/utils/auth";
 // 不直接导入 store 或 userStore
 
@@ -63,7 +63,7 @@ export function setupWebSocket() {
       console.log("[WebSocketPlugin] 字典WebSocket初始化完成");
 
       // 初始化在线用户计数WebSocket
-      import("@/composables/useOnlineCount").then(({ useOnlineCount }) => {
+      import("@/composables").then(({ useOnlineCount }) => {
         const onlineCountInstance = useOnlineCount({ autoInit: false });
         onlineCountInstance.initWebSocket();
         console.log("[WebSocketPlugin] 在线用户计数WebSocket初始化完成");
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 8125bcf4..679962ef 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -359,7 +359,7 @@ import { useUserStore } from "@/store/modules/user-store";
 import { formatGrowthRate } from "@/utils";
 import { useTransition, useDateFormat } from "@vueuse/core";
 import { Connection, Failed } from "@element-plus/icons-vue";
-import { useOnlineCount } from "@/composables/useOnlineCount";
+import { useOnlineCount } from "@/composables";
 
 // 在线用户数量组件相关
 const { onlineUserCount, lastUpdateTime, isConnected } = useOnlineCount();
diff --git a/src/views/demo/dict-sync.vue b/src/views/demo/dict-sync.vue
index dd3d8738..ddb915f2 100644
--- a/src/views/demo/dict-sync.vue
+++ b/src/views/demo/dict-sync.vue
@@ -142,7 +142,7 @@
 import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useDateFormat } from "@vueuse/core";
 import DictAPI, { DictItemForm } from "@/api/system/dict-api";
-import { useDictSync, DictMessage } from "@/composables/useDictSync";
+import { useDictSync, DictMessage } from "@/composables";
 
 // 性别字典编码
 const DICT_CODE = "gender";
diff --git a/src/views/demo/websocket.vue b/src/views/demo/websocket.vue
index 5ae54bb8..56e9cc61 100644
--- a/src/views/demo/websocket.vue
+++ b/src/views/demo/websocket.vue
@@ -97,7 +97,7 @@
 </template>
 
 <script setup lang="ts">
-import { useStomp } from "@/composables/useStomp";
+import { useStomp } from "@/composables/websocket/useStomp";
 import { useUserStoreHook } from "@/store/modules/user-store";
 
 const userStore = useUserStoreHook();

From 265257294b44b8ee31069a8ace3eed8175bae275 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 14 Sep 2025 21:22:20 +0800
Subject: [PATCH 470/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E4=BB=A3=E7=A0=81=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E9=87=8D=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/components/AppMain/index.vue      |  5 ++
 src/layouts/index.vue                         | 54 ++++++++-----------
 src/layouts/layouts/BaseLayout.vue            | 41 --------------
 src/layouts/modes/index.vue                   | 47 ++++++++++++++++
 .../LeftLayout.vue => modes/left/index.vue}   | 12 ++---
 .../MixLayout.vue => modes/mix/index.vue}     | 32 ++++-------
 .../TopLayout.vue => modes/top/index.vue}     | 14 +++--
 src/router/index.ts                           |  2 +-
 src/store/modules/permission-store.ts         |  2 +-
 9 files changed, 98 insertions(+), 111 deletions(-)
 delete mode 100644 src/layouts/layouts/BaseLayout.vue
 create mode 100644 src/layouts/modes/index.vue
 rename src/layouts/{layouts/LeftLayout.vue => modes/left/index.vue} (88%)
 rename src/layouts/{layouts/MixLayout.vue => modes/mix/index.vue} (88%)
 rename src/layouts/{layouts/TopLayout.vue => modes/top/index.vue} (88%)

diff --git a/src/layouts/components/AppMain/index.vue b/src/layouts/components/AppMain/index.vue
index 1ec6249c..2ab669b6 100644
--- a/src/layouts/components/AppMain/index.vue
+++ b/src/layouts/components/AppMain/index.vue
@@ -9,6 +9,11 @@
         </transition>
       </template>
     </router-view>
+
+    <!-- 返回顶部按钮 -->
+    <el-backtop target=".app-main">
+      <div class="i-svg:backtop w-6 h-6" />
+    </el-backtop>
   </section>
 </template>
 
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index d5e28f63..ec5fe380 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,48 +1,36 @@
 <template>
-  <div class="layout-wrapper">
-    <component :is="currentLayoutComponent" />
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
 
-    <!-- 设置面板 - 独立于布局组件 -->
-    <Settings v-if="isShowSettings" />
+    <!-- 布局内容插槽 -->
+    <slot></slot>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
-import { useRoute } from "vue-router";
-import { useLayout } from "@/composables/layout/useLayout";
-import LeftLayout from "./views/LeftLayout.vue";
-import TopLayout from "./views/TopLayout.vue";
-import MixLayout from "./views/MixLayout.vue";
-import Settings from "./components/Settings/index.vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { defaultSettings } from "@/settings";
+import { useLayout, useLayoutResponsive } from "@/composables";
 
-const { currentLayout } = useLayout();
-const route = useRoute();
+// 布局相关
+const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
 
-// 根据当前布局模式选择对应的组件
-const currentLayoutComponent = computed(() => {
-  const override = route.meta?.layout as LayoutMode | undefined;
-  const layoutToUse = override ?? currentLayout.value;
-  switch (layoutToUse) {
-    case LayoutMode.TOP:
-      return TopLayout;
-    case LayoutMode.MIX:
-      return MixLayout;
-    case LayoutMode.LEFT:
-    default:
-      return LeftLayout;
-  }
-});
-
-// 是否显示设置面板
-const isShowSettings = computed(() => defaultSettings.showSettings);
+// 响应式布局
+const { isMobile } = useLayoutResponsive();
 </script>
 
 <style lang="scss" scoped>
-.layout-wrapper {
+.layout {
   width: 100%;
   height: 100%;
+
+  &__overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
 }
 </style>
diff --git a/src/layouts/layouts/BaseLayout.vue b/src/layouts/layouts/BaseLayout.vue
deleted file mode 100644
index ca96d927..00000000
--- a/src/layouts/layouts/BaseLayout.vue
+++ /dev/null
@@ -1,41 +0,0 @@
-<template>
-  <div class="layout" :class="layoutClass">
-    <!-- 移动端遮罩层 -->
-    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
-
-    <!-- 布局内容插槽 -->
-    <slot></slot>
-
-    <!-- 返回顶部按钮 -->
-    <el-backtop target=".app-main">
-      <div class="i-svg:backtop w-6 h-6" />
-    </el-backtop>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useLayout, useLayoutResponsive } from "@/composables";
-
-// 布局相关
-const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
-
-// 响应式布局
-const { isMobile } = useLayoutResponsive();
-</script>
-
-<style lang="scss" scoped>
-.layout {
-  width: 100%;
-  height: 100%;
-
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
-}
-</style>
diff --git a/src/layouts/modes/index.vue b/src/layouts/modes/index.vue
new file mode 100644
index 00000000..08d1f41f
--- /dev/null
+++ b/src/layouts/modes/index.vue
@@ -0,0 +1,47 @@
+<template>
+  <div class="layout-wrapper">
+    <component :is="currentLayoutComponent" />
+
+    <!-- 设置面板 - 独立于布局组件 -->
+    <Settings v-if="isShowSettings" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useRoute } from "vue-router";
+import { useLayout } from "@/composables/layout/useLayout";
+import LeftLayout from "@/layouts/modes/left/index.vue";
+import TopLayout from "@/layouts/modes/top/index.vue";
+import MixLayout from "@/layouts/modes/mix/index.vue";
+import Settings from "../components/Settings/index.vue";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+import { defaultSettings } from "@/settings";
+
+const { currentLayout } = useLayout();
+const route = useRoute();
+
+// 根据当前布局模式选择对应的组件
+const currentLayoutComponent = computed(() => {
+  const override = route.meta?.layout as LayoutMode | undefined;
+  const layoutToUse = override ?? currentLayout.value;
+  switch (layoutToUse) {
+    case LayoutMode.TOP:
+      return TopLayout;
+    case LayoutMode.MIX:
+      return MixLayout;
+    case LayoutMode.LEFT:
+    default:
+      return LeftLayout;
+  }
+});
+
+// 是否显示设置面板
+const isShowSettings = computed(() => defaultSettings.showSettings);
+</script>
+
+<style lang="scss" scoped>
+.layout-wrapper {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/layouts/layouts/LeftLayout.vue b/src/layouts/modes/left/index.vue
similarity index 88%
rename from src/layouts/layouts/LeftLayout.vue
rename to src/layouts/modes/left/index.vue
index 9fa94cee..af012c91 100644
--- a/src/layouts/layouts/LeftLayout.vue
+++ b/src/layouts/modes/left/index.vue
@@ -30,12 +30,12 @@
 <script setup lang="ts">
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "./BaseLayout.vue";
-import AppLogo from "../components/AppLogo/index.vue";
-import NavBar from "../components/NavBar/index.vue";
-import TagsView from "../components/TagsView/index.vue";
-import AppMain from "../components/AppMain/index.vue";
-import BasicMenu from "../components/Menu/BasicMenu.vue";
+import BaseLayout from "@/layouts/index.vue";
+import AppLogo from "../../components/AppLogo/index.vue";
+import NavBar from "../../components/NavBar/index.vue";
+import TagsView from "../../components/TagsView/index.vue";
+import AppMain from "../../components/AppMain/index.vue";
+import BasicMenu from "../../components/Menu/BasicMenu.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo, isSidebarOpen } = useLayout();
diff --git a/src/layouts/layouts/MixLayout.vue b/src/layouts/modes/mix/index.vue
similarity index 88%
rename from src/layouts/layouts/MixLayout.vue
rename to src/layouts/modes/mix/index.vue
index 6ca8f664..ae7c85fe 100644
--- a/src/layouts/layouts/MixLayout.vue
+++ b/src/layouts/modes/mix/index.vue
@@ -58,16 +58,17 @@
 </template>
 
 <script setup lang="ts">
+import { computed, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useWindowSize } from "@vueuse/core";
 import { useLayout, useLayoutMenu } from "@/composables";
-import BaseLayout from "./BaseLayout.vue";
-import AppLogo from "../components/AppLogo/index.vue";
-import MixTopMenu from "../components/Menu/MixTopMenu.vue";
-import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView/index.vue";
-import AppMain from "../components/AppMain/index.vue";
-import MenuItem from "../components/Menu/components/MenuItem.vue";
+import BaseLayout from "@/layouts/index.vue";
+import AppLogo from "../../components/AppLogo/index.vue";
+import MixTopMenu from "../../components/Menu/MixTopMenu.vue";
+import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
+import TagsView from "../../components/TagsView/index.vue";
+import AppMain from "../../components/AppMain/index.vue";
+import MenuItem from "../../components/Menu/components/MenuItem.vue";
 import Hamburger from "@/components/Hamburger/index.vue";
 import variables from "@/styles/variables.module.scss";
 import { isExternal } from "@/utils/index";
@@ -91,8 +92,8 @@ const isLogoCollapsed = computed(() => width.value < 768);
 const activeLeftMenuPath = computed(() => {
   const { meta, path } = route;
   // 如果设置了activeMenu，则使用
-  if (meta?.activeMenu && typeof meta.activeMenu === "string") {
-    return meta.activeMenu;
+  if ((meta?.activeMenu as unknown as string) && typeof meta.activeMenu === "string") {
+    return meta.activeMenu as unknown as string;
   }
   return path;
 });
@@ -116,26 +117,16 @@ function resolvePath(routePath: string) {
 watch(
   () => route.path,
   (newPath) => {
-    console.log("📍 Route changed in MixLayout:", newPath);
-
     // 获取顶级路径
     const topMenuPath =
       newPath.split("/").filter(Boolean).length > 1 ? newPath.match(/^\/[^/]+/)?.[0] || "/" : "/";
 
     // 如果当前路径属于当前激活的顶部菜单
     if (newPath.startsWith(activeTopMenuPath.value)) {
-      console.log("📍 Route is under active top menu, ensuring menu item is activated");
+      // no-op
     }
     // 如果路径改变了顶级菜单，确保顶部菜单和左侧菜单都更新
     else if (topMenuPath !== activeTopMenuPath.value) {
-      console.log(
-        "📍 Top menu changed, updating active menu from:",
-        activeTopMenuPath.value,
-        "to:",
-        topMenuPath
-      );
-
-      // 主动更新顶部菜单和左侧菜单
       const appStore = useAppStore();
       const permissionStore = usePermissionStore();
 
@@ -283,7 +274,6 @@ watch(
     }
   }
 }
-
 :deep(.hasTagsView) {
   .app-main {
     height: calc(100vh - $navbar-height - $tags-view-height) !important;
diff --git a/src/layouts/layouts/TopLayout.vue b/src/layouts/modes/top/index.vue
similarity index 88%
rename from src/layouts/layouts/TopLayout.vue
rename to src/layouts/modes/top/index.vue
index 485c41fc..f82e3504 100644
--- a/src/layouts/layouts/TopLayout.vue
+++ b/src/layouts/modes/top/index.vue
@@ -23,16 +23,14 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
-import { useWindowSize } from "@vueuse/core";
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "./BaseLayout.vue";
-import AppLogo from "../components/AppLogo/index.vue";
-import BasicMenu from "../components/Menu/BasicMenu.vue";
-import NavbarActions from "../components/NavBar/components/NavbarActions.vue";
-import TagsView from "../components/TagsView/index.vue";
-import AppMain from "../components/AppMain/index.vue";
+import BaseLayout from "@/layouts/index.vue";
+import AppLogo from "../../components/AppLogo/index.vue";
+import BasicMenu from "../../components/Menu/BasicMenu.vue";
+import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
+import TagsView from "../../components/TagsView/index.vue";
+import AppMain from "../../components/AppMain/index.vue";
 
 // 布局相关参数
 const { isShowTagsView, isShowLogo } = useLayout();
diff --git a/src/router/index.ts b/src/router/index.ts
index 2f156190..1b20750e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import type { App } from "vue";
 import { createRouter, createWebHashHistory, type RouteRecordRaw } from "vue-router";
 
-export const Layout = () => import("@/layouts/index.vue");
+export const Layout = () => import("@/layouts/modes/index.vue");
 
 // 静态路由
 export const constantRoutes: RouteRecordRaw[] = [
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index a4088f7f..8f8b99b4 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layouts/index.vue");
+const Layout = () => import("@/layouts/modes/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 所有路由（静态路由 + 动态路由）

From 474c0e9c355cc2abb8bd585ace18fccd97975ed4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 15 Sep 2025 13:24:49 +0800
Subject: [PATCH 471/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B8=83=E5=B1=80=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../layout/{useLayoutResponsive.ts => useDeviceDetection.ts}      | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/composables/layout/{useLayoutResponsive.ts => useDeviceDetection.ts} (100%)

diff --git a/src/composables/layout/useLayoutResponsive.ts b/src/composables/layout/useDeviceDetection.ts
similarity index 100%
rename from src/composables/layout/useLayoutResponsive.ts
rename to src/composables/layout/useDeviceDetection.ts

From bf8e379616e606f914ef56a3f514801791610457 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 15 Sep 2025 13:27:25 +0800
Subject: [PATCH 472/497] =?UTF-8?q?refactor:=20:recycle:=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=B8=83=E5=B1=80=E7=BB=84=E7=BB=87=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E6=8F=90=E5=8D=87=E4=BB=A3=E7=A0=81=E5=8F=AF=E8=AF=BB?=
 =?UTF-8?q?=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/index.ts                     |  2 +-
 src/composables/layout/useDeviceDetection.ts |  4 +-
 src/layouts/index.vue                        | 53 ++++++++++++--------
 src/layouts/modes/BaseLayout.vue             | 36 +++++++++++++
 src/layouts/modes/base/index.vue             | 36 +++++++++++++
 src/layouts/modes/index.vue                  | 47 -----------------
 src/layouts/modes/left/index.vue             |  2 +-
 src/layouts/modes/mix/index.vue              |  3 +-
 src/layouts/modes/top/index.vue              |  2 +-
 src/router/index.ts                          |  2 +-
 src/store/modules/permission-store.ts        |  2 +-
 11 files changed, 112 insertions(+), 77 deletions(-)
 create mode 100644 src/layouts/modes/BaseLayout.vue
 create mode 100644 src/layouts/modes/base/index.vue
 delete mode 100644 src/layouts/modes/index.vue

diff --git a/src/composables/index.ts b/src/composables/index.ts
index 2a2a9a8f..7fd51910 100644
--- a/src/composables/index.ts
+++ b/src/composables/index.ts
@@ -4,4 +4,4 @@ export { useOnlineCount } from "./websocket/useOnlineCount";
 
 export { useLayout } from "./layout/useLayout";
 export { useLayoutMenu } from "./layout/useLayoutMenu";
-export { useLayoutResponsive } from "./layout/useLayoutResponsive";
+export { useDeviceDetection } from "./layout/useDeviceDetection";
diff --git a/src/composables/layout/useDeviceDetection.ts b/src/composables/layout/useDeviceDetection.ts
index 83554505..8fe9513b 100644
--- a/src/composables/layout/useDeviceDetection.ts
+++ b/src/composables/layout/useDeviceDetection.ts
@@ -4,10 +4,10 @@ import { useAppStore } from "@/store";
 import { DeviceEnum } from "@/enums/settings/device.enum";
 
 /**
- * 响应式布局处理
+ * 设备检测和响应式处理
  * 监听屏幕尺寸变化，自动调整设备类型和侧边栏状态
  */
-export function useLayoutResponsive() {
+export function useDeviceDetection() {
   const appStore = useAppStore();
   const { width } = useWindowSize();
 
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index ec5fe380..ffc7717a 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -1,36 +1,47 @@
 <template>
-  <div class="layout" :class="layoutClass">
-    <!-- 移动端遮罩层 -->
-    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
+  <div class="layout-wrapper">
+    <component :is="currentLayoutComponent" />
 
-    <!-- 布局内容插槽 -->
-    <slot></slot>
+    <!-- 设置面板 - 独立于布局组件 -->
+    <Settings v-if="isShowSettings" />
   </div>
 </template>
 
 <script setup lang="ts">
-import { useLayout, useLayoutResponsive } from "@/composables";
+import { useRoute } from "vue-router";
+import { useLayout } from "@/composables/layout/useLayout";
+import LeftLayout from "@/layouts/modes/left/index.vue";
+import TopLayout from "@/layouts/modes/top/index.vue";
+import MixLayout from "@/layouts/modes/mix/index.vue";
+import Settings from "./components/Settings/index.vue";
+import { LayoutMode } from "@/enums/settings/layout.enum";
+import { defaultSettings } from "@/settings";
 
-// 布局相关
-const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
+const { currentLayout } = useLayout();
+const route = useRoute();
 
-// 响应式布局
-const { isMobile } = useLayoutResponsive();
+/// Select the corresponding component based on the current layout mode
+const currentLayoutComponent = computed(() => {
+  const override = route.meta?.layout as LayoutMode | undefined;
+  const layoutToUse = override ?? currentLayout.value;
+  switch (layoutToUse) {
+    case LayoutMode.TOP:
+      return TopLayout;
+    case LayoutMode.MIX:
+      return MixLayout;
+    case LayoutMode.LEFT:
+    default:
+      return LeftLayout;
+  }
+});
+
+/// Whether to show the settings panel
+const isShowSettings = computed(() => defaultSettings.showSettings);
 </script>
 
 <style lang="scss" scoped>
-.layout {
+.layout-wrapper {
   width: 100%;
   height: 100%;
-
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
 }
 </style>
diff --git a/src/layouts/modes/BaseLayout.vue b/src/layouts/modes/BaseLayout.vue
new file mode 100644
index 00000000..49337d37
--- /dev/null
+++ b/src/layouts/modes/BaseLayout.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 - 当侧边栏打开时显示 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
+
+    <!-- 布局内容插槽 - 各种布局模式的具体内容 -->
+    <slot></slot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useLayout, useLayoutResponsive } from "@/composables";
+
+/// Layout-related functionality and state management
+const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
+
+/// Responsive layout handling for mobile devices
+const { isMobile } = useLayoutResponsive();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  width: 100%;
+  height: 100%;
+
+  &__overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+}
+</style>
diff --git a/src/layouts/modes/base/index.vue b/src/layouts/modes/base/index.vue
new file mode 100644
index 00000000..ea9b1417
--- /dev/null
+++ b/src/layouts/modes/base/index.vue
@@ -0,0 +1,36 @@
+<template>
+  <div class="layout" :class="layoutClass">
+    <!-- 移动端遮罩层 - 当侧边栏打开时显示 -->
+    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
+
+    <!-- 布局内容插槽 - 各种布局模式的具体内容 -->
+    <slot></slot>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { useLayout, useDeviceDetection } from "@/composables";
+
+/// Layout-related functionality and state management
+const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
+
+/// Device detection for responsive layout
+const { isMobile } = useDeviceDetection();
+</script>
+
+<style lang="scss" scoped>
+.layout {
+  width: 100%;
+  height: 100%;
+
+  &__overlay {
+    position: fixed;
+    top: 0;
+    left: 0;
+    z-index: 999;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.3);
+  }
+}
+</style>
diff --git a/src/layouts/modes/index.vue b/src/layouts/modes/index.vue
deleted file mode 100644
index 08d1f41f..00000000
--- a/src/layouts/modes/index.vue
+++ /dev/null
@@ -1,47 +0,0 @@
-<template>
-  <div class="layout-wrapper">
-    <component :is="currentLayoutComponent" />
-
-    <!-- 设置面板 - 独立于布局组件 -->
-    <Settings v-if="isShowSettings" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useRoute } from "vue-router";
-import { useLayout } from "@/composables/layout/useLayout";
-import LeftLayout from "@/layouts/modes/left/index.vue";
-import TopLayout from "@/layouts/modes/top/index.vue";
-import MixLayout from "@/layouts/modes/mix/index.vue";
-import Settings from "../components/Settings/index.vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
-import { defaultSettings } from "@/settings";
-
-const { currentLayout } = useLayout();
-const route = useRoute();
-
-// 根据当前布局模式选择对应的组件
-const currentLayoutComponent = computed(() => {
-  const override = route.meta?.layout as LayoutMode | undefined;
-  const layoutToUse = override ?? currentLayout.value;
-  switch (layoutToUse) {
-    case LayoutMode.TOP:
-      return TopLayout;
-    case LayoutMode.MIX:
-      return MixLayout;
-    case LayoutMode.LEFT:
-    default:
-      return LeftLayout;
-  }
-});
-
-// 是否显示设置面板
-const isShowSettings = computed(() => defaultSettings.showSettings);
-</script>
-
-<style lang="scss" scoped>
-.layout-wrapper {
-  width: 100%;
-  height: 100%;
-}
-</style>
diff --git a/src/layouts/modes/left/index.vue b/src/layouts/modes/left/index.vue
index af012c91..f341d1ca 100644
--- a/src/layouts/modes/left/index.vue
+++ b/src/layouts/modes/left/index.vue
@@ -30,7 +30,7 @@
 <script setup lang="ts">
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "@/layouts/index.vue";
+import BaseLayout from "../base/index.vue";
 import AppLogo from "../../components/AppLogo/index.vue";
 import NavBar from "../../components/NavBar/index.vue";
 import TagsView from "../../components/TagsView/index.vue";
diff --git a/src/layouts/modes/mix/index.vue b/src/layouts/modes/mix/index.vue
index ae7c85fe..02c40659 100644
--- a/src/layouts/modes/mix/index.vue
+++ b/src/layouts/modes/mix/index.vue
@@ -58,11 +58,10 @@
 </template>
 
 <script setup lang="ts">
-import { computed, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useWindowSize } from "@vueuse/core";
 import { useLayout, useLayoutMenu } from "@/composables";
-import BaseLayout from "@/layouts/index.vue";
+import BaseLayout from "../base/index.vue";
 import AppLogo from "../../components/AppLogo/index.vue";
 import MixTopMenu from "../../components/Menu/MixTopMenu.vue";
 import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
diff --git a/src/layouts/modes/top/index.vue b/src/layouts/modes/top/index.vue
index f82e3504..52967743 100644
--- a/src/layouts/modes/top/index.vue
+++ b/src/layouts/modes/top/index.vue
@@ -25,7 +25,7 @@
 <script setup lang="ts">
 import { useLayout } from "@/composables/layout/useLayout";
 import { useLayoutMenu } from "@/composables/layout/useLayoutMenu";
-import BaseLayout from "@/layouts/index.vue";
+import BaseLayout from "../base/index.vue";
 import AppLogo from "../../components/AppLogo/index.vue";
 import BasicMenu from "../../components/Menu/BasicMenu.vue";
 import NavbarActions from "../../components/NavBar/components/NavbarActions.vue";
diff --git a/src/router/index.ts b/src/router/index.ts
index 1b20750e..2f156190 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,7 +1,7 @@
 import type { App } from "vue";
 import { createRouter, createWebHashHistory, type RouteRecordRaw } from "vue-router";
 
-export const Layout = () => import("@/layouts/modes/index.vue");
+export const Layout = () => import("@/layouts/index.vue");
 
 // 静态路由
 export const constantRoutes: RouteRecordRaw[] = [
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index 8f8b99b4..a4088f7f 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layouts/modes/index.vue");
+const Layout = () => import("@/layouts/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 所有路由（静态路由 + 动态路由）

From 726181f1edf57c04a84f06ceb73903881e4cf182 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 15 Sep 2025 13:59:05 +0800
Subject: [PATCH 473/497] =?UTF-8?q?chore:=20:hammer:=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=A4=9A=E4=BD=99=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modes/BaseLayout.vue | 36 --------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 src/layouts/modes/BaseLayout.vue

diff --git a/src/layouts/modes/BaseLayout.vue b/src/layouts/modes/BaseLayout.vue
deleted file mode 100644
index 49337d37..00000000
--- a/src/layouts/modes/BaseLayout.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="layout" :class="layoutClass">
-    <!-- 移动端遮罩层 - 当侧边栏打开时显示 -->
-    <div v-if="isMobile && isSidebarOpen" class="layout__overlay" @click="closeSidebar" />
-
-    <!-- 布局内容插槽 - 各种布局模式的具体内容 -->
-    <slot></slot>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useLayout, useLayoutResponsive } from "@/composables";
-
-/// Layout-related functionality and state management
-const { layoutClass, isSidebarOpen, closeSidebar } = useLayout();
-
-/// Responsive layout handling for mobile devices
-const { isMobile } = useLayoutResponsive();
-</script>
-
-<style lang="scss" scoped>
-.layout {
-  width: 100%;
-  height: 100%;
-
-  &__overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.3);
-  }
-}
-</style>

From 97503a36128f6d95d447e412209fb9d001ab19d4 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 16 Sep 2025 17:27:17 +0800
Subject: [PATCH 474/497] =?UTF-8?q?refactor:=20:recycle:=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E3=80=81=E7=A7=BB=E9=99=A4=20pdf=20?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=92=8C=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                             |  45 +-
 src/composables/index.ts                 |   2 +-
 src/composables/websocket/useDictSync.ts |   1 -
 src/store/modules/settings-store.ts      |   2 +-
 src/views/demo/pdf-preview.vue           | 564 -----------------------
 5 files changed, 24 insertions(+), 590 deletions(-)
 delete mode 100644 src/views/demo/pdf-preview.vue

diff --git a/package.json b/package.json
index 0530bf2d..27df4214 100644
--- a/package.json
+++ b/package.json
@@ -46,54 +46,53 @@
     ]
   },
   "dependencies": {
-    "@element-plus/icons-vue": "^2.3.1",
-    "@stomp/stompjs": "^7.1.1",
+    "@element-plus/icons-vue": "^2.3.2",
+    "@stomp/stompjs": "^7.2.0",
     "@vueuse/core": "^12.8.2",
-    "@wangeditor-next/editor": "^5.6.42",
+    "@wangeditor-next/editor": "^5.6.45",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
-    "axios": "^1.11.0",
-    "codemirror": "^5.65.19",
+    "axios": "^1.12.2",
+    "codemirror": "^5.65.20",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
     "echarts": "^5.6.0",
-    "element-plus": "^2.10.5",
+    "element-plus": "^2.11.2",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
     "path-browserify": "^1.0.1",
-    "path-to-regexp": "^8.2.0",
+    "path-to-regexp": "^8.3.0",
     "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
-    "vue": "^3.5.18",
+    "vue": "^3.5.21",
     "vue-draggable-plus": "^0.6.0",
-    "vue-i18n": "^11.1.11",
-    "vue-pdf-embed": "^2.1.3",
+    "vue-i18n": "^11.1.12",
     "vue-router": "^4.5.1",
     "vxe-table": "~4.6.25"
   },
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.32.0",
+    "@eslint/js": "^9.35.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.17.0",
+    "@types/node": "^22.18.4",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.38.0",
-    "@typescript-eslint/parser": "^8.38.0",
+    "@typescript-eslint/eslint-plugin": "^8.44.0",
+    "@typescript-eslint/parser": "^8.44.0",
     "@vitejs/plugin-vue": "^6.0.1",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.12.0",
-    "eslint": "^9.32.0",
+    "eslint": "^9.35.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-prettier": "^5.5.3",
+    "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-vue": "^10.4.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
@@ -102,22 +101,22 @@
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.6.2",
-    "sass": "^1.89.2",
-    "stylelint": "^16.23.0",
+    "sass": "^1.92.1",
+    "stylelint": "^16.24.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.1.0",
     "stylelint-config-recommended": "^15.0.0",
     "stylelint-config-recommended-scss": "^14.1.0",
     "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-prettier": "^5.0.3",
-    "terser": "^5.43.1",
+    "terser": "^5.44.0",
     "typescript": "^5.9.2",
-    "typescript-eslint": "^8.38.0",
-    "unocss": "^66.4.0",
+    "typescript-eslint": "^8.44.0",
+    "unocss": "^66.5.1",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.8.0",
-    "vite": "^7.0.6",
-    "vite-plugin-mock-dev-server": "^1.9.1",
+    "vite": "^7.1.5",
+    "vite-plugin-mock-dev-server": "^1.9.3",
     "vue-eslint-parser": "^10.2.0",
     "vue-tsc": "^2.2.12"
   },
diff --git a/src/composables/index.ts b/src/composables/index.ts
index 7fd51910..59c5e4b5 100644
--- a/src/composables/index.ts
+++ b/src/composables/index.ts
@@ -1,5 +1,5 @@
 export { useStomp } from "./websocket/useStomp";
-export { useDictSync } from "./websocket/useDictSync";
+export { useDictSync, DictMessage } from "./websocket/useDictSync";
 export { useOnlineCount } from "./websocket/useOnlineCount";
 
 export { useLayout } from "./layout/useLayout";
diff --git a/src/composables/websocket/useDictSync.ts b/src/composables/websocket/useDictSync.ts
index d1efb85d..345751bd 100644
--- a/src/composables/websocket/useDictSync.ts
+++ b/src/composables/websocket/useDictSync.ts
@@ -1,4 +1,3 @@
-import { ref } from "vue";
 import { useDictStoreHook } from "@/store/modules/dict-store";
 import { useStomp } from "./useStomp";
 import type { IMessage } from "@stomp/stompjs";
diff --git a/src/store/modules/settings-store.ts b/src/store/modules/settings-store.ts
index 092e948f..8a260e83 100644
--- a/src/store/modules/settings-store.ts
+++ b/src/store/modules/settings-store.ts
@@ -71,7 +71,7 @@ export const useSettingsStore = defineStore("setting", () => {
   // 监听主题变化，自动应用样式
   watch(
     [theme, themeColor],
-    ([newTheme, newThemeColor]) => {
+    ([newTheme, newThemeColor]: [ThemeMode, string]) => {
       toggleDarkMode(newTheme === ThemeMode.DARK);
       const colors = generateThemeColors(newThemeColor, newTheme);
       applyTheme(colors);
diff --git a/src/views/demo/pdf-preview.vue b/src/views/demo/pdf-preview.vue
deleted file mode 100644
index d22b4acb..00000000
--- a/src/views/demo/pdf-preview.vue
+++ /dev/null
@@ -1,564 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-card class="box-card">
-      <template #header>
-        <div class="card-header flex justify-between items-center">
-          <div class="flex items-center gap-2">
-            <span>PDF预览组件演示</span>
-            <el-tag type="info">vue-pdf-embed</el-tag>
-          </div>
-          <el-link
-            :icon="Link"
-            href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/pdf-preview.vue"
-            type="primary"
-            target="_blank"
-          >
-            源码
-          </el-link>
-        </div>
-      </template>
-
-      <div class="pdf-layout">
-        <!-- 左侧：控制面板 + 工具栏 + 设置 -->
-        <div class="side-panel">
-          <!-- 控制面板 -->
-          <div class="control-panel mb-4">
-            <el-row :gutter="16">
-              <el-col :span="24">
-                <el-form-item label="选择PDF文件:">
-                  <el-select v-model="selectedPdf" placeholder="请选择PDF文件" style="width: 100%">
-                    <el-option
-                      v-for="pdf in pdfOptions"
-                      :key="pdf.value"
-                      :label="pdf.label"
-                      :value="pdf.value"
-                    />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="自定义PDF链接:">
-                  <el-input
-                    v-model="customPdfUrl"
-                    placeholder="请输入PDF链接"
-                    @keyup.enter="loadCustomPdf"
-                  >
-                    <template #append>
-                      <el-button @click="loadCustomPdf">加载</el-button>
-                    </template>
-                  </el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-
-          <!-- PDF工具栏 -->
-          <div class="pdf-toolbar mb-4">
-            <el-row :gutter="12" class="items-center">
-              <el-col :span="24">
-                <div class="flex items-center gap-2 mb-2">
-                  <el-button
-                    type="primary"
-                    :icon="ZoomIn"
-                    size="small"
-                    :disabled="!pdfSrc"
-                    @click="zoomIn"
-                  >
-                    放大
-                  </el-button>
-                  <el-button
-                    type="primary"
-                    :icon="ZoomOut"
-                    size="small"
-                    :disabled="!pdfSrc"
-                    @click="zoomOut"
-                  >
-                    缩小
-                  </el-button>
-                  <el-button size="small" :disabled="!pdfSrc" @click="resetZoom">
-                    重置缩放
-                  </el-button>
-                </div>
-                <div class="flex items-center gap-2">
-                  <el-button
-                    type="primary"
-                    size="small"
-                    :disabled="currentPage <= 1"
-                    @click="prevPage"
-                  >
-                    上一页
-                  </el-button>
-                  <el-input-number
-                    v-model="currentPage"
-                    :min="minPage"
-                    :max="maxPage"
-                    size="small"
-                    style="width: 120px"
-                    :disabled="!pdfSrc"
-                    @change="handlePageNumberChange"
-                  />
-                  <span class="text-sm text-gray-500">/ {{ totalPages }}</span>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    :disabled="currentPage >= totalPages"
-                    @click="nextPage"
-                  >
-                    下一页
-                  </el-button>
-                </div>
-                <div class="flex items-center justify-between mt-2">
-                  <span class="text-sm text-gray-500">缩放: {{ Math.round(scale * 100) }}%</span>
-                  <el-button
-                    type="success"
-                    :icon="Download"
-                    size="small"
-                    :disabled="!pdfSrc"
-                    @click="downloadPdf"
-                  >
-                    下载
-                  </el-button>
-                </div>
-              </el-col>
-            </el-row>
-          </div>
-
-          <!-- 设置面板 -->
-          <div class="settings-panel">
-            <el-row :gutter="16">
-              <el-col :span="24">
-                <el-form-item label="显示缩略图:">
-                  <el-switch v-model="showThumbnails" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="旋转角度:">
-                  <el-select v-model="rotation" style="width: 100%">
-                    <el-option label="0°" :value="0" />
-                    <el-option label="90°" :value="90" />
-                    <el-option label="180°" :value="180" />
-                    <el-option label="270°" :value="270" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-        </div>
-
-        <!-- 中间：预览区域 -->
-        <div class="preview-panel">
-          <div
-            ref="previewWrapRef"
-            v-loading="loading"
-            class="pdf-container"
-            element-loading-text="PDF加载中..."
-            element-loading-background="rgba(255,255,255,0.6)"
-          >
-            <div v-if="error" class="error-container">
-              <el-result icon="error" title="PDF加载失败" :sub-title="error">
-                <template #extra>
-                  <el-button type="primary" @click="retryLoad">重试</el-button>
-                </template>
-              </el-result>
-            </div>
-
-            <div v-else-if="!pdfSrc" class="empty-container">
-              <el-empty description="请选择要预览的PDF文件" />
-            </div>
-
-            <div v-else class="pdf-viewer">
-              <VuePdfEmbed
-                ref="pdfRef"
-                :source="pdfSrc"
-                :page="currentPage"
-                :width="pageWidth"
-                :rotation="rotation"
-                class="pdf-embed"
-                @loaded="onPdfLoaded"
-                @loading-failed="onLoadingFailed"
-                @page-loaded="onPageLoaded"
-                @password-requested="onPasswordRequested"
-              />
-            </div>
-          </div>
-        </div>
-
-        <!-- 右侧：竖向缩略图栏 -->
-        <div v-if="showThumbnails && pdfSrc" class="thumb-panel">
-          <div class="thumbs-wrap">
-            <div
-              v-for="pageNum in totalPages"
-              :key="pageNum"
-              :class="['thumb-item', { active: pageNum === currentPage }]"
-              @click="goToPage(pageNum)"
-            >
-              <VuePdfEmbed :source="pdfSrc" :page="pageNum" :scale="0.2" class="thumbnail-pdf" />
-              <div class="thumb-label">{{ pageNum }}</div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </el-card>
-  </div>
-</template>
-
-<script setup lang="ts">
-import VuePdfEmbed from "vue-pdf-embed";
-import { ZoomIn, ZoomOut, Download, Link } from "@element-plus/icons-vue";
-import { ElMessage, ElMessageBox } from "element-plus";
-
-defineOptions({
-  name: "PdfPreview",
-  inheritAttrs: false,
-});
-
-// PDF源文件
-const pdfSrc = ref<string>("");
-const selectedPdf = ref<string>("");
-const customPdfUrl = ref<string>("");
-
-// PDF状态
-const loading = ref(false);
-const error = ref<string>("");
-const totalPages = ref(0);
-const currentPage = ref(1);
-const scale = ref(1.0);
-const rotation = ref(0);
-// 确保 InputNumber 的 min <= max
-const minPage = computed(() => 1);
-const maxPage = computed(() => Math.max(totalPages.value, 1));
-
-// 设置选项
-const showThumbnails = ref(false);
-
-// PDF引用
-const pdfRef = ref();
-const previewWrapRef = ref<HTMLElement | null>(null);
-
-// 缩放以“容器宽度”为基准：pageWidth = containerWidth * scale
-const pageWidth = ref<number | undefined>(undefined);
-const updatePageWidth = () => {
-  const wrap = previewWrapRef.value;
-  if (!wrap) return;
-  // 预留左右 padding
-  const containerWidth = Math.max(200, wrap.clientWidth - 40);
-  pageWidth.value = Math.round(containerWidth * scale.value);
-};
-
-// 预设PDF选项
-const pdfOptions = [
-  {
-    label: "示例PDF文档",
-    value: "https://mozilla.github.io/pdf.js/web/compressed.tracemonkey-pldi-09.pdf",
-  },
-];
-
-// 监听选中的PDF变化
-watch(selectedPdf, (newVal) => {
-  if (newVal) loadPdf(newVal);
-});
-
-// 默认选中第一个示例并加载
-onMounted(() => {
-  if (!selectedPdf.value && pdfOptions.length > 0) {
-    selectedPdf.value = pdfOptions[0].value;
-  }
-  // 初始计算
-  nextTick(updatePageWidth);
-  window.addEventListener("resize", updatePageWidth);
-});
-
-onBeforeUnmount(() => {
-  window.removeEventListener("resize", updatePageWidth);
-});
-
-// 加载PDF
-const loadPdf = async (url: string) => {
-  loading.value = true;
-  error.value = "";
-  pdfSrc.value = url;
-  currentPage.value = 1;
-  scale.value = 1.0;
-  rotation.value = 0;
-  nextTick(updatePageWidth);
-};
-
-// 加载自定义PDF
-const loadCustomPdf = () => {
-  if (!customPdfUrl.value.trim()) return ElMessage.warning("请输入PDF链接");
-  if (!customPdfUrl.value.toLowerCase().endsWith(".pdf"))
-    return ElMessage.warning("请输入有效的PDF链接");
-  loadPdf(customPdfUrl.value.trim());
-};
-
-// 仅在首次/切换 source 时提示加载完成
-const lastLoadedSrc = ref<string>("");
-const onPdfLoaded = (pdf: any) => {
-  loading.value = false;
-  totalPages.value = pdf.numPages;
-  if (pdfSrc.value !== lastLoadedSrc.value) {
-    lastLoadedSrc.value = pdfSrc.value;
-    ElMessage.success(`PDF加载成功，共 ${pdf.numPages} 页`);
-  }
-};
-
-// PDF加载失败
-const onLoadingFailed = (error: any) => {
-  loading.value = false;
-  error.value = error.message || "PDF加载失败";
-  ElMessage.error("PDF加载失败: " + error.value);
-};
-
-// 页面加载完成
-const onPageLoaded = () => {};
-
-// 密码保护的PDF
-const onPasswordRequested = async (callback: any) => {
-  try {
-    const { value: password } = await ElMessageBox.prompt(
-      "此PDF文件受密码保护，请输入密码",
-      "密码验证",
-      {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        inputType: "password",
-      }
-    );
-    callback(password);
-  } catch {
-    callback(null);
-  }
-};
-
-// 重试加载
-const retryLoad = () => {
-  if (pdfSrc.value) loadPdf(pdfSrc.value);
-};
-
-// 放大/缩小/重置
-const zoomIn = () => {
-  scale.value = Math.min(scale.value + 0.25, 3.0);
-  updatePageWidth();
-};
-const zoomOut = () => {
-  scale.value = Math.max(scale.value - 0.25, 0.25);
-  updatePageWidth();
-};
-const resetZoom = () => {
-  scale.value = 1.0;
-  updatePageWidth();
-};
-
-// 上一页/下一页
-const prevPage = () => {
-  if (currentPage.value > 1) currentPage.value--;
-};
-const nextPage = () => {
-  if (currentPage.value < totalPages.value) currentPage.value++;
-};
-
-// 跳转到指定页（用于按钮/缩略图）
-const goToPage = (page: number) => {
-  if (typeof page !== "number") return;
-  if (page >= 1 && page <= totalPages.value) currentPage.value = page;
-};
-
-// 处理 el-input-number 的 @change 回调签名 (cur, prev)
-const handlePageNumberChange = (cur?: number) => {
-  if (typeof cur !== "number") return;
-  goToPage(cur);
-};
-
-// 下载PDF
-const downloadPdf = () => {
-  if (!pdfSrc.value) return;
-  const src = pdfSrc.value as string;
-
-  // 如果是 http(s) 链接，用 fetch 以 Blob 下载，确保进入浏览器下载管理器
-  if (/^https?:/i.test(src)) {
-    (async () => {
-      try {
-        const response = await fetch(src, { mode: "cors" });
-        const blob = await response.blob();
-
-        // 从响应头或 URL 推断文件名
-        const getFileName = () => {
-          const cd = response.headers.get("content-disposition") || "";
-          const m = cd.match(/filename\*=UTF-8''([^;]+)|filename="?([^";]+)"?/i);
-          if (m) return decodeURIComponent(m[1] || m[2]);
-          try {
-            const u = new URL(src, window.location.href);
-            const name = u.pathname.split("/").pop() || "";
-            return name || `document-${Date.now()}.pdf`;
-          } catch {
-            return `document-${Date.now()}.pdf`;
-          }
-        };
-
-        const fileName = getFileName();
-        const url = URL.createObjectURL(blob);
-        const a = document.createElement("a");
-        a.href = url;
-        a.download = fileName.endsWith(".pdf") ? fileName : `${fileName}.pdf`;
-        document.body.appendChild(a);
-        a.click();
-        a.remove();
-        URL.revokeObjectURL(url);
-        ElMessage.success("已开始下载");
-      } catch {
-        // 回退到组件内置下载
-        try {
-          await (pdfRef.value as any)?.download?.(`document-${Date.now()}.pdf`);
-        } catch {
-          ElMessage.error("下载失败");
-        }
-      }
-    })();
-    return;
-  }
-
-  // 其他来源（如 base64、本地 Blob 等）使用组件自带方法
-  try {
-    (pdfRef.value as any)?.download?.(`document-${Date.now()}.pdf`);
-  } catch {
-    // 最后兜底：创建本地链接
-    const link = document.createElement("a");
-    link.href = src;
-    link.download = `document-${Date.now()}.pdf`;
-    document.body.appendChild(link);
-    link.click();
-    document.body.removeChild(link);
-  }
-};
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  .card-header {
-    font-weight: 600;
-  }
-
-  .pdf-layout {
-    display: flex;
-    gap: 16px;
-  }
-
-  .side-panel {
-    position: sticky;
-    top: 0;
-    flex-shrink: 0;
-    align-self: flex-start;
-    width: 320px;
-  }
-
-  .control-panel {
-    padding: 16px;
-    background-color: var(--el-bg-color-page);
-    border-radius: 6px;
-  }
-
-  .pdf-toolbar {
-    padding: 12px;
-    background-color: var(--el-fill-color-lighter);
-    border: 1px solid var(--el-border-color-light);
-    border-radius: 6px;
-  }
-
-  .preview-panel {
-    flex: 1;
-    min-width: 0;
-  }
-
-  .pdf-container {
-    position: relative;
-    min-height: 400px;
-    max-height: 80vh; /* 预览区域上限高度，超出出现滚动条 */
-    overflow: auto; /* 允许横向滚动以展示放大效果 */
-    background-color: #f5f5f5;
-    border: 1px solid var(--el-border-color);
-    border-radius: 6px;
-
-    .loading-container,
-    .error-container,
-    .empty-container {
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      height: 400px;
-    }
-
-    .pdf-viewer {
-      display: flex;
-      justify-content: flex-start; /* 放大后从左侧开始，避免被居中压缩 */
-      padding: 20px;
-
-      .pdf-embed {
-        border: 1px solid #ddd;
-        box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
-        :deep(canvas) {
-          display: block;
-          max-width: none !important; /* 允许超出容器按实际像素渲染 */
-        }
-        /* 让 overlay 图层不参与流式高度计算 */
-        :deep(.textLayer),
-        :deep(.annotationLayer) {
-          position: absolute !important;
-          top: 0;
-          right: 0;
-          bottom: 0;
-          left: 0;
-          pointer-events: auto;
-        }
-      }
-    }
-  }
-
-  /* 右侧缩略图栏 */
-  .thumb-panel {
-    flex-shrink: 0;
-    align-self: flex-start;
-    width: 220px;
-  }
-  .thumbs-wrap {
-    max-height: 80vh;
-    padding: 8px;
-    overflow-y: auto;
-    background: var(--el-bg-color-page);
-    border: 1px solid var(--el-border-color-light);
-    border-radius: 6px;
-  }
-  .thumb-item {
-    position: relative;
-    padding: 8px;
-    margin-bottom: 8px;
-    cursor: pointer;
-    border: 2px solid transparent;
-    border-radius: 4px;
-    transition: all 0.2s ease;
-    &:hover {
-      background-color: var(--el-color-primary-light-9);
-      border-color: var(--el-color-primary);
-    }
-    &.active {
-      background-color: var(--el-color-primary-light-8);
-      border-color: var(--el-color-primary);
-    }
-    .thumbnail-pdf {
-      width: 100%;
-      border: 1px solid #ddd;
-    }
-    .thumb-label {
-      margin-top: 4px;
-      font-size: 12px;
-      color: var(--el-text-color-regular);
-      text-align: center;
-    }
-  }
-
-  .settings-panel {
-    padding: 16px;
-    background-color: var(--el-bg-color-page);
-    border-radius: 6px;
-  }
-}
-</style>

From a656a40313adc3872a74e5bdbef27c1fd8dbe6e2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 16 Sep 2025 18:59:28 +0800
Subject: [PATCH 475/497] =?UTF-8?q?feat:=20:sparkles:=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=8D=95=E6=96=87=E4=BB=B6=20CURD=20=E6=BC=94=E7=A4=BA?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                 |   2 +-
 src/views/demo/curd-demo.vue | 593 +++++++++++++++++++++++++++++++++++
 2 files changed, 594 insertions(+), 1 deletion(-)
 create mode 100644 src/views/demo/curd-demo.vue

diff --git a/package.json b/package.json
index 27df4214..21a6caa9 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.3.1",
+  "version": "3.4.0",
   "private": true,
   "type": "module",
   "scripts": {
diff --git a/src/views/demo/curd-demo.vue b/src/views/demo/curd-demo.vue
new file mode 100644
index 00000000..6f62b0dd
--- /dev/null
+++ b/src/views/demo/curd-demo.vue
@@ -0,0 +1,593 @@
+<template>
+  <div class="app-container h-full flex flex-1 flex-col">
+    <div class="mb-10">
+      <el-link
+        href="https://gitee.com/youlaiorg/vue3-element-admin/blob/master/src/views/demo/curd-demo.vue"
+        type="primary"
+        target="_blank"
+      >
+        整合版示例源码 请点击>>>>
+      </el-link>
+    </div>
+
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operate-click="handleOperateClick"
+      @filter-change="handleFilterChange"
+    >
+      <template #status="scope">
+        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+        </el-tag>
+      </template>
+      <template #gender="scope">
+        <DictLabel v-model="scope.row[scope.prop]" code="gender" />
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+      </template>
+    </page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    >
+      <template #gender="scope">
+        <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" />
+      </template>
+    </page-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import UserAPI from "@/api/system/user-api";
+import DeptAPI from "@/api/system/dept-api";
+import RoleAPI from "@/api/system/role-api";
+import type { UserForm, UserPageQuery } from "@/api/system/user-api";
+import type { IObject, IModalConfig, IContentConfig, ISearchConfig } from "@/components/CURD/types";
+import { DeviceEnum } from "@/enums/settings/device.enum";
+import { useAppStore } from "@/store";
+import usePage from "@/components/CURD/usePage";
+
+defineOptions({
+  name: "CurdDemo",
+  inheritAttrs: false,
+});
+
+// ========================= 选项数据管理 =========================
+interface OptionType {
+  label: string;
+  value: any;
+  [key: string]: any;
+}
+
+// 共享选项数据
+const deptArr = ref<OptionType[]>([]);
+const roleArr = ref<OptionType[]>([]);
+const stateArr = ref<OptionType[]>([
+  { label: "启用", value: 1 },
+  { label: "禁用", value: 0 },
+]);
+
+// 初始化选项数据
+const initOptions = async () => {
+  try {
+    const [dept, roles] = await Promise.all([DeptAPI.getOptions(), RoleAPI.getOptions()]);
+    deptArr.value = dept;
+    roleArr.value = roles;
+  } catch (error) {
+    console.error("初始化选项失败:", error);
+  }
+};
+
+// ========================= 搜索配置 =========================
+const searchConfig: ISearchConfig = reactive({
+  permPrefix: "sys:user",
+  formItems: [
+    {
+      tips: "支持模糊搜索",
+      type: "input",
+      label: "关键字",
+      prop: "keywords",
+      attrs: {
+        placeholder: "用户名/昵称/手机号",
+        clearable: true,
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "tree-select",
+      label: "部门",
+      prop: "deptId",
+      attrs: {
+        placeholder: "请选择",
+        data: deptArr,
+        filterable: true,
+        "check-strictly": true,
+        "render-after-expand": false,
+        clearable: true,
+        style: { width: "200px" },
+      },
+    },
+    {
+      type: "select",
+      label: "状态",
+      prop: "status",
+      attrs: {
+        placeholder: "全部",
+        clearable: true,
+        style: { width: "200px" },
+      },
+      options: stateArr,
+    },
+    {
+      type: "date-picker",
+      label: "创建时间",
+      prop: "createTime",
+      attrs: {
+        type: "daterange",
+        "range-separator": "~",
+        "start-placeholder": "开始时间",
+        "end-placeholder": "截止时间",
+        "value-format": "YYYY-MM-DD",
+        style: { width: "200px" },
+      },
+    },
+  ],
+});
+
+// ========================= 内容配置 =========================
+const contentConfig: IContentConfig<UserPageQuery> = reactive({
+  permPrefix: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  parseData(res: any) {
+    return {
+      total: res.total,
+      list: res.list,
+    };
+  },
+  indexAction(params: any) {
+    return UserAPI.getPage(params);
+  },
+  deleteAction: UserAPI.deleteByIds,
+  importAction(file: File) {
+    return UserAPI.import("1", file);
+  },
+  exportAction: UserAPI.export,
+  importTemplate: UserAPI.downloadTemplate,
+  importsAction(data: any) {
+    console.log("importsAction", data);
+    return Promise.resolve();
+  },
+  async exportsAction(params: any) {
+    const res = await UserAPI.getPage(params);
+    console.log("exportsAction", res.list);
+    return res.list;
+  },
+  pk: "id",
+  toolbar: [
+    "add",
+    "delete",
+    "import",
+    "export",
+    {
+      name: "custom1",
+      text: "自定义1",
+      perm: "add",
+      attrs: { icon: "plus", color: "#626AEF" },
+    },
+  ],
+  defaultToolbar: ["refresh", "filter", "imports", "exports", "search"],
+  cols: [
+    { type: "selection", width: 50, align: "center" },
+    { label: "编号", align: "center", prop: "id", width: 100, show: false },
+    { label: "用户名", align: "center", prop: "username" },
+    { label: "头像", align: "center", prop: "avatar", templet: "image" },
+    { label: "用户昵称", align: "center", prop: "nickname", width: 120 },
+    {
+      label: "性别",
+      align: "center",
+      prop: "gender",
+      width: 100,
+      templet: "custom",
+      slotName: "gender",
+    },
+    { label: "部门", align: "center", prop: "deptName", width: 120 },
+    {
+      label: "角色",
+      align: "center",
+      prop: "roleNames",
+      width: 120,
+      columnKey: "roleIds",
+      filters: [],
+      filterMultiple: true,
+      filterJoin: ",",
+      async initFn(colItem: any) {
+        const roleOptions = await RoleAPI.getOptions();
+        colItem.filters = roleOptions.map((item) => {
+          return { text: item.label, value: item.value };
+        });
+      },
+    },
+    {
+      label: "手机号码",
+      align: "center",
+      prop: "mobile",
+      templet: "custom",
+      slotName: "mobile",
+      width: 150,
+    },
+    {
+      label: "状态",
+      align: "center",
+      prop: "status",
+      templet: "custom",
+      slotName: "status",
+    },
+    { label: "创建时间", align: "center", prop: "createTime", width: 180 },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 280,
+      templet: "tool",
+      operat: [
+        {
+          name: "detail",
+          text: "详情",
+          attrs: { icon: "Document", type: "primary" },
+        },
+        {
+          name: "reset_pwd",
+          text: "重置密码",
+          attrs: {
+            icon: "refresh-left",
+            style: {
+              "--el-button-text-color": "#626AEF",
+              "--el-button-hover-link-text-color": "#9197f4",
+            },
+          },
+        },
+        "edit",
+        "delete",
+      ],
+    },
+  ],
+});
+
+// ========================= 新增配置 =========================
+const addModalConfig: IModalConfig<UserForm> = reactive({
+  permPrefix: "sys:user",
+  dialog: {
+    title: "新增用户",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 100,
+  },
+  formAction: UserAPI.create,
+  beforeSubmit(data: any) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "用户名",
+      prop: "username",
+      rules: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户名",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "用户昵称",
+      prop: "nickname",
+      rules: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户昵称",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "所属部门",
+      prop: "deptId",
+      rules: [{ required: true, message: "所属部门不能为空", trigger: "change" }],
+      type: "tree-select",
+      attrs: {
+        placeholder: "请选择所属部门",
+        data: deptArr,
+        filterable: true,
+        "check-strictly": true,
+        "render-after-expand": false,
+      },
+    },
+    {
+      type: "custom",
+      label: "性别",
+      prop: "gender",
+      initialValue: 1,
+      attrs: { style: { width: "100%" } },
+    },
+    {
+      label: "角色",
+      prop: "roleIds",
+      rules: [{ required: true, message: "用户角色不能为空", trigger: "change" }],
+      type: "select",
+      attrs: {
+        placeholder: "请选择",
+        multiple: true,
+      },
+      options: roleArr,
+      initialValue: [],
+    },
+    {
+      type: "input",
+      label: "手机号码",
+      prop: "mobile",
+      rules: [
+        {
+          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          message: "请输入正确的手机号码",
+          trigger: "blur",
+        },
+      ],
+      attrs: {
+        placeholder: "请输入手机号码",
+        maxlength: 11,
+      },
+    },
+    {
+      label: "邮箱",
+      prop: "email",
+      rules: [
+        {
+          pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
+          message: "请输入正确的邮箱地址",
+          trigger: "blur",
+        },
+      ],
+      type: "input",
+      attrs: {
+        placeholder: "请输入邮箱",
+        maxlength: 50,
+      },
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "radio",
+      options: [
+        { label: "正常", value: 1 },
+        { label: "禁用", value: 0 },
+      ],
+      initialValue: 1,
+    },
+  ],
+});
+
+// ========================= 编辑配置 =========================
+const editModalConfig: IModalConfig<UserForm> = reactive({
+  permPrefix: "sys:user",
+  component: "drawer",
+  drawer: {
+    title: "修改用户",
+    size: useAppStore().device === DeviceEnum.MOBILE ? "80%" : 500,
+  },
+  pk: "id",
+  beforeSubmit(data: any) {
+    console.log("beforeSubmit", data);
+  },
+  formAction(data: any) {
+    return UserAPI.update(data.id as string, data);
+  },
+  formItems: [
+    {
+      label: "用户名",
+      prop: "username",
+      rules: [{ required: true, message: "用户名不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户名",
+        readonly: true,
+      },
+    },
+    {
+      label: "用户昵称",
+      prop: "nickname",
+      rules: [{ required: true, message: "用户昵称不能为空", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户昵称",
+      },
+    },
+    {
+      label: "所属部门",
+      prop: "deptId",
+      rules: [{ required: true, message: "所属部门不能为空", trigger: "blur" }],
+      type: "tree-select",
+      attrs: {
+        placeholder: "请选择所属部门",
+        data: deptArr,
+        filterable: true,
+        "check-strictly": true,
+        "render-after-expand": false,
+      },
+    },
+    {
+      type: "custom",
+      label: "性别",
+      prop: "gender",
+      initialValue: 1,
+      attrs: { style: { width: "100%" } },
+    },
+    {
+      label: "角色",
+      prop: "roleIds",
+      rules: [{ required: true, message: "用户角色不能为空", trigger: "blur" }],
+      type: "select",
+      attrs: {
+        placeholder: "请选择",
+        multiple: true,
+      },
+      options: roleArr,
+      initialValue: [],
+    },
+    {
+      type: "input",
+      label: "手机号码",
+      prop: "mobile",
+      rules: [
+        {
+          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          message: "请输入正确的手机号码",
+          trigger: "blur",
+        },
+      ],
+      attrs: {
+        placeholder: "请输入手机号码",
+        maxlength: 11,
+      },
+    },
+    {
+      label: "邮箱",
+      prop: "email",
+      rules: [
+        {
+          pattern: /\w[-\w.+]*@([A-Za-z0-9][-A-Za-z0-9]+\.)+[A-Za-z]{2,14}/,
+          message: "请输入正确的邮箱地址",
+          trigger: "blur",
+        },
+      ],
+      type: "input",
+      attrs: {
+        placeholder: "请输入邮箱",
+        maxlength: 50,
+      },
+    },
+    {
+      label: "状态",
+      prop: "status",
+      type: "switch",
+      attrs: {
+        inlinePrompt: true,
+        activeText: "正常",
+        inactiveText: "禁用",
+        activeValue: 1,
+        inactiveValue: 0,
+      },
+    },
+  ],
+});
+
+// ========================= 页面逻辑 =========================
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  handleAddClick,
+  handleEditClick,
+  handleViewClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 其他工具栏
+function handleToolbarClick(name: string) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+
+// 表格工具栏
+const handleOperateClick = (data: IObject) => {
+  if (data.name === "detail") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "查看" };
+    handleViewClick(data.row, async () => {
+      return await UserAPI.getFormData(data.row.id);
+    });
+  } else if (data.name === "edit") {
+    editModalConfig.drawer = { ...editModalConfig.drawer, title: "修改" };
+    handleEditClick(data.row, async () => {
+      return await UserAPI.getFormData(data.row.id);
+    });
+  } else if (data.name === "reset_pwd") {
+    ElMessageBox.prompt("请输入用户「" + data.row.username + "」的新密码", "重置密码", {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+    })
+      .then(({ value }: any) => {
+        if (!value || value.length < 6) {
+          ElMessage.warning("密码至少需要6位字符，请重新输入");
+          return false;
+        }
+        UserAPI.resetPassword(data.row.id, value).then(() => {
+          ElMessage.success("密码重置成功，新密码是：" + value);
+        });
+      })
+      .catch(() => {});
+  }
+};
+
+// 初始化
+onMounted(() => {
+  initOptions();
+});
+</script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+</style>

From 889346a9ec619204780cd0cf1f8fed57052fd166 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 17 Sep 2025 09:27:43 +0800
Subject: [PATCH 476/497] =?UTF-8?q?fix:=20:bug:=20ts=20=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/index.ts                 | 3 ++-
 src/composables/websocket/useDictSync.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/composables/index.ts b/src/composables/index.ts
index 59c5e4b5..f9b4df02 100644
--- a/src/composables/index.ts
+++ b/src/composables/index.ts
@@ -1,5 +1,6 @@
 export { useStomp } from "./websocket/useStomp";
-export { useDictSync, DictMessage } from "./websocket/useDictSync";
+export { useDictSync } from "./websocket/useDictSync";
+export type { DictMessage } from "./websocket/useDictSync";
 export { useOnlineCount } from "./websocket/useOnlineCount";
 
 export { useLayout } from "./layout/useLayout";
diff --git a/src/composables/websocket/useDictSync.ts b/src/composables/websocket/useDictSync.ts
index 345751bd..77a9c8e4 100644
--- a/src/composables/websocket/useDictSync.ts
+++ b/src/composables/websocket/useDictSync.ts
@@ -89,7 +89,7 @@ function createDictSyncHook() {
     }
 
     // 取消所有订阅
-    subscriptionIds.value.forEach((id) => {
+    subscriptionIds.value.forEach((id: string) => {
       unsubscribe(id);
     });
     subscriptionIds.value = [];
@@ -182,7 +182,7 @@ function createDictSyncHook() {
       console.log(`[DictSync] 字典缓存已清除: ${dictCode}`);
 
       // 调用所有注册的回调函数
-      messageCallbacks.value.forEach((callback) => {
+      messageCallbacks.value.forEach((callback: DictMessageCallback) => {
         try {
           callback(parsedData);
         } catch (callbackError) {

From e1db4345a16c6e35829758d26ddcd3bafc6a75fc Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Wed, 17 Sep 2025 10:44:54 +0800
Subject: [PATCH 477/497] =?UTF-8?q?docs:=20:memo:=20=E6=9B=B4=E6=96=B0read?=
 =?UTF-8?q?me?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

更新readme
---
 README.en-US.md | 6 +++---
 README.md       | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.en-US.md b/README.en-US.md
index d87a2d85..a534f0d4 100644
--- a/README.en-US.md
+++ b/README.en-US.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.18-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-7.0.6-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.10.5-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.21-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-7.1.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.11.2-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/README.md b/README.md
index ae020a1b..5a2a93db 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.18-brightgreen.svg"/>
-  <img src="https://img.shields.io/badge/Vite-7.0.6-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.10.5-blue.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.21-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vite-7.1.5-green.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.11.2-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>

From ef23daf3b1c3dd584eaa89282e5b3d747be35c55 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 17 Sep 2025 15:38:36 +0800
Subject: [PATCH 478/497] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=20ts?=
 =?UTF-8?q?=20=E7=B1=BB=E5=9E=8B=E8=AD=A6=E5=91=8A=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layouts/modes/mix/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/layouts/modes/mix/index.vue b/src/layouts/modes/mix/index.vue
index 02c40659..4f8cb4de 100644
--- a/src/layouts/modes/mix/index.vue
+++ b/src/layouts/modes/mix/index.vue
@@ -115,7 +115,7 @@ function resolvePath(routePath: string) {
 // 监听路由变化，确保左侧菜单能随TagsView切换而正确激活
 watch(
   () => route.path,
-  (newPath) => {
+  (newPath: string) => {
     // 获取顶级路径
     const topMenuPath =
       newPath.split("/").filter(Boolean).length > 1 ? newPath.match(/^\/[^/]+/)?.[0] || "/" : "/";

From 048845ccb1767f52facc4d838a5d4265b7d8cf58 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 17 Sep 2025 15:41:48 +0800
Subject: [PATCH 479/497] =?UTF-8?q?feat(CURD):=20=E6=94=AF=E6=8C=81PageSea?=
 =?UTF-8?q?rch=E7=BB=84=E4=BB=B6=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8F=92?=
 =?UTF-8?q?=E6=A7=BD=EF=BC=8C=E5=A2=9E=E5=BC=BA=E8=A1=A8=E5=8D=95=E9=A1=B9?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- PageSearch.vue: 新增custom类型支持，允许通过插槽渲染自定义组件
- types.ts: ISearchComponent类型新增'custom'选项，支持字典等复杂组件集成
---
 src/components/CURD/PageSearch.vue | 10 +++++++++-
 src/components/CURD/types.ts       |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/CURD/PageSearch.vue b/src/components/CURD/PageSearch.vue
index 8f42a554..1cdb4610 100644
--- a/src/components/CURD/PageSearch.vue
+++ b/src/components/CURD/PageSearch.vue
@@ -19,8 +19,16 @@
               </span>
             </template>
 
+            <!-- 自定义插槽 -->
+            <slot
+              v-if="item.type === 'custom'"
+              :name="item.slotName"
+              :form-data="queryParams"
+              :prop="item.prop"
+              :attrs="{ style: { width: '100%' }, ...item.attrs }"
+            />
             <el-cascader
-              v-if="item.type === 'cascader'"
+              v-else-if="item.type === 'cascader'"
               v-model.trim="queryParams[item.prop]"
               v-bind="{ style: { width: '100%' }, ...item.attrs }"
               v-on="item.events || {}"
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index d7775873..a5fe55ec 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -14,7 +14,7 @@ export type IObject = Record<string, any>;
 type DateComponent = "date-picker" | "time-picker" | "time-select" | "custom-tag" | "input-tag";
 type InputComponent = "input" | "select" | "input-number" | "cascader" | "tree-select";
 type OtherComponent = "text" | "radio" | "checkbox" | "switch" | "icon-select" | "custom";
-export type ISearchComponent = DateComponent | InputComponent;
+export type ISearchComponent = DateComponent | InputComponent | "custom";
 export type IComponentType = DateComponent | InputComponent | OtherComponent;
 
 type ToolbarLeft = "add" | "delete" | "import" | "export";

From 26a7b1a15ed283e781f89b6b5c0090c742694698 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Wed, 17 Sep 2025 16:01:49 +0800
Subject: [PATCH 480/497] =?UTF-8?q?docs:=20=E4=BC=98=E5=8C=96README?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E5=87=86=E5=A4=87=E8=A1=A8=E6=A0=BC=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修正表格对齐格式，提升可读性
- 新增pnpm包管理器版本要求
- 优化Node.js版本描述，使用代码格式
- 完善开发工具推荐，增加插件建议
---
 README.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 5a2a93db..a203d33a 100644
--- a/README.md
+++ b/README.md
@@ -79,10 +79,10 @@
 |---------------|--------------------|
 | 视频教程 | [https://www.bilibili.com/video/BV1eFUuYyEFj](https://www.bilibili.com/video/BV1eFUuYyEFj)  |
 | 项目搭建  | [基于 Vue3 + Vite + TypeScript + Element-Plus 从0到1搭建后台管理系统](https://blog.csdn.net/u013737132/article/details/130191394)  |
-| 官方文档 | [https://www.youlai.tech/vue3-element-admin/](https://www.youlai.tech/vue3-element-admin/)  |
+| 官方文档 | [https://www.youlai.tech/vue3-element-admin](https://www.youlai.tech/vue3-element-admin/)  |
 | 代码规范     | [ESLint V9 + Prettier + Stylelint + EditorConfig 约束和统一前端代码规范](https://youlai.blog.csdn.net/article/details/145608723) |
 | 提交规范 | [Husky + Lint-staged + Commitlint + Commitizen + cz-git 配置 Git 提交规范](https://youlai.blog.csdn.net/article/details/145615236) |
-| 接口文档 | [https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
+| 接口文档 | [https://www.apifox.cn](https://www.apifox.cn/apidoc/shared-195e783f-4d85-4235-a038-eec696de4ea5) |
 
 
 
@@ -90,10 +90,11 @@
 
 - **环境准备**
 
-| 环境类型       | 名称                     |     备注          |
-|----------------|---------------|----------- |
-| **开发工具**   | [Visual Studio Code](https://code.visualstudio.com/Download) |
-| **运行环境**   | ^20.19.0 || >=22.12.0  |    20.19.0+ 或 22.12.0 及以上版本   |
+| 环境类型 | 版本要求 | 备注 |
+|---------|---------|------|
+| **Node.js** | `^20.19.0` 或 `>=22.12.0` | 推荐使用 LTS 版本（主版本为偶数） |
+| **包管理器** | `pnpm >= 8.0.0` | 项目使用 pnpm 作为包管理器 |
+| **开发工具** | [Visual Studio Code](https://code.visualstudio.com/Download) | 推荐安装 Vue、TypeScript 相关插件 |
 
 
 - **快速开始**

From fc6537d71b391842ec47b2189eb0112150149206 Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Thu, 18 Sep 2025 15:00:39 +0800
Subject: [PATCH 481/497] =?UTF-8?q?refactor(Upload):=20:recycle:=20?=
 =?UTF-8?q?=E5=8D=95=E5=9B=BE=E7=89=87=E6=94=AF=E6=8C=81=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/SingleImageUpload.vue | 47 ++++++++++++---------
 1 file changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index 72e7551d..b6759e36 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -12,13 +12,22 @@
     :on-error="onError"
   >
     <template #default>
-      <el-image v-if="modelValue" :src="http://github.com/modelValue" />
-      <el-icon v-if="modelValue" class="single-upload__delete-btn" @click.stop="handleDelete">
-        <CircleCloseFilled />
-      </el-icon>
-      <el-icon v-else class="single-upload__add-btn">
-        <Plus />
-      </el-icon>
+      <template v-if="modelValue">
+        <el-image
+          class="single-upload__image"
+          :src="http://github.com/modelValue"
+          :preview-src-list="[modelValue]"
+          @click.stop="handlePreview"
+        />
+        <el-icon class="single-upload__delete-btn" @click.stop="handleDelete">
+          <CircleCloseFilled />
+        </el-icon>
+      </template>
+      <template v-else>
+        <el-icon>
+          <Plus />
+        </el-icon>
+      </template>
     </template>
   </el-upload>
 </template>
@@ -138,6 +147,13 @@ function handleUpload(options: UploadRequestOptions) {
   });
 }
 
+/**
+ * 预览图片
+ */
+function handlePreview() {
+  console.log("预览图片,停止冒泡");
+}
+
 /**
  * 删除图片
  */
@@ -166,21 +182,14 @@ const onError = (error: any) => {
 
 <style scoped lang="scss">
 :deep(.el-upload--picture-card) {
-  width: v-bind("props.style.width");
-  height: v-bind("props.style.height");
+  position: relative;
+  width: v-bind("props.style.width ?? '150px'");
+  height: v-bind("props.style.height ?? '150px'");
 }
 
 .single-upload {
-  position: relative;
-  width: v-bind("props.style.width");
-  height: v-bind("props.style.height");
-  overflow: hidden;
-  cursor: pointer;
-  border: 1px var(--el-border-color) solid;
-  border-radius: 5px;
-
-  &:hover {
-    border-color: var(--el-color-primary);
+  &__image {
+    border-radius: 6px;
   }
 
   &__delete-btn {

From 4972173cf936f1ae49ad735c2113401052027739 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 19 Sep 2025 14:27:22 +0800
Subject: [PATCH 482/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=20directive=20=E6=8C=87=E4=BB=A4=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/{directive => directives}/index.ts            | 0
 src/{directive => directives}/permission/index.ts | 0
 src/plugins/index.ts                              | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename src/{directive => directives}/index.ts (100%)
 rename src/{directive => directives}/permission/index.ts (100%)

diff --git a/src/directive/index.ts b/src/directives/index.ts
similarity index 100%
rename from src/directive/index.ts
rename to src/directives/index.ts
diff --git a/src/directive/permission/index.ts b/src/directives/permission/index.ts
similarity index 100%
rename from src/directive/permission/index.ts
rename to src/directives/permission/index.ts
diff --git a/src/plugins/index.ts b/src/plugins/index.ts
index 99077563..96f32b85 100644
--- a/src/plugins/index.ts
+++ b/src/plugins/index.ts
@@ -1,6 +1,6 @@
 import type { App } from "vue";
 
-import { setupDirective } from "@/directive";
+import { setupDirective } from "@/directives";
 import { setupI18n } from "@/lang";
 import { setupRouter } from "@/router";
 import { setupStore } from "@/store";

From 7bda1a7cc40c11c16b2d56a6c57b5d0ac88d14b2 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Fri, 19 Sep 2025 21:03:38 +0800
Subject: [PATCH 483/497] =?UTF-8?q?refactor:=20:recycle:=20=E8=A7=84?=
 =?UTF-8?q?=E8=8C=83=E5=B8=B8=E9=87=8F=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/constants/index.ts | 136 ++++++++++++++---------------------------
 src/utils/storage.ts   |  50 +++++++++++++++
 2 files changed, 95 insertions(+), 91 deletions(-)

diff --git a/src/constants/index.ts b/src/constants/index.ts
index c9797b4e..8947c8f3 100644
--- a/src/constants/index.ts
+++ b/src/constants/index.ts
@@ -1,118 +1,72 @@
 /**
  * 项目常量统一管理
- *
- * 存储键命名规范：
- * - 使用小写 + 冒号分隔 + 名称空间
- * - 格式：myapp:user:token
- * - 便于清理和避免冲突
- * - 当需要版本升级、兼容旧数据，可在 key 中加入版本如 myapp:v2:user:token。
+ * 存储键命名规范：{prefix}:{namespace}:{key}
  */
 
-// 🏷️ 应用前缀常量
 export const APP_PREFIX = "vea";
 
-// 📦 存储键统一管理
 export const STORAGE_KEYS = {
-  // 🔐 用户认证相关
-  ACCESS_TOKEN: `${APP_PREFIX}:auth:access_token`, // JWT 访问令牌，用于 API 请求认证
-  REFRESH_TOKEN: `${APP_PREFIX}:auth:refresh_token`, // JWT 刷新令牌，用于获取新的访问令牌
-  REMEMBER_ME: `${APP_PREFIX}:auth:remember_me`, // 记住登录状态，控制登录持久化
-
-  // 🏗️ 系统核心相关
-  DICT_CACHE: `${APP_PREFIX}:system:dict_cache`, // 字典数据缓存，存储系统字典配置信息
-
-  // 🎨 系统设置相关
-  SHOW_TAGS_VIEW: `${APP_PREFIX}:ui:show_tags_view`, // 是否显示标签页视图
-  SHOW_APP_LOGO: `${APP_PREFIX}:ui:show_app_logo`, // 是否显示应用 Logo
-  SHOW_WATERMARK: `${APP_PREFIX}:ui:show_watermark`, // 是否显示水印
-  LAYOUT: `${APP_PREFIX}:ui:layout`, // 布局模式：vertical(垂直) | horizontal(水平) | mix(混合)
-  SIDEBAR_COLOR_SCHEME: `${APP_PREFIX}:ui:sidebar_color_scheme`, // 侧边栏颜色方案：light(浅色) | dark(深色)
-  THEME: `${APP_PREFIX}:ui:theme`, // 主题模式：light(浅色) | dark(深色) | auto(自动)
-  THEME_COLOR: `${APP_PREFIX}:ui:theme_color`, // 主题色，用于自定义主题色彩
-
-  // 📱 应用状态相关
-  DEVICE: `${APP_PREFIX}:app:device`, // 设备类型：desktop(桌面) | mobile(移动端) | tablet(平板)
-  SIZE: `${APP_PREFIX}:app:size`, // 屏幕尺寸：large(大) | medium(中) | small(小)
-  LANGUAGE: `${APP_PREFIX}:app:language`, // 应用语言：zh-CN(中文) | en-US(英文) 等
-  SIDEBAR_STATUS: `${APP_PREFIX}:app:sidebar_status`, // 侧边栏状态：opened(展开) | closed(收起)
+  // 用户认证相关
+  ACCESS_TOKEN: `${APP_PREFIX}:auth:access_token`, // JWT访问令牌
+  REFRESH_TOKEN: `${APP_PREFIX}:auth:refresh_token`, // JWT刷新令牌
+  REMEMBER_ME: `${APP_PREFIX}:auth:remember_me`, // 记住登录状态
+
+  // 系统核心相关
+  DICT_CACHE: `${APP_PREFIX}:system:dict_cache`, // 字典数据缓存
+
+  // UI设置相关
+  SHOW_TAGS_VIEW: `${APP_PREFIX}:ui:show_tags_view`, // 显示标签页视图
+  SHOW_APP_LOGO: `${APP_PREFIX}:ui:show_app_logo`, // 显示应用Logo
+  SHOW_WATERMARK: `${APP_PREFIX}:ui:show_watermark`, // 显示水印
+  LAYOUT: `${APP_PREFIX}:ui:layout`, // 布局模式
+  SIDEBAR_COLOR_SCHEME: `${APP_PREFIX}:ui:sidebar_color_scheme`, // 侧边栏配色方案
+  THEME: `${APP_PREFIX}:ui:theme`, // 主题模式
+  THEME_COLOR: `${APP_PREFIX}:ui:theme_color`, // 主题色
+
+  // 应用状态相关
+  DEVICE: `${APP_PREFIX}:app:device`, // 设备类型
+  SIZE: `${APP_PREFIX}:app:size`, // 屏幕尺寸
+  LANGUAGE: `${APP_PREFIX}:app:language`, // 应用语言
+  SIDEBAR_STATUS: `${APP_PREFIX}:app:sidebar_status`, // 侧边栏状态
   ACTIVE_TOP_MENU_PATH: `${APP_PREFIX}:app:active_top_menu_path`, // 当前激活的顶部菜单路径
 } as const;
 
-// 🎯 功能分组的键映射对象（向后兼容）
-// 这些分组对象提供了按功能分类的存储键访问方式，便于在特定场景下批量操作
-
-// 👤 用户角色相关
-export const ROLE_ROOT = "ROOT"; // 超级管理员角色标识
+export const ROLE_ROOT = "ROOT"; // 超级管理员角色
 
-// 🔐 认证相关键集合
-// 包含所有与用户认证、授权相关的存储键
+// 分组键集合（便于批量操作）
 export const AUTH_KEYS = {
-  ACCESS_TOKEN: STORAGE_KEYS.ACCESS_TOKEN, // JWT 访问令牌
-  REFRESH_TOKEN: STORAGE_KEYS.REFRESH_TOKEN, // JWT 刷新令牌
-  REMEMBER_ME: STORAGE_KEYS.REMEMBER_ME, // 记住登录状态
+  ACCESS_TOKEN: STORAGE_KEYS.ACCESS_TOKEN,
+  REFRESH_TOKEN: STORAGE_KEYS.REFRESH_TOKEN,
+  REMEMBER_ME: STORAGE_KEYS.REMEMBER_ME,
 } as const;
 
-// 🏗️ 系统核心相关键集合
-// 包含系统核心功能相关的存储键
 export const SYSTEM_KEYS = {
-  DICT_CACHE: STORAGE_KEYS.DICT_CACHE, // 字典数据缓存
+  DICT_CACHE: STORAGE_KEYS.DICT_CACHE,
 } as const;
 
-// 🎨 设置相关键集合
-// 包含所有用户界面设置和主题相关的存储键
 export const SETTINGS_KEYS = {
-  SHOW_TAGS_VIEW: STORAGE_KEYS.SHOW_TAGS_VIEW, // 是否显示标签页视图
-  SHOW_APP_LOGO: STORAGE_KEYS.SHOW_APP_LOGO, // 是否显示应用 Logo
-  SHOW_WATERMARK: STORAGE_KEYS.SHOW_WATERMARK, // 是否显示水印
-  SIDEBAR_COLOR_SCHEME: STORAGE_KEYS.SIDEBAR_COLOR_SCHEME, // 侧边栏颜色方案
-  LAYOUT: STORAGE_KEYS.LAYOUT, // 布局模式
-  THEME_COLOR: STORAGE_KEYS.THEME_COLOR, // 主题色
-  THEME: STORAGE_KEYS.THEME, // 主题模式
+  SHOW_TAGS_VIEW: STORAGE_KEYS.SHOW_TAGS_VIEW,
+  SHOW_APP_LOGO: STORAGE_KEYS.SHOW_APP_LOGO,
+  SHOW_WATERMARK: STORAGE_KEYS.SHOW_WATERMARK,
+  SIDEBAR_COLOR_SCHEME: STORAGE_KEYS.SIDEBAR_COLOR_SCHEME,
+  LAYOUT: STORAGE_KEYS.LAYOUT,
+  THEME_COLOR: STORAGE_KEYS.THEME_COLOR,
+  THEME: STORAGE_KEYS.THEME,
 } as const;
 
-// 📱 应用状态相关键集合
-// 包含应用运行时状态相关的存储键
 export const APP_KEYS = {
-  DEVICE: STORAGE_KEYS.DEVICE, // 设备类型
-  SIZE: STORAGE_KEYS.SIZE, // 屏幕尺寸
-  LANGUAGE: STORAGE_KEYS.LANGUAGE, // 应用语言
-  SIDEBAR_STATUS: STORAGE_KEYS.SIDEBAR_STATUS, // 侧边栏状态
-  ACTIVE_TOP_MENU_PATH: STORAGE_KEYS.ACTIVE_TOP_MENU_PATH, // 当前激活的顶部菜单路径
+  DEVICE: STORAGE_KEYS.DEVICE,
+  SIZE: STORAGE_KEYS.SIZE,
+  LANGUAGE: STORAGE_KEYS.LANGUAGE,
+  SIDEBAR_STATUS: STORAGE_KEYS.SIDEBAR_STATUS,
+  ACTIVE_TOP_MENU_PATH: STORAGE_KEYS.ACTIVE_TOP_MENU_PATH,
 } as const;
 
-// 📦 所有存储键的统一集合
-// 包含所有存储键的完整映射，用于批量操作或遍历
 export const ALL_STORAGE_KEYS = {
-  ...AUTH_KEYS, // 认证相关键
-  ...SYSTEM_KEYS, // 系统核心键
-  ...SETTINGS_KEYS, // 设置相关键
-  ...APP_KEYS, // 应用状态键
+  ...AUTH_KEYS,
+  ...SYSTEM_KEYS,
+  ...SETTINGS_KEYS,
+  ...APP_KEYS,
 } as const;
 
-// 🔧 类型定义
 export type StorageKey = (typeof STORAGE_KEYS)[keyof typeof STORAGE_KEYS];
-
-// 🧹 存储清理工具
-export const STORAGE_UTILS = {
-  // 清理所有项目相关的存储
-  clearAll: () => {
-    const keys = Object.values(STORAGE_KEYS);
-    keys.forEach((key) => {
-      localStorage.removeItem(key);
-      sessionStorage.removeItem(key);
-    });
-  },
-
-  // 清理特定分类的存储
-  clearByCategory: (category: "auth" | "system" | "ui" | "app") => {
-    const prefix = `${APP_PREFIX}:${category}:`;
-    const keys = Object.values(STORAGE_KEYS).filter((key) => key.startsWith(prefix));
-    keys.forEach((key) => {
-      localStorage.removeItem(key);
-      sessionStorage.removeItem(key);
-    });
-  },
-
-  // 获取所有项目相关的存储键
-  getAllKeys: () => Object.values(STORAGE_KEYS),
-} as const;
diff --git a/src/utils/storage.ts b/src/utils/storage.ts
index 25bf6f30..75d5e3fe 100644
--- a/src/utils/storage.ts
+++ b/src/utils/storage.ts
@@ -1,3 +1,5 @@
+import { STORAGE_KEYS, APP_PREFIX } from "@/constants";
+
 /**
  * 存储工具类
  * 提供localStorage和sessionStorage操作方法
@@ -48,4 +50,52 @@ export class Storage {
   static sessionRemove(key: string): void {
     sessionStorage.removeItem(key);
   }
+
+  /**
+   * 存储清理工具方法
+   */
+  // 清理指定键的存储（localStorage + sessionStorage）
+  static clear(key: string): void {
+    localStorage.removeItem(key);
+    sessionStorage.removeItem(key);
+  }
+
+  // 批量清理存储
+  static clearMultiple(keys: string[]): void {
+    keys.forEach((key) => {
+      localStorage.removeItem(key);
+      sessionStorage.removeItem(key);
+    });
+  }
+
+  // 清理指定前缀的存储
+  static clearByPrefix(prefix: string): void {
+    // localStorage 清理
+    const localKeys = Object.keys(localStorage).filter((key) => key.startsWith(prefix));
+    localKeys.forEach((key) => localStorage.removeItem(key));
+
+    // sessionStorage 清理
+    const sessionKeys = Object.keys(sessionStorage).filter((key) => key.startsWith(prefix));
+    sessionKeys.forEach((key) => sessionStorage.removeItem(key));
+  }
+
+  /**
+   * 项目特定的清理便利方法
+   */
+  // 清理所有项目相关的存储
+  static clearAllProject(): void {
+    const keys = Object.values(STORAGE_KEYS);
+    this.clearMultiple(keys);
+  }
+
+  // 清理特定分类的存储
+  static clearByCategory(category: "auth" | "system" | "ui" | "app"): void {
+    const prefix = `${APP_PREFIX}:${category}:`;
+    this.clearByPrefix(prefix);
+  }
+
+  // 获取所有项目相关的存储键
+  static getAllProjectKeys(): string[] {
+    return Object.values(STORAGE_KEYS);
+  }
 }

From 39f124ed61a63496b239faeeeb6809cfb2804f3d Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sun, 21 Sep 2025 10:00:25 +0800
Subject: [PATCH 484/497] =?UTF-8?q?refactor(enum):=20:recycle:=20=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E6=9E=9A=E4=B8=BE=E5=91=BD=E5=90=8D=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/enums/api/{result.enum.ts => code-enum.ts}        | 0
 src/enums/codegen/{form.enum.ts => form-enum.ts}      | 0
 src/enums/codegen/{query.enum.ts => query-enum.ts}    | 0
 src/enums/settings/{device.enum.ts => device-enum.ts} | 0
 src/enums/settings/{layout.enum.ts => layout-enum.ts} | 0
 src/enums/settings/{locale.enum.ts => locale-enum.ts} | 0
 src/enums/settings/{theme.enum.ts => theme-enum.ts}   | 0
 src/enums/system/{menu.enum.ts => menu-enum.ts}       | 0
 8 files changed, 0 insertions(+), 0 deletions(-)
 rename src/enums/api/{result.enum.ts => code-enum.ts} (100%)
 rename src/enums/codegen/{form.enum.ts => form-enum.ts} (100%)
 rename src/enums/codegen/{query.enum.ts => query-enum.ts} (100%)
 rename src/enums/settings/{device.enum.ts => device-enum.ts} (100%)
 rename src/enums/settings/{layout.enum.ts => layout-enum.ts} (100%)
 rename src/enums/settings/{locale.enum.ts => locale-enum.ts} (100%)
 rename src/enums/settings/{theme.enum.ts => theme-enum.ts} (100%)
 rename src/enums/system/{menu.enum.ts => menu-enum.ts} (100%)

diff --git a/src/enums/api/result.enum.ts b/src/enums/api/code-enum.ts
similarity index 100%
rename from src/enums/api/result.enum.ts
rename to src/enums/api/code-enum.ts
diff --git a/src/enums/codegen/form.enum.ts b/src/enums/codegen/form-enum.ts
similarity index 100%
rename from src/enums/codegen/form.enum.ts
rename to src/enums/codegen/form-enum.ts
diff --git a/src/enums/codegen/query.enum.ts b/src/enums/codegen/query-enum.ts
similarity index 100%
rename from src/enums/codegen/query.enum.ts
rename to src/enums/codegen/query-enum.ts
diff --git a/src/enums/settings/device.enum.ts b/src/enums/settings/device-enum.ts
similarity index 100%
rename from src/enums/settings/device.enum.ts
rename to src/enums/settings/device-enum.ts
diff --git a/src/enums/settings/layout.enum.ts b/src/enums/settings/layout-enum.ts
similarity index 100%
rename from src/enums/settings/layout.enum.ts
rename to src/enums/settings/layout-enum.ts
diff --git a/src/enums/settings/locale.enum.ts b/src/enums/settings/locale-enum.ts
similarity index 100%
rename from src/enums/settings/locale.enum.ts
rename to src/enums/settings/locale-enum.ts
diff --git a/src/enums/settings/theme.enum.ts b/src/enums/settings/theme-enum.ts
similarity index 100%
rename from src/enums/settings/theme.enum.ts
rename to src/enums/settings/theme-enum.ts
diff --git a/src/enums/system/menu.enum.ts b/src/enums/system/menu-enum.ts
similarity index 100%
rename from src/enums/system/menu.enum.ts
rename to src/enums/system/menu-enum.ts

From 9479feaba37087e5aa6e05e4a962478e0e88ac08 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 22 Sep 2025 16:52:26 +0800
Subject: [PATCH 485/497] =?UTF-8?q?fix(enum):=20:bug:=20=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9E=9A=E4=B8=BE=E6=96=87=E4=BB=B6=E9=87=8D?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=E5=AF=BC=E5=85=A5=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                      |  3 +--
 src/api/system/menu-api.ts                       |  2 +-
 src/components/Hamburger/index.vue               |  4 ++--
 src/components/LangSelect/index.vue              |  2 +-
 src/components/SizeSelect/index.vue              |  2 +-
 src/composables/layout/useDeviceDetection.ts     |  2 +-
 src/enums/api/code-enum.ts                       |  4 ++--
 src/enums/index.ts                               | 16 ++++++++--------
 src/layouts/components/Menu/BasicMenu.vue        |  2 +-
 src/layouts/components/Menu/MixTopMenu.vue       |  2 +-
 .../NavBar/components/NavbarActions.vue          |  4 ++--
 src/layouts/index.vue                            |  2 +-
 src/store/modules/app-store.ts                   |  4 ++--
 src/store/modules/settings-store.ts              |  4 ++--
 src/types/global.d.ts                            |  2 +-
 src/utils/request.ts                             |  8 ++++----
 src/views/codegen/index.vue                      |  4 ++--
 src/views/demo/curd-demo.vue                     |  2 +-
 src/views/demo/curd/config/edit.ts               |  2 +-
 src/views/demo/curd/config2/edit.ts              |  2 +-
 src/views/system/menu/index.vue                  |  4 ++--
 src/views/system/role/index.vue                  |  2 +-
 src/views/system/user/components/UserImport.vue  |  4 ++--
 src/views/system/user/index.vue                  |  2 +-
 24 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 7a5f3ff6..b014e1d6 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -15,8 +15,7 @@
 <script setup lang="ts">
 import { useAppStore, useSettingsStore } from "@/store";
 import { defaultSettings } from "@/settings";
-import { ThemeMode } from "@/enums/settings/theme.enum";
-import { ComponentSize } from "@/enums/settings/layout.enum";
+import { ThemeMode, ComponentSize } from "@/enums";
 
 const appStore = useAppStore();
 const settingsStore = useSettingsStore();
diff --git a/src/api/system/menu-api.ts b/src/api/system/menu-api.ts
index b4be9d35..a568a96f 100644
--- a/src/api/system/menu-api.ts
+++ b/src/api/system/menu-api.ts
@@ -42,7 +42,7 @@ export interface MenuQuery {
   /** 搜索关键字 */
   keywords?: string;
 }
-import type { MenuTypeEnum } from "@/enums/system/menu.enum";
+import type { MenuTypeEnum } from "@/enums/system/menu-enum";
 export interface MenuVO {
   /** 子菜单 */
   children?: MenuVO[];
diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 1ad9db84..9955af61 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -6,8 +6,8 @@
 
 <script setup lang="ts">
 import { useSettingsStore } from "@/store";
-import { ThemeMode, SidebarColor } from "@/enums/settings/theme.enum";
-import { LayoutMode } from "@/enums/settings/layout.enum";
+import { ThemeMode, SidebarColor } from "@/enums/settings/theme-enum";
+import { LayoutMode } from "@/enums/settings/layout-enum";
 
 defineProps({
   isActive: { type: Boolean, required: true },
diff --git a/src/components/LangSelect/index.vue b/src/components/LangSelect/index.vue
index 3c366bcb..7fcdb607 100644
--- a/src/components/LangSelect/index.vue
+++ b/src/components/LangSelect/index.vue
@@ -18,7 +18,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { LanguageEnum } from "@/enums/settings/locale.enum";
+import { LanguageEnum } from "@/enums/settings/locale-enum";
 
 defineProps({
   size: {
diff --git a/src/components/SizeSelect/index.vue b/src/components/SizeSelect/index.vue
index d24fe776..8b150ebe 100644
--- a/src/components/SizeSelect/index.vue
+++ b/src/components/SizeSelect/index.vue
@@ -20,7 +20,7 @@
 </template>
 
 <script setup lang="ts">
-import { ComponentSize } from "@/enums/settings/layout.enum";
+import { ComponentSize } from "@/enums/settings/layout-enum";
 import { useAppStore } from "@/store/modules/app-store";
 
 const { t } = useI18n();
diff --git a/src/composables/layout/useDeviceDetection.ts b/src/composables/layout/useDeviceDetection.ts
index 8fe9513b..ccb735ca 100644
--- a/src/composables/layout/useDeviceDetection.ts
+++ b/src/composables/layout/useDeviceDetection.ts
@@ -1,7 +1,7 @@
 import { watchEffect, computed } from "vue";
 import { useWindowSize } from "@vueuse/core";
 import { useAppStore } from "@/store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 /**
  * 设备检测和响应式处理
diff --git a/src/enums/api/code-enum.ts b/src/enums/api/code-enum.ts
index 349a6289..6afe5904 100644
--- a/src/enums/api/code-enum.ts
+++ b/src/enums/api/code-enum.ts
@@ -1,7 +1,7 @@
 /**
- * 响应码枚举
+ * API响应码枚举
  */
-export const enum ResultEnum {
+export const enum ApiCodeEnum {
   /**
    * 成功
    */
diff --git a/src/enums/index.ts b/src/enums/index.ts
index d56b6ad7..79189297 100644
--- a/src/enums/index.ts
+++ b/src/enums/index.ts
@@ -1,11 +1,11 @@
-export * from "./api/result.enum";
+export * from "./api/code-enum";
 
-export * from "./codegen/form.enum";
-export * from "./codegen/query.enum";
+export * from "./codegen/form-enum";
+export * from "./codegen/query-enum";
 
-export * from "./settings/layout.enum";
-export * from "./settings/theme.enum";
-export * from "./settings/locale.enum";
-export * from "./settings/device.enum";
+export * from "./settings/layout-enum";
+export * from "./settings/theme-enum";
+export * from "./settings/locale-enum";
+export * from "./settings/device-enum";
 
-export * from "./system/menu.enum";
+export * from "./system/menu-enum";
diff --git a/src/layouts/components/Menu/BasicMenu.vue b/src/layouts/components/Menu/BasicMenu.vue
index 1f9be972..593c2baf 100644
--- a/src/layouts/components/Menu/BasicMenu.vue
+++ b/src/layouts/components/Menu/BasicMenu.vue
@@ -29,7 +29,7 @@ import { useRoute } from "vue-router";
 import path from "path-browserify";
 import type { MenuInstance } from "element-plus";
 import type { RouteRecordRaw } from "vue-router";
-import { SidebarColor } from "@/enums/settings/theme.enum";
+import { SidebarColor } from "@/enums/settings/theme-enum";
 import { useSettingsStore, useAppStore } from "@/store";
 import { isExternal } from "@/utils/index";
 import MenuItem from "./components/MenuItem.vue";
diff --git a/src/layouts/components/Menu/MixTopMenu.vue b/src/layouts/components/Menu/MixTopMenu.vue
index a3b2620e..eda86fa2 100644
--- a/src/layouts/components/Menu/MixTopMenu.vue
+++ b/src/layouts/components/Menu/MixTopMenu.vue
@@ -40,7 +40,7 @@ defineOptions({
 import { LocationQueryRaw, RouteRecordRaw } from "vue-router";
 import { usePermissionStore, useAppStore, useSettingsStore } from "@/store";
 import variables from "@/styles/variables.module.scss";
-import { SidebarColor } from "@/enums/settings/theme.enum";
+import { SidebarColor } from "@/enums/settings/theme-enum";
 
 const router = useRouter();
 const appStore = useAppStore();
diff --git a/src/layouts/components/NavBar/components/NavbarActions.vue b/src/layouts/components/NavBar/components/NavbarActions.vue
index 72ec1f87..3806c3d2 100644
--- a/src/layouts/components/NavBar/components/NavbarActions.vue
+++ b/src/layouts/components/NavBar/components/NavbarActions.vue
@@ -63,9 +63,9 @@
 import { useI18n } from "vue-i18n";
 import { useRoute, useRouter } from "vue-router";
 import { defaultSettings } from "@/settings";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore, useSettingsStore, useUserStore } from "@/store";
-import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme-enum";
 import { LayoutMode } from "@/enums";
 
 // 导入子组件
diff --git a/src/layouts/index.vue b/src/layouts/index.vue
index ffc7717a..915b9c9d 100644
--- a/src/layouts/index.vue
+++ b/src/layouts/index.vue
@@ -14,7 +14,7 @@ import LeftLayout from "@/layouts/modes/left/index.vue";
 import TopLayout from "@/layouts/modes/top/index.vue";
 import MixLayout from "@/layouts/modes/mix/index.vue";
 import Settings from "./components/Settings/index.vue";
-import { LayoutMode } from "@/enums/settings/layout.enum";
+import { LayoutMode } from "@/enums/settings/layout-enum";
 import { defaultSettings } from "@/settings";
 
 const { currentLayout } = useLayout();
diff --git a/src/store/modules/app-store.ts b/src/store/modules/app-store.ts
index 21ed6e1a..bd8e6863 100644
--- a/src/store/modules/app-store.ts
+++ b/src/store/modules/app-store.ts
@@ -4,8 +4,8 @@ import { defaultSettings } from "@/settings";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import en from "element-plus/es/locale/lang/en";
 import { store } from "@/store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
-import { SidebarStatus } from "@/enums/settings/layout.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
+import { SidebarStatus } from "@/enums/settings/layout-enum";
 import { STORAGE_KEYS } from "@/constants";
 
 export const useAppStore = defineStore("app", () => {
diff --git a/src/store/modules/settings-store.ts b/src/store/modules/settings-store.ts
index 8a260e83..3f90ec1c 100644
--- a/src/store/modules/settings-store.ts
+++ b/src/store/modules/settings-store.ts
@@ -1,6 +1,6 @@
 import { defaultSettings } from "@/settings";
-import { SidebarColor, ThemeMode } from "@/enums/settings/theme.enum";
-import type { LayoutMode } from "@/enums/settings/layout.enum";
+import { SidebarColor, ThemeMode } from "@/enums/settings/theme-enum";
+import type { LayoutMode } from "@/enums/settings/layout-enum";
 import { applyTheme, generateThemeColors, toggleDarkMode, toggleSidebarColor } from "@/utils/theme";
 import { STORAGE_KEYS } from "@/constants";
 
diff --git a/src/types/global.d.ts b/src/types/global.d.ts
index 25487ca1..6e08fd75 100644
--- a/src/types/global.d.ts
+++ b/src/types/global.d.ts
@@ -67,7 +67,7 @@ declare global {
     /** 主题颜色 */
     themeColor: string;
     /** 主题模式(dark|light) */
-    theme: import("@/enums/settings/theme.enum").ThemeMode;
+    theme: import("@/enums/settings/theme-enum").ThemeMode;
     /** 布局大小(default |large |small) */
     size: string;
     /** 语言( zh-cn| en) */
diff --git a/src/utils/request.ts b/src/utils/request.ts
index ae585b2e..dda7f134 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,7 +1,7 @@
 import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
 import { useUserStoreHook } from "@/store/modules/user-store";
-import { ResultEnum } from "@/enums/api/result.enum";
+import { ApiCodeEnum } from "@/enums/api/code-enum";
 import { AuthStorage } from "@/utils/auth";
 import router from "@/router";
 
@@ -50,7 +50,7 @@ httpRequest.interceptors.response.use(
     const { code, data, msg } = response.data;
 
     // 请求成功
-    if (code === ResultEnum.SUCCESS) {
+    if (code === ApiCodeEnum.SUCCESS) {
       return data;
     }
 
@@ -72,11 +72,11 @@ httpRequest.interceptors.response.use(
     const { code, msg } = response.data as ApiResponse;
 
     switch (code) {
-      case ResultEnum.ACCESS_TOKEN_INVALID:
+      case ApiCodeEnum.ACCESS_TOKEN_INVALID:
         // Access Token 过期，尝试刷新
         return refreshTokenAndRetry(config);
 
-      case ResultEnum.REFRESH_TOKEN_INVALID:
+      case ApiCodeEnum.REFRESH_TOKEN_INVALID:
         // Refresh Token 过期，跳转登录页
         await redirectToLogin("登录已过期，请重新登录");
         return Promise.reject(new Error(msg || "Refresh Token Invalid"));
diff --git a/src/views/codegen/index.vue b/src/views/codegen/index.vue
index d4c281a7..d91cdf15 100644
--- a/src/views/codegen/index.vue
+++ b/src/views/codegen/index.vue
@@ -522,8 +522,8 @@ import Codemirror from "codemirror-editor-vue3";
 import type { CmComponentRef } from "codemirror-editor-vue3";
 import type { EditorConfiguration } from "codemirror";
 
-import { FormTypeEnum } from "@/enums/codegen/form.enum";
-import { QueryTypeEnum } from "@/enums/codegen/query.enum";
+import { FormTypeEnum } from "@/enums/codegen/form-enum";
+import { QueryTypeEnum } from "@/enums/codegen/query-enum";
 
 import GeneratorAPI, {
   TablePageVO,
diff --git a/src/views/demo/curd-demo.vue b/src/views/demo/curd-demo.vue
index 6f62b0dd..04f3103b 100644
--- a/src/views/demo/curd-demo.vue
+++ b/src/views/demo/curd-demo.vue
@@ -73,7 +73,7 @@ import DeptAPI from "@/api/system/dept-api";
 import RoleAPI from "@/api/system/role-api";
 import type { UserForm, UserPageQuery } from "@/api/system/user-api";
 import type { IObject, IModalConfig, IContentConfig, ISearchConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 import usePage from "@/components/CURD/usePage";
 
diff --git a/src/views/demo/curd/config/edit.ts b/src/views/demo/curd/config/edit.ts
index 94726b54..708ca5cb 100644
--- a/src/views/demo/curd/config/edit.ts
+++ b/src/views/demo/curd/config/edit.ts
@@ -1,6 +1,6 @@
 import UserAPI, { type UserForm } from "@/api/system/user-api";
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 import { deptArr, roleArr } from "./options";
 
diff --git a/src/views/demo/curd/config2/edit.ts b/src/views/demo/curd/config2/edit.ts
index 0fccc5d0..71273793 100644
--- a/src/views/demo/curd/config2/edit.ts
+++ b/src/views/demo/curd/config2/edit.ts
@@ -1,5 +1,5 @@
 import type { IModalConfig } from "@/components/CURD/types";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 import { useAppStore } from "@/store";
 
 const modalConfig: IModalConfig = {
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2a7e1482..9c045549 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -341,10 +341,10 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import MenuAPI, { MenuQuery, MenuForm, MenuVO } from "@/api/system/menu-api";
-import { MenuTypeEnum } from "@/enums/system/menu.enum";
+import { MenuTypeEnum } from "@/enums/system/menu-enum";
 
 defineOptions({
   name: "SysMenu",
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9c5829bf..cfc3bfb5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -213,7 +213,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import RoleAPI, { RolePageVO, RoleForm, RolePageQuery } from "@/api/system/role-api";
 import MenuAPI from "@/api/system/menu-api";
diff --git a/src/views/system/user/components/UserImport.vue b/src/views/system/user/components/UserImport.vue
index 7dafa52b..0f00f9ee 100644
--- a/src/views/system/user/components/UserImport.vue
+++ b/src/views/system/user/components/UserImport.vue
@@ -90,7 +90,7 @@
 <script lang="ts" setup>
 import { ElMessage, type UploadUserFile } from "element-plus";
 import UserAPI from "@/api/system/user-api";
-import { ResultEnum } from "@/enums/api/result.enum";
+import { ApiCodeEnum } from "@/enums/api/code-enum";
 
 const emit = defineEmits(["import-success"]);
 const visible = defineModel("modelValue", {
@@ -163,7 +163,7 @@ const handleUpload = async () => {
 
   try {
     const result = await UserAPI.import("1", importFormData.files[0].raw as File);
-    if (result.code === ResultEnum.SUCCESS && result.invalidCount === 0) {
+    if (result.code === ApiCodeEnum.SUCCESS && result.invalidCount === 0) {
       ElMessage.success("导入成功，导入数据：" + result.validCount + "条");
       emit("import-success");
       handleClose();
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 2f31eb24..47ee4797 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -245,7 +245,7 @@
 
 <script setup lang="ts">
 import { useAppStore } from "@/store/modules/app-store";
-import { DeviceEnum } from "@/enums/settings/device.enum";
+import { DeviceEnum } from "@/enums/settings/device-enum";
 
 import UserAPI, { UserForm, UserPageQuery, UserPageVO } from "@/api/system/user-api";
 import DeptAPI from "@/api/system/dept-api";

From e7a06f6fcc5ed306e2320eba674d79c5fd9dac83 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Mon, 22 Sep 2025 16:55:33 +0800
Subject: [PATCH 486/497] build(package): :package: bump version to 3.4.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 21a6caa9..c7007c0a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "private": true,
   "type": "module",
   "scripts": {

From 9bfd3242f36c1747a596a8f83e1871fb8ae19d3a Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Tue, 23 Sep 2025 10:49:35 +0800
Subject: [PATCH 487/497] =?UTF-8?q?fix(Upload):=20:bug:=20=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E5=8D=95=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0=E6=97=A0?=
 =?UTF-8?q?=E7=94=A8=E7=9A=84v-model=E7=BB=91=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/SingleImageUpload.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Upload/SingleImageUpload.vue b/src/components/Upload/SingleImageUpload.vue
index b6759e36..59a27b42 100644
--- a/src/components/Upload/SingleImageUpload.vue
+++ b/src/components/Upload/SingleImageUpload.vue
@@ -1,7 +1,6 @@
 <!-- 单图上传组件 -->
 <template>
   <el-upload
-    v-model="modelValue"
     class="single-upload"
     list-type="picture-card"
     :show-file-list="false"

From 1ed5c03568a70f32bae830da3ba50c82fa66173e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 23 Sep 2025 15:53:49 +0800
Subject: [PATCH 488/497] =?UTF-8?q?fix(mock):=20:bug:=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20mock-dev-server=20=E6=8F=92=E4=BB=B6=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F,=E4=BD=BF=E7=94=A8=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=9B=BF=E6=8D=A2=E5=B7=B2=E5=BA=9F=E5=BC=83?=
 =?UTF-8?q?=E7=9A=84=E9=BB=98=E8=AE=A4=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vite.config.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vite.config.ts b/vite.config.ts
index 8c4cdcaa..15bca5f8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -5,7 +5,7 @@ import AutoImport from "unplugin-auto-import/vite";
 import Components from "unplugin-vue-components/vite";
 import { ElementPlusResolver } from "unplugin-vue-components/resolvers";
 
-import mockDevServerPlugin from "vite-plugin-mock-dev-server";
+import { mockDevServerPlugin } from "vite-plugin-mock-dev-server";
 
 import UnoCSS from "unocss/vite";
 import { resolve } from "path";

From 6979a175ee93ace0faa82451dbd0a6ebf4689f44 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Tue, 23 Sep 2025 15:55:13 +0800
Subject: [PATCH 489/497] =?UTF-8?q?refactor(auth):=20:recycle:=20=E9=87=8D?=
 =?UTF-8?q?=E6=9E=84=E8=AE=A4=E8=AF=81=E9=80=BB=E8=BE=91=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC=E4=B8=8Etoken?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/composables/auth/useTokenRefresh.ts       |  87 ++++++++++++++
 src/composables/index.ts                      |   1 +
 src/settings.ts                               |  15 +++
 src/utils/auth.ts                             |  24 ++++
 src/utils/request.ts                          | 107 +++---------------
 ...n-column.vue => auto-operation-column.vue} |   0
 .../demo/{curd-demo.vue => curd-single.vue}   |   0
 .../{icon-selector.vue => icon-select.vue}    |   0
 8 files changed, 144 insertions(+), 90 deletions(-)
 create mode 100644 src/composables/auth/useTokenRefresh.ts
 rename src/views/demo/{auto-opreation-column.vue => auto-operation-column.vue} (100%)
 rename src/views/demo/{curd-demo.vue => curd-single.vue} (100%)
 rename src/views/demo/{icon-selector.vue => icon-select.vue} (100%)

diff --git a/src/composables/auth/useTokenRefresh.ts b/src/composables/auth/useTokenRefresh.ts
new file mode 100644
index 00000000..c81be723
--- /dev/null
+++ b/src/composables/auth/useTokenRefresh.ts
@@ -0,0 +1,87 @@
+import type { InternalAxiosRequestConfig } from "axios";
+import { useUserStoreHook } from "@/store/modules/user-store";
+import { AuthStorage, redirectToLogin } from "@/utils/auth";
+
+/**
+ * 重试请求的回调函数类型
+ */
+type RetryCallback = () => void;
+
+/**
+ * Token刷新组合式函数
+ */
+export function useTokenRefresh() {
+  // Token 刷新相关状态
+  let isRefreshingToken = false;
+  const pendingRequests: RetryCallback[] = [];
+
+  /**
+   * 刷新 Token 并重试请求
+   */
+  async function refreshTokenAndRetry(
+    config: InternalAxiosRequestConfig,
+    httpRequest: any
+  ): Promise<any> {
+    return new Promise((resolve, reject) => {
+      // 封装需要重试的请求
+      const retryRequest = () => {
+        const newToken = AuthStorage.getAccessToken();
+        if (newToken && config.headers) {
+          config.headers.Authorization = `Bearer ${newToken}`;
+        }
+        httpRequest(config).then(resolve).catch(reject);
+      };
+
+      // 将请求加入等待队列
+      pendingRequests.push(retryRequest);
+
+      // 如果没有正在刷新，则开始刷新流程
+      if (!isRefreshingToken) {
+        isRefreshingToken = true;
+
+        useUserStoreHook()
+          .refreshToken()
+          .then(() => {
+            // 刷新成功，重试所有等待的请求
+            pendingRequests.forEach((callback) => {
+              try {
+                callback();
+              } catch (error) {
+                console.error("Retry request error:", error);
+              }
+            });
+            // 清空队列
+            pendingRequests.length = 0;
+          })
+          .catch(async (error) => {
+            console.error("Token refresh failed:", error);
+            // 刷新失败，清空队列并跳转登录页
+            pendingRequests.length = 0;
+            await redirectToLogin("登录状态已失效，请重新登录");
+            // 拒绝所有等待的请求
+            pendingRequests.forEach(() => {
+              reject(new Error("Token refresh failed"));
+            });
+          })
+          .finally(() => {
+            isRefreshingToken = false;
+          });
+      }
+    });
+  }
+
+  /**
+   * 获取刷新状态（用于外部判断）
+   */
+  function getRefreshStatus() {
+    return {
+      isRefreshing: isRefreshingToken,
+      pendingCount: pendingRequests.length,
+    };
+  }
+
+  return {
+    refreshTokenAndRetry,
+    getRefreshStatus,
+  };
+}
diff --git a/src/composables/index.ts b/src/composables/index.ts
index f9b4df02..f157c145 100644
--- a/src/composables/index.ts
+++ b/src/composables/index.ts
@@ -2,6 +2,7 @@ export { useStomp } from "./websocket/useStomp";
 export { useDictSync } from "./websocket/useDictSync";
 export type { DictMessage } from "./websocket/useDictSync";
 export { useOnlineCount } from "./websocket/useOnlineCount";
+export { useTokenRefresh } from "./auth/useTokenRefresh";
 
 export { useLayout } from "./layout/useLayout";
 export { useLayoutMenu } from "./layout/useLayoutMenu";
diff --git a/src/settings.ts b/src/settings.ts
index 9641874f..4ef966a1 100644
--- a/src/settings.ts
+++ b/src/settings.ts
@@ -34,6 +34,21 @@ export const defaultSettings: AppSettings = {
   sidebarColorScheme: SidebarColor.CLASSIC_BLUE,
 };
 
+/**
+ * 认证功能配置
+ */
+export const authConfig = {
+  /**
+   * Token自动刷新开关
+   *
+   * true: 启用自动刷新 - ACCESS_TOKEN_INVALID时尝试刷新token
+   * false: 禁用自动刷新 - ACCESS_TOKEN_INVALID时直接跳转登录页
+   *
+   * 适用场景：后端没有刷新接口或不需要自动刷新的项目可设为false
+   */
+  enableTokenRefresh: true,
+} as const;
+
 // 主题色预设 - 经典配色方案
 // 注意：修改默认主题色时，需要同步修改 src/styles/variables.scss 中的 primary.base 值
 export const themeColorPresets = [
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index 9b3193ff..e5931c0f 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,5 +1,7 @@
 import { Storage } from "./storage";
 import { AUTH_KEYS } from "@/constants";
+import { useUserStoreHook } from "@/store/modules/user-store";
+import router from "@/router";
 
 // 负责本地凭证与偏好的读写
 export const AuthStorage = {
@@ -41,3 +43,25 @@ export const AuthStorage = {
     return Storage.get<boolean>(AUTH_KEYS.REMEMBER_ME, false);
   },
 };
+
+/**
+ * 重定向到登录页面
+ */
+export async function redirectToLogin(message: string = "请重新登录"): Promise<void> {
+  try {
+    ElNotification({
+      title: "提示",
+      message,
+      type: "warning",
+      duration: 3000,
+    });
+
+    await useUserStoreHook().resetAllState();
+
+    // 跳转到登录页，保留当前路由用于登录后跳转
+    const currentPath = router.currentRoute.value.fullPath;
+    await router.push(`/login?redirect=${encodeURIComponent(currentPath)}`);
+  } catch (error) {
+    console.error("Redirect to login error:", error);
+  }
+}
diff --git a/src/utils/request.ts b/src/utils/request.ts
index dda7f134..6da85474 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -1,9 +1,12 @@
 import axios, { type InternalAxiosRequestConfig, type AxiosResponse } from "axios";
 import qs from "qs";
-import { useUserStoreHook } from "@/store/modules/user-store";
 import { ApiCodeEnum } from "@/enums/api/code-enum";
-import { AuthStorage } from "@/utils/auth";
-import router from "@/router";
+import { AuthStorage, redirectToLogin } from "@/utils/auth";
+import { useTokenRefresh } from "@/composables/auth/useTokenRefresh";
+import { authConfig } from "@/settings";
+
+// 初始化token刷新组合式函数
+const { refreshTokenAndRetry } = useTokenRefresh();
 
 /**
  * 创建 HTTP 请求实例
@@ -42,8 +45,8 @@ httpRequest.interceptors.request.use(
  */
 httpRequest.interceptors.response.use(
   (response: AxiosResponse<ApiResponse>) => {
-    // 如果响应是二进制流，则直接返回（用于文件下载、Excel 导出等）
-    if (response.config.responseType === "blob") {
+    // 如果响应是二进制数据，则直接返回response对象（用于文件下载、Excel导出、图片显示等）
+    if (response.config.responseType === "blob" || response.config.responseType === "arraybuffer") {
       return response;
     }
 
@@ -73,8 +76,15 @@ httpRequest.interceptors.response.use(
 
     switch (code) {
       case ApiCodeEnum.ACCESS_TOKEN_INVALID:
-        // Access Token 过期，尝试刷新
-        return refreshTokenAndRetry(config);
+        // Access Token 过期
+        if (authConfig.enableTokenRefresh) {
+          // 启用了token刷新，尝试刷新
+          return refreshTokenAndRetry(config, httpRequest);
+        } else {
+          // 未启用token刷新，直接跳转登录页
+          await redirectToLogin("登录已过期，请重新登录");
+          return Promise.reject(new Error(msg || "Access Token Invalid"));
+        }
 
       case ApiCodeEnum.REFRESH_TOKEN_INVALID:
         // Refresh Token 过期，跳转登录页
@@ -88,87 +98,4 @@ httpRequest.interceptors.response.use(
   }
 );
 
-/**
- * 重试请求的回调函数类型
- */
-type RetryCallback = () => void;
-
-// Token 刷新相关状态
-let isRefreshingToken = false;
-const pendingRequests: RetryCallback[] = [];
-
-/**
- * 刷新 Token 并重试请求
- */
-async function refreshTokenAndRetry(config: InternalAxiosRequestConfig): Promise<any> {
-  return new Promise((resolve, reject) => {
-    // 封装需要重试的请求
-    const retryRequest = () => {
-      const newToken = AuthStorage.getAccessToken();
-      if (newToken && config.headers) {
-        config.headers.Authorization = `Bearer ${newToken}`;
-      }
-      httpRequest(config).then(resolve).catch(reject);
-    };
-
-    // 将请求加入等待队列
-    pendingRequests.push(retryRequest);
-
-    // 如果没有正在刷新，则开始刷新流程
-    if (!isRefreshingToken) {
-      isRefreshingToken = true;
-
-      useUserStoreHook()
-        .refreshToken()
-        .then(() => {
-          // 刷新成功，重试所有等待的请求
-          pendingRequests.forEach((callback) => {
-            try {
-              callback();
-            } catch (error) {
-              console.error("Retry request error:", error);
-            }
-          });
-          // 清空队列
-          pendingRequests.length = 0;
-        })
-        .catch(async (error) => {
-          console.error("Token refresh failed:", error);
-          // 刷新失败，清空队列并跳转登录页
-          pendingRequests.length = 0;
-          await redirectToLogin("登录状态已失效，请重新登录");
-          // 拒绝所有等待的请求
-          pendingRequests.forEach(() => {
-            reject(new Error("Token refresh failed"));
-          });
-        })
-        .finally(() => {
-          isRefreshingToken = false;
-        });
-    }
-  });
-}
-
-/**
- * 重定向到登录页面
- */
-async function redirectToLogin(message: string = "请重新登录"): Promise<void> {
-  try {
-    ElNotification({
-      title: "提示",
-      message,
-      type: "warning",
-      duration: 3000,
-    });
-
-    await useUserStoreHook().resetAllState();
-
-    // 跳转到登录页，保留当前路由用于登录后跳转
-    const currentPath = router.currentRoute.value.fullPath;
-    await router.push(`/login?redirect=${encodeURIComponent(currentPath)}`);
-  } catch (error) {
-    console.error("Redirect to login error:", error);
-  }
-}
-
 export default httpRequest;
diff --git a/src/views/demo/auto-opreation-column.vue b/src/views/demo/auto-operation-column.vue
similarity index 100%
rename from src/views/demo/auto-opreation-column.vue
rename to src/views/demo/auto-operation-column.vue
diff --git a/src/views/demo/curd-demo.vue b/src/views/demo/curd-single.vue
similarity index 100%
rename from src/views/demo/curd-demo.vue
rename to src/views/demo/curd-single.vue
diff --git a/src/views/demo/icon-selector.vue b/src/views/demo/icon-select.vue
similarity index 100%
rename from src/views/demo/icon-selector.vue
rename to src/views/demo/icon-select.vue

From b19f210b9f452129bd1b6b183358bed26884a490 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:28:19 +0800
Subject: [PATCH 490/497] =?UTF-8?q?chore(i18n):=20:hammer:=20=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20i18n=20Ally=20=E4=BD=BF=E7=94=A8=E5=B5=8C=E5=A5=97?=
 =?UTF-8?q?=E9=94=AE=E9=A3=8E=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 507df255..302ead28 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -66,5 +66,6 @@
   "i18n-ally.localesPaths": [
     "src/lang/package"
   ],
-  "scss.lint.unknownAtRules": "ignore"
+  "scss.lint.unknownAtRules": "ignore",
+  "i18n-ally.keystyle": "nested"
 }

From 65d2466abc44aa73242cf4e8c9868f3a77d0a770 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:30:37 +0800
Subject: [PATCH 491/497] =?UTF-8?q?chore:=20:hammer:=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E8=83=8C?=
 =?UTF-8?q?=E6=99=AF=E5=9B=BE=E4=BE=9B=E7=94=A8=E6=88=B7=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/login-bg1.svg | 71 +++++++++++++++++++++++++++++++++
 1 file changed, 71 insertions(+)
 create mode 100644 src/assets/images/login-bg1.svg

diff --git a/src/assets/images/login-bg1.svg b/src/assets/images/login-bg1.svg
new file mode 100644
index 00000000..a0fbc13f
--- /dev/null
+++ b/src/assets/images/login-bg1.svg
@@ -0,0 +1,71 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" baseProfile="full" width="100%" height="100%" viewBox="0 0 1400 800">
+  <style>
+    :root {
+      --blue: rgba(64, 158, 255, 0.08);
+      --grey: rgba(144, 147, 153, 0.05);
+      --orange: rgba(230, 162, 60, 0.06);
+      --green: rgba(144, 238, 144, 0.06);
+    }
+
+    @media (prefers-color-scheme: dark) {
+      :root {
+        --blue: rgba(64, 158, 255, 0.04);
+        --grey: rgba(144, 147, 153, 0.03);
+        --orange: rgba(230, 162, 60, 0.04);
+        --green: rgba(144, 238, 144, 0.04);
+      }
+    }
+  </style>
+
+  <!-- 左侧波浪 -->
+  <path d="M-50 550 Q200 500 450 550 T950 530"
+        fill="none"
+        stroke="#409EFF"
+        stroke-width="1.5"
+        stroke-opacity="0.05"
+        stroke-linecap="round">
+  </path>
+
+  <!-- 右侧波浪 -->
+  <path d="M450 650 Q800 620 1150 660 T1550 630"
+        fill="none"
+        stroke="#909399"
+        stroke-width="1"
+        stroke-opacity="0.03"
+        stroke-linecap="round">
+  </path>
+
+  <!-- 右下方圆形 -->
+  <circle cx="950" cy="400" r="70" 
+          fill="var(--blue)" 
+          stroke="#409EFF" 
+          stroke-width="1" 
+          stroke-opacity="0.05">
+  </circle>
+
+  <!-- 左上方半球形  -->
+  <g transform="rotate(-10, 300, 180)">
+    <path d="M 180 180 A 120 120 0 1 1 420 180 Q420 195 405 195 L 310 195 L 195 195 Q180 195 180 180" 
+          fill="var(--orange)" 
+          stroke="#E6A23C" 
+          stroke-width="1" 
+          stroke-opacity="0.05">
+    </path>
+  </g>
+
+  <!-- 左下方三角形 -->
+  <path d="M300 600 L380 520 L420 650 Z" 
+        fill="var(--green)" 
+        stroke="#909399" 
+        stroke-width="1" 
+        stroke-opacity="0.04">
+  </path>
+
+  <!-- 旋转方块 -->
+ <rect x="1000" y="420" rx="10" ry="10" width="60" height="60" fill="rgba(169, 174, 184, 0.1)" stroke="rgba(169, 174, 184, 0.2)" stroke-width="1" opacity="0.5">
+    <animateTransform attributeType="XML" attributeName="transform"
+                      begin="0s" dur="30s" type="rotate"
+                      from="0 1450 550" to="360 1450 550"
+                      repeatCount="indefinite"/>
+  </rect>
+</svg>

From 3ddf4289223f01932ff5c32e0d51ecb3fd47f11e Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:33:13 +0800
Subject: [PATCH 492/497] =?UTF-8?q?refactor(login):=20:recycle:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/components/Login.vue | 19 ++++++++++---------
 src/views/login/index.vue            |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/login/components/Login.vue b/src/views/login/components/Login.vue
index d9100a63..3da75575 100644
--- a/src/views/login/components/Login.vue
+++ b/src/views/login/components/Login.vue
@@ -37,28 +37,29 @@
 
       <!-- 验证码 -->
       <el-form-item prop="captchaCode">
-        <div flex>
+        <div flex items-center gap-10px>
           <el-input
             v-model.trim="loginFormData.captchaCode"
             :placeholder="t('login.captchaCode')"
+            clearable
+            class="flex-1"
             @keyup.enter="handleLoginSubmit"
           >
             <template #prefix>
               <div class="i-svg:captcha" />
             </template>
           </el-input>
-          <div cursor-pointer h="[40px]" w="[120px]" flex-center ml-10px @click="getCaptcha">
-            <el-icon v-if="codeLoading" class="is-loading"><Loading /></el-icon>
-
+          <div cursor-pointer h-40px w-120px flex-center @click="getCaptcha">
+            <el-icon v-if="codeLoading" class="is-loading" size="20"><Loading /></el-icon>
             <img
-              v-else
-              object-cover
+              v-else-if="captchaBase64"
               border-rd-4px
-              p-1px
+              object-cover
               shadow="[0_0_0_1px_var(--el-border-color)_inset]"
               :src="http://github.com/captchaBase64"
-              alt="code"
+              alt="captchaCode"
             />
+            <el-text v-else type="info" size="small">点击获取验证码</el-text>
           </div>
         </div>
       </el-form-item>
@@ -228,7 +229,7 @@ function toOtherForm(type: "register" | "resetPwd") {
   .divider-container {
     display: flex;
     align-items: center;
-    margin: 20px 0;
+    margin: 40px 0;
 
     .divider-line {
       flex: 1;
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index cac65417..05b89889 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -16,7 +16,7 @@
     <!-- 登录页主体 -->
     <div flex-1 flex-center>
       <div
-        class="p-4xl w-full h-auto sm:w-450px border-rd-10px sm:h-680px shadow-[var(--el-box-shadow-light)] backdrop-blur-3px"
+        class="p-4xl w-full h-auto sm:w-450px sm:h-700px shadow-[var(--el-box-shadow-light)] border-rd-2"
       >
         <div w-full flex flex-col items-center>
           <!-- logo -->

From 0e3550b5f89b778415691cb045e00b462f20a340 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:35:53 +0800
Subject: [PATCH 493/497] =?UTF-8?q?refactor(permission):=20:recycle:=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B7=AF=E7=94=B1=E6=9D=83=E9=99=90=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=EF=BC=8C=E7=AE=80=E5=8C=96=E5=91=BD=E5=90=8D=E5=92=8C?=
 =?UTF-8?q?=E8=81=8C=E8=B4=A3=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/CURD/PageContent.vue   |  4 +-
 src/plugins/permission.ts             | 40 +++--------
 src/store/modules/permission-store.ts | 99 +++++++++------------------
 src/utils/auth.ts                     | 19 ++++-
 4 files changed, 63 insertions(+), 99 deletions(-)

diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index 8437cacd..6ca9bb75 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -322,7 +322,7 @@
 </template>
 
 <script setup lang="ts">
-import { hasAuth } from "@/plugins/permission";
+import { hasPerm } from "@/utils/auth";
 import { useDateFormat, useThrottleFn } from "@vueuse/core";
 import {
   genFileId,
@@ -387,7 +387,7 @@ function hasButtonPerm(action: string): boolean {
   const perm = getButtonPerm(action);
   // 如果没有设置权限标识，则默认具有权限
   if (!perm) return true;
-  return hasAuth(perm);
+  return hasPerm(perm);
 }
 
 // 创建工具栏按钮
diff --git a/src/plugins/permission.ts b/src/plugins/permission.ts
index 33d4d601..c81379ff 100644
--- a/src/plugins/permission.ts
+++ b/src/plugins/permission.ts
@@ -2,16 +2,14 @@ import type { RouteRecordRaw } from "vue-router";
 import NProgress from "@/utils/nprogress";
 import router from "@/router";
 import { usePermissionStore, useUserStore } from "@/store";
-import { ROLE_ROOT } from "@/constants";
 
 export function setupPermission() {
-  const whiteList = ["/login"]; // 无需登录的页面
+  const whiteList = ["/login"];
 
   router.beforeEach(async (to, from, next) => {
     NProgress.start();
 
     try {
-      // 使用 store 暴露的登录态，便于后续扩展（如基于过期时间等）
       const isLoggedIn = useUserStore().isLoggedIn();
 
       // 未登录处理
@@ -25,18 +23,17 @@ export function setupPermission() {
         return;
       }
 
-      // 已登录且访问登录页，重定向到首页
+      // 已登录登录页重定向
       if (to.path === "/login") {
         next({ path: "/" });
         return;
       }
 
-      // 已登录用户的正常访问
       const permissionStore = usePermissionStore();
       const userStore = useUserStore();
 
-      // 路由未生成则生成
-      if (!permissionStore.isDynamicRoutesGenerated) {
+      // 动态路由生成
+      if (!permissionStore.isRouteGenerated) {
         if (!userStore.userInfo?.roles?.length) {
           await userStore.getUserInfo();
         }
@@ -50,13 +47,13 @@ export function setupPermission() {
         return;
       }
 
-      // 检查路由是否存在
+      // 路由404检查
       if (to.matched.length === 0) {
         next("/404");
         return;
       }
 
-      // 设置页面标题
+      // 动态标题设置
       const title = (to.params.title as string) || (to.query.title as string);
       if (title) {
         to.meta.title = title;
@@ -64,13 +61,9 @@ export function setupPermission() {
 
       next();
     } catch (error) {
-      console.error("❌ Route guard error:", error);
-      // 出错时清理状态并重定向到登录页
-      try {
-        await useUserStore().resetAllState();
-      } catch (resetError) {
-        console.error("❌ Failed to reset user state:", resetError);
-      }
+      // 错误处理：重置状态并跳转登录
+      console.error("Route guard error:", error);
+      await useUserStore().resetAllState();
       next("/login");
       NProgress.done();
     }
@@ -80,18 +73,3 @@ export function setupPermission() {
     NProgress.done();
   });
 }
-
-/** 判断是否有权限 */
-export function hasAuth(value: string | string[], type: "button" | "role" = "button") {
-  const { roles, perms } = useUserStore().userInfo;
-
-  // 超级管理员 拥有所有权限
-  if (type === "button" && roles.includes(ROLE_ROOT)) {
-    return true;
-  }
-
-  const auths = type === "button" ? perms : roles;
-  return typeof value === "string"
-    ? auths.includes(value)
-    : value.some((perm) => auths.includes(perm));
-}
diff --git a/src/store/modules/permission-store.ts b/src/store/modules/permission-store.ts
index a4088f7f..f9abc3a1 100644
--- a/src/store/modules/permission-store.ts
+++ b/src/store/modules/permission-store.ts
@@ -5,7 +5,7 @@ import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/system/menu-api";
 const modules = import.meta.glob("../../views/**/**.vue");
-const Layout = () => import("@/layouts/index.vue");
+const Layout = () => import("../../layouts/index.vue");
 
 export const usePermissionStore = defineStore("permission", () => {
   // 所有路由（静态路由 + 动态路由）
@@ -13,42 +13,34 @@ export const usePermissionStore = defineStore("permission", () => {
   // 混合布局的左侧菜单路由
   const mixLayoutSideMenus = ref<RouteRecordRaw[]>([]);
   // 动态路由是否已生成
-  const isDynamicRoutesGenerated = ref(false);
+  const isRouteGenerated = ref(false);
 
-  /**
-   * 生成动态路由
-   */
+  /** 生成动态路由 */
   async function generateRoutes(): Promise<RouteRecordRaw[]> {
     try {
-      const data = await MenuAPI.getRoutes(); // 获取当前登录人拥有的菜单路由
-      const processRouteList = processRoutes(data); // 处理后的路由数据
-      const dynamicRoutes = parseDynamicRoutes(processRouteList);
+      const data = await MenuAPI.getRoutes(); // 获取当前登录人的菜单路由
+      const dynamicRoutes = transformRoutes(data);
 
       routes.value = [...constantRoutes, ...dynamicRoutes];
-
-      isDynamicRoutesGenerated.value = true;
+      isRouteGenerated.value = true;
 
       return dynamicRoutes;
     } catch (error) {
-      console.error("❌ Failed to generate routes:", error);
-      isDynamicRoutesGenerated.value = false;
+      // 路由生成失败，重置状态
+      isRouteGenerated.value = false;
       throw error;
     }
   }
 
-  /**
-   * 设置混合布局的左侧菜单
-   */
+  /** 设置混合布局左侧菜单 */
   const setMixLayoutSideMenus = (parentPath: string) => {
     const parentMenu = routes.value.find((item) => item.path === parentPath);
     mixLayoutSideMenus.value = parentMenu?.children || [];
   };
 
-  /**
-   * 重置路由状态
-   */
+  /** 重置路由状态 */
   const resetRouter = () => {
-    // 移除动态路由
+    // 移除动态添加的路由
     const constantRouteNames = new Set(constantRoutes.map((route) => route.name).filter(Boolean));
     routes.value.forEach((route) => {
       if (route.name && !constantRouteNames.has(route.name)) {
@@ -56,16 +48,16 @@ export const usePermissionStore = defineStore("permission", () => {
       }
     });
 
-    // 重置状态
+    // 重置所有状态
     routes.value = [...constantRoutes];
     mixLayoutSideMenus.value = [];
-    isDynamicRoutesGenerated.value = false;
+    isRouteGenerated.value = false;
   };
 
   return {
     routes,
     mixLayoutSideMenus,
-    isDynamicRoutesGenerated,
+    isRouteGenerated,
     generateRoutes,
     setMixLayoutSideMenus,
     resetRouter,
@@ -73,63 +65,40 @@ export const usePermissionStore = defineStore("permission", () => {
 });
 
 /**
- * 解析后端返回的路由数据并转换为 Vue Router 兼容的路由配置
- *
- * @param rawRoutes 后端返回的原始路由数据
- * @returns 解析后的路由集合
+ * 转换后端路由数据为Vue Router配置
+ * 处理组件路径映射和Layout层级嵌套
  */
-const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
-  const parsedRoutes: RouteRecordRaw[] = [];
+const transformRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteRecordRaw[] => {
+  return routes.map((route) => {
+    const { component, children, ...args } = route;
+
+    // 处理组件：顶层或非Layout保留组件，中间层Layout设为undefined
+    const processedComponent = isTopLevel || component !== "Layout" ? component : undefined;
 
-  rawRoutes.forEach((route) => {
-    const normalizedRoute = { ...route } as RouteRecordRaw;
+    const normalizedRoute = { ...args } as RouteRecordRaw;
 
-    if (!normalizedRoute.component) {
-      // 如果没有组件，则将组件设置为 undefined 防止404 例如(多级菜单的父菜单)
+    if (!processedComponent) {
+      // 多级菜单的父级菜单，不需要组件
       normalizedRoute.component = undefined;
     } else {
-      // 处理组件路径
+      // 动态导入组件，Layout特殊处理，找不到组件时返回404
       normalizedRoute.component =
-        normalizedRoute.component?.toString() === "Layout"
+        processedComponent === "Layout"
           ? Layout
-          : modules[`../../views/${normalizedRoute.component}.vue`] ||
-            modules[`../../views/error/404.vue`]; // 找不到页面时，返回404页面
+          : modules[`../../views/${processedComponent}.vue`] ||
+            modules[`../../views/error/404.vue`];
     }
 
-    // 递归解析子路由
-    if (normalizedRoute.children) {
-      normalizedRoute.children = parseDynamicRoutes(route.children);
+    // 递归处理子路由
+    if (children && children.length > 0) {
+      normalizedRoute.children = transformRoutes(children, false);
     }
 
-    parsedRoutes.push(normalizedRoute);
-  });
-
-  return parsedRoutes;
-};
-
-/**
- * 路由处理函数
- *  - 去除中间层路由 `component: Layout` 的 `component` 属性
- * @param routes 路由数组
- * @param isTopLevel 是否是顶层路由
- */
-const processRoutes = (routes: RouteVO[], isTopLevel: boolean = true): RouteVO[] => {
-  return routes.map(({ component, children, ...args }) => {
-    return {
-      ...args,
-      component: isTopLevel || component !== "Layout" ? component : undefined,
-      //  递归处理children，标记为非顶层  todo 原样返回 children（undefined）
-      children: children && children.length > 0 ? processRoutes(children, false) : children,
-    };
+    return normalizedRoute;
   });
 };
 
-/**
- * 导出此hook函数用于在非组件环境(如其他store、工具函数等)中获取权限store实例
- *
- * 在组件中可直接使用usePermissionStore()，但在组件外部需要传入store实例
- * 此函数简化了这个过程，避免每次都手动传入store参数
- */
+/** 非组件环境使用权限store */
 export function usePermissionStoreHook() {
   return usePermissionStore(store);
 }
diff --git a/src/utils/auth.ts b/src/utils/auth.ts
index e5931c0f..3f55acea 100644
--- a/src/utils/auth.ts
+++ b/src/utils/auth.ts
@@ -1,5 +1,5 @@
 import { Storage } from "./storage";
-import { AUTH_KEYS } from "@/constants";
+import { AUTH_KEYS, ROLE_ROOT } from "@/constants";
 import { useUserStoreHook } from "@/store/modules/user-store";
 import router from "@/router";
 
@@ -44,6 +44,23 @@ export const AuthStorage = {
   },
 };
 
+/**
+ * 权限判断
+ */
+export function hasPerm(value: string | string[], type: "button" | "role" = "button"): boolean {
+  const { roles, perms } = useUserStoreHook().userInfo;
+
+  // 超级管理员拥有所有权限
+  if (type === "button" && roles.includes(ROLE_ROOT)) {
+    return true;
+  }
+
+  const auths = type === "button" ? perms : roles;
+  return typeof value === "string"
+    ? auths.includes(value)
+    : value.some((perm) => auths.includes(perm));
+}
+
 /**
  * 重定向到登录页面
  */

From 782800701d884139285e5cc0ac9629762330f50b Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Thu, 25 Sep 2025 16:38:00 +0800
Subject: [PATCH 494/497] chore: :hammer: bump version to 3.4.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c7007c0a..e02246ab 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "vue3-element-admin",
   "description": "Vue3 + Vite + TypeScript + Element-Plus 的后台管理模板，vue-element-admin 的 Vue3 版本",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "private": true,
   "type": "module",
   "scripts": {

From 8e4b71d17b97c1d8e81e7661b620102e16b6c9f7 Mon Sep 17 00:00:00 2001
From: theo <971366405@qq.com>
Date: Mon, 29 Sep 2025 10:14:50 +0800
Subject: [PATCH 495/497] =?UTF-8?q?fix:=20:bug:=20=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

分页跳转问题修复
---
 src/views/system/notice/index.vue | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 6b88f3dd..d8ff8d34 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -3,7 +3,7 @@
     <!-- 搜索区域 -->
     <div class="search-container">
       <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-suffix=":">
-        <el-form-item label="标题" prop="title">
+        <el-form-item label="标题123" prop="title">
           <el-input
             v-model="queryParams.title"
             placeholder="标题"
@@ -161,7 +161,7 @@
         v-model:total="total"
         v-model:page="queryParams.pageNum"
         v-model:limit="queryParams.pageSize"
-        @pagination="handleQuery()"
+        @pagination="fetchData()"
       />
     </el-card>
 
@@ -323,8 +323,13 @@ const currentNotice = ref<NoticeDetailVO>({});
 
 // 查询通知公告
 function handleQuery() {
-  loading.value = true;
   queryParams.pageNum = 1;
+  fetchData();
+}
+
+//发送请求接口
+function fetchData() {
+  loading.value = true;
   NoticeAPI.getPage(queryParams)
     .then((data) => {
       pageData.value = data.list;

From 51e78d730150b8f5a45b11d6b41f59be6073dfd8 Mon Sep 17 00:00:00 2001
From: "Ray.Hao" <1490493387@qq.com>
Date: Sat, 11 Oct 2025 11:35:33 +0800
Subject: [PATCH 496/497] =?UTF-8?q?chore(deps):=20:hammer:=20=E5=8D=87?=
 =?UTF-8?q?=E7=BA=A7=E4=BE=9D=E8=B5=96=E7=89=88=E6=9C=AC=EF=BC=88@types/no?=
 =?UTF-8?q?de=20=E5=8D=87=E7=BA=A7=E8=87=B3=20v24=EF=BC=8Cecharts=20?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7=E8=87=B3=20v6=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md    |  4 ++--
 package.json | 32 ++++++++++++++++----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index a203d33a..c9b49c73 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,9 @@
   <img alt="vue3-element-admin" width="80" height="80" src="http://github.com/src/assets/logo.png">
   <h1>vue3-element-admin</h1>
 
-  <img src="https://img.shields.io/badge/Vue-3.5.21-brightgreen.svg"/>
+  <img src="https://img.shields.io/badge/Vue-3.5.22-brightgreen.svg"/>
   <img src="https://img.shields.io/badge/Vite-7.1.5-green.svg"/>
-  <img src="https://img.shields.io/badge/Element%20Plus-2.11.2-blue.svg"/>
+  <img src="https://img.shields.io/badge/Element%20Plus-2.11.4-blue.svg"/>
   <img src="https://img.shields.io/badge/license-MIT-green.svg"/>
   <a href="https://gitee.com/youlaiorg" target="_blank">
       <img src="https://img.shields.io/badge/Author-%E6%9C%89%E6%9D%A5%E5%BC%80%E6%BA%90%E7%BB%84%E7%BB%87-orange.svg"/>
diff --git a/package.json b/package.json
index e02246ab..251130fd 100644
--- a/package.json
+++ b/package.json
@@ -49,15 +49,15 @@
     "@element-plus/icons-vue": "^2.3.2",
     "@stomp/stompjs": "^7.2.0",
     "@vueuse/core": "^12.8.2",
-    "@wangeditor-next/editor": "^5.6.45",
+    "@wangeditor-next/editor": "^5.6.46",
     "@wangeditor-next/editor-for-vue": "^5.1.14",
     "animate.css": "^4.1.1",
     "axios": "^1.12.2",
     "codemirror": "^5.65.20",
     "codemirror-editor-vue3": "^2.8.0",
     "default-passive-events": "^2.0.0",
-    "echarts": "^5.6.0",
-    "element-plus": "^2.11.2",
+    "echarts": "^6.0.0",
+    "element-plus": "^2.11.4",
     "exceljs": "^4.4.0",
     "lodash-es": "^4.17.21",
     "nprogress": "^0.2.0",
@@ -66,7 +66,7 @@
     "pinia": "^3.0.3",
     "qs": "^6.14.0",
     "sortablejs": "^1.15.6",
-    "vue": "^3.5.21",
+    "vue": "^3.5.22",
     "vue-draggable-plus": "^0.6.0",
     "vue-i18n": "^11.1.12",
     "vue-router": "^4.5.1",
@@ -75,25 +75,25 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.35.0",
+    "@eslint/js": "^9.37.0",
     "@iconify/utils": "^2.3.0",
     "@types/codemirror": "^5.60.16",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^22.18.4",
+    "@types/node": "^24.7.1",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.14.0",
     "@types/sortablejs": "^1.15.8",
-    "@typescript-eslint/eslint-plugin": "^8.44.0",
-    "@typescript-eslint/parser": "^8.44.0",
+    "@typescript-eslint/eslint-plugin": "^8.46.0",
+    "@typescript-eslint/parser": "^8.46.0",
     "@vitejs/plugin-vue": "^6.0.1",
     "autoprefixer": "^10.4.21",
     "commitizen": "^4.3.1",
     "cz-git": "^1.12.0",
-    "eslint": "^9.35.0",
+    "eslint": "^9.37.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
-    "eslint-plugin-vue": "^10.4.0",
+    "eslint-plugin-vue": "^10.5.0",
     "globals": "^15.15.0",
     "husky": "^9.1.7",
     "lint-staged": "^15.5.2",
@@ -101,8 +101,8 @@
     "postcss-html": "^1.8.0",
     "postcss-scss": "^4.0.9",
     "prettier": "^3.6.2",
-    "sass": "^1.92.1",
-    "stylelint": "^16.24.0",
+    "sass": "^1.93.2",
+    "stylelint": "^16.25.0",
     "stylelint-config-html": "^1.1.0",
     "stylelint-config-recess-order": "^6.1.0",
     "stylelint-config-recommended": "^15.0.0",
@@ -110,12 +110,12 @@
     "stylelint-config-recommended-vue": "^1.6.1",
     "stylelint-prettier": "^5.0.3",
     "terser": "^5.44.0",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.44.0",
-    "unocss": "^66.5.1",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.46.0",
+    "unocss": "^66.5.3",
     "unplugin-auto-import": "^19.3.0",
     "unplugin-vue-components": "^28.8.0",
-    "vite": "^7.1.5",
+    "vite": "^7.1.9",
     "vite-plugin-mock-dev-server": "^1.9.3",
     "vue-eslint-parser": "^10.2.0",
     "vue-tsc": "^2.2.12"

From 30d56bb69abc2719ea6b4e7fde5e1b1f893a025a Mon Sep 17 00:00:00 2001
From: cshaptx4869 <994774638@qq.com>
Date: Wed, 22 Oct 2025 11:11:46 +0800
Subject: [PATCH 497/497] =?UTF-8?q?fix(UploadFile):=20:bug:=20=E8=B6=85?=
 =?UTF-8?q?=E5=87=BA=E6=96=87=E4=BB=B6=E4=B8=8A=E9=99=90=E4=B8=AA=E6=95=B0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/FileUpload.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Upload/FileUpload.vue b/src/components/Upload/FileUpload.vue
index baa88a67..62195357 100644
--- a/src/components/Upload/FileUpload.vue
+++ b/src/components/Upload/FileUpload.vue
@@ -8,6 +8,7 @@
       :http-request="handleUpload"
       :on-success="handleSuccess"
       :on-error="handleError"
+      :on-exceed="handleExceed"
       :accept="props.accept"
       :limit="props.limit"
       multiple
@@ -22,10 +23,14 @@
         <template v-if="file.status === 'success'">
           <div class="el-upload-list__item-info">
             <a class="el-upload-list__item-name" @click="handleDownload(file)">
-              <el-icon><Document /></el-icon>
+              <el-icon>
+                <Document />
+              </el-icon>
               <span class="el-upload-list__item-file-name">{{ file.name }}</span>
               <span class="el-icon--close" @click.stop="handleRemove(file.url!)">
-                <el-icon><Close /></el-icon>
+                <el-icon>
+                  <Close />
+                </el-icon>
               </span>
             </a>
           </div>
@@ -176,6 +181,13 @@ function handleUpload(options: UploadRequestOptions) {
   });
 }
 
+/**
+ * 上传文件超出限制
+ */
+function handleExceed() {
+  ElMessage.warning(`最多只能上传${props.limit}个文件`);
+}
+
 /**
  * 上传成功
  */