From 37e28da53f6d4d7d8abe7626ba28ba7dbe16e7bb Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 08 四月 2024 15:36:01 +0800
Subject: [PATCH] 2024-04-08
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 57 ++++++++++++++-------------------------------------------
1 files changed, 14 insertions(+), 43 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 6ae8f77..bc0cd42 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, Row, Col, Pagination, Modal, Switch } from 'antd'
+import { Spin, Empty, Row, Col, Pagination, Switch } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -583,6 +583,7 @@
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
+ this.requestId = ''
this.setState({
activeKey: '',
@@ -594,17 +595,8 @@
total: 0,
loading: false
})
-
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- setTimeout(() => {
- this.checkTopLine(id)
- }, 10)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
@@ -632,8 +624,12 @@
let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
- let result = await Api.genericInterface(param)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
let start = 1
if (config.setting.laypage) {
start = pageSize * (pageIndex - 1) + 1
@@ -766,37 +762,15 @@
this.timer && this.timer.stop()
}
}
- if (result.message) {
- if (result.ErrCode === 'Y') {
- Modal.success({
- title: result.message
- })
- } else if (result.ErrCode === 'S') {
- notification.success({
- top: 92,
- message: result.message,
- duration: 2
- })
- }
- }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (!result.message) return
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else if (result.ErrCode !== '-2') {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -954,11 +928,8 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
}
--
Gitblit v1.8.0