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 | 181 ++++++++++++++++++++++++--------------------
1 files changed, 99 insertions(+), 82 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 8739fbb..21feaa5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -3,7 +3,7 @@
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 { modifyTabview } from '@/store/action'
import asyncComponent from '@/utils/asyncComponent'
@@ -44,8 +44,6 @@
pageIndex: 1, // 鍒濆椤甸潰绱㈠紩
pageSize: 10, // 姣忛〉鏁版嵁鏉℃暟
columns: null, // 鏄剧ず鍒�
- imgShow: false, // 鍥剧墖鏀惧ぇ妯℃�佹
- imgSrc: '', // 鍥剧墖璺緞
lineMarks: null, // 琛屾爣璁�
activeIndex: null, // 鏍囪褰撳墠閫変腑琛�
rowspans: null // 琛屽悎骞跺瓧娈典俊鎭�
@@ -75,7 +73,6 @@
let cell = null
if (item.type === 'colspan') {
- if (!item.subcols || item.subcols.length === 0) return
cell = {title: item.label, children: []}
item.subcols.forEach(col => {
@@ -111,7 +108,6 @@
})
})
} else if (item.type === 'old_colspan') {
- if (!item.subcols || item.subcols.length === 0) return
item.subcols.forEach(col => {
if (col.marks) { // 杩囨护琛屽拰鍗＄墖鏍囪
col.marks = col.marks.filter(mark => {
@@ -141,7 +137,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
}
@@ -170,21 +169,13 @@
}
}
- 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,
@@ -213,62 +204,81 @@
// 瀛楁閫忚
triggerLink = (e, item, record) => {
- const { tabviews, MenuID, setting } = this.props
+ 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)
@@ -483,6 +493,21 @@
}
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={(e) => this.triggerLink(e, item, record)}></div>
@@ -492,6 +517,21 @@
</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>
@@ -505,7 +545,7 @@
let photos = ''
if (item.field && record.hasOwnProperty(item.field)) {
photos = record[item.field] + ''
- photos = photos.split(',')
+ photos = photos.split(',').filter(Boolean)
} else {
photos = ''
}
@@ -515,7 +555,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=""/>
}
@@ -608,7 +651,7 @@
setting={this.props.setting}
/>
)
- } else if (btn.OpenType === 'tab' || btn.OpenType === 'blank') {
+ } else if (btn.OpenType === 'tab') {
return (
<TabButton
key={btn.uuid}
@@ -691,7 +734,7 @@
let photos = []
try {
photos = record[col.field] + ''
- photos = photos.split(',')
+ photos = photos.split(',').filter(Boolean)
} catch {
photos = []
}
@@ -827,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=""/>)
}
@@ -847,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=""/>)
}
@@ -866,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 => {
@@ -894,7 +923,7 @@
index = selectedRowKeys.slice(-1)[0]
}
- if (setting.tableType === 'checkbox') {
+ if (setting.tableType === 'checkbox' || setting.tableType === 'radio') {
_activeIndex = index === '' ? null : index
}
@@ -918,7 +947,7 @@
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)) {
@@ -1000,13 +1029,13 @@
let preItem = data[index - 1]
rowspans.forEach((cell, i) => {
if (i === 0) {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
}
} else {
- if ((item[cell] || item[cell] === 0) && preItem[cell] === item[cell]) {
+ if (preItem[cell] === item[cell]) {
item['$' + cell] = preItem['$' + cell] + 1
} else {
item['$' + cell] = 1
@@ -1127,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 '
}
@@ -1190,18 +1219,6 @@
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