From f0616c0783c54043be7da18fc185527c93b95696 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 02 三月 2024 12:51:46 +0800
Subject: [PATCH] 2024-03-02
---
src/tabviews/custom/components/share/normalTable/index.jsx | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 01eacd8..69244ec 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -110,7 +110,7 @@
let { col, config, record, className, style, triggerLink, ...resProps } = this.props
if (!col) return (<td {...resProps} className={className} style={style}/>)
-
+
if (col.type === 'text') {
let content = ''
if (record[col.field] !== undefined) {
@@ -162,16 +162,14 @@
resProps.rowSpan = record['$$' + col.field]
}
- if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
- content = (
- <div>
- <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div>
- {content}
- </div>
- )
- }
-
resProps.children = content
+
+ if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
+ style = style || {}
+ style.cursor = 'pointer'
+
+ return (<td {...resProps} className={className} onDoubleClick={() => triggerLink(col, record)} style={style}/>)
+ }
} else if (col.type === 'number') {
let content = ''
try {
@@ -235,16 +233,14 @@
resProps.rowSpan = record['$$' + col.field]
}
- if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
- content = (
- <div>
- <div className="link-menu" onDoubleClick={(e) => triggerLink(e, col, record)}></div>
- {content}
- </div>
- )
- }
-
resProps.children = content
+
+ if (!record.$disabled && (col.linkThdMenu || col.linkurl)) {
+ style = style || {}
+ style.cursor = 'pointer'
+
+ return (<td {...resProps} className={className} onDoubleClick={() => triggerLink(col, record)} style={style}/>)
+ }
} else if (col.type === 'picture') {
let photos = ''
if (record[col.field]) {
@@ -268,7 +264,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>
@@ -566,6 +562,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
@@ -647,6 +647,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
@@ -788,9 +791,7 @@
}
// 瀛楁閫忚
- triggerLink = (e, item, record) => {
- e.stopPropagation()
-
+ triggerLink = (item, record) => {
let __param = {
$searchkey: item.field,
$searchval: record[item.field] || '',
--
Gitblit v1.8.0