Merge branch 'main' of https://github.com/vbenjs/vue-vben-admin into dev
commit
ff5c806de2
|
@ -300,7 +300,7 @@ async function init() {
|
||||||
const enableProxyConfig = options.value.proxyConfig?.enabled;
|
const enableProxyConfig = options.value.proxyConfig?.enabled;
|
||||||
if (enableProxyConfig && autoLoad) {
|
if (enableProxyConfig && autoLoad) {
|
||||||
props.api.grid.commitProxy?.(
|
props.api.grid.commitProxy?.(
|
||||||
'initial',
|
'query',
|
||||||
formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
|
formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
|
||||||
);
|
);
|
||||||
// props.api.reload(formApi.form?.values ?? {});
|
// props.api.reload(formApi.form?.values ?? {});
|
||||||
|
|
|
@ -110,7 +110,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
toolbarConfig: {
|
toolbarConfig: {
|
||||||
custom: true,
|
custom: true,
|
||||||
export: false,
|
export: false,
|
||||||
refresh: { code: 'query' },
|
refresh: true,
|
||||||
zoom: true,
|
zoom: true,
|
||||||
},
|
},
|
||||||
treeConfig: {
|
treeConfig: {
|
||||||
|
|
|
@ -44,7 +44,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
toolbarConfig: {
|
toolbarConfig: {
|
||||||
custom: true,
|
custom: true,
|
||||||
export: false,
|
export: false,
|
||||||
refresh: { code: 'query' },
|
refresh: true,
|
||||||
zoom: true,
|
zoom: true,
|
||||||
},
|
},
|
||||||
treeConfig: {
|
treeConfig: {
|
||||||
|
|
|
@ -52,7 +52,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
|
||||||
toolbarConfig: {
|
toolbarConfig: {
|
||||||
custom: true,
|
custom: true,
|
||||||
export: false,
|
export: false,
|
||||||
refresh: { code: 'query' },
|
refresh: true,
|
||||||
search: true,
|
search: true,
|
||||||
zoom: true,
|
zoom: true,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue