From e3d44b5694b87e8b32d468d8b97fdd409da10b52 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 29 六月 2023 09:23:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/popview/index.jsx | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 0093459..67bdd49 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { notification, Spin, Row, Col } from 'antd'
+import { notification, Spin, Row, Col, Modal } from 'antd'
import Api from '@/api'
import zhCN from '@/locales/zh-CN/main.js'
@@ -41,6 +41,7 @@
const Voucher = asyncComponent(() => import('../components/module/voucher'))
const Iframe = asyncComponent(() => import('../components/iframe'))
const AntvG6 = asyncComponent(() => import('../components/chart/antv-G6'))
+const AntvX6 = asyncComponent(() => import('../components/chart/antv-X6'))
class CustomPage extends Component {
static propTpyes = {
@@ -797,6 +798,20 @@
Api.genericInterface(param).then(result => {
if (result.status) {
+ 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
+ })
+ }
+ }
+
delete result.status
delete result.message
delete result.ErrMesg
@@ -821,11 +836,19 @@
data: '',
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ 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
+ })
+ }
}
})
}
@@ -1053,6 +1076,12 @@
<AntvG6 config={item} data={data} mainSearch={mainSearch}/>
</Col>
)
+ } else if (item.type === 'antvX6') {
+ return (
+ <Col span={item.width} style={style} key={item.uuid}>
+ <AntvX6 config={item}/>
+ </Col>
+ )
} else {
return null
}
--
Gitblit v1.8.0