From de5fb842153ad2e9ddb7ede222a7c56555301948 Mon Sep 17 00:00:00 2001
From: Soybean <honghuangdc@gmail.com>
Date: Wed, 27 Apr 2022 22:51:28 +0800
Subject: [PATCH] =?UTF-8?q?refactor(projects):=20layout=E5=92=8Ctab?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BE=9D=E8=B5=96=E5=90=8D=E7=A7=B0=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4=E3=80=81=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +-
 pnpm-lock.yaml                                |  8 ++---
 .../components/MixMenuDetail.vue              |  6 ++--
 uno.config.ts                                 | 30 +++++++++----------
 4 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/package.json b/package.json
index 4517c209..828e45af 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
   "dependencies": {
     "@antv/g2plot": "^2.4.16",
     "@better-scroll/core": "^2.4.2",
-    "@soybeanjs/vue-admin-layout": "^1.0.2",
+    "@soybeanjs/vue-admin-layout": "^1.0.3",
     "@soybeanjs/vue-admin-tab": "^1.0.1",
     "@vueuse/core": "^8.3.1",
     "axios": "^0.27.2",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 857ed7f1..86f5e480 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -8,7 +8,7 @@ specifiers:
   '@commitlint/config-conventional': ^16.2.1
   '@iconify/json': ^2.1.33
   '@iconify/vue': ^3.2.1
-  '@soybeanjs/vue-admin-layout': ^1.0.2
+  '@soybeanjs/vue-admin-layout': ^1.0.3
   '@soybeanjs/vue-admin-tab': ^1.0.1
   '@types/bmapgl': ^0.0.5
   '@types/crypto-js': ^4.1.1
@@ -75,7 +75,7 @@ specifiers:
 dependencies:
   '@antv/g2plot': 2.4.16
   '@better-scroll/core': registry.nlark.com/@better-scroll/core/2.4.2
-  '@soybeanjs/vue-admin-layout': 1.0.2_vue@3.2.33
+  '@soybeanjs/vue-admin-layout': 1.0.3_vue@3.2.33
   '@soybeanjs/vue-admin-tab': 1.0.1_vue@3.2.33
   '@vueuse/core': 8.3.1_vue@3.2.33
   axios: 0.27.2
@@ -1029,8 +1029,8 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /@soybeanjs/vue-admin-layout/1.0.2_vue@3.2.33:
-    resolution: {integrity: sha512-6OnBEpabV121ChT1SHiSXhyv1QN+rkkdZt4pflrg8vOAmy2hbx935KtCsgXjw5ObGO/tYPkfQSs4gi0ZVgmpUw==}
+  /@soybeanjs/vue-admin-layout/1.0.3_vue@3.2.33:
+    resolution: {integrity: sha512-ech9q8XOkQ2rIxF5D2p4ikzV/S5yk08N2sWuQWC6QSzF3c8seG89i+Pl+k0NZRkKlnD3ntz9Ai0VqxET/jhMdw==}
     peerDependencies:
       '@vue/composition-api': ^1.4.6
       vue: ^2.0.0 || >=3.0.0
diff --git a/src/layouts/common/GlobalSider/components/VerticalMixSider/components/MixMenuDetail.vue b/src/layouts/common/GlobalSider/components/VerticalMixSider/components/MixMenuDetail.vue
index 6283de35..0f96bde9 100644
--- a/src/layouts/common/GlobalSider/components/VerticalMixSider/components/MixMenuDetail.vue
+++ b/src/layouts/common/GlobalSider/components/VerticalMixSider/components/MixMenuDetail.vue
@@ -2,12 +2,12 @@
   <div class="mb-6px px-4px cursor-pointer" @mouseenter="setTrue" @mouseleave="setFalse">
     <div
       class="flex-center flex-col py-12px rounded-2px bg-transparent transition-colors duration-300 ease-in-out"
-      :class="{ 'text-primary !bg-primary-active': isActive, 'text-primary': isHover }"
+      :class="{ 'text-primary !bg-primary_active': isActive, 'text-primary': isHover }"
     >
       <component :is="icon" :class="[isMini ? 'text-16px' : 'text-20px']" />
       <p
-        class="pt-8px text-12px overflow-hidden transition-height duration-300 ease-in-out"
-        :class="[isMini ? 'h-0 pt-0' : 'h-20px pt-8px']"
+        class="text-12px overflow-hidden transition-height duration-300 ease-in-out"
+        :class="[isMini ? 'h-0 pt-0' : 'h-24px pt-4px']"
       >
         {{ label }}
       </p>
diff --git a/uno.config.ts b/uno.config.ts
index 8e9a44d4..3a4bf181 100644
--- a/uno.config.ts
+++ b/uno.config.ts
@@ -41,25 +41,25 @@ export default defineConfig({
   theme: {
     colors: {
       primary: 'var(--primary-color)',
-      'primary-hover': 'var(--primary-color-hover)',
-      'primary-pressed': 'var(--primary-color-pressed)',
-      'primary-active': 'var(--primary-color-active)',
+      primary_hover: 'var(--primary-color-hover)',
+      primary_pressed: 'var(--primary-color-pressed)',
+      primary_active: 'var(--primary-color-active)',
       info: 'var(--info-color)',
-      'info-hover': 'var(--info-color-hover)',
-      'info-pressed': 'var(--info-color-pressed)',
-      'info-active': 'var(--info-color-active)',
+      info_hover: 'var(--info-color-hover)',
+      info_pressed: 'var(--info-color-pressed)',
+      info_active: 'var(--info-color-active)',
       success: 'var(--success-color)',
-      'success-hover': 'var(--success-color-hover)',
-      'success-pressed': 'var(--success-color-pressed)',
-      'success-active': 'var(--success-color-active)',
+      success_hover: 'var(--success-color-hover)',
+      success_pressed: 'var(--success-color-pressed)',
+      success_active: 'var(--success-color-active)',
       warning: 'var(--warning-color)',
-      'warning-hover': 'var(--warning-color-hover)',
-      'warning-pressed': 'var(--warning-color-pressed)',
-      'warning-active': 'var(--warning-color-active)',
+      warning_hover: 'var(--warning-color-hover)',
+      warning_pressed: 'var(--warning-color-pressed)',
+      warning_active: 'var(--warning-color-active)',
       error: 'var(--error-color)',
-      'error-hover': 'var(--error-color-hover)',
-      'error-pressed': 'var(--error-color-pressed)',
-      'error-active': 'var(--error-color-active)'
+      error_hover: 'var(--error-color-hover)',
+      error_pressed: 'var(--error-color-pressed)',
+      error_active: 'var(--error-color-active)'
     },
     backgroundColor: {
       dark: '#18181c'