From cc810edac6aec3c858fb352091ad8c11332447a5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 10 十二月 2023 19:12:53 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 15 +++++++++++++--
1 files changed, 13 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 fcdad35..9a9d454 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -2017,7 +2017,7 @@
setTimeout(() => {
this.plusLine(colId)
}, 10)
- } else if (edData[index] && setting.commit !== 'change') {
+ } else if (edData[index] && (setting.commit === 'all' || setting.commit === 'amend')) {
setTimeout(() => {
this.submit()
}, 10)
@@ -2158,7 +2158,7 @@
checkData = () => {
const { setting } = this.props
- const { edData, forms, checkForms } = this.state
+ const { edData, forms, checkForms, selectedRowKeys } = this.state
let data = fromJS(edData).toJS()
@@ -2166,6 +2166,17 @@
if (setting.commit === 'amend') {
data = data.filter(item => !item.$origin)
+ } else if (setting.commit === 'check') {
+ data = data.filter(item => selectedRowKeys.includes(item.$$uuid))
+
+ if (data.length === 0) {
+ notification.warning({
+ top: 92,
+ message: '璇烽�夋嫨闇�瑕佹彁浜ょ殑鏁版嵁锛�',
+ duration: 5
+ })
+ return null
+ }
}
if (data.length === 0) {
--
Gitblit v1.8.0