From 39ba968e703f9d91809c64d91abbedb7ed4cc0b8 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 七月 2024 12:34:29 +0800
Subject: [PATCH] 2024-07-25
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 23 +++++++++++++++++++++++
src/menu/components/share/actioncomponent/actionform/index.jsx | 4 +++-
src/menu/components/card/cardcellcomponent/index.jsx | 8 ++++++++
3 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/index.jsx b/src/menu/components/card/cardcellcomponent/index.jsx
index 5f5bbbf..5f36a3a 100644
--- a/src/menu/components/card/cardcellcomponent/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/index.jsx
@@ -393,6 +393,14 @@
res.width = (res.width + '').replace(/.5/, 'x')
}
+ if (res.eleType === 'formula' && res.eval === 'false' && res.noValue === 'hide') {
+ let keys = res.formula.match(/@[0-9a-z_]+@/ig)
+ if (keys) {
+ res.$keys = keys.map(key => key.slice(1, -1).toLowerCase())
+ res.$keys = Array.from(new Set(res.$keys))
+ }
+ }
+
let _elements = elements.map(cell => {
if (cell.uuid === res.uuid) {
res.style = cell.style || {}
diff --git a/src/menu/components/share/actioncomponent/actionform/index.jsx b/src/menu/components/share/actioncomponent/actionform/index.jsx
index 730898c..d730f6e 100644
--- a/src/menu/components/share/actioncomponent/actionform/index.jsx
+++ b/src/menu/components/share/actioncomponent/actionform/index.jsx
@@ -492,7 +492,9 @@
shows.push('position')
}
} else if (_funcType === 'mkBinding' || _funcType === 'mkUnBinding') {
- shows.push('execSuccess', 'execError')
+ shows.push('execSuccess', 'execError', 'tipTitle')
+ } else if (_funcType === 'mkUnsubscribe' || _funcType === 'reAuth') {
+ shows.push('tipTitle')
} else if (_funcType === 'closetab') {
shows.push('refreshTab')
} else if (_funcType === 'scan') {
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ba48a45..6c25c60 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -958,6 +958,29 @@
val = ''
} else if (data) {
let _val = card.formula
+
+ if (card.$keys && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ let _data = {}
+ let empty = true
+
+ Object.keys(data).forEach(key => {
+ _data[key.toLowerCase()] = data[key]
+ })
+ _data.username = sessionStorage.getItem('User_Name') || ''
+ _data.fullname = sessionStorage.getItem('Full_Name') || ''
+ _data.bid = data.$$BID || ''
+
+ card.$keys.forEach(key => {
+ if (!_data.hasOwnProperty(key)) {
+ empty = false
+ } else if (_data[key] && !/^1949-10-01/.test(_data[key])) {
+ empty = false
+ }
+ })
+
+ if (empty) return null
+ }
+
if (/@username@|@fullName@|@bid@/ig.test(_val)) {
_val = _val.replace(/@username@/ig, sessionStorage.getItem('User_Name') || '').replace(/@fullName@/ig, sessionStorage.getItem('Full_Name') || '').replace(/@bid@/ig, data.$$BID || '')
}
--
Gitblit v1.8.0