From 24842b40de5cd60700bf69dfd38a0332f5431e36 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 五月 2025 10:55:07 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/table/base-table/index.jsx | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index 5b5f0f3..4117ef4 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -65,8 +65,16 @@
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'
+ }
+
+ if (_config.setting.supModule && !BID) {
+ _config.setting.onload = 'false'
+ }
+
+ if (setting.tableMode === 'fast') {
+ _config.lineMarks = null
}
_config.style = _config.style || {}
@@ -140,7 +148,7 @@
if (result.status) {
if (result.$requestId && this.requestId !== result.$requestId) return
- if (repage === 'false' && result.data.length === 0 && pageIndex > 1) {
+ if (result.data.length === 0 && pageIndex > 1) {
this.reloadIndex()
return
}
@@ -182,8 +190,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, '', '') // 骞挎挱鏁版嵁鍒囨崲
@@ -424,7 +436,7 @@
if (config.setting.supModule && !BID) {
notification.warning({
top: 92,
- message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ message: config.setting.supModTip || window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
duration: 5
})
this.setState({
@@ -450,7 +462,7 @@
/**
* @description 琛ㄦ牸鏉′欢鏀瑰彉鏃堕噸缃暟鎹紙鍒嗛〉鎴栨帓搴忥級
*/
- refreshbytable = (pagination, filters, sorter) => {
+ refreshbytable = (pagination, sorter) => {
if (!sorter) { // 鏃犱汉鍊煎畧
this.setState({
pageIndex: pagination.pageIndex
--
Gitblit v1.8.0