From e5a92d6bee2b8d47d5c145ed92485fd19b663b0f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 27 十二月 2024 12:26:21 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/normal-table/index.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/table/normal-table/index.jsx b/src/tabviews/custom/components/table/normal-table/index.jsx
index a801362..2443066 100644
--- a/src/tabviews/custom/components/table/normal-table/index.jsx
+++ b/src/tabviews/custom/components/table/normal-table/index.jsx
@@ -77,7 +77,7 @@
let setting = {..._config.setting, ..._config.wrap}
- if (setting.selected !== 'always' && setting.selected !== 'init' && setting.selected !== 'sign') {
+ if (!['always', 'init', 'sign', 'local'].includes(setting.selected)) {
setting.selected = 'false'
}
@@ -577,7 +577,7 @@
Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
- if (repage === 'false' && result.data.length === 0 && pageIndex > 1) {
+ if (result.data.length === 0 && pageIndex > 1) {
this.reloadIndex()
return
}
@@ -630,8 +630,12 @@
}
if (data.length && (id || setting.selected !== 'false')) {
+ let keys = null
+ if (setting.selected === 'local') {
+ keys = this.state.selectedData.map(cell => cell.$$uuid)
+ }
setTimeout(() => {
- MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected)
+ MKEmitter.emit('mkCheckTopLine', config.uuid, id, setting.selected, keys)
}, 200)
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
--
Gitblit v1.8.0