From 72419e2f826031a158173f46d723a672064e37cd Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 31 八月 2021 22:42:51 +0800
Subject: [PATCH] 2021-08-31
---
src/tabviews/zshare/normalTable/index.jsx | 446 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 261 insertions(+), 185 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 640c6ff..21feaa5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -3,9 +3,8 @@
import md5 from 'md5'
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Table, Affix, Typography, Modal, Icon } from 'antd'
+import { Table, Affix, Typography, Icon } from 'antd'
-import Utils from '@/utils/utils.js'
import { modifyTabview } from '@/store/action'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -24,15 +23,12 @@
tableId: PropTypes.string, // 鍒楄〃Id
statFValue: PropTypes.any, // 鍚堣瀛楁鏁版嵁
pageSize: PropTypes.any, // 姣忛〉鏁版嵁
- MenuName: PropTypes.any, // 鑿滃崟鍚嶇О
dict: PropTypes.object, // 瀛楀吀椤�
- config: PropTypes.object, // 椤甸潰閰嶇疆
MenuID: PropTypes.string, // 鑿滃崟Id
setting: PropTypes.object, // 琛ㄦ牸鍏ㄥ眬璁剧疆锛歵ableType锛堣〃鏍兼槸鍚﹀彲閫夈�佸崟閫夈�佸閫夛級銆乧olumnfixed锛堝垪鍥哄畾锛夈�乤ctionfixed锛堟寜閽浐瀹氾級
pickup: PropTypes.any, // 鏁版嵁鏀惰捣
columns: PropTypes.array, // 琛ㄦ牸鍒�
- logcolumns: PropTypes.array, // 瀛楁鍒�
- BID: PropTypes.any, // 涓昏〃Id
+ fields: PropTypes.array, // 缁勪欢瀛楁闆�
ContainerId: PropTypes.any, // 鏍囩椤靛灞侷d
BData: PropTypes.any, // 涓昏〃鏁版嵁
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
@@ -41,7 +37,6 @@
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
handleTableId: PropTypes.func, // 鏁版嵁鍒囨崲
chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲
- refreshbyaction: PropTypes.func, // 鎸夐挳鎵ц瀹屾垚鍚庡埛鏂�
}
state = {
@@ -49,21 +44,19 @@
pageIndex: 1, // 鍒濆椤甸潰绱㈠紩
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
columns: null, // 鏄剧ず鍒�
- imgShow: false, // 鍥剧墖鏀惧ぇ妯℃�佹
- imgSrc: '', // 鍥剧墖璺緞
lineMarks: null, // 琛屾爣璁�
activeIndex: null, // 鏍囪褰撳墠閫変腑琛�
- rowspan: null // 琛屽悎骞跺瓧娈典俊鎭�
+ rowspans: null // 琛屽悎骞跺瓧娈典俊鎭�
}
UNSAFE_componentWillMount () {
- const { menuType, config, memberLevel, pageSize } = this.props
- let columns = JSON.parse(JSON.stringify(this.props.columns))
+ const { menuType, memberLevel, pageSize } = this.props
+ let columns = fromJS(this.props.columns).toJS()
let lineMarks = []
let _columns = []
let radio = 5 // 铏氬寲姣斾緥
let _format = false // 鏄惁铏氬寲澶勭悊
- let rowspan = null
+ let rowspans = []
if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
_format = true
@@ -75,45 +68,28 @@
}
}
- // 鑾峰彇琛屾爣璁�
- config.columns.forEach(col => {
- if (!col.field) return
-
- col.marks && col.marks.forEach(mark => {
- if (mark.signType === 'line') {
- lineMarks.push(mark)
- }
- })
- })
-
columns.forEach((item, index) => {
if (item.hidden === true || item.Hide === 'true') return
-
- if (_format && !Math.floor(Math.random() * radio)) {
- item.blur = true
- }
-
- if (item.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
- item.marks = item.marks.filter(mark => mark.signType !== 'line' && mark.signType !== 'card')
-
- if (item.marks.length === 0) {
- item.marks = ''
- }
- }
-
let cell = null
- if (item.type === 'colspan' && item.unfold === 'true') {
+ if (item.type === 'colspan') {
cell = {title: item.label, children: []}
item.subcols.forEach(col => {
-
if (col.rowspan === 'true') {
- rowspan = col
+ rowspans.push(col.field)
+ }
+ if (_format && !Math.floor(Math.random() * radio)) {
+ col.blur = true
}
if (col.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
- col.marks = col.marks.filter(mark => mark.signType !== 'line' && mark.signType !== 'card')
+ col.marks = col.marks.filter(mark => {
+ if (mark.signType === 'line') {
+ lineMarks.push(mark)
+ }
+ return mark.signType !== 'line' && mark.signType !== 'card'
+ })
if (col.marks.length === 0) {
col.marks = ''
@@ -131,9 +107,54 @@
}
})
})
+ } else if (item.type === 'old_colspan') {
+ item.subcols.forEach(col => {
+ if (col.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
+ col.marks = col.marks.filter(mark => {
+ if (mark.signType === 'line') {
+ lineMarks.push(mark)
+ }
+ return mark.signType !== 'line' && mark.signType !== 'card'
+ })
+
+ if (col.marks.length === 0) {
+ col.marks = ''
+ }
+ }
+ })
+
+ cell = {
+ align: item.Align,
+ dataIndex: item.field || item.uuid,
+ title: item.label,
+ sorter: item.field && item.IsSort === 'true',
+ width: item.Width || 120,
+ render: (text, record) => {
+ return this.getContent(item, record)
+ }
+ }
} else {
if (item.rowspan === 'true') {
- rowspan = item
+ rowspans.push(item.field)
+ }
+ if (item.type === 'index') {
+ item.field = '$Index'
+ item.type = 'text'
+ } else if (_format && !Math.floor(Math.random() * radio)) {
+ item.blur = true
+ }
+
+ if (item.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
+ item.marks = item.marks.filter(mark => {
+ if (mark.signType === 'line') {
+ lineMarks.push(mark)
+ }
+ return mark.signType !== 'line' && mark.signType !== 'card'
+ })
+
+ if (item.marks.length === 0) {
+ item.marks = ''
+ }
}
cell = {
@@ -148,22 +169,18 @@
}
}
- if (item.fixed === true || item.fixed === 'true') {
- if (index < columns.length / 2) {
- cell.fixed = 'left'
- } else {
- cell.fixed = 'right'
- }
- }
-
_columns.push(cell)
})
+ if (rowspans.length === 0) {
+ rowspans = null
+ }
+
this.setState({
columns: _columns,
pageSize: pageSize ? pageSize : 10,
- lineMarks: lineMarks,
- rowspan: rowspan
+ lineMarks,
+ rowspans
})
}
@@ -185,68 +202,83 @@
MKEmitter.removeListener('resetTable', this.resetTable)
}
- updateStatus = (type, positon, btn) => {
- if (type === 'refresh') {
- this.props.refreshbyaction(positon, btn)
- }
- }
-
// 瀛楁閫忚
- triggerLink = (item, record) => {
- const { tabviews, MenuID, setting } = this.props
+ triggerLink = (e, item, record) => {
+ const { tabviews, MenuID } = this.props
+
+ e.stopPropagation()
+
+ let __param = {
+ $searchkey: item.field,
+ $searchval: record[item.field] || '',
+ $BID: record.$$uuid
+ }
+
+ if (item.linkfields && item.linkfields.length > 0) {
+ item.linkfields.forEach(field => {
+ __param[field] = record[field] || ''
+ })
+ }
if (item.linkThdMenu) {
let tabmenu = item.linkThdMenu
- tabmenu.param = {
- searchkey: item.field,
- searchval: record[item.field] || '',
- BID: record[setting.primaryKey]
- }
-
+ tabmenu.param = __param
tabmenu.selected = true
let index = 0
- let isexit = false
- let tabs = tabviews.map((tab, i) => {
+ let tabs = tabviews.filter((tab, i) => {
tab.selected = false
if (tab.MenuID === MenuID) {
index = i
- } else if (tab.MenuID === tabmenu.MenuID) {
- tab.param = tabmenu.param
- tab.selected = true
- isexit = true
}
- return tab
+ return tab.MenuID !== tabmenu.MenuID
})
- if (!isexit) {
- tabs.splice(index + 1, 0, tabmenu)
+ if (tabviews.length > tabs.length) {
+ this.props.modifyTabview(fromJS(tabs).toJS())
}
- this.props.modifyTabview(tabs)
- } else {
+ this.setState({}, () => {
+ if (MenuID) {
+ tabs.splice(index + 1, 0, tabmenu)
+ } else {
+ tabs.push(tabmenu)
+ }
+ this.props.modifyTabview(tabs)
+ })
+ } else if (item.linkurl) {
let src = item.linkurl
- if (item.linkurl.indexOf('paramsmain/') > -1) {
+ if (src.indexOf('paramsmain/') > -1) {
try {
let _url = item.linkurl.split('paramsmain/')[0] + 'paramsmain/'
let _param = JSON.parse(window.decodeURIComponent(window.atob(item.linkurl.split('paramsmain/')[1])))
- let dataparam = {
- searchkey: item.field,
- searchval: record[item.field] || '',
- BID: record[setting.primaryKey]
- }
_param.UserID = sessionStorage.getItem('UserID')
_param.LoginUID = sessionStorage.getItem('LoginUID')
_param.User_Name = sessionStorage.getItem('User_Name')
- _param.param = dataparam
+ _param.param = __param
src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
} catch {
console.warn('鑿滃崟鍙傛暟瑙ｆ瀽閿欒锛�')
}
+ } else {
+ let con = '?'
+
+ if (/\?/ig.test(src)) {
+ con = '&'
+ }
+
+ if (item.linkfields && item.linkfields.length > 0) {
+ item.linkfields.forEach(field => {
+ if (field.toLowerCase() === 'id') return
+ con += `${field}=${record[field] || ''}&`
+ })
+ }
+
+ src = src + `${con}id=${record.$$uuid}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
}
window.open(src)
@@ -366,21 +398,21 @@
return {
children: (
<div className={className}>
- <div className="baseboard link-menu" onDoubleClick={() => this.triggerLink(item, record)}></div>
- <div className="content link-menu" style={{ minWidth: (item.Width || 120) + 'px' }} onDoubleClick={() => this.triggerLink(item, record)}>
+ <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
+ <div className="content link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}>
{content}
</div>
</div>
),
props: {
- rowSpan: record.$$rowspan,
+ rowSpan: record['$$' + item.field],
}
}
}
return (
<div className={className}>
- <div className="baseboard link-menu" onDoubleClick={() => this.triggerLink(item, record)}></div>
- <div className="content link-menu" style={{ minWidth: (item.Width || 120) + 'px' }} onDoubleClick={() => this.triggerLink(item, record)}>
+ <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
+ <div className="content link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}>
{content}
</div>
</div>
@@ -391,20 +423,20 @@
children: (
<div className={className}>
<div className="baseboard"></div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content}
</div>
</div>
),
props: {
- rowSpan: record.$$rowspan,
+ rowSpan: record['$$' + item.field],
}
}
}
return (
<div className={className}>
<div className="baseboard"></div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content}
</div>
</div>
@@ -426,11 +458,13 @@
}
if (content !== '') {
+ let decimal = item.decimal || 0
if (item.format === 'percent') {
content = content * 100
+ decimal = decimal > 2 ? decimal - 2 : 0
}
- content = content.toFixed(item.decimal || 0)
+ content = content.toFixed(decimal)
if (item.format === 'thdSeparator') {
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
@@ -459,19 +493,49 @@
}
if (item.linkThdMenu || item.linkurl) {
+ if (item.rowspan === 'true') {
+ return {
+ children: (
+ <div className={className}>
+ <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
+ <div className="content link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}>
+ {content}
+ </div>
+ </div>
+ ),
+ props: {
+ rowSpan: record['$$' + item.field],
+ }
+ }
+ }
return (
<div className={className}>
- <div className="baseboard link-menu" onDoubleClick={() => this.triggerLink(item, record)}></div>
- <div className="content link-menu" style={{ minWidth: (item.Width || 120) + 'px' }} onDoubleClick={() => this.triggerLink(item, record)}>
+ <div className="baseboard link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}></div>
+ <div className="content link-menu" onDoubleClick={(e) => this.triggerLink(e, item, record)}>
{content}
</div>
</div>
)
} else {
+ if (item.rowspan === 'true') {
+ return {
+ children: (
+ <div className={className}>
+ <div className="baseboard"></div>
+ <div className="content">
+ {content}
+ </div>
+ </div>
+ ),
+ props: {
+ rowSpan: record['$$' + item.field],
+ }
+ }
+ }
return (
<div className={className}>
<div className="baseboard"></div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content}
</div>
</div>
@@ -480,17 +544,21 @@
} else if (item.type === 'picture') {
let photos = ''
if (item.field && record.hasOwnProperty(item.field)) {
- photos = record[item.field].split(',')
+ photos = record[item.field] + ''
+ photos = photos.split(',').filter(Boolean)
} else {
photos = ''
}
let maxHeight = item.maxHeight || 128
return (
- <div className="picture-col" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="picture-col">
{photos && photos.map((url, i) => {
if (item.scale === 'true') {
- return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={this.imgScale} key={`${i}`} src={url} alt=""/>
+ return <img style={{maxHeight: maxHeight}} className="image-scale" onClick={(e) => {
+ e.stopPropagation()
+ MKEmitter.emit('mkImageScale', url, photos)
+ }} key={`${i}`} src={url} alt=""/>
} else {
return <img style={{maxHeight: maxHeight}} key={`${i}`} src={url} alt=""/>
}
@@ -512,7 +580,7 @@
return (
<div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content ? <Paragraph copyable ellipsis={{ rows: 3, expandable: true }}>{content}</Paragraph> : null }
</div>
</div>
@@ -550,28 +618,26 @@
return (
<div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content ? <a href={_href} target="_blank" rel="noopener noreferrer">{content}</a> : null }
</div>
</div>
)
} else if (item.type === 'action') {
return (
- <div className="action-col" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="action-col">
{item.operations.map(btn => {
if (['exec', 'prompt', 'pop'].includes(btn.OpenType)) {
return (
<NormalButton
key={btn.uuid}
btn={btn}
- BID={this.props.BID}
+ BID={record.$$BID}
selectedData={[record]}
BData={this.props.BData}
setting={this.props.setting}
- MenuName={this.props.MenuName}
- columns={this.props.logcolumns}
+ columns={this.props.fields || this.props.columns}
ContainerId={this.props.ContainerId}
- updateStatus={this.updateStatus}
/>
)
} else if (btn.OpenType === 'popview') {
@@ -579,14 +645,13 @@
<PopupButton
key={btn.uuid}
btn={btn}
- BID={this.props.BID}
+ BID={record.$$BID}
selectedData={[record]}
BData={this.props.BData}
setting={this.props.setting}
- updateStatus={this.updateStatus}
/>
)
- } else if (btn.OpenType === 'tab' || btn.OpenType === 'blank') {
+ } else if (btn.OpenType === 'tab') {
return (
<TabButton
key={btn.uuid}
@@ -594,7 +659,6 @@
selectedData={[record]}
MenuID={this.props.MenuID}
setting={this.props.setting}
- updateStatus={this.updateStatus}
/>
)
} else if (btn.OpenType === 'innerpage' || btn.OpenType === 'outerpage') {
@@ -604,7 +668,6 @@
btn={btn}
selectedData={[record]}
setting={this.props.setting}
- updateStatus={this.updateStatus}
/>
)
}
@@ -612,7 +675,7 @@
})}
</div>
)
- } else if (item.type === 'colspan') {
+ } else if (item.type === 'old_colspan') {
if (item.subcols.length === 0) return ''
let ordertype = item.order
let contents = []
@@ -633,11 +696,13 @@
}
if (content !== '') {
+ let decimal = col.decimal || 0
if (col.format === 'percent') {
content = content * 100
+ decimal = decimal > 2 ? decimal - 2 : 0
}
-
- content = content.toFixed(col.decimal || 0)
+
+ content = content.toFixed(decimal)
if (col.format === 'thdSeparator') {
content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
@@ -668,7 +733,8 @@
} else if (col.type === 'picture') {
let photos = []
try {
- photos = record[col.field].split(',')
+ photos = record[col.field] + ''
+ photos = photos.split(',').filter(Boolean)
} catch {
photos = []
}
@@ -686,7 +752,7 @@
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
}
- content = (col.prefix || '') + record[col.field] + (col.postfix || '')
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -759,7 +825,7 @@
return (
<div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{this.getCospanContent(ordertype, contents, images)}
</div>
</div>
@@ -804,9 +870,11 @@
<div className="content-fence">
<div className="content-fence-top" style={images[0] ? {textAlign: images[0].align} : null}>
{images.map((_img, index) => {
- if (!_img.url) return ''
if (_img.scale) {
- return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={this.imgScale} key={`${index}`} src={_img.url} alt=""/>
+ return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={(e) => {
+ e.stopPropagation()
+ MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
+ }} key={`${index}`} src={_img.url} alt=""/>
} else {
return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
}
@@ -824,9 +892,10 @@
<div className="content-fence">
<div className="content-fence-left" style={images[0] ? {textAlign: images[0].align} : null}>
{images.map((_img, index) => {
- if (!_img.url) return ''
if (_img.scale) {
- return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={this.imgScale} key={`${index}`} src={_img.url} alt=""/>
+ return <img style={{maxHeight: _img.maxHeight}} className="image-scale" onClick={() => {
+ MKEmitter.emit('mkImageScale', _img.url, images.map(g => g.url))
+ }} key={`${index}`} src={_img.url} alt=""/>
} else {
return (<img style={{maxHeight: _img.maxHeight}} key={`${index}`} src={_img.url} alt=""/>)
}
@@ -843,23 +912,6 @@
}
/**
- * @description 鍥剧墖缂╂斁
- */
- imgScaleClose = () => {
- this.setState({
- imgShow: false
- })
- }
- imgScale = (e) => {
- if (e.target.nodeName === 'IMG') {
- this.setState({
- imgShow: true,
- imgSrc: e.target.src
- })
- }
- }
-
- /**
*
*/
onSelectChange = selectedRowKeys => {
@@ -871,7 +923,7 @@
index = selectedRowKeys.slice(-1)[0]
}
- if (setting.tableType === 'checkbox') {
+ if (setting.tableType === 'checkbox' || setting.tableType === 'radio') {
_activeIndex = index === '' ? null : index
}
@@ -890,12 +942,12 @@
changeRow = (record, index) => {
if (!this.props.setting.tableType || this.props.pickup) return
- let newkeys = JSON.parse(JSON.stringify(this.state.selectedRowKeys))
+ let newkeys = fromJS(this.state.selectedRowKeys).toJS()
if (this.props.setting.tableType === 'radio') {
newkeys = [index]
this.changedata(index)
- this.setState({ selectedRowKeys: newkeys })
+ this.setState({ selectedRowKeys: newkeys, activeIndex: index })
} else {
let _index = ''
if (newkeys.includes(index)) {
@@ -961,9 +1013,71 @@
}
}
+ handleRowspan = (data) => {
+ const { rowspans } = this.state
+
+ if (!rowspans || data.length === 0) return data
+
+ data = fromJS(data).toJS()
+ data = data.reverse()
+ data.forEach((item, index) => {
+ if (index === 0) {
+ rowspans.forEach(cell => {
+ item['$' + cell] = 1
+ })
+ } else {
+ let preItem = data[index - 1]
+ rowspans.forEach((cell, i) => {
+ if (i === 0) {
+ if (preItem[cell] === item[cell]) {
+ item['$' + cell] = preItem['$' + cell] + 1
+ } else {
+ item['$' + cell] = 1
+ }
+ } else {
+ if (preItem[cell] === item[cell]) {
+ item['$' + cell] = preItem['$' + cell] + 1
+ } else {
+ item['$' + cell] = 1
+ }
+ if (item['$' + cell] > item['$' + rowspans[i - 1]]) {
+ item['$' + cell] = 1
+ }
+ }
+ })
+ }
+ })
+ data = data.reverse()
+ data.forEach((item, index) => {
+ if (index === 0) {
+ rowspans.forEach(cell => {
+ item['$$' + cell] = item['$' + cell]
+ })
+ } else {
+ let preItem = data[index - 1]
+ rowspans.forEach(cell => {
+ if (preItem['$' + cell] > 1) {
+ item['$$' + cell] = 0
+ } else {
+ item['$$' + cell] = item['$' + cell]
+ }
+ })
+ }
+ })
+ return data
+ }
+
+ doubleClickLine = (record) => {
+ const { setting } = this.props
+
+ if (!setting.doubleClick) return
+
+ MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
+ }
+
render() {
const { setting, pickup, statFValue } = this.props
- const { selectedRowKeys, lineMarks, activeIndex, rowspan } = this.state
+ const { selectedRowKeys, lineMarks, activeIndex } = this.state
// 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
let rowSelection = null
@@ -997,35 +1111,8 @@
_data = _data.filter((item, index) => selectedRowKeys.includes(index))
}
- if (rowspan) {
- let marks = {}
- let premark = {val: '', mark: ''}
- _data = _data.map(item => {
- if (item[rowspan.field]) {
- if (item[rowspan.field] !== premark.val) {
- premark = {val: item[rowspan.field], mark: Utils.getuuid()}
-
- marks[premark.mark] = 1
- item.$$mark = premark.mark
- } else {
- marks[premark.mark]++
- item.$$mark = premark.mark
- }
- } else {
- item.$$rowspan = 1
- }
- return item
- })
-
- _data = _data.map(item => {
- if (item.$$mark) {
- item.$$rowspan = marks[item.$$mark]
- marks[item.$$mark] = 0
- }
- return item
- })
- }
-
+ _data = this.handleRowspan(_data)
+
let _pagination = false
if (setting.laypage !== 'false' && setting.laypage !== false) {
_pagination = {
@@ -1069,7 +1156,7 @@
dataSource={_data}
rowClassName={(record) => {
let className = ''
- if (setting.tableType === 'checkbox' && record.key === activeIndex) {
+ if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) {
className = 'mk-row-active '
}
@@ -1124,25 +1211,14 @@
scroll={{ x: '100%', y: false }}
onRow={(record, index) => {
return {
- onClick: () => {this.changeRow(record, index)}
+ onClick: () => {this.changeRow(record, index)},
+ onDoubleClick: () => {this.doubleClickLine(record)}
}
}}
onChange={this.changeTable}
pagination={_pagination}
/>
{_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
- <Modal
- className="image-scale-modal"
- visible={this.state.imgShow}
- width="70vw"
- maskClosable={true}
- onCancel={this.imgScaleClose}
- title={this.props.dict['main.form.picture.check']}
- footer={[<span key="close" onClick={this.imgScaleClose}>{this.props.dict['main.close']}</span>]}
- destroyOnClose
- >
- <img style={{maxWidth:'100%'}} src={this.state.imgSrc} alt="" />
- </Modal>
</div>
)
}
--
Gitblit v1.8.0