From 6a0110feb3eb6515447c5a477f20eeaaaabb328b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 26 九月 2021 15:10:07 +0800
Subject: [PATCH] 2021-09-26
---
src/tabviews/custom/components/card/prop-card/index.jsx | 121 ++++++----------------------------------
1 files changed, 19 insertions(+), 102 deletions(-)
diff --git a/src/tabviews/custom/components/card/prop-card/index.jsx b/src/tabviews/custom/components/card/prop-card/index.jsx
index db60d7e..bc19ece 100644
--- a/src/tabviews/custom/components/card/prop-card/index.jsx
+++ b/src/tabviews/custom/components/card/prop-card/index.jsx
@@ -1,7 +1,6 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { connect } from 'react-redux'
import { Spin, notification, Col, Row } from 'antd'
import moment from 'moment'
@@ -10,7 +9,6 @@
import UtilsDM from '@/utils/utils-datamanage.js'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
-import { modifyTabview } from '@/store/action'
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
@@ -74,12 +72,15 @@
let _width = 0
_config.subcards.forEach(card => {
- card.setting.$click = ''
- if (card.setting.click === 'button') {
- if (card.elements.filter(ele => ele.eleType === 'button').length < 2) {
- card.setting.$click = ' trigger-button'
+ if (card.setting.click === 'button' && !card.setting.linkbtn) {
+ card.elements.forEach(ele => {
+ if (ele.eleType === 'button') {
+ card.setting.linkbtn = ele.uuid
+ }
+ })
+ if (!card.setting.linkbtn) {
+ card.setting.click = ''
}
- card.setting.click = ''
}
_width += card.setting.width
card.elements = card.elements.map(item => {
@@ -187,7 +188,7 @@
if (!config.timer) return
- const _change = { '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
+ const _change = { '5s': 5000, '15s': 15000, '30s': 30000, '1min': 60000, '5min': 300000, '10min': 600000, '15min': 900000, '30min': 1800000, '1hour': 3600000 }
let timer = _change[config.timer]
@@ -260,7 +261,7 @@
resetParentParam = (MenuID, id, data) => {
const { config } = this.state
- if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
+ if (!config.setting || !config.setting.supModule || config.setting.supModule !== MenuID) return
if (id !== this.state.BID) {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
@@ -318,6 +319,13 @@
data: _data,
loading: false
})
+
+ if (config.timer && config.clearField) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(_data[config.clearField])) {
+ clearTimeout(this.timer)
+ }
+ }
} else {
this.setState({
loading: false,
@@ -334,8 +342,6 @@
changeCard = (index, item) => {
const { config, data, activeKey } = this.state
- this.openView(item)
-
if (!config.wrap.cardType || activeKey === index) return
this.setState({
@@ -344,82 +350,6 @@
MKEmitter.emit('resetSelectLine', config.uuid, (item.setting.primaryId || ''), data)
}
-
- openView = (item) => {
- if (item.setting.click === 'menu') {
- let menu = null
-
- if (item.setting.menu && item.setting.menu.length > 0) {
- let menu_id = item.setting.menu.slice(-1)[0]
- menu = this.props.permMenus.filter(m => m.MenuID === menu_id)[0] || ''
- }
-
- if (!menu) {
- notification.warning({
- top: 92,
- message: '鑿滃崟宸插垹闄ゆ垨娌℃湁璁块棶鏉冮檺锛�',
- duration: 5
- })
- return
- }
-
- let newtab = {
- ...menu,
- selected: true,
- param: {}
- }
-
- if (item.setting.joint === 'true') {
- newtab.param.$BID = item.setting.primaryId || ''
- }
-
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- this.props.modifyTabview([newtab])
- } else {
- let tabs = this.props.tabviews.filter((tab, i) => {
- tab.selected = false
- return tab.MenuID !== newtab.MenuID
- })
-
- if (this.props.tabviews.length > tabs.length) {
- this.props.modifyTabview(fromJS(tabs).toJS())
- }
-
- this.setState({}, () => {
- tabs.push(newtab)
- this.props.modifyTabview(tabs)
- })
- }
- } else if (item.setting.click === 'link') {
- let src = item.setting.linkurl
-
- if (src.indexOf('paramsmain/') > -1) {
- try {
- let _url = src.split('paramsmain/')[0] + 'paramsmain/'
- let _param = JSON.parse(window.decodeURIComponent(window.atob(src.split('paramsmain/')[1])))
-
- _param.UserID = sessionStorage.getItem('UserID')
- _param.LoginUID = sessionStorage.getItem('LoginUID')
- _param.User_Name = sessionStorage.getItem('User_Name')
- _param.param = { BID: item.setting.primaryId }
- src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
- } catch (e) {
- console.warn('鑿滃崟鍙傛暟瑙ｆ瀽閿欒锛�')
- }
- } else if (item.setting.joint === 'true') {
- let con = '?'
-
- if (/\?/ig.test(src)) {
- con = '&'
- }
-
- src = src + `${con}id=${item.setting.primaryId}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
- }
-
- window.open(src)
- }
- }
-
render() {
const { config, loading, data, activeKey } = this.state
@@ -435,7 +365,7 @@
<NormalHeader config={config}/>
<Row className={`card-row-list ${config.wrap.cardType || ''} ${config.wrap.scale || ''}`}>
{config.subcards.map((item, index) => (
- <Col className={(activeKey === index ? 'active' : '') + (item.setting.click ? ' pointer' : '') + item.setting.$click} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
+ <Col className={(activeKey === index ? 'active' : '') + (item.setting.click ? ' pointer' : '')} key={index} span={item.setting.width || 6} offset={item.offset || 0} onClick={() => {this.changeCard(index, item)}}>
<CardItem card={item} cards={config} data={data}/>
</Col>
))}
@@ -445,17 +375,4 @@
}
}
-const mapStateToProps = (state) => {
- return {
- permMenus: state.permMenus,
- tabviews: state.tabviews,
- }
-}
-
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
-}
-
-export default connect(mapStateToProps, mapDispatchToProps)(PropCard)
\ No newline at end of file
+export default PropCard
\ No newline at end of file
--
Gitblit v1.8.0