From 31ec63f0419895876cbaba99637a884a32d33d0d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 01 九月 2021 10:31:45 +0800
Subject: [PATCH] 2021-09-01
---
src/tabviews/custom/components/share/normalTable/index.jsx | 84 ++++++++++++++++++++++++++++++++++--------
1 files changed, 68 insertions(+), 16 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 24682cc..80ee2da 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -3,7 +3,7 @@
import md5 from 'md5'
import { connect } from 'react-redux'
import { is, fromJS } from 'immutable'
-import { Table, Typography, Icon, Col, Switch } from 'antd'
+import { Table, Typography, Icon, Col, Switch, message } from 'antd'
import { modifyTabview } from '@/store/action'
import asyncComponent from '@/utils/asyncComponent'
@@ -51,7 +51,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -62,7 +62,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -120,7 +120,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -131,7 +131,7 @@
try {
originVal = parseFloat(originVal)
contrastVal = parseFloat(contrastVal)
- } catch {
+ } catch (e) {
originVal = NaN
}
@@ -191,7 +191,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 + content + col.postfix
+ content = (col.prefix || '') + content + (col.postfix || '')
}
if (col.marks) {
@@ -223,7 +223,7 @@
if (isNaN(content)) {
content = ''
}
- } catch {
+ } catch (e) {
content = ''
}
@@ -275,6 +275,7 @@
let cols = 24 / (col.picSort || 1)
let paddingTop = '100%'
+ let scale = col.scale === 'true'
if (PicRadio[col.lenWidRadio]) {
paddingTop = PicRadio[col.lenWidRadio]
@@ -282,9 +283,12 @@
resProps.children = (
<div>
- {photos.map((url, i) => (
+ {photos && photos.map((url, i) => (
<Col key={i} span={cols}>
- <div className="ant-mk-picture" style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
+ <div className={'ant-mk-picture' + (scale ? ' scale' : '')} onClick={() => {
+ if (!scale) return
+ MKEmitter.emit('mkImageScale', url, photos)
+ }} style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
</Col>
))}
</div>
@@ -328,7 +332,7 @@
try {
_param = window.btoa(_quary)
- } catch {
+ } catch (e) {
_param = window.btoa(window.encodeURIComponent(_quary))
}
@@ -350,6 +354,10 @@
)
} else if (col.type === 'custom') {
style.padding = '0px'
+ if (col.style) {
+ style = {...style, ...col.style}
+ }
+
resProps.children = (
<CardCellComponent data={record} cards={config} elements={col.elements}/>
)
@@ -423,7 +431,10 @@
if (item.rowspan === 'true') {
rowspans.push(item.field)
}
- if (_format && !Math.floor(Math.random() * radio)) {
+ if (item.type === 'index') {
+ item.field = '$Index'
+ item.type = 'text'
+ } else if (_format && !Math.floor(Math.random() * radio)) {
item.blur = true
}
@@ -489,6 +500,7 @@
}
componentDidMount () {
+ MKEmitter.addListener('mkCheckAll', this.mkCheckAll)
MKEmitter.addListener('resetTable', this.resetTable)
}
@@ -499,7 +511,39 @@
this.setState = () => {
return
}
+ MKEmitter.removeListener('mkCheckAll', this.mkCheckAll)
MKEmitter.removeListener('resetTable', this.resetTable)
+ }
+
+ mkCheckAll = (menuId, checked) => {
+ const { MenuID, data } = this.props
+
+ if (MenuID !== menuId) return
+
+ if (checked) {
+ this.setState({
+ activeIndex: '',
+ selectedRowKeys: data.map((item, index) => index)
+ })
+
+ this.props.chgSelectData(data)
+
+ MKEmitter.emit('resetSelectLine', MenuID, '', '')
+ MKEmitter.emit('syncBalconyData', MenuID, data, data.length > 0)
+ if (data.length === 0) {
+ message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+ }
+ } else {
+ this.setState({
+ activeIndex: '',
+ selectedRowKeys: [],
+ })
+
+ this.props.chgSelectData([])
+
+ MKEmitter.emit('resetSelectLine', MenuID, '', '')
+ MKEmitter.emit('syncBalconyData', MenuID, [], false)
+ }
}
// 瀛楁閫忚
@@ -550,7 +594,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 {
@@ -578,7 +622,7 @@
*
*/
onSelectChange = selectedRowKeys => {
- const { setting } = this.props
+ const { setting, MenuID, data } = this.props
let index = ''
let _activeIndex = null
@@ -597,13 +641,16 @@
let selects = this.props.data.filter((item, _index) => selectedRowKeys.includes(_index))
this.props.chgSelectData(selects)
+ if (setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', MenuID, selects, data.length === selects.length)
+ }
}
/**
* @description 鐐瑰嚮鏁磋锛岃Е鍙戝垏鎹紝 鍒ゆ柇鏄惁鍙�夛紝鍗曢�夋垨澶氶�夛紝杩涜瀵瑰簲鎿嶄綔
*/
changeRow = (record, index) => {
- const { setting } = this.props
+ const { setting, MenuID, data } = this.props
if (!setting.tableType || this.state.pickup) return
@@ -633,6 +680,10 @@
let selects = this.props.data.filter((item, _index) => newkeys.includes(_index))
this.props.chgSelectData(selects)
+
+ if (setting.$hasSyncModule) {
+ MKEmitter.emit('syncBalconyData', MenuID, selects, data.length === selects.length)
+ }
}
changeTable = (pagination, filters, sorter) => {
@@ -803,12 +854,13 @@
}
return (
- <div className={'normal-custom-table ' + setting.tableHeader} id={tableId}>
+ <div className={`normal-custom-table ${setting.tableHeader || ''} ${setting.mode || ''}`} id={tableId}>
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
- <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" defaultChecked={pickup} onChange={this.pickupChange} /> : null
+ <Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
<Table
components={components}
+ style={setting.style}
size={setting.size || 'middle'}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
--
Gitblit v1.8.0