From a898abd9e42a4b428d6daf1d34fa400ed18e8689 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期三, 23 十一月 2022 17:35:34 +0800
Subject: [PATCH] 2022-11-23
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index fa8a097..b720973 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -17,9 +17,9 @@
sequence: ['eleType', 'width'],
text: ['eleType', 'datatype', 'format', 'width', 'height', 'prefix', 'postfix', 'link', 'anchors', 'noValue', 'bgImage', 'fixStyle', 'copyable'],
number: ['eleType', 'datatype', 'width', 'height', 'prefix', 'postfix', 'noValue', 'fixStyle'],
- picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'maxWidth', 'link', 'noValue'],
+ picture: ['eleType', 'datatype', 'width', 'lenWidRadio', 'backgroundSize', 'maxWidth', 'link', 'noValue'],
video: ['eleType', 'datatype', 'width', 'aspectRatio', 'autoPlay', 'loop', 'startTime', 'noValue', 'posterType'],
- icon: ['eleType', 'icon', 'datatype', 'width'],
+ icon: ['eleType', 'datatype', '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'],
@@ -144,7 +144,7 @@
if (datatype === 'dynamic') {
_options.push('field')
} else {
- _options.push('tooltip')
+ _options.push('icon')
}
}
if (_options.includes('fixStyle') && fixStyle === 'alone') {
@@ -215,6 +215,10 @@
item.initVal = posterType
} else if (item.key === 'fixStyle') {
item.initVal = fixStyle
+ } else if (item.key === 'color') {
+ if (value === 'splitline') {
+ item.initVal = '#EBE9E9'
+ }
}
return item
@@ -226,7 +230,9 @@
showType: card.showType || 'line',
formlist: _formlist
}, () => {
- if (value === 'slider') {
+ if (value === 'splitline') {
+ this.props.form.setFieldsValue({width: 24, color: '#EBE9E9'})
+ } else if (value === 'slider') {
this.props.form.setFieldsValue({width: 24, color: '#1890ff'})
} else if (value === 'qrcode') {
this.props.form.setFieldsValue({color: '#000000'})
--
Gitblit v1.8.0