Merge branch 'master' of https://github.com/yudaocode/yudao-ui-admin-vue3

.vscode/settings.json

@@ -138,7 +138,7 @@
     "*.ts": "$(capture).test.ts, $(capture).test.tsx",
     "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
     "*.env": "$(capture).env.*",
-    "package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.js,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.js,.eslintignore"
+    "package.json": "pnpm-lock.yaml,yarn.lock,LICENSE,README*,CHANGELOG*,CNAME,.gitattributes,.eslintrc-auto-import.json,.gitignore,prettier.config.cjs,stylelint.config.js,commitlint.config.js,.stylelintignore,.prettierignore,.gitpod.yml,.eslintrc.cjs,.eslintignore"
   },
   "terminal.integrated.scrollback": 10000,
   "nuxt.isNuxtApp": false

package.json

@@ -4,6 +4,7 @@
   "description": "基于vue3、vite4、element-plus、typesScript",
   "author": "xingyu",
   "private": false,
+  "type": "module",
   "scripts": {
     "i": "pnpm install",
     "dev": "vite --mode env.local",

postcss.config.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default  {
   plugins: {
     autoprefixer: {}
   }

src/layout/components/useRenderLayout.tsx

@@ -197,7 +197,7 @@ export const useRenderLayout = () => {
               `${prefixCls}-content-scrollbar`,
               {
                 '!h-[calc(100%-var(--tags-view-height))] mt-[calc(var(--tags-view-height))]':
-                  fixedHeader.value
+                  fixedHeader.value && tagsView.value
               }
             ]}
           >