From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 38 +++++++++++++++++++++++++-------------
1 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index a628ea3..f2461f4 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -313,10 +313,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -405,10 +407,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -477,10 +481,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -728,10 +734,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
children = content
@@ -779,10 +787,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
children = content
@@ -836,10 +846,12 @@
if (mark.icon) {
if (mark.position === 'front') {
- content = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {content}</span>
+ content = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {content}</span>
} else {
- content = <span>{content} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ content = <span>{content} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
+ } else if (mark.innerStyle) {
+ content = <span style={mark.innerStyle}>{content}</span>
}
}
@@ -1187,7 +1199,7 @@
if (!_cell.label && _cell.label !== 0) return
if (_map.has(_cell.value)) return
- _map.set(_cell.value, true)
+ _map.set(_cell.value, 0)
if (item.linkSubField) {
item.linkSubField.forEach(m => {
--
Gitblit v1.8.0