Merge branch 'main' into pages

package.json

@@ -127,7 +127,7 @@
     "@types/dagre": "^0.7.53",
     "@types/intro.js": "^5.1.5",
     "@types/js-cookie": "^3.0.6",
-    "@types/node": "^20.19.29",
+    "@types/node": "^20.19.30",
     "@types/nprogress": "^0.2.3",
     "@types/path-browserify": "^1.0.3",
     "@types/qrcode": "^1.5.6",
@@ -154,16 +154,16 @@
     "rimraf": "^6.1.2",
     "rollup-plugin-visualizer": "^6.0.5",
     "sass": "^1.97.2",
-    "stylelint": "^16.26.1",
+    "stylelint": "^17.0.0",
     "stylelint-config-recess-order": "^7.4.0",
     "stylelint-config-recommended-vue": "^1.6.1",
-    "stylelint-config-standard-scss": "^14.0.0",
+    "stylelint-config-standard-scss": "^17.0.0",
     "stylelint-prettier": "^5.0.3",
     "svgo": "^4.0.0",
     "tailwindcss": "^4.1.18",
     "typescript": "^5.9.3",
     "typescript-eslint": "^8.53.0",
-    "unplugin-icons": "^22.5.0",
+    "unplugin-icons": "^23.0.1",
     "vite": "^7.3.1",
     "vite-plugin-cdn-import": "^1.0.1",
     "vite-plugin-compression": "^0.5.1",

src/App.vue

@@ -7,12 +7,13 @@
 </template>
 
 <script lang="ts">
+import { useRouter } from "vue-router";
 import { useGlobal } from "@pureadmin/utils";
 import { checkVersion } from "version-rocket";
 import { defineComponent, computed } from "vue";
 import { ElConfigProvider } from "element-plus";
-import { ReDialog } from "@/components/ReDialog";
-import { ReDrawer } from "@/components/ReDrawer";
+import { ReDialog, closeAllDialog } from "@/components/ReDialog";
+import { ReDrawer, closeAllDrawer } from "@/components/ReDrawer";
 import en from "element-plus/es/locale/lang/en";
 import zhCn from "element-plus/es/locale/lang/zh-cn";
 import plusEn from "plus-pro-components/es/locale/lang/en";
@@ -27,12 +28,19 @@ export default defineComponent({
     ReDrawer
   },
   setup() {
+    const router = useRouter();
     const { $storage } = useGlobal<GlobalPropertiesApi>();
     const currentLocale = computed(() => {
       return $storage.locale?.locale === "zh"
         ? { ...zhCn, ...plusZhCn }
         : { ...en, ...plusEn };
     });
+
+    router.beforeEach(() => {
+      closeAllDialog();
+      closeAllDrawer();
+    });
+
     return {
       currentLocale
     };

src/layout/components/lay-navbar/index.vue

@@ -174,7 +174,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -192,7 +192,7 @@ const { t, locale, translationCh, translationEn } = useTranslationLang();
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/layout/components/lay-sidebar/NavHorizontal.vue

@@ -159,7 +159,7 @@ onMounted(() => {
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -177,7 +177,7 @@ onMounted(() => {
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/layout/components/lay-sidebar/NavMix.vue

@@ -180,7 +180,7 @@ watch(
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }
 
@@ -198,7 +198,7 @@ watch(
 .logout {
   width: 120px;
 
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     display: inline-flex;
     flex-wrap: wrap;
     min-width: 100%;

src/views/able/video-frame/index.vue

@@ -171,7 +171,7 @@ onBeforeUnmount(() => {
 </template>
 
 <style lang="scss" scoped>
-::v-deep(.el-upload-dragger) {
+:deep(.el-upload-dragger) {
   display: flex;
   align-items: center;
   height: 180px;

src/views/components/split-pane.vue

@@ -71,17 +71,17 @@ const settingTB: ContextProps = reactive({
 
   .dv-a {
     padding-top: 30vh;
-    color: rgba($color: dodgerblue, $alpha: 80%);
+    color: rgb(30 144 255 / 80%);
   }
 
   .dv-b {
     padding-top: 10vh;
-    color: rgba($color: #000, $alpha: 80%);
+    color: rgb(0 0 0 / 80%);
   }
 
   .dv-c {
     padding-top: 18vh;
-    color: rgba($color: #ce272d, $alpha: 80%);
+    color: rgb(206 39 45 / 80%);
   }
 }
 </style>

src/views/login/index.vue

@@ -368,7 +368,7 @@ watch(loginDay, value => {
 }
 
 .translation {
-  ::v-deep(.el-dropdown-menu__item) {
+  :deep(.el-dropdown-menu__item) {
     padding: 5px 40px;
   }