Merge branch 'main' of github.com:flipped-aurora/gin-vue-admin

Author: piexlMax(奇淼

web/package.json

@@ -58,6 +58,7 @@
     "@eslint/js": "^8.56.0",
     "@unocss/extractor-svelte": "^66.4.2",
     "@unocss/preset-wind3": "^66.4.2",
+    "@unocss/vite": "^66.5.0",
     "@vitejs/plugin-legacy": "^6.0.0",
     "@vitejs/plugin-vue": "^5.0.3",
     "@vue/cli-plugin-babel": "~5.0.8",
@@ -72,6 +73,7 @@
     "dotenv": "^16.4.5",
     "eslint": "^8.57.0",
     "eslint-plugin-vue": "^9.19.2",
+    "globals": "^16.3.0",
     "sass": "^1.78.0",
     "terser": "^5.31.6",
     "unocss": "^66.4.2",

web/src/view/layout/index.vue

@@ -11,7 +11,7 @@
       :content="userStore.userInfo.nickName"
     />
     <gva-header />
-    <div class="flex flex-row w-full pt-16 box-border h-full">
+    <div class="flex flex-row w-full gva-container pt-16 box-border !h-full">
       <gva-aside
         v-if="
           config.side_mode === 'normal' || config.side_mode === 'sidebar' ||

web/vite.config.js

@@ -9,7 +9,7 @@ import vueDevTools from 'vite-plugin-vue-devtools'
 import VueFilePathPlugin from './vitePlugin/componentName/index.js'
 import { svgBuilder } from 'vite-auto-import-svg'
 import { AddSecret } from './vitePlugin/secret'
-import UnoCSS from 'unocss/vite'
+import UnoCSS from '@unocss/vite'
 
 // @see https://cn.vitejs.dev/config/
 export default ({ mode }) => {