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/mob/components/formdragelement/index.jsx |   36 +++++++++++++++++++++++++-----------
 1 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/mob/components/formdragelement/index.jsx b/src/mob/components/formdragelement/index.jsx
index 38485bc..45f4207 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'
@@ -52,6 +53,13 @@
     let oInput = document.createElement('input')
     let val = JSON.parse(JSON.stringify(_card))
     val.copyType = 'form'
+
+    delete val.$srcId
+    
+    let srcid = localStorage.getItem(window.location.href.split('#')[0] + 'srcId')
+    if (srcid) {
+      val.$srcId = srcid
+    }
 
     oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val)))
     document.body.appendChild(oInput)
@@ -114,17 +122,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