From 3c50bfdd8d605b3dd449adcb54cdf7f7c25d6c16 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 04 十一月 2022 15:46:05 +0800
Subject: [PATCH] 2022-11-04
---
src/tabviews/custom/components/carousel/prop-card/index.jsx | 342 ++++++++++++++++++++++++++++++++------------------------
1 files changed, 196 insertions(+), 146 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/prop-card/index.jsx b/src/tabviews/custom/components/carousel/prop-card/index.jsx
index 392ac7a..6ad1652 100644
--- a/src/tabviews/custom/components/carousel/prop-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/prop-card/index.jsx
@@ -1,25 +1,23 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { connect } from 'react-redux'
-import { Spin, notification, Carousel } from 'antd'
+import { Spin, notification, Carousel, Modal, Checkbox, Button } from 'antd'
+import { LeftOutlined, RightOutlined } from '@ant-design/icons'
import asyncComponent from '@/utils/asyncComponent'
import Api from '@/api'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
-import { modifyTabview } from '@/store/action'
+import TimerTask from '@/utils/timer-task.js'
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
class PropCard extends Component {
static propTpyes = {
- BID: PropTypes.any, // 鐖剁骇Id
data: PropTypes.array, // 缁熶竴鏌ヨ鏁版嵁
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
- menuType: PropTypes.any, // 鑿滃崟绫诲瀷
}
state = {
@@ -27,43 +25,55 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
loading: false, // 鏁版嵁鍔犺浇鐘舵��
sync: false, // 鏄惁缁熶竴璇锋眰鏁版嵁
- data: {}, // 鏁版嵁
- BData: null
+ data: {$$empty: true},
+ BData: null,
+ visible: false
}
UNSAFE_componentWillMount () {
- const { data, initdata, BID } = this.props
+ const { data, initdata } = this.props
let _config = fromJS(this.props.config).toJS()
let _cols = new Map()
- let _data = {}
+ let _data = {$$empty: true}
let _sync = false
+
+ let BID = ''
+ let BData = ''
+
+ if (_config.setting.supModule) {
+ BData = window.GLOB.CacheData.get(_config.setting.supModule)
+ } else {
+ BData = window.GLOB.CacheData.get(_config.$pageId)
+ }
+ if (BData) {
+ BID = BData.$BID || ''
+ }
- if (_config.setting && _config.wrap.datatype !== 'static') {
+ if (_config.setting && _config.wrap.datatype === 'dynamic') {
_sync = _config.setting.sync === 'true'
if (_sync && data) {
- _data = data[_config.dataName] || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = data[_config.dataName] || {$$empty: true}
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
} else if (_sync && initdata) {
- _data = initdata || {}
- if (_data && Array.isArray(_data)) {
- _data = _data[0] || {}
+ _data = initdata
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
_sync = false
}
- } else {
- _data = {}
}
- if (_data) {
- _data.$$BID = BID || ''
- }
+ _data.$$uuid = _data[_config.setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
_config.columns.forEach(item => {
+ if (item.type !== 'number') return
_cols.set(item.field, item)
})
@@ -73,8 +83,8 @@
card.style.cursor = 'pointer'
}
card.elements = card.elements.map(item => {
- if (item.field && _cols.has(item.field)) {
- item.col = _cols.get(item.field)
+ if (item.eleType === 'number' && item.field && _cols.has(item.field) && typeof(item.decimal) !== 'number') {
+ item.decimal = _cols.get(item.field).decimal || 0
}
return item
})
@@ -86,19 +96,34 @@
sync: _sync,
data: _data,
BID: BID || '',
+ BData: BData || '',
config: _config,
arr_field: _config.columns.map(col => col.field).join(','),
}, () => {
- if (_config.wrap.datatype !== 'static' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
- this.loadData()
+ if (_config.wrap.datatype === 'dynamic' && _config.setting && _config.setting.sync !== 'true' && _config.setting.onload === 'true') {
+ setTimeout(() => {
+ this.loadData()
+ }, _config.setting.delay || 0)
+ } else if (_config.wrap.display === 'modal' && _config.wrap.datatype === 'static') {
+ this.openModal()
}
})
}
componentDidMount () {
+ const { config } = this.state
+
MKEmitter.addListener('reloadData', this.reloadData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+ MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ if (config.timer && config.wrap.datatype === 'dynamic') {
+ this.timer = new TimerTask()
+ this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
+ this.loadData('timer')
+ })
+ }
}
shouldComponentUpdate (nextProps, nextState) {
@@ -111,34 +136,60 @@
}
MKEmitter.removeListener('reloadData', this.reloadData)
MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ this.timer && this.timer.stop()
}
/**
* @description 鍥捐〃鏁版嵁鏇存柊锛屽埛鏂板唴瀹�
*/
UNSAFE_componentWillReceiveProps (nextProps) {
- const { sync, config, BID } = this.state
+ const { sync, config, BID, BData } = this.state
if (sync && !is(fromJS(this.props.data), fromJS(nextProps.data))) {
- let _data = {}
+ let _data = {$$empty: true}
if (nextProps.data && nextProps.data[config.dataName]) {
_data = nextProps.data[config.dataName]
- if (_data && Array.isArray(_data)) {
- _data = _data[0]
+ if (Array.isArray(_data)) {
+ _data = _data[0] || {$$empty: true}
}
}
- if (_data) {
- _data.$$BID = BID || ''
- }
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
- this.setState({sync: false, data: _data})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ this.setState({sync: false, data: _data}, () => {
+ if (config.wrap.display === 'modal') {
+ this.openModal()
+ }
+ })
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
}
+ }
+
+ openModal = () => {
+ const { config, data } = this.state
+
+ let code = config.wrap.code || ('modal' + config.uuid)
+ let tip = localStorage.getItem(code)
+
+ if ((data.$$uuid && tip === data.$$uuid) || (!data.$$uuid && tip)) return
+
+ if (config.wrap.modalContent === 'update') {
+ localStorage.setItem(code, data.$$uuid || 'true')
+
+ Api.getAppVersion(true)
+ }
+
+ setTimeout(() => {
+ this.setState({visible: true})
+ }, 200)
}
/**
@@ -152,16 +203,13 @@
if (config.uuid !== menuId) return
- this.loadData() // 鏁版嵁鍒锋柊
-
- if (btn.syncComponentId && btn.syncComponentId !== config.uuid && btn.syncComponentId !== config.setting.supModule) {
- MKEmitter.emit('reloadData', btn.syncComponentId) // 鍚岀骇鏍囩鍒锋柊
+ if ((position === 'mainline' || position === 'popclose') && config.setting.supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
+ MKEmitter.emit('reloadData', config.setting.supModule, BID)
+ } else {
+ this.loadData()
}
- if (position === 'mainline' && config.setting.supModule) { // 涓昏〃琛屽埛鏂�
- MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
- } else if (position === 'popclose') { // 鏍囩鍏抽棴鍒锋柊
- config.setting.supModule && MKEmitter.emit('reloadData', config.setting.supModule, (BID || 'empty'))
+ if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
}
}
@@ -170,11 +218,30 @@
const { config } = this.state
if (config.wrap.datatype === 'static' || !config.setting.supModule || config.setting.supModule !== MenuID) return
- if (id !== this.state.BID) {
+ if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data }, () => {
this.loadData()
})
}
+ }
+
+ /**
+ * @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
+ */
+ queryModuleParam = (menuId, callback) => {
+ const { mainSearch } = this.props
+ const { config } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let searches = config.setting.useMSearch && mainSearch ? mainSearch : []
+
+ callback({
+ arr_field: '',
+ orderBy: '',
+ search: searches,
+ menuName: config.name
+ })
}
reloadData = (menuId) => {
@@ -185,18 +252,18 @@
this.loadData()
}
- async loadData () {
- const { mainSearch, menuType } = this.props
+ async loadData (type) {
+ const { mainSearch } = this.props
const { config, arr_field, BID, BData } = this.state
if (config.wrap.datatype === 'static') {
this.setState({
- data: {$$BID: BID || '', $$BData: BData}
+ data: {$$BID: BID || '', $$BData: BData, $$empty: true}
})
return
} else if (config.setting.supModule && !BID) { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.setState({
- data: {$$BID: BID || '', $$BData: BData}
+ data: {$$BID: BID || '', $$BData: BData, $$empty: true}
})
return
}
@@ -208,116 +275,112 @@
return
}
- this.setState({
- loading: true
- })
+ if (type !== 'timer') {
+ this.setState({
+ loading: true
+ })
+ }
let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID, menuType)
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, 1, 1, BID)
let result = await Api.genericInterface(param)
if (result.status) {
- let _data = result.data && result.data[0] ? result.data[0] : {}
+ let _data = {}
+
+ if (!result.data || !result.data[0]) {
+ _data.$$empty = true
+ } else {
+ _data = result.data[0]
+ }
+
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
_data.$$BID = BID || ''
_data.$$BData = BData || ''
this.setState({
data: _data,
loading: false
+ }, () => {
+ if (config.wrap.display === 'modal') {
+ this.openModal()
+ }
})
} else {
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
- }
-
- 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
+ this.timer && this.timer.stop()
+
+ if (result.ErrCode === 'N') {
+ Modal.error({
+ title: result.message,
})
- 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)
+ notification.error({
+ top: 92,
+ message: result.message,
+ duration: 10
})
}
- } 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 {
- 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)
}
}
+ onTipChange = (e) => {
+ const { config, data } = this.state
+
+ let code = config.wrap.code || ('modal' + config.uuid)
+ if (e.target.checked) {
+ localStorage.setItem(code, data.$$uuid || 'true')
+ } else {
+ localStorage.removeItem(code)
+ }
+ }
render() {
- const { config, loading, data } = this.state
+ const { config, loading, data, visible } = this.state
+
+ if (config.wrap.empty === 'hidden' && data.$$empty) return null
+
+ if (config.wrap.display === 'modal') {
+ return <Modal
+ wrapClassName='mk-carousel-modal'
+ visible={visible}
+ maskClosable={false}
+ width={config.wrap.modalWidth}
+ onCancel={() => this.setState({visible: false})}
+ footer={null}
+ destroyOnClose
+ >
+ <div className="custom-prop-carousel-box" style={config.style}>
+ {config.subcards.length > 1 && config.wrap.autoplay === 'false' ? <div className="prev" onClick={() => this.node && this.node.prev()}><LeftOutlined /></div> : null}
+ {config.subcards.length > 1 && config.wrap.autoplay === 'false' ? <div className="next" onClick={() => this.node && this.node.next()}><RightOutlined /></div> : null}
+ <Carousel
+ autoplay={config.wrap.autoplay !== 'false'}
+ dots={config.wrap.dots !== 'false'}
+ dotPosition={config.wrap.dotPosition || 'bottom'}
+ effect={config.wrap.effect || 'scrollx'}
+ autoplaySpeed={config.wrap.speed}
+ ref={ref => this.node = ref}
+ >
+ {config.subcards.map((item, index) => (
+ <div key={index}>
+ <CardItem card={item} cards={config} data={data}/>
+ </div>
+ ))}
+ </Carousel>
+ </div>
+ {config.wrap.modalContent !== 'update' ? <div className="mk-footer">
+ <Checkbox defaultChecked={false} onChange={this.onTipChange}>涓嶅湪鎻愰啋</Checkbox>
+ <Button className="close" onClick={() => this.setState({visible: false})}>绔嬪嵆浣撻獙</Button>
+ </div> : <div className="mk-footer">
+ <Button className="close" onClick={() => this.setState({visible: false})}>鐭ラ亾浜�</Button>
+ </div>}
+ </Modal>
+ }
return (
- <div className="custom-prop-carousel-box" style={config.style}>
+ <div className="custom-prop-carousel-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
<div className="ant-spin-blur"></div>
@@ -332,7 +395,7 @@
autoplaySpeed={config.wrap.speed}
>
{config.subcards.map((item, index) => (
- <div key={index} onClick={() => {this.openView(item)}}>
+ <div key={index}>
<CardItem card={item} cards={config} data={data}/>
</div>
))}
@@ -342,17 +405,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