From 08cce3334a2dc81d690b518136b0aaea64e48b0b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 14 六月 2023 09:55:50 +0800
Subject: [PATCH] 2023-06-14
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 360 ++++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 228 insertions(+), 132 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 3599a92..33637fa 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -7,14 +7,13 @@
import Api from '@/api'
import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
-import preImg from '@/assets/img/prev.png'
-import nextImg from '@/assets/img/next.png'
import MKEmitter from '@/utils/events.js'
import TimerTask from '@/utils/timer-task.js'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
+const TableHeader = asyncComponent(() => import('../tableHeader'))
const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
@@ -30,6 +29,9 @@
config: null, // 鍥捐〃閰嶇疆淇℃伅
search: null, // 鎼滅储鏉′欢
pageIndex: 1, // 椤电爜
+ pageSize: 10,
+ orderBy: '',
+ pageOptions: [],
activeKey: '', // 閫変腑鍗�
selectKeys: [], // 澶氶�夋椂閫変腑鍗＄墖
selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
@@ -76,6 +78,8 @@
}
}
+ _config.$extend = false
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -91,8 +95,10 @@
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
+ _config.$extend = true
precards.push(item)
} else {
+ _config.$extend = true
nextcards.push(item)
}
})
@@ -127,17 +133,45 @@
subcard.setting = subcard.backSetting
if (_card.setting.position === 'inner') {
- wrapStyle = {}
+ wrapStyle = {backgroundColor: '#ffffff'}
Object.keys(_card.style).forEach(key => {
- if (!/^(margin|border|box)/.test(key)) return
+ if (!/^(margin|border|box|backgroundColor)/.test(key)) return
wrapStyle[key] = _card.style[key]
delete _card.style[key]
})
}
_config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
+ let pageOptions = ['10', '25', '50', '100', '500', '1000']
+
+ if (!_config.setting.laypage) {
+ _config.wrap.pagestyle = 'none'
+ }
+
+ if (_config.wrap.pagestyle === 'page') {
+ let size = (_config.setting.pageSize || 10) + ''
+ if (!pageOptions.includes(size)) {
+ pageOptions.push(size)
+ pageOptions = pageOptions.sort((a, b) => a - b)
+ }
+ }
+
+ if (_config.wrap.zHeight) {
+ _config.wrap.zHeight = _config.wrap.zHeight <= 100 ? _config.wrap.zHeight + 'vh' : _config.wrap.zHeight
+ }
+
+ if (_config.wrap.zHeight || _config.wrap.minWidth) {
+ _config.wrap.zoomStyle = {
+ border: `1px solid ${_config.wrap.zBColor || 'transparent'}`,
+ height: _config.wrap.zHeight || 'auto'
+ }
+ } else {
+ _config.wrap.zoomStyle = null
+ }
this.setState({
+ pageSize: _config.setting.pageSize || 10,
+ pageOptions,
selected,
precards,
nextcards,
@@ -183,30 +217,35 @@
Api.getLCacheConfig(config.uuid).then(res => {
if (!res || this.loaded) return
let _data = res.map((item, index) => {
+ let children = []
+
if (item[config.setting.subdata]) {
let _children = item[config.setting.subdata]
delete item[config.setting.subdata]
- item.children = _children.map((cell, i) => {
+ _children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
+ cell.$$parentId = item[config.setting.primaryKey] || ''
cell.$$BID = item[config.setting.primaryKey] || ''
cell.$$BData = {...item}
cell.$Index = i + 1 + ''
- return cell
+ if (cell.$$uuid) {
+ children.push(cell)
+ }
})
- } else {
- item.children = []
}
+
+ item.children = children
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
item.$Index = index + 1 + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -260,7 +299,7 @@
if (position === 'line') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid)
} else {
this.loadData(id)
}
@@ -366,6 +405,7 @@
checkAll = () => {
const { config, data, selectedData } = this.state
+ if (config.wrap.cardType !== 'checkbox') return
if (!data || data.length === 0) return
if (selectedData.length === 0 || selectedData.length < data.length) {
@@ -429,7 +469,7 @@
*/
queryModuleParam = (menuId, callback) => {
const { mainSearch } = this.props
- const { arr_field, config, search } = this.state
+ const { arr_field, config, search, orderBy } = this.state
if (config.uuid !== menuId) return
@@ -445,7 +485,7 @@
callback({
arr_field: arr_field,
- orderBy: config.setting.order || '',
+ orderBy: orderBy || config.setting.order || '',
search: searches,
menuName: config.name
})
@@ -453,7 +493,7 @@
async loadData (id, type) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, search, BID, BData, selected, card } = this.state
+ const { config, arr_field, pageIndex, pageSize, search, BID, BData, selected, card, orderBy } = this.state
if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') { // BID 涓嶅瓨鍦ㄦ椂锛屼笉鍋氭煡璇�
this.loaded = true
@@ -503,14 +543,14 @@
})
}
- let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID)
+ let _orderBy = orderBy || config.setting.order || ''
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID)
let result = await Api.genericInterface(param)
if (result.status) {
let start = 1
if (config.setting.laypage) {
- start = config.setting.pageSize * (pageIndex - 1) + 1
+ start = pageSize * (pageIndex - 1) + 1
}
this.loaded = true
@@ -536,20 +576,25 @@
let _data = (this.state.data || []).concat(result.data || [])
data = _data.map((item, index) => {
if (item[config.setting.subdata]) {
+ let children = []
let _children = item[config.setting.subdata]
delete item[config.setting.subdata]
-
- item.children = _children.map((cell, i) => {
+
+ _children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
+ cell.$$parentId = item[config.setting.primaryKey] || ''
cell.$$BID = item[config.setting.primaryKey] || ''
cell.$$BData = {...item}
cell.$Index = i + 1 + ''
- return cell
+ if (cell.$$uuid) {
+ children.push(cell)
+ }
})
- } else {
+ item.children = children
+ } else if (!item.children) {
item.children = []
}
@@ -560,7 +605,7 @@
item.$Index = index + 1 + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -569,23 +614,28 @@
})
} else {
data = result.data.map((item, index) => {
+ let children = []
+
if (item[config.setting.subdata]) {
let _children = item[config.setting.subdata]
delete item[config.setting.subdata]
- item.children = _children.map((cell, i) => {
+ _children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
+ cell.$$parentId = item[config.setting.primaryKey] || ''
cell.$$BID = item[config.setting.primaryKey] || ''
cell.$$BData = {...item}
cell.$Index = i + 1 + ''
- return cell
+ if (cell.$$uuid) {
+ children.push(cell)
+ }
})
- } else {
- item.children = []
}
+
+ item.children = children
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
@@ -594,7 +644,7 @@
item.$Index = index + start + ''
if (config.wrap.controlField) {
- if (config.wrap.controlVal.includes(item[config.wrap.controlField])) {
+ if (config.wrap.controlVal.includes(item[config.wrap.controlField] + '')) {
item.$disabled = true
}
}
@@ -617,6 +667,13 @@
total: result.total,
loading: false
})
+
+ if (config.timer && config.clearField && result.data && result.data[0]) {
+ let vals = (config.clearValue || '').split(',')
+ if (vals.includes(result.data[0][config.clearField])) {
+ this.timer && this.timer.stop()
+ }
+ }
} else {
this.setState({
loading: false
@@ -641,7 +698,7 @@
*/
async loadLinedata (id) {
const { mainSearch } = this.props
- const { config, arr_field, pageIndex, search, BID, BData } = this.state
+ const { config, arr_field, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
let searches = fromJS(search).toJS()
if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
@@ -657,8 +714,8 @@
loading: true
})
- let _orderBy = config.setting.order || ''
- let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, config.setting.pageSize, BID, id)
+ let _orderBy = orderBy || config.setting.order || ''
+ let param = UtilsDM.getQueryDataParams(config.setting, arr_field, searches, _orderBy, pageIndex, pageSize, BID, id)
let result = await Api.genericInterface(param)
if (result.status) {
@@ -669,23 +726,28 @@
try {
data = data.map(item => {
if (item[config.setting.primaryKey] === _data[config.setting.primaryKey]) {
+ let children = []
+
if (_data[config.setting.subdata]) {
let _children = _data[config.setting.subdata]
delete _data[config.setting.subdata]
- _data.children = _children.map((cell, i) => {
+ _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 + ''
- return cell
+ if (cell.$$uuid) {
+ children.push(cell)
+ }
})
- } else {
- _data.children = []
}
+
+ _data.children = children
_data.key = item.key
_data.$$uuid = _data[config.setting.primaryKey] || ''
@@ -721,9 +783,9 @@
}
loadMore = () => {
- const { total, pageIndex, loading, config } = this.state
+ const { total, pageIndex, pageSize, loading } = this.state
- if (loading || config.setting.pageSize * pageIndex >= total) {
+ if (loading || pageSize * pageIndex >= total) {
return
}
@@ -731,31 +793,6 @@
pageIndex: pageIndex + 1
}, () => {
this.loadData('', 'plus')
- })
- }
-
- prevPage = () => {
- const { pageIndex } = this.state
-
- if (pageIndex === 1) return
-
- this.setState({
- pageIndex: pageIndex - 1
- }, () => {
- this.loadData()
- })
- }
-
- nextPage = () => {
- const { config, pageIndex, total } = this.state
- let _total = config.setting.pageSize * pageIndex
-
- if (_total >= total) return
-
- this.setState({
- pageIndex: pageIndex + 1
- }, () => {
- this.loadData()
})
}
@@ -771,6 +808,15 @@
this.setState({
search: list,
pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
+ }
+
+ pageSizeChange = (current, size) => {
+ this.setState({
+ pageIndex: current,
+ pageSize: size
}, () => {
this.loadData()
})
@@ -840,6 +886,43 @@
}
}
+ changeSubCard = (item) => {
+ const { subcard, card } = this.state
+
+ 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]
+
+ if (!menu && card.setting.MenuName && card.setting.tabType) {
+ menu = {
+ MenuID: menuId,
+ MenuName: card.setting.MenuName,
+ MenuNo: card.setting.MenuNo || '',
+ type: card.setting.tabType
+ }
+ }
+
+ if (!menu) return
+
+ let newtab = {
+ ...menu,
+ param: {}
+ }
+
+ if (card.setting.joint === 'true') {
+ newtab.param.$BID = item.$$uuid || ''
+
+ Object.keys(item).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ newtab.param[key] = item[key]
+ })
+ }
+
+ MKEmitter.emit('modifyTabs', newtab, true)
+ }
+
onDoubleClick = (i, subClass) => {
const { opens, card } = this.state
@@ -852,22 +935,31 @@
}
}
+ refreshByHeader = (sorter) => {
+ this.setState({
+ orderBy: sorter || ''
+ }, () => {
+ this.loadData()
+ })
+ }
+
render() {
- const { config, precards, nextcards, loading, data, pageIndex, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+ const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
- let _total = 0
- let switchable = false
- if (config.wrap.pagestyle === 'switch' && config.pageable && config.setting.laypage && total > config.setting.pageSize && data) {
- _total = config.setting.pageSize * pageIndex
- switchable = true
- }
+ let extendData = null
- let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
-
- if (data && data[0]) {
- extendData = {...extendData, ...data[0]}
+ if (config.$extend) {
+ extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+ if (data && data[0]) {
+ if (selectedData[0]) {
+ extendData = {...extendData, ...selectedData[0]}
+ } else {
+ extendData = {...extendData, ...data[0]}
+ }
+ }
}
let checkAll = ''
@@ -902,69 +994,73 @@
selectedData={selectedData}
/> : null
}
- <div className={`data-zoom ${config.wrap.wrapClass}`}>
- {switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
- <Row className={'card-row-list '}>
- {precards.map((item, index) => (
- <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
- {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
- </CardItem>
- </Col>
- ))}
- {data && data.map((item, index) => {
- let className = 'card-item-wrap mk-card ' + mainBox
- let subClass = 'mk-unfold'
- let unfold = true
-
- if (item.$disabled) {
- className = 'mk-disabled ' + mainBox
- } else if (activeKey === index) {
- className += 'active'
- } else if (selectKeys.indexOf(index) > -1) {
- className += 'selected'
- }
-
- if (card.setting.display !== 'default') {
- if (item.children.length === 0) {
- subClass = 'mk-disabled'
- unfold = false
- } else {
- subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
- unfold = opens.indexOf(index) > -1
- }
- }
-
- return (
- <Col key={index} span={card.setting.width}>
- <div className={className} style={wrapStyle}>
- <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, 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}
- </CardItem>
- <div className={'sub-card-wrap ' + subClass + (config.wrap.parity === 'true' ? ' mk-parity-bg' : '')}>
- {item.children.map((cell, index) => <Col key={'sub' + index} span={subcard.setting.width || 24}>
- <CardItem card={subcard} cards={subconfig} data={cell} />
- </Col>)}
- </div>
- </div>
+ <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 '}>
+ {precards.map((item, index) => (
+ <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
+ {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </CardItem>}
</Col>
- )
- })}
- {nextcards.map((item, index) => (
- <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
- <CardItem card={item} cards={config} data={extendData}>
- {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
- </CardItem>
- </Col>
- ))}
- </Row>
- {switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
- {precards.length === 0 && nextcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : null}
+ ))}
+ {data && 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) {
+ className += 'active'
+ } else if (selectKeys.indexOf(index) > -1) {
+ className += 'selected'
+ }
+
+ if (card.setting.display !== 'default') {
+ if (item.children.length === 0) {
+ subClass = 'mk-disabled'
+ unfold = false
+ } else {
+ subClass = opens.indexOf(index) > -1 ? 'mk-unfold' : 'mk-collapse'
+ unfold = opens.indexOf(index) > -1
+ }
+ }
+
+ return (
+ <Col key={index} span={card.setting.width}>
+ <div className={className} style={wrapStyle}>
+ <CardItem card={card} cards={config} data={item} onDoubleClick={() => this.onDoubleClick(index, subClass)} onClick={() => {this.changeCard(index, 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}
+ </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}>
+ <CardItem card={subcard} cards={subconfig} data={cell} />
+ </Col>)}
+ </div>
+ </div>
+ </Col>
+ )
+ })}
+ {nextcards.map((item, index) => (
+ <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
+ {item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </TableHeader> : <CardItem card={item} cards={config} data={extendData}>
+ {item.setting.checkAll === 'show' ? <span onClick={this.checkAll} className={'circle-select' + checkAll}></span> : null}
+ </CardItem>}
+ </Col>
+ ))}
+ </Row>
+ {!config.$extend && (!data || data.length === 0) ? <Empty description={false}/> : null}
+ </div>
</div>
- {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={t => `鍏� ${t} 鏉} pageSize={config.setting.pageSize} onChange={this.changePageIndex} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && config.setting.laypage && data && data.length > 0 ? <div className={'mk-more' + (config.setting.pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+ {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}
</div>
)
}
--
Gitblit v1.8.0