From d32c4297cc47342f0a5229d5108cc7c26809f50f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 25 七月 2024 13:23:36 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardcellcomponent/index.jsx | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 || {}
--
Gitblit v1.8.0