From 79e4981aa6cc9354276fc54cdf6d14eb08ab7fee Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 22 六月 2023 15:59:04 +0800
Subject: [PATCH] Merge branch 'develop' of ssh://121.36.20.145:29418/~jinfei/pc-plat into develop
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index b0620bb..2f3f53a 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -19,7 +19,7 @@
number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle', 'alignItems'],
picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
- icon: ['eleType', 'datatype', 'width', 'tooltip'],
+ icon: ['eleType', 'datatype', 'tipType', 'width', 'tooltip'],
slider: ['eleType', 'datatype', 'width', 'color', 'maxValue', 'showInfo', 'showType', 'strokeWidth', 'strokeLinecap', 'trailColor'],
splitline: ['eleType', 'color', 'width', 'borderWidth'],
barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval', 'noValue'],
@@ -182,7 +182,7 @@
_options.push('linkurl')
}
} else if (this.record.linkType === 'other') {
- _options.push('linkurl', 'joint')
+ _options.push('linkurl', 'joint', 'open')
} else {
_options.push('linkurl')
}
@@ -199,8 +199,13 @@
} else if (this.record.eleType === 'icon') {
if (this.record.datatype === 'dynamic') {
_options.push('field', 'noValue')
+ } else if (this.record.tipType === 'text') {
+ _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')
@@ -336,7 +341,7 @@
return item
})
})
- } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType'].includes(key)) {
+ } else if (['datatype', 'showInfo', 'showType', 'fixStyle', 'posterType', 'eval', 'linkType', 'tipType'].includes(key)) {
let _options = this.getOptions()
this.setState({
--
Gitblit v1.8.0