Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev

2024-12-30 19:38:01 +08:00
parent 5234f2ef54 2eb7fed9f4
commit e3025176ff
53 changed files with 359 additions and 93 deletions
--- a/packages/locales/src/langs/zh-CN/preferences.json
+++ b/packages/locales/src/langs/zh-CN/preferences.json
@@ -17,7 +17,9 @@
  "horizontalTip": "水平菜单模式，菜单全部显示在顶部",
  "twoColumn": "双列菜单",
  "twoColumnTip": "垂直双列菜单模式",
-  "mixedMenu": "混合菜单",
+  "headerTwoColumn": "混合双列",
+  "headerTwoColumnTip": "双列、水平菜单共存模式",
+  "mixedMenu": "混合垂直",
  "mixedMenuTip": "垂直水平菜单共存",
  "fullContent": "内容全屏",
  "fullContentTip": "不显示任何菜单，只显示内容主体",