Skip to content

Commit

Permalink
fix 修复筛选报错问题
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Jul 10, 2024
1 parent 0dac8d6 commit 5bf63f4
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vxe-table",
"version": "4.7.46",
"version": "4.7.47",
"description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、列拖拽,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
"scripts": {
"update": "npm install --legacy-peer-deps",
Expand Down Expand Up @@ -28,7 +28,7 @@
"style": "lib/style.css",
"typings": "types/index.d.ts",
"dependencies": {
"vxe-pc-ui": "^4.0.52"
"vxe-pc-ui": "^4.0.56"
},
"devDependencies": {
"@types/resize-observer-browser": "^0.1.11",
Expand Down
4 changes: 2 additions & 2 deletions packages/table/module/filter/panel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export default defineComponent({
const renderOptions = (filterRender: any, compConf: any) => {
const { filterStore } = props
const { column, multiple, maxHeight } = filterStore
const { slots } = column
const slots = column ? column.slots : null
const filterSlot = slots ? slots.filter : null
const params = Object.assign({}, tableInternalData._currFilterParams, { $panel, $table: $xeTable })
const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null
Expand Down Expand Up @@ -233,7 +233,7 @@ export default defineComponent({
}
],
style: filterStore.style
}, initStore.filter ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
}, initStore.filter && column ? renderOptions(filterRender, compConf).concat(renderFooters()) : [])
}

return renderVN
Expand Down

0 comments on commit 5bf63f4

Please sign in to comment.