From f497f734966504bd8a7e98bf602da582a53d91e5 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 12 九月 2021 02:55:59 +0800
Subject: [PATCH] 2021-09-12
---
src/tabviews/custom/components/card/data-card/index.jsx | 113 ++++++--------------------------------------------------
1 files changed, 12 insertions(+), 101 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index 704d0d3..33aaad5 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-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, Empty, notification, message, Row, Col, Pagination } from 'antd'
import Api from '@/api'
@@ -11,7 +10,6 @@
import nextImg from '@/assets/img/next.png'
import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
-import { modifyTabview } from '@/store/action'
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
@@ -55,12 +53,15 @@
let nextcards = []
_config.subcards.forEach(item => {
- item.setting.$click = ''
- if (item.setting.click === 'button') {
- if (item.elements.filter(ele => ele.eleType === 'button').length < 2) {
- item.setting.$click = ' trigger-button'
+ if (item.setting.click === 'button' && !item.setting.linkbtn) {
+ item.elements.forEach(ele => {
+ if (ele.eleType === 'button') {
+ item.setting.linkbtn = ele.uuid
+ }
+ })
+ if (!item.setting.linkbtn) {
+ item.setting.click = ''
}
- item.setting.click = ''
}
if (item.$cardType !== 'extendCard') {
@@ -546,8 +547,6 @@
changeCard = (index, item) => {
const { config, selectKeys, selectedData, activeKey, data } = this.state
- this.openView(item)
-
if (!config.wrap.cardType) return
let _selectKeys = []
@@ -586,83 +585,6 @@
MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item)
if (config.setting.$hasSyncModule) {
MKEmitter.emit('syncBalconyData', config.uuid, _selectedData, data.length === _selectedData.length)
- }
- }
-
- openView = (item) => {
- const { card } = this.state
-
- if (card.setting.click === 'menu') {
- let menu = null
-
- if (card.setting.menu && card.setting.menu.length > 0) {
- let menu_id = card.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 (card.setting.joint === 'true') {
- newtab.param.$BID = item.$$uuid
- }
-
- 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 (card.setting.click === 'link') {
- let src = card.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.$$uuid }
- src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
- } catch (e) {
- console.warn('鑿滃崟鍙傛暟瑙ｆ瀽閿欒锛�')
- }
- } else if (card.setting.joint === 'true') {
- let con = '?'
-
- if (/\?/ig.test(src)) {
- con = '&'
- }
-
- src = src + `${con}id=${item.$$uuid}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
- }
-
- window.open(src)
}
}
@@ -711,17 +633,17 @@
<Row className="card-row-list">
{offset ? <Col span={offset} style={{height: '10px'}}> </Col> : null}
{precards.map((item, index) => (
- <Col key={'pre' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
+ <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
<CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
</Col>
))}
{data && data.map((item, index) => (
- <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.$click ? ' pointer' : '') + card.setting.$click} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
+ <Col className={(activeKey === index ? ' active' : (selectKeys.indexOf(index) > -1 ? ' selected' : '')) + (card.setting.click ? ' pointer' : '')} key={index} span={card.setting.width} onClick={() => {this.changeCard(index, item)}}>
<CardItem card={card} cards={config} data={item}/>
</Col>
))}
{nextcards.map((item, index) => (
- <Col key={'next' + index} className={'extend-card ' + item.setting.$click} span={item.setting.width || 6}>
+ <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
<CardItem card={item} cards={config} data={{$$BID: BID, $$type: 'extendCard'}}/>
</Col>
))}
@@ -735,17 +657,6 @@
}
}
-const mapStateToProps = (state) => {
- return {
- permMenus: state.permMenus,
- tabviews: state.tabviews,
- }
-}
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
-}
-export default connect(mapStateToProps, mapDispatchToProps)(DataCard)
\ No newline at end of file
+export default DataCard
\ No newline at end of file
--
Gitblit v1.8.0