From 347c1360ca4b5c6c17353b3e407a26e62c18138b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 12 五月 2025 16:35:19 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/card/double-data-card/index.jsx | 379 ++++++++++++++++++++++++++++--------------------------
1 files changed, 197 insertions(+), 182 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 57af326..4fac5cc 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, Switch } from 'antd'
+import { Spin, Empty, Row, Col, Pagination, Switch, notification } from 'antd'
import { DownOutlined, UpOutlined, PlusSquareOutlined, MinusSquareOutlined } from '@ant-design/icons'
import Api from '@/api'
@@ -116,6 +116,12 @@
})
_config.subcards = null
+
+ if (!_config.wrap.cardType) {
+ _config.wrap.selStyle = 'none'
+ _config.wrap.selected = 'false'
+ _config.wrap.pickup = 'false'
+ }
let selected = 'false'
if (_config.wrap.selected === 'always' || _config.wrap.selected === 'init' || _config.wrap.selected === 'sign') {
@@ -124,10 +130,33 @@
_config.wrap.selected = 'false'
}
- _config.wrap.selStyle = _config.wrap.selStyle || 'active'
+ _config.wrap.selStyle = _config.wrap.selStyle || 'check'
_config.wrap.pagestyle = _config.wrap.pagestyle || 'page'
- _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''}`
+ _config.wrap.wrapClass = `${_config.wrap.selStyle} ${_config.wrap.cardType || ''} ${config.wrap.empSign === 'hidden' ? 'mk-empty-hide' : ''}`
+
+ if (_config.wrap.zHeight || _config.wrap.minWidth) {
+ _config.wrap.zoomStyle = {
+ maxHeight: 'none',
+ '--mk-data-zoom-width': _config.wrap.minWidth ? _config.wrap.minWidth + 'px' : '100%'
+ }
+
+ if (_config.wrap.zHeight) {
+ if (_config.wrap.zHeight <= 100) {
+ if (_config.wrap.zHeight < 0) {
+ _config.wrap.zoomStyle.maxHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+ _config.wrap.zoomStyle.minHeight = '100px'
+ } else {
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'vh'
+ }
+ } else {
+ _config.wrap.zoomStyle.maxHeight = _config.wrap.zHeight + 'px'
+ }
+ _config.wrap.wrapClass += ' fix-height'
+ }
+ } else {
+ _config.wrap.zoomStyle = null
+ }
if (_config.wrap.shifting === 'true') {
_config.wrap.shifting = 'shifting'
@@ -155,8 +184,10 @@
})
}
- _config.setting.sub_field = subconfig.columns.map(col => col.field).join(',')
- _config.setting.all_field = _config.setting.arr_field + ',' + _config.setting.sub_field
+ if (_config.setting.subdata !== 'sub_data_string') {
+ _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']
@@ -175,17 +206,8 @@
}
}
- 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
+ if (_config.setting.supModule && !BID && _config.wrap.supKey !== 'false') {
+ _config.setting.onload = 'false'
}
this.setState({
@@ -260,13 +282,18 @@
if (config.$cache) {
let getData = (res) => {
return res.map((item, index) => {
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
+
let children = []
- if (item[config.setting.subdata]) {
- let _children = item[config.setting.subdata]
-
- delete item[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -327,6 +354,21 @@
}
}
+ parseSubData = (data) => {
+ try {
+ data = JSON.parse(data)
+ if (typeof(data) !== 'object') {
+ data = []
+ } else if (!Array.isArray(data)) {
+ data = [data]
+ }
+ } catch(e) {
+ console.warn('Data parsing error.')
+ data = []
+ }
+ return data
+ }
+
autoExec = (times) => {
const { config } = this.state
@@ -351,9 +393,7 @@
if (config.$searchId !== searchId) return
- this.setState({pageIndex: 1}, () => {
- this.loadData()
- })
+ this.reloadIndex()
}
/**
@@ -366,22 +406,23 @@
let supModule = config.setting.supModule
+ let _id = config.wrap.selected === 'always' ? id : ''
if (position === 'line' || position === 'line_grid') {
if (lines && lines.length === 1) {
- this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
+ if (config.forbidLine) {
+ this.loadData(lines[0].$$parentId || lines[0].$$uuid, 'repage')
+ } else {
+ this.loadLinedata(lines[0].$$parentId || lines[0].$$uuid, position)
+ }
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
- } else if ((position === 'mainline' || position === 'popclose') && supModule && BID) { // 鍒锋柊婧愮粍浠舵椂锛岄檮甯﹀埛鏂颁笂绾ц涓庡綋鍓嶇粍浠�
- MKEmitter.emit('reloadData', supModule, BID)
- } else if (!btn || btn.resetPageIndex !== 'false') {
- this.setState({
- pageIndex: 1
- }, () => {
- this.loadData(id)
- })
+ } else if (['mainline', 'maingrid', 'popclose'].includes(position) && supModule) {
+ MKEmitter.emit('reloadData', supModule, position === 'maingrid' ? '' : BID)
+ } else if (btn.resetPageIndex !== 'false') {
+ this.reloadIndex()
} else {
- this.loadData(id)
+ this.loadData(_id, 'repage')
}
}
@@ -407,64 +448,40 @@
})
}
- checkTopLine = (id) => {
- const { config, data, selected, card } = this.state
+ checkTopLine = (id, selected) => {
+ const { config, data, card } = this.state
let _opens = [...this.state.opens]
- if (data.length === 0) {
- this.setState({
- activeKey: '',
- selectKeys: [],
- selectedData: []
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- return
- }
+ let index = -1
+ let keys = []
+ let items = []
- if (selected === 'sign') {
- let index = ''
- let keys = []
- let items = []
- let last = ''
-
- if (card.setting.display === 'collapse') {
- _opens = []
+ if (data.length > 0) {
+ if (id) {
+ index = data.findIndex(item => item.$$uuid === id && !item.$disabled)
}
- data.forEach((item, i) => {
- if (!item.$disabled && item.selected === 'true') {
- items.push(item)
- keys.push(i)
- index = i
- last = item
-
- if (card.setting.display === 'collapse') {
- _opens.push(i)
+ if (index !== -1) {
+ keys = [index]
+ items = [data[index]]
+ } else if (selected === 'sign') {
+ data.forEach((item, i) => {
+ if (!item.$disabled && item.selected === 'true') {
+ items.push(item)
+ keys.push(i)
+ index = i
}
+ })
+ } else if (selected !== 'false') {
+ if (!data[0].$disabled) {
+ index = 0
+ keys = [index]
+ items = [data[index]]
}
- })
-
- this.setState({
- opens: _opens,
- activeKey: index,
- selectKeys: keys,
- selectedData: items
- })
-
- MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
- return
- }
-
- let index = 0
- if (id) {
- index = data.findIndex(item => item.$$uuid === id)
- if (index === -1) {
- index = 0
}
}
- if (data[index].$disabled) {
+ if (index === -1) {
this.setState({
activeKey: '',
selectKeys: [],
@@ -476,17 +493,19 @@
}
if (card.setting.display === 'collapse') {
- _opens = [index]
+ _opens = keys
}
+
+ let item = items[items.length - 1]
this.setState({
opens: _opens,
activeKey: index,
- selectKeys: [index],
- selectedData: [data[index]]
+ selectKeys: keys,
+ selectedData: items
})
- MKEmitter.emit('resetSelectLine', config.uuid, data[index].$$uuid, data[index])
+ MKEmitter.emit('resetSelectLine', config.uuid, item.$$uuid, item)
}
checkAll = () => {
@@ -534,7 +553,9 @@
if (config.uuid !== menuId) return
if (!id) {
- this.loadData()
+ this.reloadIndex()
+ } else if (config.forbidLine) {
+ this.loadData(id, 'repage')
} else {
this.loadLinedata(id)
}
@@ -595,17 +616,8 @@
total: 0,
loading: false
})
-
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
- setTimeout(() => {
- this.checkTopLine(id)
- }, 10)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
- } else {
- MKEmitter.emit('resetSelectLine', config.uuid, '', '')
- }
+
+ MKEmitter.emit('resetSelectLine', config.uuid, '', '')
return
}
@@ -633,13 +645,16 @@
let _orderBy = orderBy || config.setting.order || ''
let param = UtilsDM.getQueryDataParams(config.setting, searches, _orderBy, pageIndex, pageSize, BID)
- if (param.func === 'sPC_Get_TableData') {
- this.requestId = param.timestamp
- }
+ this.requestId = config.uuid + new Date().getTime()
- let result = await Api.genericInterface(param)
+ let result = await Api.genericInterface(param, '', '', this.requestId)
if (result.status) {
- if (result.timestamp_back && this.requestId !== result.timestamp_back) return
+ if (result.$requestId && this.requestId !== result.$requestId) return
+
+ if (type === 'repage' && result.data.length === 0 && pageIndex > 1) {
+ this.reloadIndex()
+ return
+ }
let start = 1
if (config.setting.laypage) {
@@ -651,13 +666,10 @@
Api.writeCacheConfig(config.uuid, result.data || [], BID)
}
- if (selected !== 'false' || (id && config.wrap.selected !== 'false')) {
+ if (selected !== 'false' || id) {
setTimeout(() => {
- this.checkTopLine(id)
+ this.checkTopLine(id, selected)
}, 10)
- if (selected === 'init') {
- this.setState({selected: 'false'})
- }
} else {
MKEmitter.emit('resetSelectLine', config.uuid, '', '')
}
@@ -668,12 +680,17 @@
if (type === 'plus') {
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]
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
- delete item[config.setting.subdata]
-
+ let children = []
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -686,10 +703,9 @@
children.push(cell)
}
})
- item.children = children
- } else if (!item.children) {
- item.children = []
}
+
+ item.children = children
item.key = index
item.$$uuid = item[config.setting.primaryKey] || ''
@@ -707,13 +723,18 @@
})
} else {
data = result.data.map((item, index) => {
+ let _children = item[config.setting.subdata]
+
+ delete item[config.setting.subdata]
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (item.sub_data_string) {
+ _children = this.parseSubData(item.sub_data_string)
+ }
+
let children = []
- if (item[config.setting.subdata]) {
- let _children = item[config.setting.subdata]
-
- delete item[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -767,43 +788,25 @@
loading: false
})
+ if (selected === 'init') {
+ this.setState({selected: '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()
}
}
- if (result.message) {
- if (result.ErrCode === 'Y') {
- Modal.success({
- title: result.message
- })
- } else if (result.ErrCode === 'S') {
- notification.success({
- top: 92,
- message: result.message,
- duration: 2
- })
- }
- }
+
+ UtilsDM.querySuccess(result)
} else {
this.setState({
loading: false
})
this.timer && this.timer.stop()
- if (!result.message) return
- if (result.ErrCode === 'N') {
- Modal.error({
- title: result.message,
- })
- } else if (result.ErrCode !== '-2') {
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
- }
+ UtilsDM.queryFail(result)
}
}
@@ -812,15 +815,6 @@
*/
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) { // 涓昏〃鎼滅储鏉′欢
@@ -843,7 +837,7 @@
let result = await Api.genericInterface(param)
if (result.status) {
if (position === 'line_grid' && (!result.data || !result.data[0])) {
- this.loadData()
+ this.reloadIndex()
return
}
@@ -860,13 +854,19 @@
data = data.map(item => {
if (item.$$uuid === _data.$$uuid) {
+ let _children = _data[config.setting.subdata]
+
+ delete _data[config.setting.subdata]
+
+ if (config.setting.subdata === 'sub_data_string') {
+ _children = this.parseSubData(_children)
+ } else if (_data.sub_data_string) {
+ _children = this.parseSubData(_data.sub_data_string)
+ }
+
let children = []
- if (_data[config.setting.subdata]) {
- let _children = _data[config.setting.subdata]
-
- delete _data[config.setting.subdata]
-
+ if (_children) {
_children.forEach((cell, i) => {
cell.key = i
cell.$$uuid = cell[config.setting.subKey] || ''
@@ -961,12 +961,17 @@
this.setState({
loading: false
})
- notification.error({
- top: 92,
- message: result.message,
- duration: 10
- })
+
+ UtilsDM.queryFail(result)
}
+ }
+
+ reloadIndex = () => {
+ this.setState({
+ pageIndex: 1
+ }, () => {
+ this.loadData()
+ })
}
loadMore = () => {
@@ -992,6 +997,20 @@
}
refreshSearch = (list) => {
+ const { config, BID } = this.state
+
+ if (config.setting.supModule && !BID && config.wrap.supKey !== 'false') {
+ notification.warning({
+ top: 92,
+ message: window.GLOB.dict['sup_key_req'] || '闇�瑕佷笂绾т富閿�硷紒',
+ duration: 5
+ })
+ this.setState({
+ search: list
+ })
+ return
+ }
+
this.setState({
search: list,
pageIndex: 1
@@ -1094,17 +1113,13 @@
if (!menu) return
- menu.param = {}
+ menu.param = {$BID: item.$$uuid || ''}
- if (card.setting.joint === 'true') {
- menu.param.$BID = item.$$uuid || ''
-
- Object.keys(item).forEach(key => {
- if (/^\$/.test(key)) return
- if (key === 'children') return
- menu.param[key] = item[key]
- })
- }
+ Object.keys(item).forEach(key => {
+ if (/^\$/.test(key)) return
+ if (key === 'children') return
+ menu.param[key] = item[key]
+ })
MKEmitter.emit('modifyTabs', menu, true)
}
@@ -1192,10 +1207,10 @@
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}
+ {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} 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 '}>
+ <div className={`data-zoom ${config.wrap.wrapClass}`}>
+ <Row className="card-row-list">
{precards.map((item, index) => (
<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}>
@@ -1272,8 +1287,8 @@
</div>
{config.$empty && data.length === 0 ? <Empty description={false}/> : null}
</div>
- {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}
+ {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}` : `${total} ${window.GLOB.dict['items'] || '鏉�'}`} 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}>{window.GLOB.dict['view_more'] || '鏌ョ湅鏇村'}<DownOutlined/></div> : null}
</div>
)
}
--
Gitblit v1.8.0