From ac6d0fb42f2e728eefefa673749f1f5dedc4942b Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 23 二月 2024 17:21:54 +0800
Subject: [PATCH] 2024-02-23
---
src/tabviews/custom/components/share/normalTable/index.jsx | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index b090fc7..2b00baa 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -268,7 +268,7 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={col.span || 24}>
- <MkPicture style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
+ <MkPicture lostTip={col.lostTip !== 'false'} style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
</Col>
))}
</div>
@@ -499,10 +499,6 @@
} else if (_format && !Math.floor(Math.random() * radio)) {
item.blur = true
}
-
- if (item.marks && item.marks.length === 0) {
- item.marks = ''
- }
if (item.field) {
orderfields[item.uuid] = item.field
@@ -570,6 +566,10 @@
pageOptions = pageOptions.sort((a, b) => a - b)
}
+ if (setting.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
+ }
+
let allColumns = null
if (colsCtrls) {
rowspans = null
@@ -585,12 +585,6 @@
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')
})
}
@@ -657,6 +651,9 @@
result = originVal === contrastVal
} else if (item.match === '!=') {
result = originVal !== contrastVal
+ } else if (item.match === 'regexp') {
+ let reg = new RegExp(item.contrastValue, 'ig')
+ result = reg.test(originVal)
} else {
originVal = isNaN(originVal) ? originVal : +originVal
contrastVal = isNaN(contrastVal) ? contrastVal : +contrastVal
@@ -843,6 +840,8 @@
onSelectChange = (selectedRowKeys, e) => {
const { setting, MenuID, data } = this.props
+
+ if (this.state.pickup) return
let index = ''
let _activeIndex = null
@@ -1073,7 +1072,7 @@
render() {
const { setting, statFValue, lineMarks, data } = this.props
- const { selectedRowKeys, activeIndex, pickup, tableId, pageOptions, columns, reseting } = this.state
+ const { selectedRowKeys, activeIndex, pickup, pageOptions, columns, reseting } = this.state
if (reseting) return null
@@ -1143,8 +1142,15 @@
}
}
+ let style = {
+ '--mk-table-border-color': setting.borderColor || '#e8e8e8',
+ '--mk-table-color': setting.color || 'rgba(0, 0, 0, 0.65)',
+ '--mk-table-font-size': setting.fontSize || '14px',
+ '--mk-table-font-weight': setting.fontWeight || 'normal'
+ }
+
return (
- <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length} ${fixed}`} id={tableId}>
+ <div className={`normal-custom-table ${setting.tableHeader || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''} table-vertical-${setting.vertical || 'middle'} table-col-${columns.length} ${fixed}`} style={style}>
{(setting.tableType === 'radio' || setting.tableType === 'checkbox') && data && data.length > 0 ?
<Switch title="鏀惰捣" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /> : null
}
--
Gitblit v1.8.0