From bdfec44c9f3a37dbbe05bf14a252ffec04132a86 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 21:24:28 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/templates/modalconfig/dragelement/card.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/templates/modalconfig/dragelement/card.jsx b/src/templates/modalconfig/dragelement/card.jsx
index 3b2f64f..d4dc506 100644
--- a/src/templates/modalconfig/dragelement/card.jsx
+++ b/src/templates/modalconfig/dragelement/card.jsx
@@ -16,7 +16,7 @@
const ColorSketch = asyncComponent(() => import('@/mob/colorsketch'))
const CheckCard = asyncComponent(() => import('../checkCard'))
-const Card = ({ id, card, moveCard, findCard, editCard, closeCard, copyCard, showField }) => {
+const Card = ({ id, card, moveCard, findCard, editCard, closeCard, copyCard, showField, setStyle }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'form', id, originalIndex },
@@ -55,7 +55,7 @@
const changeStyle = () => {
let options = ['font1']
- MKEmitter.emit('changeStyle', ['form', card.uuid], options, card.style || {})
+ MKEmitter.emit('changeStyle', options, card.style || {}, (s) => {setStyle(s, id)})
}
let selectval = ''
--
Gitblit v1.8.0