From 47a5550dde3f170b7efb74eea76bb2cdf69489da Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 23 八月 2022 11:44:39 +0800
Subject: [PATCH] 2022-08-23
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 51 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 36 insertions(+), 15 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..048b71d 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -14,6 +14,7 @@
import zhCN from '@/locales/zh-CN/main.js'
import enUS from '@/locales/en-US/main.js'
import CusSwitch from './cusSwitch'
+import Encrypts from '@/components/encrypts'
import '@/assets/css/table.scss'
import './index.scss'
@@ -301,9 +302,13 @@
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}`
} else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) {
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
+ } else if (col.textFormat === 'encryption') {
+ content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
}
- content = (col.prefix || '') + content + (col.postfix || '')
+ if (col.textFormat !== 'encryption') {
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
}
if (col.marks) {
@@ -313,10 +318,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 +412,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 +486,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>
}
}
@@ -716,9 +727,13 @@
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)}`
} else if (col.textFormat === 'YYYY-MM-DD HH:mm:ss' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1]).([0-1][0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]/.test(content)) {
content = `${content.substr(0, 4)}-${content.substr(5, 2)}-${content.substr(8, 2)} ${content.substr(11, 2)}:${content.substr(14, 2)}:${content.substr(17, 2)}`
+ } else if (col.textFormat === 'encryption') {
+ content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
}
- content = (col.prefix || '') + content + (col.postfix || '')
+ if (col.textFormat !== 'encryption') {
+ content = (col.prefix || '') + content + (col.postfix || '')
+ }
}
if (col.marks) {
@@ -728,10 +743,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 +796,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 +855,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 +1208,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