Merge branch 'main' into feat-cssvar

.github/workflows/deploy.yml

@@ -14,15 +14,15 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Setup Node.js 20.10.0
+      - name: Setup Node.js 20.15.1
         uses: actions/setup-node@master
         with:
-          node-version: 20.10.0
+          node-version: 20.15.1
 
       - name: Setup pnpm
         uses: pnpm/action-setup@v2
         with:
-          version: 8.11.0
+          version: 9.5.0
 
       - name: Build
         run: pnpm install && pnpm build:prod

.husky/pre-commit

@@ -1,4 +1 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 npx lint-staged

.vscode/settings.json

@@ -1,4 +1,5 @@
 {
+  "prettier.enable": true,
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": "explicit"
   },

README.md

@@ -151,10 +151,7 @@ Small projects are not easy to get a star, if you like this project, welcome to
 
 ## Group
 
-QQ group：1014374415 (left) && add me on WeChat，Invite you to join WeChat group (right)
-
-![qq.png](./src/assets/docs/qq.png)
-![wechat.png](./src/assets/docs/wechat.png)
+[See how to join a group chat](https://github.com/un-pany/v3-admin-vite/issues/191)
 
 ## 📄 License
 

README.zh-CN.md

@@ -151,10 +151,7 @@ pnpm test
 
 ## 可有可无的群
 
-QQ 群：1014374415（左）&& 加我微信，拉你进微信群（右）
-
-![qq.png](./src/assets/docs/qq.png)
-![wechat.png](./src/assets/docs/wechat.png)
+[查看进群方式](https://github.com/un-pany/v3-admin-vite/issues/191)
 
 ## 📄 License
 

package.json

@@ -21,58 +21,58 @@
     "lint:eslint": "eslint --cache --max-warnings 0 \"{src,tests,types}/**/*.{vue,js,jsx,ts,tsx}\" --fix",
     "lint:prettier": "prettier --write \"{src,tests,types}/**/*.{vue,js,jsx,ts,tsx,json,css,less,scss,html,md}\"",
     "lint": "pnpm lint:eslint && pnpm lint:prettier",
-    "prepare": "husky install",
+    "prepare": "husky",
     "test": "vitest"
   },
   "dependencies": {
     "@element-plus/icons-vue": "2.3.1",
-    "axios": "1.6.8",
-    "dayjs": "1.11.10",
-    "element-plus": "2.6.2",
+    "axios": "1.7.2",
+    "dayjs": "1.11.11",
+    "element-plus": "2.7.7",
     "js-cookie": "3.0.5",
     "lodash-es": "4.17.21",
     "mitt": "3.0.1",
     "normalize.css": "8.0.1",
     "nprogress": "0.2.0",
     "path-browserify": "1.0.1",
-    "path-to-regexp": "6.2.1",
+    "path-to-regexp": "7.1.0",
     "pinia": "2.1.7",
     "screenfull": "6.0.2",
-    "vue": "3.4.21",
-    "vue-router": "4.3.0",
-    "vxe-table": "4.5.21",
-    "vxe-table-plugin-element": "4.0.1",
-    "xe-utils": "3.5.22"
+    "vue": "3.4.31",
+    "vue-router": "4.4.0",
+    "vxe-table": "4.6.18",
+    "vxe-table-plugin-element": "4.0.4",
+    "xe-utils": "3.5.28"
   },
   "devDependencies": {
     "@types/js-cookie": "3.0.6",
     "@types/lodash-es": "4.17.12",
-    "@types/node": "20.11.30",
+    "@types/node": "20.14.10",
     "@types/nprogress": "0.2.3",
     "@types/path-browserify": "1.0.2",
-    "@typescript-eslint/eslint-plugin": "7.3.1",
-    "@typescript-eslint/parser": "7.3.1",
-    "@vitejs/plugin-vue": "5.0.4",
-    "@vitejs/plugin-vue-jsx": "3.1.0",
+    "@typescript-eslint/eslint-plugin": "7.16.0",
+    "@typescript-eslint/parser": "7.16.0",
+    "@vitejs/plugin-vue": "5.0.5",
+    "@vitejs/plugin-vue-jsx": "4.0.0",
     "@vue/eslint-config-prettier": "9.0.0",
     "@vue/eslint-config-typescript": "13.0.0",
-    "@vue/test-utils": "2.4.5",
+    "@vue/test-utils": "2.4.6",
     "eslint": "8.57.0",
     "eslint-plugin-prettier": "5.1.3",
-    "eslint-plugin-vue": "9.23.0",
+    "eslint-plugin-vue": "9.27.0",
     "husky": "9.0.11",
-    "jsdom": "24.0.0",
-    "lint-staged": "15.2.2",
-    "prettier": "3.2.5",
-    "sass": "1.72.0",
-    "typescript": "5.4.3",
-    "unocss": "0.58.6",
-    "vite": "5.2.6",
+    "jsdom": "24.1.0",
+    "lint-staged": "15.2.7",
+    "prettier": "3.3.3",
+    "sass": "1.77.8",
+    "typescript": "5.5.3",
+    "unocss": "0.61.3",
+    "vite": "5.3.3",
     "vite-plugin-svg-icons": "2.0.1",
     "vite-svg-loader": "5.1.0",
-    "vitest": "1.4.0",
-    "vue-eslint-parser": "9.4.2",
-    "vue-tsc": "2.0.7"
+    "vitest": "2.0.3",
+    "vue-eslint-parser": "9.4.3",
+    "vue-tsc": "2.0.26"
   },
   "lint-staged": {
     "*.{vue,js,jsx,ts,tsx}": [

src/components/ThemeSwitch/index.vue

@@ -37,7 +37,7 @@ const handleChangeTheme = ({ clientX, clientY }: MouseEvent, themeName: ThemeNam
           :key="index"
           :disabled="activeThemeName === theme.name"
           @click="
-            (e) => {
+            (e: MouseEvent) => {
               handleChangeTheme(e, theme.name)
             }
           "

src/plugins/vxe-table/index.ts

@@ -7,7 +7,7 @@ import VXETablePluginElement from "vxe-table-plugin-element"
 VXETable.use(VXETablePluginElement)
 
 /** 全局默认参数 */
-VXETable.config({
+VXETable.setConfig({
   /** 全局尺寸 */
   size: "medium",
   /** 全局 zIndex 起始值，如果项目的的 z-index 样式值过大时就需要跟随设置更大，避免被遮挡 */
@@ -27,15 +27,15 @@ VXETable.config({
     emptyText: "暂无数据",
     rowConfig: {
       isHover: true,
-      isCurrent: true
+      isCurrent: true,
+      // 行数据的唯一主键字段名
+      keyField: "_VXE_ID"
     },
     columnConfig: {
       resizable: false
     },
     align: "center",
-    headerAlign: "center",
-    /** 行数据的唯一主键字段名 */
-    rowId: "_VXE_ID"
+    headerAlign: "center"
   },
   pager: {
     // size: "medium",

src/styles/variables.css

@@ -5,10 +5,13 @@
   --v3-body-text-color: var(--el-text-color-primary);
   --v3-body-bg-color: var(--el-bg-color-page);
   /** Header 区域 = NavigationBar 组件 + TagsView 组件 */
-  --v3-header-height: calc(var(--v3-navigationbar-height) + var(--v3-tagsview-height));
+  --v3-header-height: calc(
+    var(--v3-navigationbar-height) + var(--v3-tagsview-height) + var(--v3-header-border-bottom-width)
+  );
   --v3-header-bg-color: var(--el-bg-color);
   --v3-header-box-shadow: var(--el-box-shadow-lighter);
-  --v3-header-border-bottom: 1px solid var(--el-fill-color);
+  --v3-header-border-bottom-width: 1px;
+  --v3-header-border-bottom: var(--v3-header-border-bottom-width) solid var(--el-fill-color);
   /** NavigationBar 组件 */
   --v3-navigationbar-height: 50px;
   --v3-navigationbar-text-color: var(--el-text-color-regular);