From 7a75537c6fb888fe55515b89b6e02d0852d73332 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 08 三月 2024 21:09:00 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 ee270d7..4bcdb13 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -767,6 +767,10 @@
content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
}
+ if (col.noValue === 'hide' && content < '1949-10-02') {
+ content = ''
+ }
+
if (col.textFormat !== 'encryption') {
content = (col.prefix || '') + content + (col.postfix || '')
}
@@ -1107,6 +1111,10 @@
content = <span>{col.prefix || ''}<Encrypts value={content} />{col.postfix || ''}</span>
}
+ if (col.noValue === 'hide' && content < '1949-10-02') {
+ content = ''
+ }
+
if (col.textFormat !== 'encryption') {
content = (col.prefix || '') + content + (col.postfix || '')
}
--
Gitblit v1.8.0