From b69b5f6329ca5f87932436b7a6c1ddfc3377e10f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 16 五月 2024 10:56:41 +0800
Subject: [PATCH] 2024-05-16
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 638 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 439 insertions(+), 199 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 917346e..4f56e58 100644
--- a/src/tabviews/custom/components/card/double-data-card/index.jsx
+++ b/src/tabviews/custom/components/card/double-data-card/index.jsx
@@ -1,11 +1,10 @@
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, Row, Col, Pagination, Switch } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
-import Utils from '@/utils/utils.js'
import UtilsDM from '@/utils/utils-datamanage.js'
import MKEmitter from '@/utils/events.js'
import TimerTask from '@/utils/timer-task.js'
@@ -20,7 +19,6 @@
class DoubleDataCard extends Component {
static propTpyes = {
config: PropTypes.object, // 缁勪欢閰嶇疆淇℃伅
- mainSearch: PropTypes.any, // 澶栧眰鎼滅储鏉′欢
}
state = {
@@ -37,15 +35,16 @@
selectedData: [], // 閫変腑鏁版嵁锛岀敤浜庡伐鍏锋爮鎸夐挳
loading: false, // 鏁版嵁鍔犺浇鐘舵��
card: null, // 鍗＄墖璁剧疆
- data: null, // 鏁版嵁
- total: null,
+ data: [], // 鏁版嵁
+ total: 0,
precards: [],
nextcards: [],
selected: 'false',
opens: [],
wrapStyle: null,
subcard: null,
- subconfig: null
+ subconfig: null,
+ pickup: false
}
loaded = false
@@ -78,6 +77,9 @@
}
}
+ _config.$extend = false
+ _config.$empty = true
+
_config.subcards.forEach(item => {
if (item.setting.click === 'button' && !item.setting.linkbtn) {
item.elements.forEach(ele => {
@@ -90,19 +92,31 @@
}
}
+ if (item.style.clear === 'left') {
+ item.wStyle = {clear: 'left'}
+ } else if (item.style.clear === 'right') {
+ item.wStyle = {float: 'right'}
+ }
+
+ delete item.style.clear
+
if (item.$cardType !== 'extendCard') {
_card = item
} else if (!_card) {
+ _config.$extend = true
+ if (item.setting.width !== 24) {
+ _config.$empty = false
+ }
precards.push(item)
} else {
+ _config.$extend = true
+ _config.$empty = false
nextcards.push(item)
}
})
_config.subcards = null
- let _data = null
-
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
selected = _config.wrap.selected
@@ -115,8 +129,12 @@
_config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
- this.loaded = _data !== null
-
+ if (_config.wrap.shifting === 'true') {
+ _config.wrap.shifting = 'shifting'
+ } else {
+ _config.wrap.shifting = ''
+ }
+
let wrapStyle = null
let subcard = fromJS(_card).toJS()
let subconfig = fromJS(_config).toJS()
@@ -129,16 +147,22 @@
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(',')
+ _config.setting.all_field = _config.setting.arr_field + ',' + _config.setting.sub_field
+
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) + ''
@@ -146,6 +170,22 @@
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (_config.wrap.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= _config.wrap.maxPageSize)
+ }
+ }
+
+ 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({
@@ -154,7 +194,6 @@
selected,
precards,
nextcards,
- data: _data,
BID: BID || '',
BData: BData || '',
config: _config,
@@ -162,14 +201,7 @@
subconfig: subconfig,
wrapStyle: wrapStyle,
card: _card,
- search: Utils.initMainSearch(_config.search),
- arr_field: _config.columns.map(col => col.field).join(','),
- }, () => {
- if (_config.setting.onload === 'true') {
- setTimeout(() => {
- this.loadData()
- }, _config.setting.delay || 0)
- }
+ search: _config.$searches
})
}
@@ -177,10 +209,15 @@
const { config } = this.state
MKEmitter.addListener('reloadData', this.reloadData)
+ MKEmitter.addListener('refreshLineData', this.refreshLineData)
MKEmitter.addListener('resetSelectLine', this.resetParentParam)
MKEmitter.addListener('queryModuleParam', this.queryModuleParam)
MKEmitter.addListener('refreshByButtonResult', this.refreshByButtonResult)
+ if (config.setting.useMSearch) {
+ MKEmitter.addListener('searchRefresh', this.searchRefresh)
+ }
+
if (config.timer) {
this.timer = new TimerTask()
this.timer.init(config.uuid, config.timer, config.timerRepeats, () => {
@@ -192,10 +229,37 @@
})
}
- if (config.$cache && !this.loaded) {
- Api.getLCacheConfig(config.uuid).then(res => {
- if (!res || this.loaded) return
- let _data = res.map((item, index) => {
+ if (config.setting.onload === 'true') {
+ this.initExec()
+ }
+
+ this.autoExec()
+ }
+
+ shouldComponentUpdate (nextProps, nextState) {
+ return !is(fromJS(this.state), fromJS(nextState))
+ }
+
+ componentWillUnmount () {
+ this.setState = () => {
+ return
+ }
+ MKEmitter.removeListener('reloadData', this.reloadData)
+ MKEmitter.removeListener('searchRefresh', this.searchRefresh)
+ MKEmitter.removeListener('refreshLineData', this.refreshLineData)
+ MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
+ MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
+ MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+
+ this.timer && this.timer.stop()
+ }
+
+ initExec = () => {
+ const { config, BID } = this.state
+
+ if (config.$cache) {
+ let getData = (res) => {
+ return res.map((item, index) => {
let children = []
if (item[config.setting.subdata]) {
@@ -224,50 +288,76 @@
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
}
}
return item
})
+ }
+
+ if (config.$time && !config.setting.laypage) {
+ Api.getLCacheConfig(config.uuid, config.$time, BID).then(res => {
+ if (!res.valid) {
+ setTimeout(() => {
+ this.loadData('', 'init')
+ }, config.setting.delay || 0)
+ }
- this.setState({data: _data})
- })
+ if (!res.data) return
+
+ this.setState({data: getData(res.data)})
+ })
+ } else {
+ Api.getLCacheConfig(config.uuid, 0, BID).then(res => {
+ if (!res.data || this.loaded) return
+
+ this.setState({data: getData(res.data)})
+ })
+
+ setTimeout(() => {
+ this.loadData('', 'init')
+ }, config.setting.delay || 0)
+ }
+ } else {
+ setTimeout(() => {
+ this.loadData()
+ }, config.setting.delay || 0)
}
}
- shouldComponentUpdate (nextProps, nextState) {
- return !is(fromJS(this.state), fromJS(nextState))
- }
-
- UNSAFE_componentWillReceiveProps (nextProps) {
+ autoExec = (times) => {
const { config } = this.state
- if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
+ if (!config.wrap.autoExec) return
+
+ let btn = document.getElementById('button' + config.wrap.autoExec)
+
+ this.autoTimer && clearTimeout(this.autoTimer)
+
+ if (btn) {
+ MKEmitter.emit('triggerBtnId', config.wrap.autoExec, [])
+ } else if (!times || times < 20) {
+ times = times ? times + 1 : 1
+ this.autoTimer = setTimeout(() => {
+ this.autoExec(times)
+ }, 1000)
}
}
- componentWillUnmount () {
- this.setState = () => {
- return
- }
- MKEmitter.removeListener('reloadData', this.reloadData)
- MKEmitter.removeListener('resetSelectLine', this.resetParentParam)
- MKEmitter.removeListener('queryModuleParam', this.queryModuleParam)
- MKEmitter.removeListener('refreshByButtonResult', this.refreshByButtonResult)
+ searchRefresh = (searchId) => {
+ const { config } = this.state
- this.timer && this.timer.stop()
+ if (config.$searchId !== searchId) return
+
+ this.setState({pageIndex: 1}, () => {
+ this.loadData()
+ })
}
/**
* @description 鎸夐挳鎵ц瀹屾垚鍚庨〉闈㈠埛鏂�
- * @param {*} menuId // 鑿滃崟Id
- * @param {*} position // 鍒锋柊浣嶇疆
- * @param {*} btn // 鎵ц鐨勬寜閽�
*/
refreshByButtonResult = (menuId, position, btn, id = '', lines) => {
const { config, BID } = this.state
@@ -276,14 +366,14 @@
let supModule = config.setting.supModule
- if (position === 'line') {
+ if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid)
+ this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
} else {
this.loadData(id)
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
} else if (!btn || btn.resetPageIndex !== 'false') {
this.setState({
pageIndex: 1
@@ -293,17 +383,35 @@
} else {
this.loadData(id)
}
+ }
- if (position === 'popclose') { // 鎵ц鍚姩寮圭獥鐨勬寜閽墍閫夋嫨鐨勫埛鏂伴」
- btn.$tabId && MKEmitter.emit('refreshPopButton', btn.$tabId)
- }
+ refreshLineData = (menuId, btn, uuid, count) => {
+ const { config, data } = this.state
+
+ if (config.uuid !== menuId) return
+
+ let _data = fromJS(data).toJS().map(item => {
+ if (item.$$uuid === uuid) {
+ item[btn.field] = count
+ }
+ item.children.forEach(cell => {
+ if (cell.$$uuid === uuid) {
+ cell[btn.field] = count
+ }
+ })
+ return item
+ })
+
+ this.setState({
+ data: _data
+ })
}
checkTopLine = (id) => {
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: [],
@@ -384,7 +492,8 @@
checkAll = () => {
const { config, data, selectedData } = this.state
- if (!data || data.length === 0) return
+ if (config.wrap.cardType !== 'checkbox') return
+ if (data.length === 0) return
if (selectedData.length === 0 || selectedData.length < data.length) {
let index = ''
@@ -437,7 +546,9 @@
if (!config.setting.supModule || config.setting.supModule !== MenuID) return
if (id !== this.state.BID || id !== '') {
this.setState({ BID: id, BData: data, pageIndex: 1 }, () => {
- this.loadData()
+ if (!config.checkBid) {
+ this.loadData()
+ }
})
}
}
@@ -446,35 +557,33 @@
* @description 瀵煎嚭Excel鏃讹紝鑾峰彇椤甸潰鎼滅储鎺掑簭绛夊弬鏁�
*/
queryModuleParam = (menuId, callback) => {
- const { mainSearch } = this.props
- const { arr_field, config, search, orderBy } = this.state
+ const { config, search, orderBy } = this.state
if (config.uuid !== menuId) return
let searches = search ? fromJS(search).toJS() : []
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
callback({
- arr_field: arr_field,
orderBy: orderBy || config.setting.order || '',
- search: searches,
- menuName: config.name
+ search: searches
})
}
async loadData (id, type) {
- const { mainSearch } = this.props
- 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
+ this.requestId = ''
this.setState({
activeKey: '',
@@ -486,32 +595,23 @@
total: 0,
loading: false
})
-
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- setTimeout(() => {
- this.checkTopLine(id)
- }, 200)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
let searches = fromJS(search).toJS()
- if (config.setting.useMSearch && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
- let requireFields = searches.filter(item => item.required && item.value === '')
- if (requireFields.length > 0) {
+ if (config.$s_req && searches.filter(item => item.required && item.value === '').length > 0) {
return
}
@@ -522,24 +622,28 @@
}
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)
+ this.requestId = config.uuid + new Date().getTime()
+
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
let start = 1
if (config.setting.laypage) {
start = pageSize * (pageIndex - 1) + 1
}
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'})
}
@@ -553,9 +657,8 @@
if (type === 'plus') {
let _data = (this.state.data || []).concat(result.data || [])
data = _data.map((item, index) => {
- let children = []
-
if (item[config.setting.subdata]) {
+ let children = []
let _children = item[config.setting.subdata]
delete item[config.setting.subdata]
@@ -572,9 +675,10 @@
children.push(cell)
}
})
+ item.children = children
+ } else if (!item.children) {
+ item.children = []
}
-
- item.children = children
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
@@ -583,7 +687,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
}
}
@@ -622,7 +726,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
}
}
@@ -636,13 +740,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
})
@@ -652,39 +762,41 @@
this.timer && this.timer.stop()
}
}
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+
+ UtilsDM.queryFail(result)
}
}
/**
* @description 鑾峰彇鍗曡鏁版嵁
*/
- async loadLinedata (id) {
- const { mainSearch } = this.props
- const { config, arr_field, pageIndex, pageSize, search, BID, BData, orderBy } = this.state
+ async loadLinedata (id, position) {
+ 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 && mainSearch && mainSearch.length > 0) { // 涓昏〃鎼滅储鏉′欢
- let keys = searches.map(item => item.key.toLowerCase())
+ if (config.setting.useMSearch) { // 涓昏〃鎼滅储鏉′欢
+ let mainSearch = window.GLOB.SearchBox.get(config.$searchId) || []
+ let keys = config.$s_keys || []
mainSearch.forEach(item => {
- if (!keys.includes(item.key.toLowerCase())) {
- searches.push(item)
- }
+ if (keys.includes(item.key.toLowerCase())) return
+
+ searches.push(item)
})
}
@@ -693,70 +805,131 @@
})
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()
- if (result.data && result.data[0]) {
- let _data = result.data[0]
-
- 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]
-
- _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
- }
- })
- } catch (e) {
- console.warn('鏁版嵁鏌ヨ閿欒')
- }
-
- MKEmitter.emit('resetSelectLine', config.uuid, _data.$$uuid || '', _data)
+ if (position === 'line_grid' && (!result.data || !result.data[0])) {
+ this.loadData()
+ return
}
- this.setState({
- data: data,
- loading: false
- })
+ 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 || ''
+
+ data = data.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ let children = []
+
+ if (_data[config.setting.subdata]) {
+ let _children = _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 + ''
+
+ 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
+ })
+ return
+ }
+
+ selectedData = selectedData.map(item => {
+ if (item.$$uuid === _data.$$uuid) {
+ return _data
+ }
+ return item
+ })
+
+ 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
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
}
@@ -838,6 +1011,7 @@
if (activeKey === index) return
_selectedData = [item]
+ _selectKeys = [index]
_activeKey = index
}
@@ -864,6 +1038,37 @@
}
}
+ changeSubCard = (item) => {
+ const { subcard, card } = this.state
+
+ if (subcard.setting.click || card.setting.position !== 'inner' || card.setting.click !== 'menu') return
+
+ let menuId = card.setting.menu.slice(-1)[0]
+ let menu = null
+
+ if (window.GLOB.mkThdMenus.has(menuId)) {
+ menu = {...window.GLOB.mkThdMenus.get(menuId)}
+ } else if (card.setting.MenuID) {
+ menu = {
+ MenuID: card.setting.MenuID,
+ MenuName: card.setting.MenuName,
+ type: card.setting.tabType
+ }
+ }
+
+ if (!menu) return
+
+ menu.param = {$BID: item.$$uuid || ''}
+
+ Object.keys(item).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ menu.param[key] = item[key]
+ })
+
+ MKEmitter.emit('modifyTabs', menu, true)
+ }
+
onDoubleClick = (i, subClass) => {
const { opens, card } = this.state
@@ -884,15 +1089,31 @@
})
}
+ pickupChange = () => {
+ this.setState({
+ pickup: !this.state.pickup
+ })
+ }
+
render() {
- const { config, precards, nextcards, loading, data, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens } = this.state
+ const { config, precards, nextcards, loading, pageIndex, pageSize, total, card, activeKey, BID, BData, selectedData, selectKeys, subcard, subconfig, wrapStyle, opens, pickup } = this.state
- if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
+ let data = this.state.data
- let extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+ if (config.wrap.empty === 'hidden' && data.length === 0) return null
- if (data && data[0]) {
- extendData = {...extendData, ...data[0]}
+ let extendData = null
+
+ if (config.$extend) {
+ extendData = {$$BID: BID, $$BData: BData, $$selectedData: selectedData, $$type: 'extendCard'}
+
+ if (data[0]) {
+ if (selectedData[0]) {
+ extendData = {...extendData, ...selectedData[0]}
+ } else {
+ extendData = {...extendData, ...data[0]}
+ }
+ }
}
let checkAll = ''
@@ -908,11 +1129,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}>
+ <div className={'double-data-card-box ' + config.wrap.shifting} 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
}
@@ -927,11 +1152,12 @@
selectedData={selectedData}
/> : null
}
- <div className={config.wrap.minWidth ? 'data-zoom-box' : ''}>
+ {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 '}>
{precards.map((item, index) => (
- <Col key={'pre' + index} className="extend-card" span={item.setting.width || 6}>
+ <Col key={'pre' + index} className="extend-card" style={item.wStyle} 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}>
@@ -939,16 +1165,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 = 'mk-disabled ' + mainBox
- } else if (activeKey === index) {
+ className = 'card-item-wrap mk-disabled ' + mainBox
+ } else if (activeKey === item.key) {
className += 'active'
- } else if (selectKeys.indexOf(index) > -1) {
+ } else if (selectKeys.indexOf(item.key) > -1) {
className += 'selected'
}
@@ -957,20 +1183,34 @@
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
+ }
+
+ if (!unfold && item.children.length > 5) {
+ 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(item.key, subClass)} onClick={() => {this.changeCard(item.key, item, subClass)}}>
+ <span className="circle-select"></span>
+ {card.setting.controlIcon === 'left' ? <PlusSquareOutlined 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>
+ </Col>
+ )
}
}
return (
- <Col key={index} span={card.setting.width}>
+ <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' : '')}>
+ <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>)}
@@ -980,7 +1220,7 @@
)
})}
{nextcards.map((item, index) => (
- <Col key={'next' + index} className="extend-card" span={item.setting.width || 6}>
+ <Col key={'next' + index} className="extend-card" style={item.wStyle} 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}>
@@ -989,11 +1229,11 @@
</Col>
))}
</Row>
- {precards.length === 0 && nextcards.length === 0 && (!data || data.length === 0) ? <Empty description={false}/> : null}
</div>
+ {config.$empty && data.length === 0 ? <Empty description={false}/> : null}
</div>
- {config.wrap.pagestyle === 'page' && config.setting.laypage && data ? <Pagination size="small" total={total} showTotal={(t, range) => `${range[0]}-${range[1]} 鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && config.setting.laypage && 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