From bdcd0fd5fc77daae9ea308e5c8b07aef7d9acb02 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 20 六月 2023 16:41:50 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index da387bd..2f3f53a 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -200,10 +200,13 @@
if (this.record.datatype === 'dynamic') {
_options.push('field', 'noValue')
} else if (this.record.tipType === 'text') {
- _options.push('value', 'height')
+ _options.push('value')
} else {
_options.push('icon')
}
+ if (this.record.tipType === 'text') {
+ _options.push('height')
+ }
} else if (this.record.eleType === 'formula' && this.record.eval === 'true') {
_options.push('decimal')
}
--
Gitblit v1.8.0