From d1cd5af5adb53e91efdd278328e1b6f8ad834fb5 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期四, 06 二月 2025 21:11:56 +0800 Subject: [PATCH] Merge branch 'positec' into dms --- src/mob/components/formdragelement/index.jsx | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/src/mob/components/formdragelement/index.jsx b/src/mob/components/formdragelement/index.jsx index 7ff6d39..63cccb9 100644 --- a/src/mob/components/formdragelement/index.jsx +++ b/src/mob/components/formdragelement/index.jsx @@ -1,7 +1,7 @@ import React, { useState } from 'react' import { useDrop } from 'react-dnd' import { is, fromJS } from 'immutable' -import { Col } from 'antd' +import { Col, message } from 'antd' import update from 'immutability-helper' import Utils from '@/utils/utils.js' import Card from './card' @@ -42,6 +42,14 @@ closeForm(card) } + const setStyle = (style, id) => { + const { card, index } = findCard(id) + + const _cards = update(cards, { $splice: [[index, 1, {...card, style}]] }) + + handleList(_cards) + } + const copyCard = id => { const { card, index: overIndex } = findCard(id) @@ -54,12 +62,7 @@ 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 - } + _card.$copy = true oInput.value = window.btoa(window.encodeURIComponent(JSON.stringify(val))) document.body.appendChild(oInput) @@ -69,11 +72,15 @@ oInput.style.display = 'none' document.body.removeChild(oInput) - const _cards = update(cards, { $splice: [[overIndex + 1, 0, _card]] }) + if (window.GLOB.CopyOnly) { + message.success('澶嶅埗鎴愬姛銆�') + } else { + const _cards = update(cards, { $splice: [[overIndex + 1, 0, _card]] }) - setCards(_cards) + setCards(_cards) - handleList(_cards, _card) + handleList(_cards, _card) + } } const [, drop] = useDrop({ @@ -91,7 +98,16 @@ newcard.options = [] newcard.readonly = 'false' newcard.required = 'true' + newcard.readin = 'top' + newcard.span = 24 newcard.focus = true + + if (item.subType === 'linkMain') { + newcard.hidden = 'true' + newcard.verifyVal = 'true' + } else if (item.subType === 'textarea') { + newcard.required = 'false' + } let targetId = '' @@ -138,6 +154,7 @@ showField={showField} moveCard={moveCard} editCard={editCard} + setStyle={setStyle} closeCard={closeCard} copyCard={copyCard} findCard={findCard} -- Gitblit v1.8.0