Skip to content

Commit

Permalink
releases 4.7.70
Browse files Browse the repository at this point in the history
  • Loading branch information
xuliangzhan committed Aug 25, 2024
1 parent 77b9840 commit 55ad6f5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 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.68",
"version": "4.7.70",
"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.1.4"
"vxe-pc-ui": "^4.1.6"
},
"devDependencies": {
"@types/resize-observer-browser": "^0.1.11",
Expand Down
8 changes: 4 additions & 4 deletions packages/table/render/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function getChangeEvent (renderOpts: any) {
case 'input':
case 'textarea':
case 'VxeInput':
case 'VxeNumberInput':
case 'VxeTextarea':
case '$input':
case '$textarea':
Expand Down Expand Up @@ -215,15 +216,14 @@ function getEditOns (renderOpts: any, params: any) {
const isImmediate = isImmediateCell(renderOpts, params)
return getComponentOns(renderOpts, params, (cellValue: any) => {
// 处理 model 值双向绑定
model.update = true
model.value = cellValue
if (isImmediate) {
setCellValue(row, column, cellValue)
} else {
model.update = true
model.value = cellValue
}
}, (eventParams: any) => {
// 处理 change 事件相关逻辑
if (!isImmediate && (['VxeInput', 'VxeTextarea', '$input', '$textarea'].includes(name))) {
if (!isImmediate && (['VxeInput', 'VxeNumberInput', 'VxeTextarea', '$input', '$textarea'].includes(name))) {
const cellValue = eventParams.value
model.update = true
model.value = cellValue
Expand Down
2 changes: 1 addition & 1 deletion packages/table/src/table.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1438,7 +1438,7 @@ export default defineComponent({
const { filterMethod, filterRender } = column
const compConf = isEnableConf(filterRender) ? renderer.get(filterRender.name) : null
const compFilterMethod = compConf ? (compConf.tableFilterMethod || compConf.filterMethod) : null
const tdFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
const tdFilterMethod = compConf ? (compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
const cellValue = getCellValue(row, column)
if (filterMethod) {
return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: $xeTable }))
Expand Down

0 comments on commit 55ad6f5

Please sign in to comment.