From 1d32b21f464a916695acc9fa7e7eeda6e44f830d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 25 十月 2023 18:14:44 +0800
Subject: [PATCH] 2023-10-25
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 278 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 182 insertions(+), 96 deletions(-)
diff --git a/src/tabviews/custom/components/card/double-data-card/index.jsx b/src/tabviews/custom/components/card/double-data-card/index.jsx
index 8f4e530..bda5137 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,7 +1,7 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Spin, Empty, notification, Row, Col, Pagination, Modal } from 'antd'
+import { Spin, Empty, notification, Row, Col, Pagination, Modal, Switch } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -35,7 +35,7 @@
selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
loading: false, // 鏁版嵁鍔犺浇鐘舵��
card: null, // 鍗＄墖璁剧疆
- data: null, // 鏁版嵁
+ data: [], // 鏁版嵁
total: null,
precards: [],
nextcards: [],
@@ -43,7 +43,8 @@
opens: [],
wrapStyle: null,
subcard: null,
- subconfig: null
+ subconfig: null,
+ pickup: false
}
loaded = false
@@ -149,6 +150,8 @@
}
_config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
+ _config.setting.all_field = _config.setting.arr_field + ',' + _config.setting.sub_field
+
let pageOptions = ['10', '25', '50', '100', '500', '1000']
if (!_config.setting.laypage) {
@@ -189,8 +192,7 @@
subconfig: subconfig,
wrapStyle: wrapStyle,
card: _card,
- search: _config.$searches,
- arr_field: _config.columns.map(col => col.field).join(','),
+ search: _config.$searches
})
}
@@ -242,7 +244,7 @@
}
initExec = () => {
- const { config } = this.state
+ const { config, BID } = this.state
if (config.$cache) {
let getData = (res) => {
@@ -285,26 +287,26 @@
}
if (config.$time && !config.setting.laypage) {
- Api.getLCacheConfig(config.uuid, config.$time).then(res => {
- if (!res) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid) {
setTimeout(() => {
- this.loadData()
+ this.loadData('', 'init')
}, config.setting.delay || 0)
}
- if (!res) return
+ if (!res.data) return
- this.setState({data: getData(res)})
+ this.setState({data: getData(res.data)})
})
} else {
- Api.getLCacheConfig(config.uuid, 0).then(res => {
- if (!res || this.loaded) return
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
- this.setState({data: getData(res)})
+ this.setState({data: getData(res.data)})
})
setTimeout(() => {
- this.loadData()
+ this.loadData('', 'init')
}, config.setting.delay || 0)
}
} else {
@@ -379,7 +381,7 @@
const { config, data, selected, card } = this.state
let _opens = [...this.state.opens]
- if (!data || data.length === 0) {
+ if (data.length === 0) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -461,7 +463,7 @@
const { config, data, selectedData } = this.state
if (config.wrap.cardType !== 'checkbox') return
- if (!data || data.length === 0) return
+ if (data.length === 0) return
if (selectedData.length === 0 || selectedData.length < data.length) {
let index = ''
@@ -523,7 +525,7 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { arr_field, config, search, orderBy } = this.state
+ const { config, search, orderBy } = this.state
if (config.uuid !== menuId) return
@@ -539,15 +541,13 @@
}
callback({
- arr_field: arr_field,
orderBy: orderBy || config.setting.order || '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
async loadData (id, type) {
- const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card, orderBy } = this.state
+ const { config, pageIndex, pageSize, search, BID, BData, selected, card, orderBy } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
@@ -566,7 +566,7 @@
if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
this.checkTopLine(id)
- }, 200)
+ }, 10)
if (selected === 'init') {
this.setState({selected: 'false'})
}
@@ -598,7 +598,7 @@
}
let _orderBy = orderBy || config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -608,14 +608,14 @@
}
this.loaded = true
- if (config.$cache && pageIndex === 1 && config.setting.onload !== 'false') {
- Api.writeCacheConfig(config.uuid, result.data || [])
+ if (config.$cache && type === 'init') {
+ Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
setTimeout(() => {
this.checkTopLine(id)
- }, 200)
+ }, 10)
if (selected === 'init') {
this.setState({selected: 'false'})
}
@@ -712,13 +712,19 @@
opens = []
}
+ let total = result.total || 0
+ if (config.setting.custompage && data.length) {
+ total = data[data.length - 1].mk_total || 0
+ }
+
this.setState({
activeKey: '',
selectKeys: [],
opens: opens,
selectedData: [],
data: data,
- total: result.total,
+ total: total,
+ pickup: false,
loading: false
})
@@ -766,7 +772,16 @@
* @description 鑾峰彇鍗曡鏁版嵁
*/
async loadLinedata (id) {
- const { config, arr_field, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
+ const { config, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
+
+ if (config.forbidLine) {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ return
+ }
let searches = fromJS(search).toJS()
if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
@@ -784,61 +799,120 @@
})
let _orderBy = orderBy || config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
+ let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
let data = fromJS(this.state.data).toJS()
+ let selectedData = fromJS(this.state.selectedData).toJS()
+ let selectKeys = fromJS(this.state.selectKeys).toJS()
+ let activeKey = this.state.activeKey
+
if (result.data && result.data[0]) {
let _data = result.data[0]
+ _data.$$uuid = _data[config.setting.primaryKey] || ''
+ _data.$$BID = BID || ''
+ _data.$$BData = BData || ''
- try {
- data = data.map(item => {
- if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
- let children = []
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ let children = []
- if (_data[config.setting.subdata]) {
- let _children = _data[config.setting.subdata]
+ if (_data[config.setting.subdata]) {
+ let _children = _data[config.setting.subdata]
- delete _data[config.setting.subdata]
+ delete _data[config.setting.subdata]
- _children.forEach((cell, i) => {
- cell.key = i
- cell.$$uuid = cell[config.setting.subKey] || ''
- cell.$$parentId = _data[config.setting.primaryKey] || ''
- cell.$$BID = _data[config.setting.primaryKey] || ''
- cell.$$BData = {..._data}
- cell.$Index = i + 1 + ''
+ _children.forEach((cell, i) => {
+ cell.key = i
+ cell.$$uuid = cell[config.setting.subKey] || ''
+ cell.$$parentId = _data[config.setting.primaryKey] || ''
+ cell.$$BID = _data[config.setting.primaryKey] || ''
+ cell.$$BData = {..._data}
+ cell.$Index = i + 1 + ''
- if (cell.$$uuid) {
- children.push(cell)
- }
- })
- }
-
- _data.children = children
-
- _data.key = item.key
- _data.$$uuid = _data[config.setting.primaryKey] || ''
- _data.$$BID = BID || ''
- _data.$$BData = BData || ''
- _data.$Index = item.$Index
- return _data
- } else {
- return item
+ if (cell.$$uuid) {
+ children.push(cell)
+ }
+ })
}
+
+ _data.children = children
+ _data.key = item.key
+ _data.$Index = item.$Index
+ return _data
+ } else {
+ return item
+ }
+ })
+
+ if (!_data.$Index) {
+ this.setState({
+ loading: false
})
- } catch (e) {
- console.warn('鏁版嵁鏌ヨ閿欒')
+ return
}
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
- }
+ selectedData = selectedData.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ return _data
+ }
+ return item
+ })
- this.setState({
- data: data,
- loading: false
- })
+ this.setState({
+ data: data,
+ selectedData: selectedData,
+ loading: false
+ })
+
+ if (_data.key === activeKey) {
+ MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+ }
+ } else {
+ let index = data.findIndex(item => item.$$uuid === id)
+
+ if (index === -1) {
+ this.setState({
+ loading: false
+ })
+ return
+ }
+
+ data = data.filter(item => item.$$uuid !== id)
+ data = data.map((item, i) => {
+ item.key = i
+ return item
+ })
+
+ let trans = activeKey === index
+ let _item = null
+
+ if (config.wrap.cardType) {
+ selectKeys = selectKeys.filter(key => key !== index)
+ selectKeys = selectKeys.map(key => key > index ? key - 1 : key)
+
+ selectedData = selectKeys.map(key => data[key]).filter(Boolean)
+
+ activeKey = selectKeys.length ? selectKeys[selectKeys.length - 1] : ''
+
+ if (trans && selectedData.length) {
+ _item = selectedData[selectedData.length - 1]
+ }
+ }
+
+ this.setState({
+ data: data,
+ activeKey: activeKey,
+ selectKeys: selectKeys,
+ selectedData: selectedData,
+ loading: false
+ })
+
+ if (trans) {
+ MKEmitter.emit('resetSelectLine', config.uuid, (_item ? _item.$$uuid : ''), _item)
+ }
+ }
} else {
this.setState({
loading: false
@@ -929,6 +1003,7 @@
if (activeKey === index) return
_selectedData = [item]
+ _selectKeys = [index]
_activeKey = index
}
@@ -960,36 +1035,34 @@
if (subcard.setting.click || card.setting.position !== 'inner' || card.setting.click !== 'menu') return
- let menuId = card.setting.MenuID || card.setting.menu.slice(-1)[0]
- let menu = window.GLOB.mkThdMenus.filter(m => m.MenuID === menuId)[0]
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
- if (!menu && card.setting.MenuName && card.setting.tabType) {
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
menu = {
- MenuID: menuId,
+ MenuID: card.setting.MenuID,
MenuName: card.setting.MenuName,
- MenuNo: card.setting.MenuNo || '',
type: card.setting.tabType
}
}
if (!menu) return
- let newtab = {
- ...menu,
- param: {}
- }
+ menu.param = {}
if (card.setting.joint === 'true') {
- newtab.param.$BID = item.$$uuid || ''
+ menu.param.$BID = item.$$uuid || ''
Object.keys(item).forEach(key => {
if (/^\$/.test(key)) return
if (key === 'children') return
- newtab.param[key] = item[key]
+ menu.param[key] = item[key]
})
}
- MKEmitter.emit('modifyTabs', newtab, true)
+ MKEmitter.emit('modifyTabs', menu, true)
}
onDoubleClick = (i, subClass) => {
@@ -1012,17 +1085,25 @@
})
}
- render() {
- const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+ pickupChange = () => {
+ this.setState({
+ pickup: !this.state.pickup
+ })
+ }
- if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
+ render() {
+ const { config, precards, nextcards, loading, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens, pickup } = this.state
+
+ let data = this.state.data
+
+ if (config.wrap.empty === 'hidden' && data.length === 0) return null
let extendData = null
if (config.$extend) {
extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
- if (data && data[0]) {
+ if (data[0]) {
if (selectedData[0]) {
extendData = {...extendData, ...selectedData[0]}
} else {
@@ -1044,11 +1125,15 @@
mainBox = 'flex-card '
}
+ if (pickup) {
+ data = data.filter(item => selectKeys.includes(item.key))
+ }
+
return (
<div className="double-data-card-box" id={'anchor' + config.uuid} style={config.style}>
{loading ?
<div className="loading-mask">
- {data ? <div className="ant-spin-blur"></div> : null}
+ {data.length ? <div className="ant-spin-blur"></div> : null}
<Spin />
</div> : null
}
@@ -1063,6 +1148,7 @@
selectedData={selectedData}
/> : null
}
+ {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /></div> : null}
<div className={config.wrap.zoomStyle ? 'data-zoom-box' : ''} style={config.wrap.zoomStyle}>
<div className={`data-zoom ${config.wrap.wrapClass}`} style={config.wrap.minWidth ? {minWidth: config.wrap.minWidth} : null}>
<Row className={'card-row-list '}>
@@ -1075,16 +1161,16 @@
</CardItem>}
</Col>
))}
- {data && data.map((item, index) => {
+ {data.map((item, index) => {
let className = 'card-item-wrap mk-card ' + mainBox
let subClass = 'mk-unfold'
let unfold = true
if (item.$disabled) {
className = 'card-item-wrap mk-disabled ' + mainBox
- } else if (activeKey === index) {
+ } else if (activeKey === item.key) {
className += 'active'
- } else if (selectKeys.indexOf(index) > -1) {
+ } else if (selectKeys.indexOf(item.key) > -1) {
className += 'selected'
}
@@ -1093,18 +1179,18 @@
subClass = 'mk-disabled'
unfold = false
} else {
- subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
- unfold = opens.indexOf(index) > -1
+ subClass = opens.indexOf(item.key) > -1 ? 'mk-unfold' : 'mk-collapse'
+ unfold = opens.indexOf(item.key) > -1
}
}
return (
<Col key={index} span={card.setting.width} style={card.wStyle}>
<div className={className} style={wrapStyle}>
- <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, item, subClass)}}>
+ <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}>
<span className="circle-select"></span>
- {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/>) : null}
- {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, index, subClass)}/> : null}
+ {card.setting.controlIcon === 'left' ? (!unfold ? <PlusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : <MinusSquareOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/>) : null}
+ {card.setting.controlIcon === 'right' ? <UpOutlined className={subClass} onClick={(e) => this.changeUnfold(e, item.key, subClass)}/> : null}
</CardItem>
<div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')} onClick={() => this.changeSubCard(item)}>
{item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
@@ -1126,10 +1212,10 @@
))}
</Row>
</div>
- {config.$empty && (!data || data.length === 0) ? <Empty description={false}/> : null}
+ {config.$empty && data.length === 0 ? <Empty description={false}/> : null}
</div>
- {config.wrap.pagestyle === 'page' && data ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && data && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+ {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+ {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
</div>
)
}
--
Gitblit v1.8.0