diff --git a/examples/assets/image/vxe-table.next.gif b/examples/assets/image/vxe-table.next.gif index 471e8b54e..6c4f5ee0f 100644 Binary files a/examples/assets/image/vxe-table.next.gif and b/examples/assets/image/vxe-table.next.gif differ diff --git a/packages/form/src/form.js b/packages/form/src/form.js index 9b20cbb0e..fc442f7a7 100644 --- a/packages/form/src/form.js +++ b/packages/form/src/form.js @@ -121,12 +121,12 @@ function renderItems (h, _vm) { } } let contentVNs = [] - if (compConf && compConf.renderItemContent) { + if (slots && slots.default) { + contentVNs = _vm.callSlot(slots.default, params, h) + } else if (compConf && compConf.renderItemContent) { contentVNs = compConf.renderItemContent.call(_vm, h, itemRender, params) } else if (compConf && compConf.renderItem) { contentVNs = compConf.renderItem.call(_vm, h, itemRender, params) - } else if (slots && slots.default) { - contentVNs = _vm.callSlot(slots.default, params, h) } else if (field) { contentVNs = [`${XEUtils.get(data, field)}`] } diff --git a/packages/table/src/table.js b/packages/table/src/table.js index 59fa2226a..8accd03b9 100644 --- a/packages/table/src/table.js +++ b/packages/table/src/table.js @@ -733,10 +733,10 @@ export default { } } if (this.mouseOpts.area && this.mouseOpts.selected) { - UtilTools.error('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']) + UtilTools.warn('vxe.error.errConflicts', ['mouse-config.area', 'mouse-config.selected']) } if (this.mouseOpts.area && this.checkboxOpts.range) { - UtilTools.error('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']) + UtilTools.warn('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range']) } if (this.treeConfig && this.mouseOpts.area) { UtilTools.error('vxe.error.noTree', ['mouse-config.area'])