From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index 0591bea..57dba86 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -310,7 +310,7 @@
const { config, lineId } = this.props
if (config.$ctrl) {
- MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
+ MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid, true)
}
setTimeout(() => {
@@ -1556,7 +1556,11 @@
MKEmitter.removeListener('changeRecord' + tableId, this.changeRecord)
}
- colBlur = (lineId) => {
+ colBlur = (lineId, colId, defer) => {
+ if (defer && this.focusId === lineId && this.colId !== colId) {
+ return
+ }
+
this.blurId = lineId
this.focusId = ''
--
Gitblit v1.8.0