From 3b103caa6bfc9ed410e67156c3ca1785bf1cecc9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 19 八月 2022 01:15:31 +0800
Subject: [PATCH] 2022-08-19
---
src/mob/components/formdragelement/card.jsx | 134 +++++++++++++++++++++++++++++++++++---------
1 files changed, 105 insertions(+), 29 deletions(-)
diff --git a/src/mob/components/formdragelement/card.jsx b/src/mob/components/formdragelement/card.jsx
index cd0b26d..2fc4c8f 100644
--- a/src/mob/components/formdragelement/card.jsx
+++ b/src/mob/components/formdragelement/card.jsx
@@ -1,14 +1,18 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Button, Popover, Switch, Checkbox, Form } from 'antd'
+import { fromJS } from 'immutable'
+import { Button, Popover, Switch, Checkbox, Form, Rate } from 'antd'
+import { ScanOutlined, RightOutlined, PlusOutlined, StarFilled, EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
+import MkIcon from '@/components/mk-icon'
+import MKEmitter from '@/utils/events.js'
import './index.scss'
const CheckCard = asyncComponent(() => import('@/templates/modalconfig/checkCard'))
-const Card = ({ id, card, moveCard, findCard, editCard, closeCard, copyCard, showField }) => {
+const Card = ({ id, card, moveCard, findCard, editCard, closeCard, copyCard, showField, setStyle }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'form', id, originalIndex },
@@ -30,7 +34,7 @@
}
}
})
- const opacity = isDragging ? 0 : 1
+ const opacity = isDragging ? 0.5 : 1
const edit = () => {
editCard(id)
@@ -44,6 +48,20 @@
copyCard(id)
}
+ const changeStyle = () => {
+ let options = ['font1', 'margin']
+ let style = fromJS(card.style || {}).toJS()
+
+ if (card.marginTop && !style.marginTop) { // 澶栬竟璺濊缃浆绉�
+ style.marginTop = card.marginTop
+ }
+ if (card.marginBottom && !style.marginBottom) {
+ style.marginBottom = card.marginBottom
+ }
+
+ MKEmitter.emit('changeStyle', options, style, (s) => {setStyle(s, id)})
+ }
+
let selectval = ''
if (card.type === 'select' || card.type === 'link') {
if (card.initval) {
@@ -53,28 +71,60 @@
} else {
selectval = ''
}
- } else if (card.setAll === 'true') {
- selectval = card.emptyText || '绌�'
}
}
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>)
+ if (card.type === 'text' || card.type === 'linkMain') {
+ 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"><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') {
- 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"><Icon type="right" /></div></div></div>)
+ 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'}}><span style={{color: 'transparent'}}>input</span></span> }</div>{card.placeholder ? <div className="am-list-extra" style={{color: '#999999', width: 'auto', lineHeight: 1.5}}>{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>)
} else if (card.type === 'date') {
- 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') : '璇烽�夋嫨'}</div><div className="am-list-extra"><Icon type="right" /></div></div></div>)
+ let format = 'YYYY-MM-DD'
+ if (card.precision === 'hour') {
+ format = 'YYYY-MM-DD HH'
+ } else if (card.precision === 'minute') {
+ format = 'YYYY-MM-DD HH:mm'
+ } 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>)
} 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"><Icon type="right" /></div></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.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"><Icon type="right" /></div></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.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') {
- // formItem = (<TextareaItem title={card.label} autoHeight />)
+ let height = (card.maxRows || 2) * 25
+ formItem = (<div className="am-list-item check-card">
+ <div className="am-list-line">
+ <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'}}>{card.placeholder || ''}</span> }
+ {card.count === 'true' ? <span style={{position: 'absolute', right: 0, bottom: 0}}>0/{card.fieldlength}</span> : null}
+ </div>
+ </div>
+ </div>
+ </div>)
+ } else if (card.type === 'rate') {
+ formItem = (<div className={'am-list-item ' + (card.place || '')}><div className="am-list-line"><div className="am-input-label">{card.label}</div><div style={{textAlign: 'left'}} className={'am-input-control ' + (card.place === 'up_down' ? 'left' : '')}>
+ <Rate value={card.initval || 0} count={card.rateCount || 5} character={card.character ? <MkIcon type={card.character}/> : <StarFilled />} allowHalf={card.allowHalf === 'true'} />
+ </div></div></div>)
} else if (card.type === 'fileupload') {
- formItem = (<Button style={{marginTop: '3px'}}><Icon type="upload" /> 鐐瑰嚮涓婁紶 </Button>)
+ formItem = (
+ <div className="am-list-item checkbox">
+ <div className="am-list-line">
+ <div className="am-input-label">{card.label}</div>
+ <div className="am-input-control" style={{textAlign: 'left'}}>
+ <Button style={{width: '100px', marginBottom: '10px', height: '100px', fontSize: '50px', color: '#d9d9d9'}}><PlusOutlined /></Button>
+ </div>
+ </div>
+ </div>
+ )
} else if (card.type === 'funcvar') {
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.linkfield}</div></div></div>)
} else if (card.type === 'switch') {
@@ -92,16 +142,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>)
@@ -119,7 +171,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">
@@ -140,35 +192,59 @@
</div>
</div>
</div>
+ } else if (card.type === 'formula') {
+ formItem = <div className="am-list-item formula">
+ <div className="am-list-line">
+ <div className="am-input-label">{card.label}</div>
+ <div className="am-input-control">
+ {card.formula}{card.postfix || ''}
+ </div>
+ </div>
+ </div>
} 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">
<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 width={card.width} ratio={card.ratio} display={card.display} fields={card.fields} options={card.options} />
+ <CheckCard config={card} />
</div>
</div>
</div>)
}
+ let style = {...card.style}
+
+ if (card.marginTop && !style.marginTop) { // 澶栬竟璺濊缃浆绉�
+ style.marginTop = card.marginTop
+ }
+ if (card.marginBottom && !style.marginBottom) {
+ style.marginBottom = card.marginBottom
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
<div className="mk-popover-control">
- <Icon className="edit" type="edit" onClick={edit} />
- <Icon className="copy" type="copy" onClick={copy} />
- <Icon className="close" type="close" onClick={close} />
+ <EditOutlined className="edit" onClick={edit} />
+ <CopyOutlined className="copy" onClick={copy} />
+ <FontColorsOutlined className="style" onClick={changeStyle} />
+ <CloseOutlined className="close" onClick={close} />
</div>
} trigger="hover">
<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' : '')}
+ <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' : '')}
>
{formItem}
- {showField ? <div className="field-name">{card.field}{card.hidden === 'true' ? '(闅愯棌)' : ''}</div> : ''}
- </Form.Item>}
+ <div></div>
+ {showField && card.field ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
+ {card.field}{card.hidden === 'true' || card.type === 'funcvar' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}{card.linkField ? <span style={{color: '#1890ff'}}>{`锛堝叧鑱�${card.linkField}锛塦}</span> : ''}{card.supField ? <span style={{color: '#8E44AD'}}>{`锛堜笂绾�${card.supField}锛塦}</span> : ''}
+ </div> : ''}
+ </Form.Item>
</div>
</div>
</Popover>
--
Gitblit v1.8.0