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

2024-11-09 16:45:50 +08:00
parent f11523953f 26bec4222f
commit d69618e491
58 changed files with 1512 additions and 111 deletions
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -139,10 +139,6 @@ const options = computed(() => {
    mergedOptions.proxyConfig.autoLoad = false;
  }

-  if (!showToolbar.value && mergedOptions.toolbarConfig) {
-    mergedOptions.toolbarConfig.enabled = false;
-  }
-
  if (mergedOptions.pagerConfig) {
    const mobileLayouts = [
      'PrevJump',