From f2f059007551e01399f4df1afc82ec0abc489a43 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 十一月 2023 21:44:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index bda5137..a7f73d6 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -336,9 +336,9 @@
let supModule = config.setting.supModule
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
} else {
this.loadData(id)
}
@@ -771,7 +771,7 @@
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadLinedata (id) {
+ async loadLinedata (id, position) {
const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
if (config.forbidLine) {
@@ -803,6 +803,11 @@
let result = await Api.genericInterface(param)
if (result.status) {
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadData()
+ return
+ }
+
let data = fromJS(this.state.data).toJS()
let selectedData = fromJS(this.state.selectedData).toJS()
let selectKeys = fromJS(this.state.selectKeys).toJS()
--
Gitblit v1.8.0