Skip to content

Commit 352c9a1

Browse files
committed
releases 4.22.3
1 parent 503643b commit 352c9a1

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vxe-table",
3-
"version": "4.22.2",
3+
"version": "4.22.3",
44
"description": "A PC-end table component based on Vxe UI, supporting copy-paste, data pivot table, and high-performance virtual list table solution.",
55
"scripts": {
66
"update": "npm install --legacy-peer-deps",
@@ -66,7 +66,7 @@
6666
"typescript": "~5.9.3",
6767
"vue": "3.4.27",
6868
"vue-router": "~4.5.1",
69-
"vxe-pc-ui": "4.18.18"
69+
"vxe-pc-ui": "4.18.21"
7070
},
7171
"vetur": {
7272
"tags": "helper/vetur/tags.json",

‎packages/grid/src/grid.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,12 +486,13 @@ export default defineVxeComponent({
486486
const { $event } = params
487487
const proxyOpts = computeProxyOpts.value
488488
if (proxyConfig && isEnableConf(proxyOpts)) {
489+
const formOptions = proxyOpts.formOptions || {}
489490
$xeGrid.dispatchEvent('form-reset', params, $event)
490491
if ($xeTable) {
491492
$xeTable.clearScroll()
492493
}
493494
internalData.uFoot = true
494-
$xeGrid.commitProxy('reload').then((rest) => {
495+
$xeGrid.commitProxy(formOptions.resetMode === 'reset_form' ? 'query' : 'reload').then((rest) => {
495496
$xeGrid.dispatchEvent('proxy-query', { ...rest, isReload: true }, $event)
496497
})
497498
internalData.uFoot = false
@@ -1225,7 +1226,8 @@ export default defineVxeComponent({
12251226
}
12261227
break
12271228
}
1228-
case 'queryFooter': {
1229+
case 'queryFooter':
1230+
case 'query_footer': {
12291231
const bqfMethod = ajax.beforeQueryFooter
12301232
const qfMethod = ajax.queryFooter
12311233
const aqfMethod = ajax.afterQueryFooter

0 commit comments

Comments
 (0)