From 2b46797c3a5868f7f26329da5834c13aae07ad69 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 03 四月 2023 11:59:34 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/mob/components/formdragelement/card.jsx | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index 1ca1c3b..e019a9f 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -79,10 +79,8 @@
formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval ? card.initval : <span style={{color: '#bcbcbc'}}>{card.placeholder || <span style={{color: 'transparent'}}>input</span>}</span> }</div>{card.scan && card.scan !== 'false' ? <div className="am-list-extra"><ScanOutlined /></div> : null}</div></div>)
} else if (card.type === 'number') {
formItem = (<div className={'am-list-item input ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval || 0}</div>{card.placeholder ? <div className="am-list-extra" style={{color: '#999999', width: 'auto', lineHeight: 1.5, height: '22px'}}>{card.placeholder}</div> : null}</div></div>)
- } else if (card.type === 'number') {
- formItem = (<div className="am-list-item input"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className={'am-input-control ' + card.cursor}>{card.initval || <span style={{color: 'transparent'}}>input</span>}</div></div></div>)
} else if (card.type === 'select' || card.type === 'link' || card.type === 'cascader') {
- formItem = (<div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{selectval || '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className={'am-list-item picker ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{selectval || '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'date') {
let format = 'YYYY-MM-DD'
if (card.precision === 'hour') {
@@ -92,14 +90,14 @@
} else if (card.precision === 'second') {
format = 'YYYY-MM-DD HH:mm:ss'
}
- 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.initval ? moment().subtract(card.initval, 'days').format(format) : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className={'am-list-item picker ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'days').format(format) : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'datemonth') {
- 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.initval ? moment().subtract(card.initval, 'month').format('YYYY-MM') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
+ formItem = (<div className={'am-list-item picker ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control">{card.initval ? moment().subtract(card.initval, 'month').format('YYYY-MM') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'datetime') {
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.initval ? moment().subtract(card.initval, 'days').format('YYYY-MM-DD HH:mm') : '璇烽�夋嫨'}</div><div className="am-list-extra"><RightOutlined /></div></div></div>)
} else if (card.type === 'textarea') {
let height = (card.maxRows || 2) * 25
- formItem = (<div className="am-list-item check-card">
+ formItem = (<div className={'am-list-item check-card ' + (card.place || '')}>
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
@@ -142,7 +140,7 @@
}
formItem = (
- <div className={'am-list-item checkbox mk-radio ' + (card.arrange || '')}>
+ <div className={'am-list-item checkbox mk-radio ' + (card.arrange || '') + ' ' + (card.place || '')}>
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
@@ -171,7 +169,7 @@
}
formItem = (
- <div className={'am-list-item checkbox ' + (card.arrange || '')}>
+ <div className={'am-list-item checkbox ' + (card.arrange || '') + ' ' + (card.place || '')}>
<div className="am-list-line">
<div className="am-input-label">{card.label}</div>
<div className="am-input-control">
@@ -204,7 +202,7 @@
} else if (card.type === 'split') {
formItem = <div className="split-line">{card.label}</div>
} else if (card.type === 'checkcard') {
- formItem = (<div className="am-list-item check-card">
+ formItem = (<div className={'am-list-item check-card ' + (card.place || '')}>
<div className="am-list-line">
{card.hidelabel !== 'true' ? <div className="am-input-label">{card.label}</div> : null}
<div className="am-input-control">
@@ -214,6 +212,12 @@
</div>)
} else if (card.type === 'vercode') {
formItem = <div className="am-list-item"><div className="am-list-line"><div className="am-input-label">{card.label}</div><div className="am-input-control"><span style={{color: '#bcbcbc'}}>{card.placeholder || ''}</span></div><div className="am-list-extra" style={{width: 'auto', height: 'auto', backgroundColor: '#fafafa', padding: '0 15px'}}>鑾峰彇楠岃瘉鐮�</div></div></div>
+ }
+
+ let className = `${card.required === 'true' ? 'required' : ''} ${card.type === 'split' ? 'split-wrap' : ''} ${card.splitline === 'false' ? 'no-boder' : ''}`
+
+ if (window.GLOB.formId === card.uuid) {
+ className += ' actived'
}
let style = {...card.style}
@@ -238,8 +242,7 @@
<div ref={node => drag(drop(node))} style={{ border: '0.5px solid transparent'}} onDoubleClick={edit}>
<Form.Item
style={style}
- // style={{marginTop: card.marginTop || 0, marginBottom: card.marginBottom || 0}}
- className={(card.required === 'true' ? ' required' : '') + (card.type === 'split' ? ' split-wrap' : '') + (card.splitline === 'false' ? ' no-boder' : '')}
+ className={className}
>
{formItem}
<div></div>
--
Gitblit v1.8.0