From b50e2da8557695c55b8b524e237691e63f7f3484 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 三月 2025 14:14:57 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardcellcomponent/formconfig.jsx | 8 ++++++++
src/tabviews/custom/components/card/cardcellList/index.jsx | 11 +++++++++--
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 14 +++++++++++---
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 3b9f876..5181b6d 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -201,9 +201,17 @@
_options.push('value')
}
- if (this.record.eleType === 'text' && this.record.datatype === 'static' && this.record.noValue === 'hide') {
- _options.push('noVField')
+ if (this.record.eleType === 'text' && this.record.noValue === 'hide') {
+ if (this.record.datatype === 'static') {
+ _options.push('noVField')
+ if (this.record.noVField) {
+ _options.push('noVExtra')
+ }
+ } else {
+ _options.push('noVExtra')
+ }
}
+
if (this.record.eleType === 'picture' && this.record.noValue === 'show') {
_options.push('lostTip')
} else if (this.record.eleType === 'video' && this.record.posterType) {
@@ -409,7 +417,7 @@
return item
})
})
- } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType', 'tipType', 'noValue'].includes(key)) {
+ } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType', 'tipType', 'noValue', 'noVField'].includes(key)) {
let _options = this.getOptions()
this.setState({
diff --git a/src/menu/components/card/cardcellcomponent/formconfig.jsx b/src/menu/components/card/cardcellcomponent/formconfig.jsx
index 08054fd..c57d042 100644
--- a/src/menu/components/card/cardcellcomponent/formconfig.jsx
+++ b/src/menu/components/card/cardcellcomponent/formconfig.jsx
@@ -735,6 +735,14 @@
options: [],
},
{
+ type: 'text',
+ key: 'noVExtra',
+ label: '绌哄�兼墿灞�',
+ initVal: card.noVExtra || '',
+ tooltip: '褰撳瓧娈靛�硷紙鎴栭潤鎬佸厓绱犵殑绌哄�煎瓧娈碉級涓烘墿灞曞�兼椂锛堜笉鍖哄垎澶у皬鍐欙紝澶氫釜鍊肩敤閫楀彿鍒嗛殧锛夛紝绛夋晥浜庣┖鍊硷紝鍏冪礌灏嗚闅愯棌銆�',
+ required: false
+ },
+ {
type: 'radio',
key: 'lostTip',
label: '鍥剧墖缂哄け',
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 18a0a34..966bf1b 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -373,11 +373,18 @@
}
}
- if (card.noVField && !data[card.noVField]) {
- val = ''
+ if (card.noVField) {
+ if (!data[card.noVField]) {
+ val = ''
+ } else if (card.noVExtra && new RegExp('^(' + card.noVExtra.split(',').join('|') + ')$', 'ig').test(data[card.noVField])) {
+ val = ''
+ }
}
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field] + ''
+ if (card.noVExtra && val && new RegExp('^(' + card.noVExtra.split(',').join('|') + ')$', 'ig').test(val)) {
+ val = ''
+ }
}
if (val && card.format && card.format !== 'encryption') {
--
Gitblit v1.8.0