From 0c84df247914f893ef5e41d57a422e10a2dc814c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 12 十一月 2021 17:02:06 +0800
Subject: [PATCH] 2021-11-12
---
src/templates/modalconfig/dragelement/card.jsx | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 847e429..0b25add 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -1,6 +1,7 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form } from 'antd'
+import { Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form } from 'antd'
+import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined } from '@ant-design/icons'
import moment from 'moment'
import asyncComponent from '@/utils/asyncComponent'
@@ -64,8 +65,9 @@
}
let formItem = null
+ let className = 'ant-form-item'
if (card.type === 'text') {
- formItem = (<Input style={{marginTop: '4px'}} value={card.initval} />)
+ formItem = (<Input style={{marginTop: '4px'}} placeholder={card.placeholder || ''} value={card.initval} />)
} else if (card.type === 'number') {
formItem = (<InputNumber value={card.initval} precision={card.decimal} />)
} else if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
@@ -79,11 +81,11 @@
} else if (card.type === 'datetime') {
formItem = (<DatePicker showTime value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
} else if (card.type === 'textarea') {
- formItem = (<TextArea value={card.initval} autoSize={{ minRows: 2, maxRows: 6 }} />)
+ formItem = (<TextArea value={card.initval} placeholder={card.placeholder || ''} autoSize={{ minRows: 2, maxRows: 6 }} />)
} else if (card.type === 'brafteditor') {
formItem = (<Editor />)
} else if (card.type === 'fileupload') {
- formItem = (<Button style={{marginTop: '3px'}}><Icon type="upload" /> 鐐瑰嚮涓婁紶 </Button>)
+ formItem = (<Button style={{marginTop: '3px'}}><UploadOutlined /> 鐐瑰嚮涓婁紶 </Button>)
} else if (card.type === 'funcvar') {
formItem = (<Input style={{marginTop: '4px'}} value={card.linkfield} />)
} else if (card.type === 'linkMain') {
@@ -114,12 +116,13 @@
} else if (card.type === 'split') {
formItem = <div className="split-line">{card.label}</div>
} else if (card.type === 'checkcard') {
- formItem = <CheckCard width={card.width} ratio={card.ratio} display={card.display} fields={card.fields} options={card.options} />
+ className += ' checkcard'
+ formItem = <CheckCard config={card} />
}
let _label = card.label
if (card.tooltip) {
- _label = <span><Icon type="question-circle" />{card.label}</span>
+ _label = <span><QuestionCircleOutlined className="mk-form-tip" />{card.label}</span>
}
if (card.type === 'brafteditor' && card.hidelabel === 'true') {
_label = null
@@ -128,15 +131,15 @@
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} />
+ <CloseOutlined className="close" onClick={close} />
</div>
} trigger="hover">
<div className="page-card" style={{ opacity: opacity}}>
- <div ref={node => drag(drop(node))}>
+ <div ref={node => drag(drop(node))} onDoubleClick={edit}>
{card.type === 'split' ? formItem : <Form.Item
- className="ant-form-item"
+ className={className}
colon={!!_label}
label={_label}
required={card.required === 'true'}
--
Gitblit v1.8.0