vxe-table 3.24.2 → 3.24.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/grid/src/grid.js +4 -2
- package/es/style.css +1 -1
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/grid/src/grid.js +3 -1
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +5 -3
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +2 -2
- package/packages/grid/src/grid.ts +4 -2
- /package/es/{iconfont.1789983617913.ttf → iconfont.1790757586395.ttf} +0 -0
- /package/es/{iconfont.1789983617913.woff → iconfont.1790757586395.woff} +0 -0
- /package/es/{iconfont.1789983617913.woff2 → iconfont.1790757586395.woff2} +0 -0
- /package/lib/{iconfont.1789983617913.ttf → iconfont.1790757586395.ttf} +0 -0
- /package/lib/{iconfont.1789983617913.woff → iconfont.1790757586395.woff} +0 -0
- /package/lib/{iconfont.1789983617913.woff2 → iconfont.1790757586395.woff2} +0 -0
package/es/grid/src/grid.js
CHANGED
|
@@ -789,7 +789,8 @@ export default {
|
|
|
789
789
|
}
|
|
790
790
|
break;
|
|
791
791
|
}
|
|
792
|
-
case 'queryFooter':
|
|
792
|
+
case 'queryFooter':
|
|
793
|
+
case 'query_footer': {
|
|
793
794
|
const bqfMethod = ajax.beforeQueryFooter;
|
|
794
795
|
const qfMethod = ajax.queryFooter;
|
|
795
796
|
const aqfMethod = ajax.afterQueryFooter;
|
|
@@ -1373,12 +1374,13 @@ export default {
|
|
|
1373
1374
|
const { $event } = params;
|
|
1374
1375
|
const proxyOpts = $xeGrid.computeProxyOpts;
|
|
1375
1376
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
1377
|
+
const formOptions = proxyOpts.formOptions || {};
|
|
1376
1378
|
$xeGrid.dispatchEvent('form-reset', params, $event);
|
|
1377
1379
|
if ($xeTable) {
|
|
1378
1380
|
$xeTable.clearScroll();
|
|
1379
1381
|
}
|
|
1380
1382
|
internalData.uFoot = true;
|
|
1381
|
-
$xeGrid.commitProxy('reload').then((rest) => {
|
|
1383
|
+
$xeGrid.commitProxy(formOptions.resetMode === 'reset_form' ? 'query' : 'reload').then((rest) => {
|
|
1382
1384
|
$xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), { isReload: true }), $event);
|
|
1383
1385
|
});
|
|
1384
1386
|
internalData.uFoot = false;
|