From 5046d0d13dc6a8563b8e54e31913bc44cfa1072f Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 26 四月 2022 19:23:18 +0800
Subject: [PATCH] 2022-04-26
---
src/templates/modalconfig/dragelement/card.jsx | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 662a035..bbd5db0 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -1,11 +1,12 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox, Form, Rate } from 'antd'
-import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined, StarFilled } from '@ant-design/icons'
+import { QuestionCircleOutlined, UploadOutlined, EditOutlined, CopyOutlined, CloseOutlined, StarFilled, 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 { MonthPicker } = DatePicker
@@ -51,6 +52,12 @@
copyCard(id)
}
+ const changeStyle = () => {
+ let options = ['font']
+
+ MKEmitter.emit('changeStyle', ['form', card.uuid], options, card.style || {})
+ }
+
let selectval = ''
if (card.type === 'multiselect' || card.type === 'select' || card.type === 'link') {
if (card.initval) {
@@ -76,11 +83,19 @@
} else if (card.type === 'color') {
formItem = (<ColorSketch value={card.initval || 'transparent'}/>)
} else if (card.type === 'date') {
- formItem = (<DatePicker value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
+ 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 = (<DatePicker format={format} value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
} else if (card.type === 'datemonth') {
formItem = (<MonthPicker value={card.initval ? moment().subtract(card.initval, 'month') : null} />)
} else if (card.type === 'datetime') {
- formItem = (<DatePicker showTime value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
+ formItem = (<DatePicker format='YYYY-MM-DD HH:mm:ss' value={card.initval ? moment().subtract(card.initval, 'days') : null} />)
} else if (card.type === 'textarea') {
formItem = (<TextArea value={card.initval} placeholder={card.placeholder || ''} autoSize={{ minRows: 2, maxRows: 6 }} />)
} else if (card.type === 'brafteditor') {
@@ -115,24 +130,23 @@
<Checkbox value="D">D</Checkbox>
</Checkbox.Group>)
} else if (card.type === 'hint') {
- formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5'}}>{card.message}</div>
+ formItem = <div style={{marginTop: '10px', color: 'rgba(0, 0, 0, 0.85)', lineHeight: '1.5', ...card.style}}>{card.message}</div>
} else if (card.type === 'split') {
- formItem = <div className="split-line">{card.label}</div>
+ formItem = <div className="split-line" style={card.style}>{card.label}</div>
} else if (card.type === 'checkcard') {
className += ' checkcard'
formItem = <CheckCard config={card} />
}
- let _label = card.label
- let colon = !!card.label
+ let _label = <span className="mk-form-label" style={card.style}>{card.label}</span>
+
if (card.tooltip) {
- _label = <span><QuestionCircleOutlined className="mk-form-tip" />{card.label}</span>
+ _label = <><QuestionCircleOutlined className="mk-form-tip" /><span className="mk-form-label" style={card.style}>{card.label}</span></>
}
if (card.type === 'brafteditor' && card.hidelabel === 'true') {
_label = null
- colon = false
- } else if (card.type === 'hint') {
- _label = _label || ' '
+ } else if (card.type === 'hint' && !card.label) {
+ _label = ' '
}
return (
@@ -140,6 +154,7 @@
<div className="mk-popover-control">
<EditOutlined className="edit" onClick={edit} />
<CopyOutlined className="copy" onClick={copy} />
+ <FontColorsOutlined className="style" onClick={changeStyle} />
<CloseOutlined className="close" onClick={close} />
</div>
} trigger="hover">
@@ -147,7 +162,7 @@
<div ref={node => drag(drop(node))} onDoubleClick={edit}>
{card.type === 'split' ? formItem : <Form.Item
className={className}
- colon={colon}
+ colon={false}
label={_label}
required={card.required === 'true'}
extra={card.extra || null}
@@ -155,8 +170,9 @@
wrapperCol={card.labelwidth ? {style: {width: (100 - card.labelwidth) + '%'}} : null}
>
{formItem}
+ <div></div>
{showField ? <div className="field-name" style={card.writein === 'false' ? {color: 'orange'} : {}}>
- {card.field}{card.hidden === 'true' ? '锛堥殣钘忥級' : ''}{card.readonly === 'true' ? '锛堝彧璇伙級' : ''}
+ {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>
--
Gitblit v1.8.0