Skip to content

Commit e359e86

Browse files
authored
fix(grid): [grid] fix repeated trigger cell active when boardConfig.isEdit is set true (#2770)
* fix(grid): [grid] fix repeated trigger cell active when boardConfig.isEdit is set true * fix(grid): [grid] fix value to be set null when keyboard enter edit
1 parent 8373a4d commit e359e86

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

packages/vue/src/grid/src/table/src/events.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,6 @@ export function handleOtherKeyDown({ event, selected }) {
230230
(!keyboardConfig.editMethod || !(keyboardConfig.editMethod(selected.args, event) === false))
231231
) {
232232
// 如果是按下非功能键之外允许直接编辑
233-
setCellValue(selected.row, selected.column, null)
234233
this.handleActived(selected.args, event)
235234
}
236235
}

packages/vue/src/grid/src/table/src/utils/handleGlobalKeydownEvent.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,11 @@ function rule9({ keyboardConfig, isKeyWithCtrl, isKeyA, isKeyX, isKeyC, isKeyV,
100100
}
101101
}
102102

103-
function rule10({ keyboardConfig, isKeyWithCtrl, _vm, event, selected }) {
103+
function rule10({ keyboardConfig, isKeyWithCtrl, _vm, event, selected, actived }) {
104+
// 如果同一个单元格已经被激活编辑态,那么就不重复触发
104105
return {
105-
match: () => keyboardConfig.isEdit && !isKeyWithCtrl,
106+
match: () =>
107+
keyboardConfig.isEdit && !isKeyWithCtrl && !(selected.row === actived.row && selected.column === actived.column),
106108
action: () => _vm.handleOtherKeyDown({ event, selected })
107109
}
108110
}
@@ -147,7 +149,7 @@ export function onGlobalKeydown(event, _vm) {
147149
rule8({ isKeyDel, treeConfig, highlightCurrentRow, currentRow, isKeyBack, keyboardConfig, _vm, event, selected }),
148150
rule9({ keyboardConfig, isKeyWithCtrl, isKeyA, isKeyX, isKeyC, isKeyV, _vm, event }),
149151
// 如果是按下非功能键之外允许直接编辑
150-
rule10({ keyboardConfig, isKeyWithCtrl, _vm, event, selected })
152+
rule10({ keyboardConfig, isKeyWithCtrl, _vm, event, selected, actived })
151153
]
152154

153155
for (let i = 0; i < rules.length; i++) {

0 commit comments

Comments
 (0)