From a1b34fcc49cfeb7324cb7f4584380426ec6b092f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 29 五月 2022 20:08:00 +0800
Subject: [PATCH] 2022-05-29
---
src/tabviews/custom/components/share/normalTable/index.jsx | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 4d753fc..d80adcc 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -185,7 +185,7 @@
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
}
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -259,7 +259,7 @@
}
if (content) {
- content = col.prefix + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.blur) {
@@ -664,6 +664,7 @@
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
+ selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled)
index = selectedRowKeys.slice(-1)[0]
}
@@ -675,7 +676,7 @@
this.setState({ selectedRowKeys, activeIndex: _activeIndex })
- let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
+ let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
this.props.chgSelectData(selects)
if (setting.$hasSyncModule) {
@@ -843,7 +844,7 @@
if (!setting.doubleClick) return
if (record.$disabled) return
- MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+ MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn')
}
render() {
--
Gitblit v1.8.0