From a9ac16fecc0cf9bc66dfaefe4e9b35fa3c722812 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 16:58:43 +0800
Subject: [PATCH] 2020-11-10
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index d2748f7..25490a1 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -16,7 +16,10 @@
icon: ['eleType', 'icon', 'datatype', 'width'],
link: ['eleType', 'datatype', 'label', 'width', 'height', 'joint'],
slider: ['eleType', 'datatype', 'width', 'color', 'maxValue'],
- splitline: ['eleType', 'color', 'width'],
+ splitline: ['eleType', 'color', 'width', 'borderWidth'],
+ barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval'],
+ qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url'],
+ currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix'],
}
class MainSearch extends Component {
@@ -73,7 +76,7 @@
getOptions = (eleType, datatype) => {
let _options = fromJS(cardTypeOptions[eleType]).toJS() // 閫夐」鍒楄〃
- if (['text', 'number', 'picture', 'link', 'slider'].includes(eleType)) {
+ if (['text', 'number', 'picture', 'link', 'slider', 'barcode', 'qrcode'].includes(eleType)) {
if (datatype === 'dynamic') {
_options.push('field')
} else if (eleType !== 'picture') {
--
Gitblit v1.8.0