From 1f6d49bf15e6b50eeee1edc32022eb006b401835 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 08 二月 2023 00:35:55 +0800
Subject: [PATCH] 2023-02-08
---
src/tabviews/zshare/normalTable/index.jsx | 69 +++++-----------------------------
1 files changed, 11 insertions(+), 58 deletions(-)
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index b355463..e08b2cb 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -2,7 +2,7 @@
import PropTypes from 'prop-types'
import md5 from 'md5'
import { is, fromJS } from 'immutable'
-import { Table, Affix, Typography, Col } from 'antd'
+import { Table, Typography, Col } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import MKEmitter from '@/utils/events.js'
@@ -18,6 +18,7 @@
const TabButton = asyncComponent(() => import('@/tabviews/zshare/actionList/tabbutton'))
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
const Video = asyncComponent(() => import('@/components/video'))
+const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
const PicRadio = {
'4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
@@ -47,7 +48,6 @@
pickup: PropTypes.any, // 鏁版嵁鏀惰捣
columns: PropTypes.array, // 琛ㄦ牸鍒�
fields: PropTypes.array, // 缁勪欢瀛楁闆�
- ContainerId: PropTypes.any, // 鏍囩椤靛灞侷d
BData: PropTypes.any, // 涓昏〃鏁版嵁
data: PropTypes.any, // 琛ㄦ牸鏁版嵁
total: PropTypes.any, // 鎬绘暟
@@ -360,11 +360,7 @@
let tabmenu = item.linkThdMenu
tabmenu.param = __param
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- MKEmitter.emit('modifyTabs', tabmenu, 'replace')
- } else {
- MKEmitter.emit('modifyTabs', tabmenu, 'plus', true)
- }
+ MKEmitter.emit('modifyTabs', tabmenu, true)
} else if (item.linkurl) {
let src = item.linkurl
@@ -660,17 +656,7 @@
return (
<div className="picture-col">
{photos.map((url, i) => (<Col key={i} span={item.span || 24}>
- <div
- className={'mk-picture' + (scale ? ' image-scale' : '')}
- onClick={(e) => {
- if (!scale) return
-
- e.stopPropagation()
-
- MKEmitter.emit('mkImageScale', url, photos)
- }}
- style={{...style, backgroundImage: `url('${url}')`}}
- ></div>
+ <MkPicture style={style} scale={scale} url={url} urls={photos}/>
</Col>))}
</div>
)
@@ -767,7 +753,6 @@
BData={this.props.BData}
setting={this.props.setting}
columns={this.props.fields || this.props.columns}
- ContainerId={this.props.ContainerId}
/>
)
} else if (btn.OpenType === 'popview') {
@@ -789,9 +774,9 @@
btn={btn}
disabled={record.$disabled}
selectedData={[record]}
+ BID={record.$$BID}
BData={this.props.BData}
MenuID={this.props.MenuID}
- setting={this.props.setting}
/>
)
} else if (btn.OpenType === 'innerpage' || btn.OpenType === 'outerpage') {
@@ -802,7 +787,6 @@
disabled={record.$disabled}
selectedData={[record]}
BData={this.props.BData}
- setting={this.props.setting}
/>
)
}
@@ -1131,9 +1115,9 @@
}
changedata = (index) => {
- const { data, setting, tableId, ContainerId } = this.props
+ const { data, setting, tableId } = this.props
- if (!tableId || !ContainerId) return
+ if (!tableId || !setting.ContainerId) return
let _id = ''
let _data = ''
@@ -1143,7 +1127,7 @@
_data = data[index] || ''
}
- MKEmitter.emit('changeTableLine', ContainerId, tableId, _id, _data)
+ MKEmitter.emit('changeTableLine', setting.ContainerId, tableId, _id, _data)
}
resetTable = (id, repage) => {
@@ -1230,7 +1214,7 @@
render() {
const { setting, pickup, statFValue } = this.props
- const { selectedRowKeys, lineMarks, activeIndex, pageOptions } = this.state
+ const { selectedRowKeys, lineMarks, activeIndex, pageOptions, columns } = this.state
let components = {
body: {}
@@ -1247,21 +1231,6 @@
selectedRowKeys,
type: (setting.tableType === 'radio') ? 'radio' : 'checkbox',
onChange: this.onSelectChange
- }
- }
-
- // 琛ㄦ牸澶撮儴鍥哄畾浜庨《閮ㄦ椂锛屽垽鏂窛椤堕儴楂樺害
- let offset = null
- if (this.props.tableId === 'mainTable' && setting.columnfixed) {
- if (!setting.actionfixed) {
- offset = 48
- } else {
- let box = document.getElementById(this.props.MenuID + 'mainaction')
- if (box) {
- offset = 48 + box.offsetHeight
- } else {
- offset = 105
- }
}
}
@@ -1307,30 +1276,14 @@
}
return (
- <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '')}>
- {offset && <Affix offsetTop={offset} className="fix-header">
- <Table
- size={setting.size || 'middle'}
- style={style}
- bordered={setting.bordered !== 'false'}
- rowSelection={rowSelection}
- columns={this.state.columns.map(column => {
- return {
- align: column.align,
- dataIndex: column.dataIndex,
- title: column.title,
- width: column.width
- }
- })}
- />
- </Affix>}
+ <div className={'normal-data-table mingke-table ' + (height ? 'fixed-height' : '') + ` table-col-${columns.length}`}>
<Table
components={components}
size={setting.size || 'middle'}
style={style}
bordered={setting.bordered !== 'false'}
rowSelection={rowSelection}
- columns={this.state.columns}
+ columns={columns}
dataSource={_data}
rowClassName={(record) => {
let className = ''
--
Gitblit v1.8.0