From f6a1ab6a58215cf7546976a86eb6face1a7be32f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 30 七月 2021 15:37:17 +0800
Subject: [PATCH] 2021-07-30
---
src/mob/components/formdragelement/card.jsx | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index cef6188..bf36729 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -60,7 +60,7 @@
let formItem = null
if (card.type === 'text' || card.type === 'number') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval}</div>{card.scan === 'true' ? <div className="am-list-extra"><Icon type="scan" /></div> : null}</div></div>)
+ formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval}</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><Icon type="scan" /></div> : null}</div></div>)
} else if (card.type === 'number') {
formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval}</div></div></div>)
} else if (card.type === 'select' || card.type === 'link') {
@@ -78,7 +78,7 @@
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
<div style={{textAlign: 'left', position: 'relative', height, lineHeight: 1.5}}>
- {card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>璇疯緭鍏�</span> }
+ {card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span> }
{card.count === 'true' ? <span style={{position: 'absolute', right: 0, bottom: 0}}>0/{card.fieldlength}</span> : null}
</div>
</div>
@@ -113,16 +113,18 @@
}
formItem = (
- <div className="am-list-item checkbox">
+ <div className={'am-list-item checkbox mk-radio ' + (card.arrange || '')}>
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
- <div className="mk-radio-group">
+ {card.arrange !== 'line' ? <Checkbox.Group value={[card.initval]}>
+ {options.map(cell => <Checkbox key={cell.key} value={cell.Value}>{cell.Text}</Checkbox>)}
+ </Checkbox.Group> : <div className="mk-radio-group">
{options.map(cell => (<div key={cell.key} className="mk-radio-wrapper">
<span className="radio-value">{cell.Text}</span>
<span className={'radio-check ' + (card.initval === cell.Value ? 'checked' : '')}></span>
</div>))}
- </div>
+ </div>}
</div>
</div>
</div>)
@@ -140,7 +142,7 @@
}
formItem = (
- <div className="am-list-item checkbox">
+ <div className={'am-list-item checkbox ' + (card.arrange || '')}>
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
@@ -166,9 +168,9 @@
} else if (card.type === 'checkcard') {
formItem = (<div className="am-list-item check-card">
<div className="am-list-line">
- <div className="am-input-label">{card.label}</div>
+ {card.hidelabel !== 'true' ? <div className="am-input-label">{card.label}</div> : null}
<div className="am-input-control">
- <CheckCard config={card} />
+ <CheckCard config={card} />
</div>
</div>
</div>)
@@ -185,7 +187,7 @@
<div className="page-card" style={{ opacity: opacity}}>
<div ref={node => drag(drop(node))}>
{card.type === 'split' ? formItem : <Form.Item
- className={'ant-form-item ' + (card.required === 'true' ? 'required' : '')}
+ className={'ant-form-item' + (card.required === 'true' ? ' required' : '') + (card.splitline === 'false' ? ' no-boder' : '')}
>
{formItem}
{showField ? <div className="field-name">{card.field}{card.hidden === 'true' ? '(闅愯棌)' : ''}</div> : ''}
--
Gitblit v1.8.0