From 8d7c3eed8bdac1e77c8de90a3227d801708c358e Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:12:56 +0800
Subject: [PATCH] 2023-05-15
---
src/tabviews/custom/components/share/normalTable/index.jsx | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 993c4db..33d8d9b 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -348,11 +348,8 @@
if (content !== '') {
content = `${col.prefix || ''}${content}${col.postfix || ''}`
-
- if (col.eval === 'false') {
- content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
- content = <span dangerouslySetInnerHTML={{__html: content}}></span>
- }
+ content = content.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
+ content = <span dangerouslySetInnerHTML={{__html: content}}></span>
}
if (col.marks) {
@@ -990,6 +987,9 @@
}
let height = setting.height || false
+ if (height && height <= 100) {
+ height = height + 'vh'
+ }
let loading = this.props.loading
if (setting.mask === 'hidden') {
loading = false
@@ -1023,6 +1023,7 @@
return {
lineMarks: setting.tableMode !== 'fast' ? lineMarks : null,
data: record,
+ title: setting.tipField ? record[setting.tipField] : '',
className: index === activeIndex ? ' mk-row-active ' : '',
onClick: () => {this.changeRow(record, index)},
onDoubleClick: () => {this.doubleClickLine(record)}
--
Gitblit v1.8.0