From ff2ba12cdcc4ece62154e561d5877eb63f81eba6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 13 七月 2024 23:27:22 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/base-table/index.jsx | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/table/base-table/index.jsx b/src/tabviews/custom/components/table/base-table/index.jsx
index bc2b635..045bf64 100644
--- a/src/tabviews/custom/components/table/base-table/index.jsx
+++ b/src/tabviews/custom/components/table/base-table/index.jsx
@@ -110,9 +110,9 @@
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
reset && MKEmitter.emit('resetTable', config.uuid, 'true') // 鍒楄〃閲嶇疆
- if (setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [], false)
- }
+ // if (setting.$hasSyncModule) {
+ // MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ // }
this.requestId = ''
return
@@ -173,9 +173,9 @@
}
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '') // 骞挎挱鏁版嵁鍒囨崲
- if (setting.$hasSyncModule) {
- MKEmitter.emit('syncBalconyData', config.uuid, [], false)
- }
+ // if (setting.$hasSyncModule) {
+ // MKEmitter.emit('syncBalconyData', config.uuid, [], false)
+ // }
}
reset && MKEmitter.emit('resetTable', config.uuid, repage) // 鍒楄〃閲嶇疆
@@ -439,7 +439,19 @@
* 鍚湁鍒濆涓嶅姞杞界殑椤甸潰锛屼慨鏀硅缃�
*/
refreshbysearch = (searches) => {
- const { config} = this.state
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID) {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: searches
+ })
+ return
+ }
this.setState({
pageIndex: 1,
@@ -568,7 +580,7 @@
if (config.uuid !== menuId) return
if (position === 'line' || position === 'line_grid') {
- if (lines && lines.length === 1) {
+ if (lines && lines.length === 1 && !config.forbidLine) {
this.loadLinedata(lines[0].$$uuid, position)
} else {
this.reloadtable(btn, id)
--
Gitblit v1.8.0