mirror of
https://gitee.com/xuliangzhan_admin/vxe-table.git
synced 2026-01-21 05:27:57 +08:00
修复渲染函数参数错误问题
This commit is contained in:
@@ -209,7 +209,7 @@ export default {
|
||||
spanPlugin: 'Select merge cells',
|
||||
shortcutKeyPlugin: 'plugin-shortcut-key Shortcut key Settings',
|
||||
chartsPlugin: 'plugin-charts Chart tools',
|
||||
exportXLSXPlugin: 'plugin-export The export xlsx',
|
||||
exportXLSXPlugin: 'plugin-export The import/export xlsx',
|
||||
exportPDFPlugin: 'plugin-export The export pdf',
|
||||
rendererPlugin: 'plugin-renderer More renderer',
|
||||
menusPlugin: 'plugin-menus Context menus',
|
||||
|
||||
@@ -208,7 +208,7 @@ export default {
|
||||
spanPlugin: '单元格选中合并',
|
||||
shortcutKeyPlugin: 'plugin-shortcut-key 快捷键设置',
|
||||
chartsPlugin: 'plugin-charts 图表工具',
|
||||
exportXLSXPlugin: 'plugin-export 导出 xlsx',
|
||||
exportXLSXPlugin: 'plugin-export 导入/导出 xlsx',
|
||||
exportPDFPlugin: 'plugin-export 导出 pdf',
|
||||
rendererPlugin: 'plugin-renderer 更多渲染',
|
||||
menusPlugin: 'plugin-menus 快捷菜单集',
|
||||
|
||||
@@ -208,7 +208,7 @@ export default {
|
||||
spanPlugin: '单元格选中合并',
|
||||
shortcutKeyPlugin: 'plugin-shortcut-key 快捷键设置',
|
||||
chartsPlugin: 'plugin-charts 图表工具',
|
||||
exportXLSXPlugin: 'plugin-export 导出 xlsx',
|
||||
exportXLSXPlugin: 'plugin-export 导入/导出 xlsx',
|
||||
exportPDFPlugin: 'plugin-export 导出 pdf',
|
||||
rendererPlugin: 'plugin-renderer 更多渲染',
|
||||
menusPlugin: 'plugin-menus 快捷菜单集',
|
||||
|
||||
@@ -324,7 +324,7 @@ function toHtml ($xetable, opts, columns, datas) {
|
||||
'vxe-table',
|
||||
`border--${toTableBorder(border)}`,
|
||||
isPrint ? 'is--print' : '',
|
||||
isHeader ? 'show--head' : ''
|
||||
isHeader ? 'is--header' : ''
|
||||
].filter(cls => cls)
|
||||
const tables = [
|
||||
`<table class="${clss.join(' ')}" border="0" cellspacing="0" cellpadding="0">`,
|
||||
|
||||
@@ -21,7 +21,7 @@ export default {
|
||||
const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
|
||||
return h('div', {
|
||||
class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', {
|
||||
't--animat': $xetable.animat,
|
||||
'is--animat': $xetable.animat,
|
||||
'is--multiple': filterStore.multiple,
|
||||
'filter--active': filterStore.visible
|
||||
}],
|
||||
|
||||
@@ -76,7 +76,7 @@ function renderTitle (h, _vm, item) {
|
||||
tss.push(
|
||||
h('span', {
|
||||
class: 'vxe-form--item-title-label'
|
||||
}, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params) : UtilTools.getFuncText(item.title)))
|
||||
}, compConf && compConf.renderItemTitle ? compConf.renderItemTitle(itemRender, params) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : UtilTools.getFuncText(item.title)))
|
||||
)
|
||||
if (titleSuffix) {
|
||||
tss.push(
|
||||
@@ -258,14 +258,14 @@ export default {
|
||||
]))
|
||||
},
|
||||
methods: {
|
||||
callSlot (slotFunc, params) {
|
||||
callSlot (slotFunc, params, h) {
|
||||
if (slotFunc) {
|
||||
const { $scopedSlots } = this
|
||||
if (XEUtils.isString(slotFunc)) {
|
||||
slotFunc = $scopedSlots[slotFunc] || null
|
||||
}
|
||||
if (XEUtils.isFunction(slotFunc)) {
|
||||
return slotFunc.call(this, params)
|
||||
return slotFunc.call(this, params, h)
|
||||
}
|
||||
}
|
||||
return []
|
||||
|
||||
@@ -291,7 +291,7 @@ export default {
|
||||
return h('div', {
|
||||
class: ['vxe-grid', {
|
||||
[`size--${vSize}`]: vSize,
|
||||
't--animat': !!this.animat,
|
||||
'is--animat': !!this.animat,
|
||||
'is--round': this.round,
|
||||
'is--maximize': isZMax,
|
||||
'is--loading': this.loading || this.tableLoading
|
||||
|
||||
@@ -905,27 +905,26 @@ export default {
|
||||
return h('div', {
|
||||
class: ['vxe-table', `tid_${tId}`, vSize ? `size--${vSize}` : '', `border--${tableBorder}`, {
|
||||
'vxe-editable': !!editConfig,
|
||||
'show--head': showHeader,
|
||||
'show--foot': showFooter,
|
||||
'is--group': isGroup,
|
||||
'has--height': height,
|
||||
'has--tree-line': treeConfig && treeOpts.line,
|
||||
'fixed--left': leftList.length,
|
||||
'fixed--right': rightList.length,
|
||||
'c--highlight': highlightCell,
|
||||
't--animat': !!this.animat,
|
||||
'is--round': this.round,
|
||||
't--stripe': !treeConfig && stripe,
|
||||
't--selected': mouseConfig && mouseOpts.selected,
|
||||
'is--area': mouseConfig && mouseOpts.area,
|
||||
'cell--highlight': highlightCell,
|
||||
'cell--selected': mouseConfig && mouseOpts.selected,
|
||||
'cell--area': mouseConfig && mouseOpts.area,
|
||||
'row--highlight': highlightHoverRow,
|
||||
'column--highlight': highlightHoverColumn,
|
||||
'is--header': showHeader,
|
||||
'is--footer': showFooter,
|
||||
'is--group': isGroup,
|
||||
'is--tree-line': treeConfig && treeOpts.line,
|
||||
'is--fixed-left': leftList.length,
|
||||
'is--fixed-right': rightList.length,
|
||||
'is--animat': !!this.animat,
|
||||
'is--round': this.round,
|
||||
'is--stripe': !treeConfig && stripe,
|
||||
'is--loading': loading,
|
||||
'is--empty': !loading && !tableData.length,
|
||||
'scroll--y': overflowY,
|
||||
'scroll--x': overflowX,
|
||||
'virtual--x': scrollXLoad,
|
||||
'virtual--y': scrollYLoad
|
||||
'is--scroll-y': overflowY,
|
||||
'is--scroll-x': overflowX,
|
||||
'is--virtual-x': scrollXLoad,
|
||||
'is--virtual-y': scrollYLoad
|
||||
}]
|
||||
}, [
|
||||
/**
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
}
|
||||
|
||||
/*animat*/
|
||||
.t--animat {
|
||||
.is--animat {
|
||||
.vxe-sort--asc-btn,
|
||||
.vxe-sort--desc-btn,
|
||||
.vxe-filter--btn {
|
||||
|
||||
@@ -244,8 +244,8 @@
|
||||
.vxe-table--border-line {
|
||||
@extend %AllRadius;
|
||||
}
|
||||
&.show--head {
|
||||
&:not(.show--foot) {
|
||||
&.is--header {
|
||||
&:not(.is--footer) {
|
||||
.vxe-table--body-wrapper {
|
||||
&.fixed-left--wrapper {
|
||||
@extend %BottomLeftRadius;
|
||||
@@ -270,8 +270,8 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
&:not(.show--head) {
|
||||
&:not(.show--foot) {
|
||||
&:not(.is--header) {
|
||||
&:not(.is--footer) {
|
||||
.vxe-table--body-wrapper {
|
||||
&.body--wrapper {
|
||||
@extend %AllRadius;
|
||||
@@ -279,8 +279,8 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
&.show--foot {
|
||||
&:not(.show--head) {
|
||||
&.is--footer {
|
||||
&:not(.is--header) {
|
||||
.vxe-table--body-wrapper {
|
||||
&.fixed-left--wrapper {
|
||||
@extend %BottomLeftRadius;
|
||||
@@ -335,8 +335,8 @@
|
||||
overflow-y: hidden;
|
||||
}
|
||||
&:not(.is--empty) {
|
||||
&.show--foot {
|
||||
&.scroll--x {
|
||||
&.is--footer {
|
||||
&.is--scroll-x {
|
||||
.vxe-table--body-wrapper {
|
||||
overflow-x: scroll;
|
||||
}
|
||||
@@ -372,7 +372,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
&.has--tree-line {
|
||||
&.is--tree-line {
|
||||
.vxe-body--row {
|
||||
&.row--stripe {
|
||||
.vxe-tree--btn-wrapper {
|
||||
@@ -458,7 +458,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
&.is--area {
|
||||
&.cell--area {
|
||||
.vxe-table--main-wrapper {
|
||||
user-select: none;
|
||||
}
|
||||
@@ -485,7 +485,7 @@
|
||||
text-align: right;
|
||||
}
|
||||
}
|
||||
&.has--tree-line {
|
||||
&.is--tree-line {
|
||||
.vxe-header--column,
|
||||
.vxe-body--column,
|
||||
.vxe-footer--column {
|
||||
@@ -712,6 +712,7 @@
|
||||
z-index: 1;
|
||||
overflow: hidden;
|
||||
background-color: inherit;
|
||||
transition: 0.3s box-shadow;
|
||||
.vxe-table--body-wrapper {
|
||||
overflow-x: hidden;
|
||||
}
|
||||
@@ -721,7 +722,7 @@
|
||||
width: calc(100% + 40px);
|
||||
}
|
||||
}
|
||||
&.show--head {
|
||||
&.is--header {
|
||||
.vxe-table--fixed-left-wrapper,
|
||||
.vxe-table--fixed-right-wrapper {
|
||||
.vxe-table--body-wrapper {
|
||||
@@ -802,7 +803,7 @@
|
||||
}
|
||||
|
||||
/*树形节点*/
|
||||
&.has--tree-line {
|
||||
&.is--tree-line {
|
||||
.vxe-body--row {
|
||||
&:first-child {
|
||||
.vxe-tree--line {
|
||||
@@ -1087,7 +1088,7 @@
|
||||
|
||||
/*可编辑*/
|
||||
&.vxe-editable {
|
||||
&.c--highlight {
|
||||
&.cell--highlight {
|
||||
.vxe-body--column {
|
||||
&.col--actived {
|
||||
box-shadow: inset 0px 0px 0px 2px $vxe-primary-color;
|
||||
|
||||
Reference in New Issue
Block a user