From d1dbe184ea1026e20a202ac9f8f7c8c049665ae3 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 10 一月 2024 17:04:26 +0800
Subject: [PATCH] 2024-01-10
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 3a725fa..57dba86 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -55,7 +55,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -191,7 +191,7 @@
this.props.onChange(values)
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -283,9 +283,11 @@
this.props.onChange(values, val)
+ if (config.enter === '$noActX') return
+
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
setTimeout(() => {
if (/\$next/.test(config.enter)) {
@@ -308,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(() => {
@@ -408,7 +410,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
if (/\$next/.test(config.enter)) {
MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
@@ -536,7 +538,7 @@
this.node.blur()
- if (config.enter === '$noAct') return
+ if (/\$noAct/.test(config.enter)) return
setTimeout(() => {
if (/\$next/.test(config.enter)) {
@@ -1554,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