升级依赖

README.md

@@ -1,46 +1,4 @@
 # fs-admin
 
-This template should help get you started developing with Vue 3 in Vite.
-
-## Recommended IDE Setup
-
-[VSCode](https://code.visualstudio.com/) + [Volar](https://marketplace.visualstudio.com/items?itemName=Vue.volar) (and disable Vetur) + [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin).
-
-## Type Support for `.vue` Imports in TS
-
-TypeScript cannot handle type information for `.vue` imports by default, so we replace the `tsc` CLI with `vue-tsc` for type checking. In editors, we need [TypeScript Vue Plugin (Volar)](https://marketplace.visualstudio.com/items?itemName=Vue.vscode-typescript-vue-plugin) to make the TypeScript language service aware of `.vue` types.
-
-If the standalone TypeScript plugin doesn't feel fast enough to you, Volar has also implemented a [Take Over Mode](https://github.com/johnsoncodehk/volar/discussions/471#discussioncomment-1361669) that is more performant. You can enable it by the following steps:
-
-1. Disable the built-in TypeScript Extension
-    1) Run `Extensions: Show Built-in Extensions` from VSCode's command palette
-    2) Find `TypeScript and JavaScript Language Features`, right click and select `Disable (Workspace)`
-2. Reload the VSCode window by running `Developer: Reload Window` from the command palette.
-
-## Customize configuration
-
-See [Vite Configuration Reference](https://vitejs.dev/config/).
-
-## Project Setup
-
-```sh
-pnpm install
-```
-
-### Compile and Hot-Reload for Development
-
-```sh
-pnpm dev
-```
-
-### Type-Check, Compile and Minify for Production
-
-```sh
-pnpm build
-```
-
-### Lint with [ESLint](https://eslint.org/)
-
-```sh
-pnpm lint
-```
+## 方是科技管理后台框架
+### vue3 + vue-router + pinia + typescript

package.json

@@ -12,38 +12,38 @@
   "dependencies": {
     "@element-plus/icons-vue": "^2.0.9",
     "@icon-park/vue-next": "^1.4.2",
-    "@vueuse/core": "^9.1.1",
+    "@vueuse/core": "^9.2.0",
     "@wangeditor/editor": "^5.1.18",
     "@wangeditor/editor-for-vue": "^5.1.12",
     "axios": "^0.27.2",
-    "element-plus": "^2.2.15",
+    "element-plus": "^2.2.17",
     "nprogress": "^0.2.0",
-    "pinia": "^2.0.17",
-    "vue": "^3.2.37",
-    "vue-router": "^4.1.3"
+    "pinia": "^2.0.22",
+    "vue": "^3.2.39",
+    "vue-router": "^4.1.5"
   },
   "devDependencies": {
     "@iconify-json/ep": "^1.1.7",
-    "@rushstack/eslint-patch": "^1.1.4",
-    "@types/node": "^16.11.47",
+    "@rushstack/eslint-patch": "^1.2.0",
+    "@types/node": "^16.11.59",
     "@types/nprogress": "^0.2.0",
-    "@vitejs/plugin-vue": "^3.0.1",
-    "@vitejs/plugin-vue-jsx": "^2.0.0",
+    "@vitejs/plugin-vue": "^3.1.0",
+    "@vitejs/plugin-vue-jsx": "^2.0.1",
     "@vue/eslint-config-prettier": "^7.0.0",
-    "@vue/eslint-config-typescript": "^11.0.0",
+    "@vue/eslint-config-typescript": "^11.0.1",
     "@vue/tsconfig": "^0.1.3",
-    "eslint": "^8.21.0",
-    "eslint-plugin-vue": "^9.3.0",
+    "eslint": "^8.23.1",
+    "eslint-plugin-vue": "^9.5.1",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.7.1",
     "sass": "^1.54.9",
     "typescript": "~4.7.4",
-    "unocss": "^0.45.14",
+    "unocss": "^0.45.22",
     "unplugin-auto-import": "^0.11.2",
-    "unplugin-icons": "^0.14.9",
-    "unplugin-vue-components": "^0.22.4",
+    "unplugin-icons": "^0.14.10",
+    "unplugin-vue-components": "^0.22.7",
     "unplugin-vue-define-options": "^0.11.2",
-    "vite": "^3.0.4",
+    "vite": "^3.1.3",
     "vue-tsc": "^0.39.5"
   }
 }

src/components/GlobalTabs.vue

@@ -129,7 +129,7 @@ watch(contextMenuVisible, val => {
 </script>
 
 <template>
-  <div class="bg-white" style="border-top: 1px solid var(--el-border-color-light)">
+  <div class="bg-white">
     <el-tabs
       v-model="activeValue"
       :closable="!(tabs.length === 1)"
@@ -165,6 +165,7 @@ watch(contextMenuVisible, val => {
 <style lang="scss" scoped>
 :deep(.el-tabs__header) {
   margin: 0;
+  border-top: 1px solid var(--el-border-color-light);
 }
 :deep(.el-tabs__nav) {
   border-top: none !important;

src/layouts/BasicLayout.vue

@@ -9,7 +9,7 @@
       <global-menu />
       <el-main style="padding: 0">
         <global-tabs></global-tabs>
-        <div style="padding: var(--main-padding)">
+        <div style="padding: var(--main-padding); height: calc(100% - 40px)">
           <router-view></router-view>
         </div>
       </el-main>