From af6486b3629d23e426ce85b87dbc20dfa15b1afe Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期一, 07 十一月 2022 18:50:27 +0800 Subject: [PATCH] 2022-11-07 --- src/tabviews/custom/components/share/normalTable/index.jsx | 509 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 300 insertions(+), 209 deletions(-) diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx index e56e977..09611a8 100644 --- a/src/tabviews/custom/components/share/normalTable/index.jsx +++ b/src/tabviews/custom/components/share/normalTable/index.jsx @@ -1,18 +1,22 @@ 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 { Table, Typography, Icon, Col, Switch, message } from 'antd' +import { Table, Typography, Col, Switch, message } from 'antd' import asyncComponent from '@/utils/asyncComponent' +import { getMark } from '@/utils/utils.js' +import MkIcon from '@/components/mk-icon' import MKEmitter from '@/utils/events.js' import zhCN from '@/locales/zh-CN/main.js' import enUS from '@/locales/en-US/main.js' +import Encrypts from '@/components/encrypts' import '@/assets/css/table.scss' import './index.scss' const { Paragraph } = Typography +const Video = asyncComponent(() => import('@/components/video')) +const MkPicture = asyncComponent(() => import('@/components/mkPicture')) const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList')) const PicRadio = { '4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%', @@ -21,12 +25,16 @@ } class BodyRow extends React.Component { shouldComponentUpdate (nextProps, nextState) { - return !is(fromJS(this.props.data), fromJS(nextProps.data)) || !is(fromJS(this.props.className), fromJS(nextProps.className)) + return !is(fromJS(this.props.data), fromJS(nextProps.data)) || this.props.className !== nextProps.className } render() { let { lineMarks, onDoubleClick, data, className, ...resProps } = this.props let style = {} + + if (data && data.$disabled) { + className = className + ' mk-disabled ' + } if (lineMarks && lineMarks.length > 0) { lineMarks.some(mark => { @@ -78,7 +86,7 @@ if (mark.fontColor) { style.color = mark.fontColor } - className += className + ' background' + className = className + ' background' } else if (mark.signType[0] === 'underline') { style.textDecoration = 'underline' style.color = mark.color @@ -97,77 +105,6 @@ } class BodyCell extends React.Component { - getMark = (record, marks, style, content) => { - marks.some(mark => { - let originVal = record[mark.field[0]] + '' - let contrastVal = '' - let result = false - - if (mark.field[1] === 'static') { - contrastVal = mark.contrastValue + '' - } else { - contrastVal = record[mark.field[2]] + '' - } - - if (mark.match === '=') { - result = originVal === contrastVal - } else if (mark.match === '!=') { - result = originVal !== contrastVal - } else if (mark.match === 'like') { - result = originVal.indexOf(contrastVal) > -1 - } else if (mark.match === '>') { - try { - originVal = parseFloat(originVal) - contrastVal = parseFloat(contrastVal) - } catch (e) { - originVal = NaN - } - - if (!isNaN(originVal) && !isNaN(contrastVal) && originVal > contrastVal) { - result = true - } - } else if (mark.match === '<') { - try { - originVal = parseFloat(originVal) - contrastVal = parseFloat(contrastVal) - } catch (e) { - originVal = NaN - } - - if (!isNaN(originVal) && !isNaN(contrastVal) && originVal < contrastVal) { - result = true - } - } - - if (result) { - if (mark.signType[0] === 'font') { - style.color = mark.color - } else if (mark.signType[0] === 'background') { - style.background = mark.color - if (mark.fontColor) { - style.color = mark.fontColor - } - } else if (mark.signType[0] === 'underline') { - style.textDecoration = 'underline' - style.color = mark.color - } else if (mark.signType[0] === 'line-through') { - style.textDecoration = 'line-through' - style.color = mark.color - } else if (mark.signType[0] === 'icon') { - let icon = (<Icon style={{color: mark.color}} type={mark.signType[3]} />) - if (mark.signType[1] === 'front') { - content = <span>{icon} {content}</span> - } else { - content = <span>{content} {icon}</span> - } - } - } - return result - }) - - return content - } - shouldComponentUpdate (nextProps, nextState) { return !nextProps.record || !is(fromJS(this.props.record), fromJS(nextProps.record)) } @@ -188,14 +125,29 @@ content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}` } else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) { 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)}` + } else if (col.textFormat === 'encryption') { + content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span> } - - content = (col.prefix || '') + content + (col.postfix || '') + + if (col.textFormat !== 'encryption') { + content = (col.prefix || '') + content + (col.postfix || '') + } } if (col.marks) { - style = style || {} - content = this.getMark(record, col.marks, style, content) + let mark = getMark(col.marks, record, style) + + style = mark.style + + if (mark.icon) { + if (mark.position === 'front') { + content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span> + } else { + content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span> + } + } else if (mark.innerStyle) { + content = <span style={mark.innerStyle}>{content}</span> + } } if (col.blur) { content = md5(content) @@ -205,7 +157,7 @@ resProps.rowSpan = record['$$' + col.field] } - if (col.linkThdMenu || col.linkurl) { + if (!record.$disabled && (col.linkThdMenu || col.linkurl)) { content = ( <div> <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div> @@ -227,24 +179,39 @@ } if (content !== '') { - let decimal = col.decimal || 0 + if (col.round) { + content = Math.round(content * col.round) / col.round + } if (col.format === 'percent') { content = content * 100 - decimal = decimal > 2 ? decimal - 2 : 0 + } else if (col.format === 'abs') { + content = Math.abs(content) } - - content = content.toFixed(decimal) + if (col.round) { + content = content.toFixed(col.decimal) + } if (col.format === 'thdSeparator') { content = content.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,') } - content = col.prefix + content + col.postfix + content = (col.prefix || '') + content + (col.postfix || '') } if (col.marks) { - style = style || {} - content = this.getMark(record, col.marks, style, content) + let mark = getMark(col.marks, record, style) + + style = mark.style + + if (mark.icon) { + if (mark.position === 'front') { + content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span> + } else { + content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span> + } + } else if (mark.innerStyle) { + content = <span style={mark.innerStyle}>{content}</span> + } } if (col.blur) { @@ -255,7 +222,7 @@ resProps.rowSpan = record['$$' + col.field] } - if (col.linkThdMenu || col.linkurl) { + if (!record.$disabled && (col.linkThdMenu || col.linkurl)) { content = ( <div> <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div> @@ -269,10 +236,14 @@ let photos = '' if (record[col.field]) { photos = `${record[col.field]}` - photos = photos.split(',') } - let cols = 24 / (col.picSort || 1) + if (/^data:image/.test(photos)) { + photos = [photos] + } else { + photos = photos.split(',').filter(Boolean) + } + let paddingTop = '100%' let scale = col.scale === 'true' @@ -282,14 +253,19 @@ resProps.children = ( <div> - {photos && photos.map((url, i) => ( - <Col key={i} span={cols}> - <div className={'ant-mk-picture' + (scale ? ' scale' : '')} onClick={() => { - if (!scale) return - MKEmitter.emit('mkImageScale', url, photos) - }} style={{paddingTop, backgroundImage: `url('${url}')`}}></div> + {photos.map((url, i) => ( + <Col key={i} span={col.span || 24}> + <MkPicture style={{paddingTop}} scale={scale} url={url} urls={photos}/> </Col> ))} + </div> + ) + } else if (col.type === 'video') { + let url = record[col.field] || '' + + resProps.children = ( + <div className="video-wrap"> + {url ? <Video card={col} value={url}/> : null} </div> ) } else if (col.type === 'textarea') { @@ -299,7 +275,7 @@ } if (content) { - content = col.prefix + content + col.postfix + content = (col.prefix || '') + content + (col.postfix || '') } if (col.blur) { @@ -346,11 +322,59 @@ content = md5(content) } + if (_href && /^https/.test(window.location.protocol)) { // https杞崲 + _href = _href.replace(/^http:/ig, 'https:') + } + resProps.children = ( <div> {content && _href ? <a href={_href} target="_blank" rel="noopener noreferrer">{content}</a> : null } </div> ) + } else if (col.type === 'formula') { + let content = col.formula + Object.keys(record).forEach(key => { + let reg = new RegExp('@' + key + '@', 'ig') + content = content.replace(reg, record[key]) + }) + + if (col.eval !== 'false') { + try { + // eslint-disable-next-line + content = eval(content) + } catch (e) { + content = '' + } + } + + content = content === undefined ? '' : content + + if (content !== '') { + content = `${col.prefix || ''}${content}${col.postfix || ''}` + + if (col.eval === 'false') { + content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ') + content = <span dangerouslySetInnerHTML={{__html: content}}></span> + } + } + + if (col.marks) { + let mark = getMark(col.marks, record, style) + + style = mark.style + + if (mark.icon) { + if (mark.position === 'front') { + content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span> + } else { + content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span> + } + } else if (mark.innerStyle) { + content = <span style={mark.innerStyle}>{content}</span> + } + } + + resProps.children = content } else if (col.type === 'custom') { style.padding = '0px' if (col.style) { @@ -380,13 +404,12 @@ columns: PropTypes.array, // 琛ㄦ牸鍒� lineMarks: PropTypes.array, // 琛屾爣璁� fields: PropTypes.array, // 缁勪欢瀛楁闆� - ContainerId: PropTypes.any, // 鏍囩椤靛灞侷d - BData: PropTypes.any, // 涓昏〃鏁版嵁 data: PropTypes.any, // 琛ㄦ牸鏁版嵁 total: PropTypes.any, // 鎬绘暟 loading: PropTypes.bool, // 琛ㄦ牸鍔犺浇涓� refreshdata: PropTypes.func, // 琛ㄦ牸涓帓搴忓垪銆侀〉鐮佺殑鍙樺寲鏃跺埛鏂� chgSelectData: PropTypes.func, // 鏁版嵁鍒囨崲 + autoMatic: PropTypes.any } state = { @@ -399,72 +422,90 @@ activeIndex: null, // 鏍囪褰撳墠閫変腑琛� rowspans: null, // 琛屽悎骞跺瓧娈典俊鎭� pickup: false, // 鏀惰捣鏈�夋嫨椤� - orderfields: {} // 鎺掑簭id涓巉ield杞崲 + orderfields: {}, // 鎺掑簭id涓巉ield杞崲 + pageOptions: [] } UNSAFE_componentWillMount () { - const { menuType, memberLevel, setting, fields, columns } = this.props + const { setting, fields, columns } = this.props let radio = 5 // 铏氬寲姣斾緥 let _format = false // 鏄惁铏氬寲澶勭悊 let rowspans = [] let orderfields = {} - if (window.GLOB.dataFormat && menuType !== 'HS' && memberLevel) { + if (window.GLOB.dataFormat && !window.GLOB.mkHS) { _format = true - if (memberLevel >= 30) { + if (window.GLOB.memberLevel >= 30) { radio = 20 - } else if (memberLevel >= 20) { + } else if (window.GLOB.memberLevel >= 20) { radio = 10 } } - let getColumns = (cols) => { - return cols.map(item => { - let cell = null - - if (item.type === 'colspan') { - cell = { title: item.label, align: item.Align } - cell.children = getColumns(item.subcols) - } 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.length === 0) { - item.marks = '' - } + let _columns = [] - if (item.field) { - orderfields[item.uuid] = item.field - } - - cell = { - align: item.Align, - dataIndex: item.uuid, - title: item.label, - sorter: item.field && item.IsSort === 'true', - width: item.Width || 120, - onCell: record => ({ - record, - col: item, - config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null, - triggerLink: this.triggerLink - }) - } - } + if (setting.tableMode !== 'fast') { + let getColumns = (cols) => { + return cols.map(item => { + let cell = null + + if (item.type === 'colspan') { + cell = { title: item.label, align: item.Align } + cell.children = getColumns(item.subcols) + } 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.length === 0) { + item.marks = '' + } - return cell + if (item.field) { + orderfields[item.uuid] = item.field + } + + cell = { + align: item.Align, + dataIndex: item.uuid, + title: item.label, + sorter: item.field && item.IsSort === 'true', + width: item.Width || 120, + onCell: record => ({ + record, + col: item, + config: item.type === 'custom' || item.type === 'action' ? {setting, columns: fields} : null, + triggerLink: this.triggerLink + }) + } + } + + return cell + }) + } + _columns = getColumns(columns) + } else { + let fields = [] + columns.forEach(item => { + if (!item.field || fields.includes(item.field)) return + fields.push(item.field) + + _columns.push({ + align: item.Align, + dataIndex: item.field, + title: item.label, + sorter: item.IsSort === 'true', + width: item.Width || 120 + }) }) } - - let _columns = getColumns(columns) if (rowspans.length === 0) { rowspans = null @@ -479,18 +520,27 @@ return uuid.join('') }) () - if (setting.borderColor) { // 杈规棰滆壊 - let style = `#${tableId} table, #${tableId} tr, #${tableId} th, #${tableId} td {border-color: ${setting.borderColor}}` - let ele = document.createElement('style') - ele.innerHTML = style - document.getElementsByTagName('head')[0].appendChild(ele) + let size = (setting.pageSize || 10) + '' + let pageOptions = ['10', '25', '50', '100', '500', '1000'] + + if (!pageOptions.includes(size)) { + pageOptions.push(size) + pageOptions = pageOptions.sort((a, b) => a - b) } this.setState({ + pageSize: setting.pageSize || 10, + pageOptions, columns: _columns, rowspans, tableId, orderfields + }, () => { + const element = document.getElementById(tableId) + element && element.style.setProperty('--mk-table-border-color', setting.borderColor || '#e8e8e8') + element && element.style.setProperty('--mk-table-color', setting.color || 'rgba(0, 0, 0, 0.65)') + element && element.style.setProperty('--mk-table-font-size', setting.fontSize || '14px') + element && element.style.setProperty('--mk-table-font-weight', setting.fontWeight || 'normal') }) } @@ -499,9 +549,17 @@ } componentDidMount () { - MKEmitter.addListener('mkCheckTopLine', this.mkCheckTopLine) + const { autoMatic } = this.props + MKEmitter.addListener('mkCheckAll', this.mkCheckAll) MKEmitter.addListener('resetTable', this.resetTable) + + if (autoMatic === true) { + MKEmitter.addListener('autoQueryData', this.autoQueryData) + MKEmitter.addListener('autoSelectData', this.autoSelectData) + } + + MKEmitter.addListener('mkCheckTopLine', this.mkCheckTopLine) } /** @@ -511,22 +569,73 @@ this.setState = () => { return } - MKEmitter.removeListener('mkCheckTopLine', this.mkCheckTopLine) MKEmitter.removeListener('mkCheckAll', this.mkCheckAll) MKEmitter.removeListener('resetTable', this.resetTable) + MKEmitter.removeListener('autoQueryData', this.autoQueryData) + MKEmitter.removeListener('autoSelectData', this.autoSelectData) + MKEmitter.removeListener('mkCheckTopLine', this.mkCheckTopLine) } - mkCheckTopLine = (menuId) => { + 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}) + } + + mkCheckTopLine = (menuId, id) => { const { MenuID, data, setting } = this.props if (MenuID !== menuId || !data || data.length === 0) return - this.changedata(0) - this.setState({ selectedRowKeys: [0], activeIndex: 0 }) - this.props.chgSelectData([data[0]]) + let index = 0 + if (id) { + index = data.findIndex(item => item.$$uuid === id) + if (index === -1) { + index = 0 + } + } + + if (data[index].$disabled) return + + this.changedata(index) + this.setState({ selectedRowKeys: [index], activeIndex: index }) + this.props.chgSelectData([data[index]]) if (setting.$hasSyncModule) { - MKEmitter.emit('syncBalconyData', MenuID, [data[0]], data.length === 1) + MKEmitter.emit('syncBalconyData', MenuID, [data[index]], data.length === 1) } } @@ -585,39 +694,25 @@ if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) { MKEmitter.emit('modifyTabs', tabmenu, 'replace') } else { - MKEmitter.emit('modifyTabs', tabmenu, 'plus') + MKEmitter.emit('modifyTabs', tabmenu, 'plus', true) } } else if (item.linkurl) { let src = item.linkurl - 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]))) - _param.UserID = sessionStorage.getItem('UserID') - _param.LoginUID = sessionStorage.getItem('LoginUID') - _param.User_Name = sessionStorage.getItem('User_Name') - _param.param = __param - src = _url + window.btoa(window.encodeURIComponent(JSON.stringify(_param))) - } catch (e) { - console.warn('鑿滃崟鍙傛暟瑙f瀽閿欒锛�') - } - } else { - let con = '?' + 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') || ''}` + 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) } @@ -632,6 +727,7 @@ let index = '' let _activeIndex = null if (selectedRowKeys.length > 0) { + selectedRowKeys = selectedRowKeys.filter(key => !data[key].$disabled) index = selectedRowKeys.slice(-1)[0] } @@ -643,7 +739,7 @@ this.setState({ selectedRowKeys, activeIndex: _activeIndex }) - let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index)) + let selects = data.filter((item, _index) => selectedRowKeys.includes(_index) && !item.$disabled) this.props.chgSelectData(selects) if (setting.$hasSyncModule) { @@ -658,6 +754,7 @@ const { setting, MenuID, data } = this.props if (!setting.tableType || this.state.pickup) return + if (record.$disabled) return let newkeys = fromJS(this.state.selectedRowKeys).toJS() @@ -682,7 +779,7 @@ this.setState({ selectedRowKeys: newkeys, activeIndex: _index !== '' ? _index : null }) } - let selects = this.props.data.filter((item, _index) => newkeys.includes(_index)) + let selects = this.props.data.filter((item, _index) => newkeys.includes(_index) && !item.$disabled) this.props.chgSelectData(selects) @@ -708,15 +805,17 @@ } changedata = (index) => { - const { MenuID, data, setting } = this.props + const { MenuID, data } = this.props let _id = '' let _data = '' if (data && data.length > 0 && index !== '') { - _id = data[index][setting.primaryKey] || '' + _id = data[index].$$uuid || '' _data = data[index] || '' } + + if (_data && _data.$disabled) return MKEmitter.emit('resetSelectLine', MenuID, _id, _data) } @@ -806,13 +905,14 @@ const { setting } = this.props if (!setting.doubleClick) return + if (record.$disabled) return - MKEmitter.emit('triggerBtnId', setting.doubleClick, [record]) + MKEmitter.emit('triggerBtnId', setting.doubleClick, [record], 'linkbtn') } render() { const { setting, statFValue, lineMarks, data } = this.props - const { selectedRowKeys, activeIndex, pickup, tableId } = this.state + const { selectedRowKeys, activeIndex, pickup, tableId, pageOptions } = this.state // 璁剧疆琛ㄦ牸閫夋嫨灞炴�э細鍗曢�夈�佸閫夈�佷笉鍙�� let rowSelection = null @@ -824,11 +924,14 @@ } } - const components = { + let components = { body: { - row: BodyRow, - cell: BodyCell + row: BodyRow } + } + + if (setting.tableMode !== 'fast') { + components.body.cell = BodyCell } // 鏁版嵁鏀惰捣鏃讹紝杩囨护宸查�夋暟鎹� @@ -845,7 +948,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.state.dict['main.pagination.of']} ${total} ${this.state.dict['main.pagination.items']}` @@ -867,7 +970,6 @@ } <Table components={components} - style={setting.style} size={setting.size || 'middle'} bordered={setting.bordered !== 'false'} rowSelection={rowSelection} @@ -877,7 +979,7 @@ scroll={{ x: '100%', y: height }} onRow={(record, index) => { return { - lineMarks, + lineMarks: setting.tableMode !== 'fast' ? lineMarks : null, data: record, className: index === activeIndex ? ' mk-row-active ' : '', onClick: () => {this.changeRow(record, index)}, @@ -893,15 +995,4 @@ } } -const mapStateToProps = (state) => { - return { - menuType: state.editLevel, - memberLevel: state.memberLevel - } -} - -const mapDispatchToProps = () => { - return {} -} - -export default connect(mapStateToProps, mapDispatchToProps)(NormalTable) \ No newline at end of file +export default NormalTable \ No newline at end of file -- Gitblit v1.8.0