From b59af63c6742fa48de8fcdba67c9b8dc2e42bf94 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 二月 2023 11:25:29 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/pc/menushell/card.jsx | 19 ++-----------------
1 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/src/pc/menushell/card.jsx b/src/pc/menushell/card.jsx
index 085daf7..e003785 100644
--- a/src/pc/menushell/card.jsx
+++ b/src/pc/menushell/card.jsx
@@ -32,7 +32,7 @@
const AntvG6 = asyncComponent(() => import('@/menu/components/chart/antv-G6'))
const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
-const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
+const Card = ({ id, card, moveCard, findCard, delCard, unGroup, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'menu', id, originalIndex },
@@ -71,21 +71,6 @@
}
let col = ' ant-col ant-col-' + (card.width || 24)
- if (card.type === 'login') {
- let height = ''
- if (card.wrap && card.wrap.height) {
- // scaleview
- height = card.wrap.height.replace(/\d+vw/ig, (word) => {
- return parseFloat(word) * (window.GLOB.winWidth || 420) / 100 + 'px'
- // return parseFloat(word) * 350 / 100 + 'px'
- }).replace(/\d+vh/ig, (word) => {
- return parseFloat(word) * (window.GLOB.winHeight || 738) / 100 + 'px'
- // return parseFloat(word) * 615 / 100 + 'px'
- })
- }
-
- style.minHeight = height
- }
const getCardComponent = () => {
if (card.type === 'bar' || card.type === 'line') {
@@ -125,7 +110,7 @@
} else if (card.type === 'table' && card.subtype === 'editable') {
return (<EditTable card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'group' && card.subtype === 'normalgroup') {
- return (<NormalGroup group={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ return (<NormalGroup group={card} updateConfig={updateConfig} unGroup={unGroup} deletecomponent={delCard}/>)
} else if (card.type === 'editor') {
return (<BraftEditor card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'code') {
--
Gitblit v1.8.0