From fe098b477db95ac7053936abc8a823905de7c21d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 18 一月 2021 18:57:46 +0800
Subject: [PATCH] 2021-01-18
---
src/tabviews/custom/components/share/normalTable/index.jsx | 4 ++++
src/tabviews/zshare/normalTable/index.jsx | 32 +++++++++++++++++++++++++++++++-
2 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 7e30033..ca764a7 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -248,6 +248,10 @@
content = md5(content)
}
+ if (col.rowspan === 'true') {
+ resProps.rowSpan = record['$$' + col.field]
+ }
+
if (col.linkThdMenu || col.linkurl) {
content = (
<div>
diff --git a/src/tabviews/zshare/normalTable/index.jsx b/src/tabviews/zshare/normalTable/index.jsx
index 11db080..77e74d5 100644
--- a/src/tabviews/zshare/normalTable/index.jsx
+++ b/src/tabviews/zshare/normalTable/index.jsx
@@ -182,7 +182,7 @@
if (rowspans.length === 0) {
rowspans = null
}
-
+
this.setState({
columns: _columns,
pageSize: pageSize ? pageSize : 10,
@@ -481,6 +481,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>
@@ -490,6 +505,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>
--
Gitblit v1.8.0