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/mkPopSelect/index.jsx | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
index e99578c..4428a97 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/mkPopSelect/index.jsx
@@ -284,7 +284,7 @@
this.props.onChange(values, record.$$uuid)
- this.setState({visible: false})
+ this.setState({visible: false, value: record.$$uuid})
if (config.$ctrl) {
MKEmitter.emit('colBlur' + config.tableId, lineId, config.uuid)
@@ -292,13 +292,15 @@
this.props.onBlur && this.props.onBlur()
- 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_', ''))
- } else {
- MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
- }
+ setTimeout(() => {
+ if (/\$next/.test(config.enter)) {
+ MKEmitter.emit('nextLine' + config.tableId, lineId, config.enter.replace('$next_', ''))
+ } else {
+ MKEmitter.emit('setFocus' + config.tableId, lineId, config.enter)
+ }
+ }, 10)
}
trigger = (e) => {
--
Gitblit v1.8.0