vxe-table 3.24.0-beta.1 → 3.24.1
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 -3
- 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 +4 -3
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/index.umd.js +6 -5
- 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 -3
- /package/es/{iconfont.1789279209327.ttf → iconfont.1789964216394.ttf} +0 -0
- /package/es/{iconfont.1789279209327.woff → iconfont.1789964216394.woff} +0 -0
- /package/es/{iconfont.1789279209327.woff2 → iconfont.1789964216394.woff2} +0 -0
- /package/lib/{iconfont.1789279209327.ttf → iconfont.1789964216394.ttf} +0 -0
- /package/lib/{iconfont.1789279209327.woff → iconfont.1789964216394.woff} +0 -0
- /package/lib/{iconfont.1789279209327.woff2 → iconfont.1789964216394.woff2} +0 -0
package/es/grid/src/grid.js
CHANGED
|
@@ -1347,13 +1347,14 @@ export default {
|
|
|
1347
1347
|
const internalData = $xeGrid.internalData;
|
|
1348
1348
|
const { proxyConfig } = props;
|
|
1349
1349
|
const proxyOpts = $xeGrid.computeProxyOpts;
|
|
1350
|
+
const formOptions = proxyOpts.formOptions || {};
|
|
1350
1351
|
if (reactData.tableLoading) {
|
|
1351
1352
|
return;
|
|
1352
1353
|
}
|
|
1353
1354
|
if (proxyConfig && isEnableConf(proxyOpts)) {
|
|
1354
1355
|
$xeGrid.dispatchEvent('form-submit', params, params.$event);
|
|
1355
1356
|
internalData.uFoot = true;
|
|
1356
|
-
$xeGrid.commitProxy('reload').then((rest) => {
|
|
1357
|
+
$xeGrid.commitProxy(formOptions.submitMode || 'reload').then((rest) => {
|
|
1357
1358
|
$xeGrid.dispatchEvent('proxy-query', Object.assign(Object.assign({}, rest), { isReload: true }), params.$event);
|
|
1358
1359
|
});
|
|
1359
1360
|
internalData.uFoot = false;
|
|
@@ -1486,7 +1487,7 @@ export default {
|
|
|
1486
1487
|
XEUtils.eachTree(columns, column => {
|
|
1487
1488
|
if (column.slots) {
|
|
1488
1489
|
XEUtils.each(column.slots, (func) => {
|
|
1489
|
-
if (!XEUtils.isFunction(func)) {
|
|
1490
|
+
if (func && !XEUtils.isFunction(func)) {
|
|
1490
1491
|
if (!slots[func]) {
|
|
1491
1492
|
errLog('vxe.error.notSlot', [func]);
|
|
1492
1493
|
}
|
|
@@ -1608,7 +1609,7 @@ export default {
|
|
|
1608
1609
|
// 处理插槽
|
|
1609
1610
|
formOpts.items.forEach((item) => {
|
|
1610
1611
|
XEUtils.each(item.slots, (func) => {
|
|
1611
|
-
if (!XEUtils.isFunction(func)) {
|
|
1612
|
+
if (func && !XEUtils.isFunction(func)) {
|
|
1612
1613
|
if (slots[func]) {
|
|
1613
1614
|
formSlots[func] = slots[func];
|
|
1614
1615
|
}
|