From b03948f1f9f2998a4649d92263457255438b09b3 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期六, 12 二月 2022 17:37:51 +0800 Subject: [PATCH] 2022-02-12 --- src/mob/components/formdragelement/index.jsx | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/src/mob/components/formdragelement/index.jsx b/src/mob/components/formdragelement/index.jsx index 38485bc..410a4a4 100644 --- a/src/mob/components/formdragelement/index.jsx +++ b/src/mob/components/formdragelement/index.jsx @@ -1,6 +1,7 @@ import React, { useState } from 'react' import { useDrop } from 'react-dnd' import { is, fromJS } from 'immutable' +import { Col } from 'antd' import update from 'immutability-helper' import Utils from '@/utils/utils.js' import Card from './card' @@ -114,17 +115,23 @@ return ( <div ref={drop} className="ant-row modal-fields-row mob-form" style={style}> {cards.map(card => { - return <Card - id={card.uuid} - key={card.uuid} - card={card} - showField={showField} - moveCard={moveCard} - editCard={editCard} - closeCard={closeCard} - copyCard={copyCard} - findCard={findCard} - /> + let span = card.span || 24 + if (![24, 12, 8, 6].includes(span)) { + span = 24 + } + return <Col key={card.uuid} span={span}> + <Card + id={card.uuid} + key={card.uuid} + card={card} + showField={showField} + moveCard={moveCard} + editCard={editCard} + closeCard={closeCard} + copyCard={copyCard} + findCard={findCard} + /> + </Col> })} </div> ) -- Gitblit v1.8.0