From 316877c1d9e5b6d92334f30b03d97d7e833cd934 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期二, 02 二月 2021 16:01:57 +0800 Subject: [PATCH] 2021-02-02 --- src/templates/modalconfig/dragelement/card.jsx | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx index 19e6785..75afee1 100644 --- a/src/templates/modalconfig/dragelement/card.jsx +++ b/src/templates/modalconfig/dragelement/card.jsx @@ -3,12 +3,15 @@ import { Icon, Select, DatePicker, Input, InputNumber, Button, Popover, Switch, Radio, Checkbox } from 'antd' import moment from 'moment' -import CheckCard from '../checkCard' -import ColorSketch from '@/mob/colorsketch' +import asyncComponent from '@/utils/asyncComponent' import './index.scss' const { MonthPicker } = DatePicker const { TextArea } = Input + +const Editor = asyncComponent(() => import('@/components/editor')) +const ColorSketch = asyncComponent(() => import('@/mob/colorsketch')) +const CheckCard = asyncComponent(() => import('../checkCard')) const Card = ({ id, card, cols, moveCard, findCard, editCard, closeCard, copyCard, showField }) => { const originalIndex = findCard(id).index @@ -63,7 +66,7 @@ let wrapCol = 'ant-col-sm-16' let isEntireLine = false - if (card.entireLine === 'true' || ['textarea', 'hint', 'checkcard'].includes(card.type)) { + if (card.entireLine === 'true' || ['textarea', 'hint', 'checkcard', 'brafteditor'].includes(card.type)) { isEntireLine = true } @@ -77,6 +80,9 @@ } else if (cols === '4') { labelCol = 'ant-col-sm-2' wrapCol = 'ant-col-sm-22' + } + if (card.hidelabel === 'true') { + wrapCol = 'ant-col-sm-24' } } @@ -97,6 +103,8 @@ 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 }} />) + } else if (card.type === 'brafteditor') { + formItem = (<Editor />) } else if (card.type === 'fileupload') { formItem = (<Button style={{marginTop: '3px'}}><Icon type="upload" /> 鐐瑰嚮涓婁紶 </Button>) } else if (card.type === 'funcvar') { @@ -141,11 +149,11 @@ <div className="page-card" style={{ opacity: opacity}}> <div ref={node => drag(drop(node))}> {<div className="ant-row ant-form-item"> - <div className={'ant-col ant-form-item-label ant-col-xs-24 ' + labelCol}> + {card.hidelabel !== 'true' ? <div className={'ant-col ant-form-item-label ant-col-xs-24 ' + labelCol}> {card.label ? <label className={card.required === 'true' ? 'required' : ''}>{card.tooltip ? <Icon type="question-circle" /> : null} {card.label}</label> : null} - </div> + </div> : null} <div className={'ant-col ant-form-item-control-wrapper ant-col-xs-24 ' + wrapCol}> {formItem} {showField ? card.field : ''} -- Gitblit v1.8.0