lxm_front/vxe-table
1
0
Fork 0
mirror of https://gitee.com/xuliangzhan_admin/vxe-table.git synced 2026-01-21 05:27:57 +08:00
Code Issues Projects Releases Wiki Activity

form 修复自定义插槽渲染无效问题

Browse Source
This commit is contained in:
xuliangzhan
2021-02-03 23:04:11 +08:00
parent 631bcb5188
commit 620f2ec7f2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
examples/assets/image/vxe-table.next.gif
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 MiB

After

Width:  |  Height:  |  Size: 2.2 MiB

6
packages/form/src/form.js
View File

@@ -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)}`]
}

4
packages/table/src/table.js
View File

@@ -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'])