From e9c48bd7356462ba9257540b130a47a65ad1861d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 26 八月 2021 17:17:11 +0800
Subject: [PATCH] 2021-08-26
---
src/menu/components/card/cardcellcomponent/elementform/index.jsx | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/elementform/index.jsx b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
index 38de87f..1a5f1d4 100644
--- a/src/menu/components/card/cardcellcomponent/elementform/index.jsx
+++ b/src/menu/components/card/cardcellcomponent/elementform/index.jsx
@@ -10,6 +10,7 @@
const { TextArea } = Input
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
const SourceComponent = asyncComponent(() => import('@/menu/components/share/sourcecomponent'))
+const MkIcon = asyncComponent(() => import('@/components/mkIcon'))
const cardTypeOptions = {
sequence: ['eleType', 'width'],
@@ -23,6 +24,7 @@
barcode: ['eleType', 'datatype', 'width', 'barHeight', 'displayValue', 'interval'],
qrcode: ['eleType', 'datatype', 'width', 'qrWidth', 'color', 'url'],
currentDate: ['eleType', 'width', 'dateFormat', 'prefix', 'postfix'],
+ formula: ['eleType', 'width', 'height', 'prefix', 'postfix', 'formula'],
}
class MainSearch extends Component {
@@ -55,12 +57,12 @@
if (item.key === 'field' || item.key === 'linkurl') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (card.eleType === 'number' || card.eleType === 'slider')) {
item.options.push({
value: col.field,
text: col.label
})
- } else if (/^Nvarchar/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
+ } else if (/^(Nvarchar|date)/ig.test(col.datatype) && card.eleType !== 'number' && card.eleType !== 'slider') {
item.options.push({
value: col.field,
text: col.label
@@ -108,6 +110,8 @@
} else if (link === 'linkpage') {
_options.push('linkmenu', 'joint', 'open')
}
+ } else if (eleType === 'picture' && !link) {
+ _options.push('scale')
}
} else if (eleType === 'icon') {
if (datatype === 'dynamic') {
@@ -139,12 +143,12 @@
if (item.key === 'field') {
item.options = []
config.columns.forEach(col => {
- if (!/^Nvarchar/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
+ if (/^(Int|Decimal)/ig.test(col.datatype) && (value === 'number' || value === 'slider')) {
item.options.push({
value: col.field,
text: col.label
})
- } else if (/^Nvarchar/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
+ } else if (/^(Nvarchar|date)/ig.test(col.datatype) && value !== 'number' && value !== 'slider') {
item.options.push({
value: col.field,
text: col.label
@@ -298,7 +302,7 @@
message: formRule.input.message
}
]
- })(<TextArea rows={2} disabled={item.readonly} />)}
+ })(<TextArea rows={2} disabled={item.readonly} placeholder={item.placeholder || ''} />)}
</Form.Item>
</Col>
)
@@ -353,6 +357,27 @@
</Form.Item>
</Col>
)
+ } else if (item.type === 'icon') {
+ fields.push(
+ <Col span={12} key={index}>
+ <Form.Item label={item.tooltip ?
+ <Tooltip placement="topLeft" title={item.tooltip}>
+ <Icon type="question-circle" />
+ {item.label}
+ </Tooltip> : item.label
+ }>
+ {getFieldDecorator(item.key, {
+ initialValue: item.initVal || '',
+ rules: [{
+ required: !!item.required,
+ message: this.props.dict['form.required.select'] + item.label + '!'
+ }]
+ })(
+ <MkIcon />
+ )}
+ </Form.Item>
+ </Col>
+ )
} else if (item.type === 'radio') {
fields.push(
<Col span={12} key={index}>
--
Gitblit v1.8.0