From f07c42a322f41e14ef5b1bf8f2fd66fc5d338cdd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 28 六月 2023 18:17:09 +0800
Subject: [PATCH] 2023-06-28
---
src/tabviews/custom/popview/index.jsx | 277 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 166 insertions(+), 111 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index a48c356..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 = {
@@ -97,7 +98,7 @@
// 鏁版嵁缂撳瓨璁剧疆
if (config.cacheUseful === 'true') {
- if (!['day', 'hour'].includes(config.timeUnit)) {
+ if (!['day', 'hour', 'minute'].includes(config.timeUnit)) {
config.timeUnit = 'day'
}
config.cacheTime = config.cacheTime || 1
@@ -302,56 +303,7 @@
item.search = Utils.initSearchVal(item.search)
}
- if (item.type === 'table') {
- let statFields = []
- let getCols = (cols) => {
- return cols.filter(col => {
- if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
- return false
- } else if (col.Hide === 'true') {
- return false
- }
-
- if (col.type === 'number') {
- if (col.sum === 'true' && !statFields.includes(col.field)) {
- statFields.push(col)
- }
- if (typeof(col.decimal) === 'number') {
- col.round = Math.pow(10, col.decimal)
- if (col.format === 'percent') {
- col.decimal = col.decimal > 2 ? col.decimal - 2 : 0
- }
- }
- } else if (col.type === 'colspan') {
- col.subcols = getCols(col.subcols || [])
- if (col.subcols.length === 0) {
- return false
- }
- } else if (col.type === 'custom') {
- col.elements = col.elements.map(cell => {
- cell = this.resetElement(cell)
- return cell
- })
- }
-
- if (col.linkmenu && col.linkmenu.length > 0) {
- let menu_id = col.linkmenu.pop()
- col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
- } else {
- col.linkThdMenu = ''
- }
-
- return true
- })
- }
-
- item.cols = getCols(item.cols)
- item.statFields = statFields
- }
-
- let mutil = false
if (item.wrap && item.wrap.supType === 'multi') { // 鏁版嵁鍗″涓婄骇缁勪欢
- mutil = true
item.setting.supModule = item.supNodes[0].componentId
} else if (item.setting && item.setting.supModule && typeof(item.setting.supModule) !== 'string') {
let pid = item.setting.supModule.pop()
@@ -370,18 +322,86 @@
cell = this.resetButton(item, cell, Tab)
cell.$toolbtn = true
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
-
return true
})
}
- if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
+ if (item.type === 'table') {
+ let statFields = []
+ let getCols = (cols) => {
+ return cols.filter(col => {
+ if (col.blacklist && col.blacklist.filter(v => roleId.indexOf(v) > -1).length > 0) {
+ return false
+ } else if (col.Hide === 'true') {
+ return false
+ } else if (col.type === 'action') {
+ col.type = 'custom'
+ }
+
+ if (col.type === 'number') {
+ if (col.sum === 'true' && !statFields.includes(col.field)) {
+ statFields.push(col)
+ }
+ if (typeof(col.decimal) === 'number') {
+ col.round = Math.pow(10, col.decimal)
+ if (col.format === 'percent') {
+ col.decimal = col.decimal > 2 ? col.decimal - 2 : 0
+ }
+ }
+ } else if (col.type === 'formula') {
+ if (typeof(col.decimal) === 'number') {
+ col.round = Math.pow(10, col.decimal)
+ }
+ } else if (col.type === 'colspan') {
+ col.subcols = getCols(col.subcols || [])
+ if (col.subcols.length === 0) {
+ return false
+ }
+ } else if (col.type === 'custom') {
+ col.elements = col.elements.filter(cell => {
+ if (cell.eleType === 'button') {
+ if (cell.hidden === 'true' || cell.OpenType === 'popview') return false
+
+ cell = this.resetButton(item, cell, Tab)
+ } else {
+ cell = this.resetElement(cell)
+ }
+
+ return true
+ })
+
+ if (col.elements.length === 0) {
+ return false
+ }
+ }
+
+ if (col.linkmenu && col.linkmenu.length > 0) {
+ let menu_id = col.linkmenu.pop()
+ col.linkThdMenu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menu_id)[0] || ''
+ } else {
+ col.linkThdMenu = ''
+ }
+
+ return true
+ })
+ }
+
+ item.cols = getCols(item.cols)
+ item.statFields = statFields
+
+ if (item.subtype === 'editable') {
+ item.submit.logLabel = item.$menuname + '-鎻愪氦'
+ item.submit.$menuId = item.uuid
+ item.submit.syncComponentId = item.submit.syncComponent ? (item.submit.syncComponent.pop() || '') : ''
+
+ if (item.submit.syncComponentId && item.submit.syncComponentId === item.setting.supModule) {
+ item.submit.syncComponentId = ''
+ if (item.submit.execSuccess === 'grid') {
+ item.submit.execSuccess = 'mainline'
+ }
+ }
+ }
+ } else if (item.type === 'card' || item.type === 'carousel' || item.type === 'timeline') {
item.subcards && item.subcards.forEach(card => {
if (card.style.boxShadow) {
delete card.style.hShadow
@@ -395,19 +415,36 @@
if (cell.hidden === 'true' || cell.OpenType === 'popview') return false
cell = this.resetButton(item, cell, Tab)
-
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
} else {
cell = this.resetElement(cell)
}
return true
})
+
+ if (card.setting.click === 'menus') {
+ if (card.menus) {
+ card.menus = card.menus.filter(m => !!m.MenuID)
+ if (card.menus.length === 0) {
+ card.menus = null
+ }
+ }
+ if (!card.menus || item.subtype !== 'datacard' || card.$cardType === 'extendCard') {
+ card.setting.click = ''
+ }
+ } else if (card.setting.click === 'menu') {
+ if (!Array.isArray(card.setting.menu)) {
+ card.setting.click = ''
+ }
+ }
+
+ if (item.subtype === 'dualdatacard' && card.$cardType !== 'extendCard') {
+ if (card.backSetting && card.backSetting.click === 'menu') {
+ if (!Array.isArray(card.backSetting.menu)) {
+ card.backSetting.click = ''
+ }
+ }
+ }
if (!card.backElements || card.backElements.length === 0) return
@@ -416,13 +453,6 @@
if (cell.hidden === 'true' || cell.OpenType === 'popview') return false
cell = this.resetButton(item, cell, Tab)
-
- if (!mutil && cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
} else {
cell = this.resetElement(cell)
}
@@ -443,43 +473,12 @@
if (cell.hidden === 'true' || cell.OpenType === 'popview') return false
cell = this.resetButton(item, cell, Tab)
-
- if (cell.syncComponentId === item.wrap.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
} else {
cell = this.resetElement(cell)
}
return true
})
- } else if (item.type === 'table') {
- item.cols = item.cols.filter(col => {
- if (col.type !== 'action') return true
- col.elements = col.elements.filter(cell => {
- if (cell.hidden === 'true' || cell.OpenType === 'popview') return false
-
- cell = this.resetButton(item, cell, Tab)
-
- if (cell.syncComponentId === item.setting.supModule) {
- cell.syncComponentId = ''
- if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
- cell.execSuccess = 'mainline'
- }
- }
-
- return true
- })
- return col.elements.length !== 0
- })
-
- if (item.subtype === 'editable') {
- item.submit.logLabel = item.$menuname + '-鎻愪氦'
- item.submit.$menuId = item.uuid
- }
} else if (item.type === 'form') {
item.subcards = item.subcards.map(group => {
group.subButton.uuid = group.uuid
@@ -493,9 +492,9 @@
group.subButton.Ot = item.wrap.datatype === 'static' ? 'notRequired' : 'requiredSgl'
}
- group.subButton.syncComponentId = group.subButton.syncComponent ? group.subButton.syncComponent.pop() : ''
+ group.subButton.syncComponentId = group.subButton.syncComponent ? (group.subButton.syncComponent.pop() || '') : ''
- if (group.subButton.syncComponentId === item.setting.supModule) {
+ if (group.subButton.syncComponentId && group.subButton.syncComponentId === item.setting.supModule) {
group.subButton.syncComponentId = ''
if (group.subButton.execSuccess === 'grid') {
group.subButton.execSuccess = 'mainline'
@@ -587,6 +586,32 @@
}
}
+ if (cell.syncComponentId) {
+ if (cell.syncComponentId === item.setting.supModule) {
+ cell.syncComponentId = ''
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
+ } else if (cell.syncComponentId === 'multiComponent') {
+ let ids = cell.syncComponents.map(m => {
+ return m.syncComId.pop() || ''
+ })
+
+ if (item.setting.supModule && ids.includes(item.setting.supModule)) {
+ if (cell.execSuccess === 'line' || cell.execSuccess === 'grid') {
+ cell.execSuccess = 'mainline'
+ }
+ ids = ids.filter(id => id !== item.setting.supModule)
+ }
+
+ if (ids.length === 0) {
+ cell.syncComponentId = ''
+ } else {
+ cell.syncComponentIds = ids
+ }
+ }
+ }
+
return cell
}
@@ -605,6 +630,8 @@
if (cell.format === 'percent') {
cell.decimal = cell.decimal > 2 ? cell.decimal - 2 : 0
}
+ } else if (cell.type === 'formula' && typeof(cell.decimal) === 'number') {
+ cell.round = Math.pow(10, cell.decimal)
}
} else if (cell.eleType === 'icon') {
if (!cell.innerHeight) { // 鍏煎
@@ -771,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
@@ -795,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
+ })
+ }
}
})
}
@@ -1027,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