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

2025-05-26 10:50:54 +08:00
parent 3355024e42 6fbf1387f5
commit be1889a0e0
34 changed files with 524 additions and 178 deletions
--- a/playground/src/views/system/menu/data.ts
+++ b/playground/src/views/system/menu/data.ts
@@ -11,7 +11,7 @@ export function getMenuTypeOptions() {
      value: 'catalog',
    },
    { color: 'default', label: $t('system.menu.typeMenu'), value: 'menu' },
-    { color: 'error', label: $t('system.menu.typeButton'), value: 'action' },
+    { color: 'error', label: $t('system.menu.typeButton'), value: 'button' },
    {
      color: 'success',
      label: $t('system.menu.typeEmbedded'),