Quellcode durchsuchen

😎1、调整子菜单样式 2、升级npm依赖

zuohuaijun vor 1 Jahr
Ursprung
Commit
bb52cc18d4
3 geänderte Dateien mit 14 neuen und 22 gelöschten Zeilen
  1. 11 11
      Web/package.json
  2. 1 4
      Web/src/layout/navBars/topBar/settings.vue
  3. 2 7
      Web/src/theme/element.scss

+ 11 - 11
Web/package.json

@@ -2,7 +2,7 @@
 	"name": "admin.net",
 	"type": "module",
 	"version": "2.4.33",
-	"lastBuildTime": "2024.07.26",
+	"lastBuildTime": "2024.07.31",
 	"description": "Admin.NET 站在巨人肩膀上的 .NET 通用权限开发框架",
 	"author": "zuohuaijun",
 	"license": "MIT",
@@ -14,8 +14,8 @@
 	},
 	"dependencies": {
 		"@element-plus/icons-vue": "^2.3.1",
-		"@logicflow/core": "^1.2.27",
-		"@logicflow/extension": "^1.2.27",
+		"@logicflow/core": "^1.2.28",
+		"@logicflow/extension": "^1.2.28",
 		"@microsoft/signalr": "^8.0.7",
 		"@vue-office/docx": "^1.6.2",
 		"@vue-office/excel": "^1.7.11",
@@ -31,9 +31,9 @@
 		"echarts": "^5.5.1",
 		"echarts-gl": "^2.0.9",
 		"echarts-wordcloud": "^2.1.0",
-		"element-plus": "^2.7.7",
+		"element-plus": "^2.7.8",
 		"ezuikit": "^1.0.0",
-		"ezuikit-js": "^8.0.6",
+		"ezuikit-js": "^8.0.8",
 		"js-cookie": "^3.0.5",
 		"js-table2excel": "^1.1.2",
 		"jsplumb": "^2.15.6",
@@ -42,12 +42,12 @@
 		"monaco-editor": "^0.50.0",
 		"mqtt": "^4.3.8",
 		"nprogress": "^0.2.0",
-		"pinia": "^2.1.7",
+		"pinia": "^2.2.0",
 		"print-js": "^1.6.0",
 		"push.js": "^1.0.12",
 		"qrcodejs2-fixes": "^0.0.2",
 		"qs": "^6.12.3",
-		"relation-graph": "^2.2.2",
+		"relation-graph": "^2.2.3",
 		"screenfull": "^6.0.2",
 		"sm-crypto-v2": "^1.9.1",
 		"sortablejs": "^1.15.2",
@@ -70,12 +70,12 @@
 	"devDependencies": {
 		"@plugin-web-update-notification/vite": "^1.7.1",
 		"@types/lodash-es": "^4.17.12",
-		"@types/node": "^20.14.12",
+		"@types/node": "^20.14.13",
 		"@types/nprogress": "^0.2.3",
 		"@types/sortablejs": "^1.15.8",
-		"@typescript-eslint/eslint-plugin": "^7.17.0",
-		"@typescript-eslint/parser": "^7.17.0",
-		"@vitejs/plugin-vue": "^5.1.0",
+		"@typescript-eslint/eslint-plugin": "^7.18.0",
+		"@typescript-eslint/parser": "^7.18.0",
+		"@vitejs/plugin-vue": "^5.1.1",
 		"@vitejs/plugin-vue-jsx": "^4.0.0",
 		"@vue/compiler-sfc": "^3.4.34",
 		"code-inspector-plugin": "^0.15.2",

+ 1 - 4
Web/src/layout/navBars/topBar/settings.vue

@@ -485,10 +485,7 @@ const onColorPickerChange = () => {
 // 2、菜单 / 顶栏
 const onBgColorPickerChange = (bg: string) => {
 	document.documentElement.style.setProperty(`--next-bg-${bg}`, themeConfig.value[bg]);
-	if(bg === 'menuBarColor'){
-		document.documentElement.style.setProperty(`--el-menu-text-color`, themeConfig.value[bg]);
-	}
-    if (bg === 'menuBar') {
+	if (bg === 'menuBar') {
 		document.documentElement.style.setProperty(`--next-bg-menuBar-light-1`, getLightColor(getThemeConfig.value.menuBar, 0.05));
 	}
 	onTopBarGradualChange();

+ 2 - 7
Web/src/theme/element.scss

@@ -83,17 +83,12 @@
 	width: 220px;
 }
 
-.el-menu-item {
-	height: 45px !important;
-	line-height: 45px !important;
-	margin: 0 0 1px 0;
-}
-
-//.el-menu-item,
+.el-menu-item,
 .el-sub-menu__title {
 	color: var(--next-bg-menuBarColor);
 	height: 45px !important;
 	line-height: 45px !important;
+	// margin: 0 0 1px 0;
 }
 
 // 修复点击左侧菜单折叠再展开时,宽度不跟随问题