From bde2916433c7830e2879e6524e32b9f6c8bd0bab Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 02 一月 2022 16:31:32 +0800
Subject: [PATCH] 2022-01-02
---
src/tabviews/zshare/normalTable/index.jsx | 545 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 329 insertions(+), 216 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index ac7f9c5..88e69c8 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -3,11 +3,11 @@
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 } from 'antd'
-import { modifyTabview } from '@/store/action'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
+import MkIcon from '@/components/mk-icon'
import '@/assets/css/table.scss'
import './index.scss'
@@ -17,6 +17,17 @@
const PopupButton = asyncComponent(() => import('@/tabviews/zshare/actionList/popupbutton'))
const TabButton = asyncComponent(() => import('@/tabviews/zshare/actionList/tabbutton'))
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
+
+class BodyRow extends React.Component {
+ shouldComponentUpdate (nextProps) {
+ return !is(fromJS(this.props.record), fromJS(nextProps.record)) || this.props.className !== nextProps.className
+ }
+
+ render() {
+ const { record, ...resProps } = this.props
+ return <tr {...resProps}/>
+ }
+}
class NormalTable extends Component {
static propTpyes = {
@@ -35,7 +46,6 @@
total: PropTypes.any, // 鎬绘暟
loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓�
refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂�
- handleTableId: PropTypes.func, // 鏁版嵁鍒囨崲
chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲
}
@@ -44,15 +54,14 @@
pageIndex: 1, // 鍒濆椤甸潰绱㈠紩
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
columns: null, // 鏄剧ず鍒�
- imgShow: false, // 鍥剧墖鏀惧ぇ妯℃�佹
- imgSrc: '', // 鍥剧墖璺緞
lineMarks: null, // 琛屾爣璁�
activeIndex: null, // 鏍囪褰撳墠閫変腑琛�
- rowspans: null // 琛屽悎骞跺瓧娈典俊鎭�
+ rowspans: null, // 琛屽悎骞跺瓧娈典俊鎭�
+ pageOptions: []
}
UNSAFE_componentWillMount () {
- const { menuType, memberLevel, pageSize } = this.props
+ const { menuType, memberLevel, pageSize, setting } = this.props
let columns = fromJS(this.props.columns).toJS()
let lineMarks = []
let _columns = []
@@ -60,125 +69,171 @@
let _format = false // 鏄惁铏氬寲澶勭悊
let rowspans = []
- if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
- _format = true
-
- if (memberLevel >= 30) {
- radio = 20
- } else if (memberLevel >= 20) {
- radio = 10
+ if (setting.tableMode === 'fast') {
+ rowspans = null
+ columns.forEach(item => {
+ if (item.hidden === true || item.Hide === 'true') return
+ let cell = null
+
+ if (item.type === 'colspan' || item.type === 'old_colspan') {
+ cell = {title: item.label, children: []}
+
+ item.subcols.forEach(col => {
+ cell.children.push({
+ align: col.Align,
+ title: col.label,
+ dataIndex: col.field || col.uuid,
+ key: col.uuid,
+ width: col.Width || 120
+ })
+ })
+ } else {
+ if (item.type === 'index') {
+ item.field = '$Index'
+ item.type = 'text'
+ }
+
+ cell = {
+ align: item.Align,
+ dataIndex: item.field || item.uuid,
+ title: item.label,
+ sorter: item.field && item.IsSort === 'true',
+ width: item.Width || 120
+ }
+ }
+
+ _columns.push(cell)
+ })
+ } else {
+ if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) {
+ _format = true
+
+ if (memberLevel >= 30) {
+ radio = 20
+ } else if (memberLevel >= 20) {
+ radio = 10
+ }
+ }
+
+ columns.forEach((item, index) => {
+ if (item.hidden === true || item.Hide === 'true') return
+ let cell = null
+
+ if (item.type === 'colspan') {
+ cell = {title: item.label, children: []}
+
+ item.subcols.forEach(col => {
+ if (col.rowspan === 'true') {
+ 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({
+ align: col.Align,
+ title: col.label,
+ dataIndex: col.field || col.uuid,
+ key: col.uuid,
+ width: col.Width || 120,
+ render: (text, record) => {
+ return this.getContent(col, record)
+ }
+ })
+ })
+ } 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') {
+ 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 = {
+ 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)
+ }
+ }
+ }
+
+ _columns.push(cell)
+ })
+
+ if (rowspans.length === 0) {
+ rowspans = null
}
}
- columns.forEach((item, index) => {
- if (item.hidden === true || item.Hide === 'true') return
- let cell = null
+ let size = (setting.pageSize || 10) + ''
+ let pageOptions = ['10', '25', '50', '100', '500', '1000']
- if (item.type === 'colspan') {
- cell = {title: item.label, children: []}
-
- item.subcols.forEach(col => {
- if (col.rowspan === 'true') {
- 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({
- align: col.Align,
- title: col.label,
- dataIndex: col.field || col.uuid,
- key: col.uuid,
- width: col.Width || 120,
- render: (text, record) => {
- return this.getContent(col, record)
- }
- })
- })
- } 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') {
- 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 = {
- 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)
- }
- }
- }
-
- _columns.push(cell)
- })
-
- if (rowspans.length === 0) {
- rowspans = null
+ if (!pageOptions.includes(size)) {
+ pageOptions.push(size)
+ pageOptions = pageOptions.sort((a, b) => a - b)
}
this.setState({
+ pageOptions,
columns: _columns,
pageSize: pageSize ? pageSize : 10,
lineMarks,
@@ -192,6 +247,9 @@
componentDidMount () {
MKEmitter.addListener('resetTable', this.resetTable)
+ MKEmitter.addListener('autoQueryData', this.autoQueryData)
+ MKEmitter.addListener('autoSelectData', this.autoSelectData)
+ MKEmitter.addListener('mkTableCheckTopLine', this.mkTableCheckTopLine)
}
/**
@@ -202,12 +260,60 @@
return
}
MKEmitter.removeListener('resetTable', this.resetTable)
+ MKEmitter.removeListener('autoQueryData', this.autoQueryData)
+ MKEmitter.removeListener('autoSelectData', this.autoSelectData)
+ MKEmitter.removeListener('mkTableCheckTopLine', this.mkTableCheckTopLine)
+ }
+
+ mkTableCheckTopLine = (id) => {
+ if (id !== this.props.MenuID) return
+
+ if (this.props.data.length > 0) {
+ this.changeRow(this.props.data[0], 0)
+ }
+ }
+
+ autoSelectData = (id, index) => {
+ if (id !== this.props.MenuID) return
+
+ const { pageSize, pageIndex } = this.state
+
+ let i = index - (pageIndex - 1) * pageSize - 1
+
+ if (this.props.data[i]) {
+ this.changeRow(this.props.data[i], i)
+ MKEmitter.emit('autoTransSelectData', this.props.MenuID, this.props.data[i])
+ } else {
+ MKEmitter.emit('autoMaticOver', this.props.MenuID)
+ }
+ }
+
+ autoQueryData = (id, index) => {
+ if (id !== this.props.MenuID) return
+
+ const { total } = this.props
+ const { pageSize } = this.state
+
+ if (index !== 1 && (!total || index > total)) {
+ MKEmitter.emit('autoMaticOver', this.props.MenuID)
+ return
+ }
+
+ console.clear()
+
+ let pageIndex = Math.ceil(index / pageSize)
+
+ this.setState({
+ pageIndex: pageIndex,
+ selectedRowKeys: [],
+ activeIndex: null
+ })
+
+ this.props.refreshdata({pageIndex})
}
// 瀛楁閫忚
triggerLink = (e, item, record) => {
- const { tabviews, MenuID } = this.props
-
e.stopPropagation()
let __param = {
@@ -224,33 +330,13 @@
if (item.linkThdMenu) {
let tabmenu = item.linkThdMenu
-
tabmenu.param = __param
- tabmenu.selected = true
-
- let index = 0
- let tabs = tabviews.filter((tab, i) => {
- tab.selected = false
-
- if (tab.MenuID === MenuID) {
- index = i
- }
-
- return tab.MenuID !== tabmenu.MenuID
- })
-
- if (tabviews.length > tabs.length) {
- this.props.modifyTabview(fromJS(tabs).toJS())
+
+ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
+ MKEmitter.emit('modifyTabs', tabmenu, 'replace')
+ } else {
+ MKEmitter.emit('modifyTabs', tabmenu, 'plus', true)
}
-
- 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
@@ -263,7 +349,7 @@
_param.User_Name = sessionStorage.getItem('User_Name')
_param.param = __param
src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param)))
- } catch {
+ } catch (e) {
console.warn('鑿滃崟鍙傛暟瑙ｆ瀽閿欒锛�')
}
} else {
@@ -312,7 +398,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -323,7 +409,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -343,7 +429,7 @@
if (mark.position === 'front') {
position = 'front'
}
- icon = <Icon className={'font ' + className} type={mark.icon} />
+ icon = <MkIcon className={'font ' + className} type={mark.icon} />
className = ''
}
@@ -395,7 +481,7 @@
content = md5(content)
}
- if (item.linkThdMenu || item.linkurl) {
+ if (!record.$disabled && (item.linkThdMenu || item.linkurl)) {
if (item.rowspan === 'true') {
return {
children: (
@@ -454,7 +540,7 @@
if (isNaN(content)) {
content = ''
}
- } catch {
+ } catch (e) {
content = ''
}
}
@@ -494,7 +580,7 @@
content = md5(content)
}
- if (item.linkThdMenu || item.linkurl) {
+ if (!record.$disabled && (item.linkThdMenu || item.linkurl)) {
if (item.rowspan === 'true') {
return {
children: (
@@ -547,7 +633,7 @@
let photos = ''
if (item.field && record.hasOwnProperty(item.field)) {
photos = record[item.field] + ''
- photos = photos.split(',')
+ photos = photos.split(',').filter(Boolean)
} else {
photos = ''
}
@@ -557,7 +643,10 @@
<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=""/>
}
@@ -604,11 +693,15 @@
try {
_param = window.btoa(_quary)
- } catch {
+ } catch (e) {
_param = window.btoa(window.encodeURIComponent(_quary))
}
_href += '?' + _param
+ }
+
+ if (_href && /^https/.test(window.location.protocol)) { // https杞崲
+ _href = _href.replace(/^http:/ig, 'https:')
}
if (item.blur) {
@@ -632,6 +725,7 @@
key={btn.uuid}
btn={btn}
BID={record.$$BID}
+ disabled={record.$disabled}
selectedData={[record]}
BData={this.props.BData}
setting={this.props.setting}
@@ -645,6 +739,7 @@
key={btn.uuid}
btn={btn}
BID={record.$$BID}
+ disabled={record.$disabled}
selectedData={[record]}
BData={this.props.BData}
setting={this.props.setting}
@@ -655,7 +750,9 @@
<TabButton
key={btn.uuid}
btn={btn}
+ disabled={record.$disabled}
selectedData={[record]}
+ BData={this.props.BData}
MenuID={this.props.MenuID}
setting={this.props.setting}
/>
@@ -665,7 +762,9 @@
<NewPageButton
key={btn.uuid}
btn={btn}
+ disabled={record.$disabled}
selectedData={[record]}
+ BData={this.props.BData}
setting={this.props.setting}
/>
)
@@ -690,7 +789,7 @@
if (isNaN(content)) {
content = ''
}
- } catch {
+ } catch (e) {
content = ''
}
@@ -733,8 +832,8 @@
let photos = []
try {
photos = record[col.field] + ''
- photos = photos.split(',')
- } catch {
+ photos = photos.split(',').filter(Boolean)
+ } catch (e) {
photos = []
}
@@ -789,11 +888,15 @@
try {
_param = window.btoa(_quary)
- } catch {
+ } catch (e) {
_param = window.btoa(window.encodeURIComponent(_quary))
}
_href += '?' + _param
+ }
+
+ if (_href && /^https/.test(window.location.protocol)) { // https杞崲
+ _href = _href.replace(/^http:/ig, 'https:')
}
if (item.blur) {
@@ -869,9 +972,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=""/>)
}
@@ -889,9 +994,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=""/>)
}
@@ -904,23 +1010,6 @@
</div>
</div>
)
- }
- }
-
- /**
- * @description 鍥剧墖缂╂斁
- */
- imgScaleClose = () => {
- this.setState({
- imgShow: false
- })
- }
- imgScale = (e) => {
- if (e.target.nodeName === 'IMG') {
- this.setState({
- imgShow: true,
- imgSrc: e.target.src
- })
}
}
@@ -944,7 +1033,7 @@
this.setState({ selectedRowKeys, activeIndex: _activeIndex })
- let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index))
+ let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled)
this.props.chgSelectData(selects)
}
@@ -954,6 +1043,7 @@
*/
changeRow = (record, index) => {
if (!this.props.setting.tableType || this.props.pickup) return
+ if (record.$disabled) return
let newkeys = fromJS(this.state.selectedRowKeys).toJS()
@@ -994,7 +1084,9 @@
}
changedata = (index) => {
- const { data, setting } = this.props
+ const { data, setting, tableId, ContainerId } = this.props
+
+ if (!tableId || !ContainerId) return
let _id = ''
let _data = ''
@@ -1004,13 +1096,13 @@
_data = data[index] || ''
}
- this.props.handleTableId(this.props.tableId, _id, _data)
+ MKEmitter.emit('changeTableLine', ContainerId, tableId, _id, _data)
}
resetTable = (id, repage) => {
- const { MenuID, tableId } = this.props
+ const { tableId } = this.props
- if (id !== (MenuID + tableId)) return
+ if (id !== tableId) return
if (repage === 'false') {
this.setState({
@@ -1084,13 +1176,22 @@
const { setting } = this.props
if (!setting.doubleClick) return
+ if (record.$disabled) return
MKEmitter.emit('triggerBtnId', setting.doubleClick, [record])
}
render() {
const { setting, pickup, statFValue } = this.props
- const { selectedRowKeys, lineMarks, activeIndex } = this.state
+ const { selectedRowKeys, lineMarks, activeIndex, pageOptions } = this.state
+
+ let components = {
+ body: {}
+ }
+
+ if (setting.tableMode === 'fast') {
+ components.body.row = BodyRow
+ }
// 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙��
let rowSelection = null
@@ -1131,7 +1232,7 @@
_pagination = {
current: this.state.pageIndex,
pageSize: this.state.pageSize,
- pageSizeOptions: ['10', '25', '50', '100', '500', '1000'],
+ pageSizeOptions: pageOptions,
showSizeChanger: true,
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']}`
@@ -1144,11 +1245,26 @@
_footer = statFValue.map(f => `${f.label}(鍚堣)锛�${f.value}`).join('锛�')
}
+ let height = setting.height || false
+ let style = {}
+ if (setting.color) {
+ style.color = setting.color
+ }
+ if (setting.fontSize) {
+ style.fontSize = setting.fontSize
+ }
+
+ let loading = this.props.loading
+ if (setting.mask === 'hidden') {
+ loading = false
+ }
+
return (
- <div className="normal-data-table mingke-table">
+ <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '')}>
{offset && <Affix offsetTop={offset} className="fix-header">
<Table
- size="middle"
+ size={setting.size || 'middle'}
+ style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
columns={this.state.columns.map(column => {
@@ -1162,14 +1278,18 @@
/>
</Affix>}
<Table
- size="middle"
+ components={components}
+ size={setting.size || 'middle'}
+ style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
columns={this.state.columns}
dataSource={_data}
rowClassName={(record) => {
let className = ''
- if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) {
+ if (record.$disabled) {
+ className = 'mk-disabled '
+ } else if ((setting.tableType === 'checkbox' || setting.tableType === 'radio') && record.key === activeIndex) {
className = 'mk-row-active '
}
@@ -1194,7 +1314,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -1205,7 +1325,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -1220,30 +1340,26 @@
return className
}}
- loading={this.props.loading}
- scroll={{ x: '100%', y: false }}
+ loading={loading}
+ scroll={{ x: '100%', y: height }}
onRow={(record, index) => {
- return {
- onClick: () => {this.changeRow(record, index)},
- onDoubleClick: () => {this.doubleClickLine(record)}
+ if (setting.tableMode === 'fast') {
+ return {
+ record,
+ onClick: () => {this.changeRow(record, index)},
+ onDoubleClick: () => {this.doubleClickLine(record)}
+ }
+ } else {
+ return {
+ 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>
)
}
@@ -1252,15 +1368,12 @@
const mapStateToProps = (state) => {
return {
menuType: state.editLevel,
- tabviews: state.tabviews,
memberLevel: state.memberLevel
}
}
-const mapDispatchToProps = (dispatch) => {
- return {
- modifyTabview: (tabviews) => dispatch(modifyTabview(tabviews))
- }
+const mapDispatchToProps = () => {
+ return {}
}
export default connect(mapStateToProps, mapDispatchToProps)(NormalTable)
\ No newline at end of file
--
Gitblit v1.8.0