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

2026-01-26 10:13:23 +08:00
parent 1ce562601f 7cb2699f19
commit baed599fcc
62 changed files with 5078 additions and 3451 deletions
--- a/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
+++ b/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
@@ -315,6 +315,7 @@ async function init() {
      '[Vben Vxe Table]: The formConfig in the grid is not supported, please use the `formOptions` props',
    );
  }
+  // @ts-ignore
  props.api?.setState?.({ gridOptions: defaultGridOptions });
  // form 由 vben-form 代替，所以需要保证query相关事件可以拿到参数
  extendProxyOptions(props.api, defaultGridOptions, () =>