Browse Source

Merge pull request #1297 from colinin/fix-vxe-table

fix: fixed #1277
pull/1312/head
yx lin 8 months ago
committed by GitHub
parent
commit
db4198d806
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts
  2. 2
      apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue
  3. 2
      apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue
  4. 4
      apps/vben5/pnpm-workspace.yaml

2
apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.ts

@ -24,8 +24,8 @@ export function useVbenVxeGrid(options: VxeGridProps) {
return () => h(VxeGrid, { ...props, ...attrs, api: extendedApi }, slots); return () => h(VxeGrid, { ...props, ...attrs, api: extendedApi }, slots);
}, },
{ {
inheritAttrs: false,
name: 'VbenVxeGrid', name: 'VbenVxeGrid',
inheritAttrs: false,
}, },
); );
// Add reactivity support // Add reactivity support

2
apps/vben5/packages/@abp/ui/src/components/vxe-table/use-vxe-grid.vue

@ -249,7 +249,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?.(
'_init', 'initial',
formOptions.value ? ((await formApi.getValues()) ?? {}) : {}, formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
); );
// props.api.reload(formApi.form?.values ?? {}); // props.api.reload(formApi.form?.values ?? {});

2
apps/vben5/packages/effects/plugins/src/vxe-table/use-vxe-grid.vue

@ -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?.(
'_init', 'initial',
formOptions.value ? ((await formApi.getValues()) ?? {}) : {}, formOptions.value ? ((await formApi.getValues()) ?? {}) : {},
); );
// props.api.reload(formApi.form?.values ?? {}); // props.api.reload(formApi.form?.values ?? {});

4
apps/vben5/pnpm-workspace.yaml

@ -205,8 +205,8 @@ catalog:
vue-simple-uploader: ^1.0.3 vue-simple-uploader: ^1.0.3
vue-tippy: ^6.7.0 vue-tippy: ^6.7.0
vue-tsc: 2.2.10 vue-tsc: 2.2.10
vxe-pc-ui: ^4.5.35 vxe-pc-ui: ^4.7.12
vxe-table: ^4.13.16 vxe-table: ^4.14.4
watermark-js-plus: ^1.6.0 watermark-js-plus: ^1.6.0
zod: ^3.24.3 zod: ^3.24.3
zod-defaults: ^0.1.3 zod-defaults: ^0.1.3

Loading…
Cancel
Save