From da7068bd48791cdee966c786ce0dfd46f6e03df9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 一月 2021 19:02:24 +0800
Subject: [PATCH] 2021-01-08
---
src/tabviews/zshare/normalTable/index.jsx | 477 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 246 insertions(+), 231 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index a8e4994..0d1e6dd 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -1,11 +1,10 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import md5 from 'md5'
+import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import {connect} from 'react-redux'
-import { Table, message, Affix, Typography, Modal, Icon } from 'antd'
+import { Table, Affix, Typography, Modal, 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'
@@ -20,23 +19,16 @@
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
class NormalTable extends Component {
- static defaultProps = {
- total: 0
- }
-
static propTpyes = {
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, // 琛ㄦ牸鏁版嵁
@@ -45,7 +37,6 @@
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
handleTableId: PropTypes.func, // 鏁版嵁鍒囨崲
chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲
- refreshbyaction: PropTypes.func, // 鏁版嵁鍒囨崲
}
state = {
@@ -56,20 +47,18 @@
imgShow: false, // 鍥剧墖鏀惧ぇ妯℃�佹
imgSrc: '', // 鍥剧墖璺緞
lineMarks: null, // 琛屾爣璁�
- colMap: 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 colMap = new Map() // 鐢ㄤ簬鑾峰彇瀛楁淇℃伅
let radio = 5 // 铏氬寲姣斾緥
let _format = false // 鏄惁铏氬寲澶勭悊
- let rowspan = null
+ let rowspans = []
if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
_format = true
@@ -81,59 +70,32 @@
}
}
- config.columns.forEach(col => {
- if (!col.field) return
-
- colMap.set(col.field, col)
- })
-
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 => {
- let originField = colMap.get(mark.field)
- let contrastField = mark.contrastType === 'dynamic' ? colMap.get(mark.contrastField) : ''
-
- if (!originField || (mark.contrastType === 'dynamic' && !contrastField)) return false
- if (contrastField && originField.type !== contrastField.type) return false
- if (mark.contrastType === 'static') {
- if (originField.type === 'text' && typeof(mark.contrastValue) === 'number') {
- return false
- } else if (originField.type === 'number' && typeof(mark.contrastValue) === 'string') {
- return false
- } else if (!['number', 'text'].includes(originField.type)) {
- return false
- }
- }
-
- if (mark.signType === 'line') {
- lineMarks.push(mark)
- return false
- } else if (mark.signType === 'card') {
- return false
- }
- return true
- })
-
- 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.subColumn.forEach(col => {
-
+ 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 => {
+ if (mark.signType === 'line') {
+ lineMarks.push(mark)
+ }
+ return mark.signType !== 'line' && mark.signType !== 'card'
+ })
+
+ if (col.marks.length === 0) {
+ col.marks = ''
+ }
}
cell.children.push({
@@ -147,9 +109,51 @@
}
})
})
+ } 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 (_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 = {
@@ -175,12 +179,15 @@
_columns.push(cell)
})
+ if (rowspans.length === 0) {
+ rowspans = null
+ }
+
this.setState({
columns: _columns,
pageSize: pageSize ? pageSize : 10,
- lineMarks: lineMarks,
- colMap: colMap,
- rowspan: rowspan
+ lineMarks,
+ rowspans
})
}
@@ -203,30 +210,14 @@
}
// 瀛楁閫忚
- triggerLink = (item, record) => {
+ triggerLink = (e, item, record) => {
const { tabviews, MenuID, setting } = this.props
+
+ e.stopPropagation()
if (item.linkThdMenu) {
let tabmenu = item.linkThdMenu
- let iframes = ['Main/Index', 'bda/rdt', 'Home/rdt']
-
- if (tabmenu.LinkUrl === 'CommonTable') {
- tabmenu.type = 'CommonTable'
- } else if (tabmenu.LinkUrl === 'DataManage') {
- tabmenu.type = 'DataManage'
- } else if (tabmenu.LinkUrl && iframes.includes(tabmenu.LinkUrl.split('?')[0])) {
- tabmenu.type = 'iframe'
- }
-
- if (tabmenu.type !== 'iframe') {
- try {
- tabmenu.PageParam = JSON.parse(tabmenu.PageParam)
- } catch (e) {
- tabmenu.PageParam = {}
- }
- tabmenu.type = tabmenu.PageParam.Template || tabmenu.type
- }
-
+
tabmenu.param = {
searchkey: item.field,
searchval: record[item.field] || '',
@@ -283,54 +274,48 @@
}
getMark = (record, marks) => {
- const { colMap } = this.state
let className = ''
let isIcon = false
let position = 'back'
let icon = ''
marks.some(mark => {
- let originField = colMap.get(mark.field)
-
- if (!originField) return false
-
- let originType = originField.type || 'text'
-
- let originVal = record.hasOwnProperty(mark.field) ? record[mark.field] : ''
+ let originVal = record[mark.field] + ''
let contrastVal = ''
if (mark.contrastType === 'static') {
- contrastVal = mark.contrastValue
+ contrastVal = mark.contrastValue + ''
} else {
- contrastVal = record.hasOwnProperty(mark.contrastField) ? record[mark.contrastField] : ''
+ contrastVal = record[mark.contrastField] + ''
}
- if (originType === 'text') {
- originVal = '' + originVal
- contrastVal = '' + contrastVal
- } else if (originType === 'number' && originVal !== '' && contrastVal !== '') {
+ if (mark.match === '=') {
+ className = originVal === contrastVal ? mark.color[1] : ''
+ } else if (mark.match === '!=') {
+ className = originVal !== contrastVal ? mark.color[1] : ''
+ } else if (mark.match === 'like') {
+ className = originVal.indexOf(contrastVal) > -1 ? mark.color[1] : ''
+ } else if (mark.match === '>') {
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- if (isNaN(originVal) || isNaN(contrastVal)) {
- originVal = ''
- }
} catch {
- originVal = ''
+ originVal = NaN
}
- }
- if (originVal === '' || contrastVal === '') return false
+ if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) {
+ className = mark.color[1]
+ }
+ } else if (mark.match === '<') {
+ try {
+ originVal = parseFloat(originVal)
+ contrastVal = parseFloat(contrastVal)
+ } catch {
+ originVal = NaN
+ }
- if (mark.match === '=' && originVal === contrastVal) {
- className = mark.color[1]
- } else if (mark.match === '!=' && originVal !== contrastVal) {
- className = mark.color[1]
- } else if (mark.match === 'like' && originVal.indexOf(contrastVal) > -1) {
- className = mark.color[1]
- } else if (mark.match === '>' && originVal > contrastVal) {
- className = mark.color[1]
- } else if (mark.match === '<' && originVal < contrastVal) {
- className = mark.color[1]
+ if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) {
+ className = mark.color[1]
+ }
}
if (!className) return false
@@ -401,21 +386,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>
@@ -426,20 +411,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>
@@ -461,11 +446,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, '$&,')
@@ -496,8 +483,8 @@
if (item.linkThdMenu || item.linkurl) {
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>
@@ -506,7 +493,7 @@
return (
<div className={className}>
<div className="baseboard"></div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{content}
</div>
</div>
@@ -515,14 +502,15 @@
} 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(',')
} 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=""/>
@@ -547,7 +535,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>
@@ -585,28 +573,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.props.refreshbyaction}
/>
)
} else if (btn.OpenType === 'popview') {
@@ -614,11 +600,10 @@
<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.props.refreshbyaction}
/>
)
} else if (btn.OpenType === 'tab' || btn.OpenType === 'blank') {
@@ -629,7 +614,6 @@
selectedData={[record]}
MenuID={this.props.MenuID}
setting={this.props.setting}
- updateStatus={this.props.refreshbyaction}
/>
)
} else if (btn.OpenType === 'innerpage' || btn.OpenType === 'outerpage') {
@@ -639,7 +623,6 @@
btn={btn}
selectedData={[record]}
setting={this.props.setting}
- updateStatus={this.props.refreshbyaction}
/>
)
}
@@ -647,13 +630,13 @@
})}
</div>
)
- } else if (item.type === 'colspan') {
- if (item.subColumn.length === 0) return ''
+ } else if (item.type === 'old_colspan') {
+ if (item.subcols.length === 0) return ''
let ordertype = item.order
let contents = []
let images = []
- item.subColumn.forEach(col => {
+ item.subcols.forEach(col => {
if (!col.field || !record.hasOwnProperty(col.field)) return
if (col.type === 'number') {
@@ -668,11 +651,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, '$&,')
@@ -703,7 +688,8 @@
} else if (col.type === 'picture') {
let photos = []
try {
- photos = record[col.field].split(',')
+ photos = record[col.field] + ''
+ photos = photos.split(',')
} catch {
photos = []
}
@@ -721,7 +707,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) {
@@ -794,7 +780,7 @@
return (
<div>
- <div className="content" style={{ minWidth: (item.Width || 120) + 'px' }}>
+ <div className="content">
{this.getCospanContent(ordertype, contents, images)}
</div>
</div>
@@ -894,19 +880,6 @@
}
}
- copycontent = (e, content) => {
- // 琛ㄦ牸涓唴瀹瑰鍒�
- e.stopPropagation()
- let oInput = document.createElement('input')
- oInput.value = content
- document.body.appendChild(oInput)
- oInput.select()
- document.execCommand('Copy')
- oInput.className = 'oInput'
- oInput.style.display='none'
- message.success(this.props.dict['main.copy.success'])
- }
-
/**
*
*/
@@ -916,7 +889,7 @@
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
- index = selectedRowKeys[selectedRowKeys.length - 1]
+ index = selectedRowKeys.slice(-1)[0]
}
if (setting.tableType === 'checkbox') {
@@ -938,7 +911,7 @@
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]
@@ -949,7 +922,7 @@
if (newkeys.includes(index)) {
newkeys = newkeys.filter(item => item !== index)
if (newkeys.length > 0) {
- _index = newkeys[newkeys.length - 1]
+ _index = newkeys.slice(-1)[0]
}
this.changedata(_index)
} else {
@@ -990,21 +963,90 @@
this.props.handleTableId(this.props.tableId, _id, _data)
}
- resetTable = (id) => {
+ resetTable = (id, repage) => {
const { MenuID, tableId } = this.props
if (id !== (MenuID + tableId)) return
- this.setState({
- pageIndex: 1,
- selectedRowKeys: [],
- activeIndex: null
+ if (repage === 'false') {
+ this.setState({
+ selectedRowKeys: [],
+ activeIndex: null
+ })
+ } else {
+ this.setState({
+ pageIndex: 1,
+ selectedRowKeys: [],
+ activeIndex: null
+ })
+ }
+ }
+
+ 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 ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ item['$' + cell] = preItem['$' + cell] + 1
+ } else {
+ item['$' + cell] = 1
+ }
+ } else {
+ if ((item[cell] || item[cell] === 0) && 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, colMap, activeIndex, rowspan } = this.state
+ const { selectedRowKeys, lineMarks, activeIndex } = this.state
// 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
let rowSelection = null
@@ -1038,35 +1080,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 = {
@@ -1074,7 +1089,7 @@
pageSize: this.state.pageSize,
pageSizeOptions: ['10', '25', '50', '100', '500', '1000'],
showSizeChanger: true,
- total: this.props.total,
+ total: this.props.total || 0,
showTotal: (total, range) => `${range[0]}-${range[1]} ${this.props.dict['main.pagination.of']} ${total} ${this.props.dict['main.pagination.items']}`
}
}
@@ -1117,43 +1132,42 @@
if (lineMarks.length === 0) return className
lineMarks.some(mark => {
- let originType = colMap.get(mark.field).type
-
- let originVal = record.hasOwnProperty(mark.field) ? record[mark.field] : ''
+ let originVal = record[mark.field] + ''
let contrastVal = ''
if (mark.contrastType === 'static') {
- contrastVal = mark.contrastValue
+ contrastVal = mark.contrastValue + ''
} else {
- contrastVal = record.hasOwnProperty(mark.contrastField) ? record[mark.contrastField] : ''
+ contrastVal = record[mark.contrastField] + ''
}
- if (originType === 'text') {
- originVal = '' + originVal
- contrastVal = '' + contrastVal
- } else if (originType === 'number' && originVal !== '' && contrastVal !== '') {
+ if (mark.match === '=') {
+ className = originVal === contrastVal ? 'background ' + mark.color[1] : ''
+ } else if (mark.match === '!=') {
+ className = originVal !== contrastVal ? 'background ' + mark.color[1] : ''
+ } else if (mark.match === 'like') {
+ className = originVal.indexOf(contrastVal) > -1 ? 'background ' + mark.color[1] : ''
+ } else if (mark.match === '>') {
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- if (isNaN(originVal) || isNaN(contrastVal)) {
- originVal = ''
- }
} catch {
- originVal = ''
+ originVal = NaN
}
- }
-
- if (originVal === '' || contrastVal === '') return false
-
- if (mark.match === '=' && originVal === contrastVal) {
- className = 'background ' + mark.color[1]
- } else if (mark.match === '!=' && originVal !== contrastVal) {
- className = 'background ' + mark.color[1]
- } else if (mark.match === 'like' && originVal.indexOf(contrastVal) > -1) {
- className = 'background ' + mark.color[1]
- } else if (mark.match === '>' && originVal > contrastVal) {
- className = 'background ' + mark.color[1]
- } else if (mark.match === '<' && originVal < contrastVal) {
- className = 'background ' + mark.color[1]
+
+ if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) {
+ className = 'background ' + mark.color[1]
+ }
+ } else if (mark.match === '<') {
+ try {
+ originVal = parseFloat(originVal)
+ contrastVal = parseFloat(contrastVal)
+ } catch {
+ originVal = NaN
+ }
+
+ if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) {
+ className = 'background ' + mark.color[1]
+ }
}
if (!className) return false
@@ -1166,7 +1180,8 @@
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}
--
Gitblit v1.8.0