From f3d4db769ba9b51b799d981511a710fd443d0e08 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 四月 2025 12:18:03 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/mob/mobshell/card.jsx | 54 ++++++++++++++++++++++++++++++++++++------------------
1 files changed, 36 insertions(+), 18 deletions(-)
diff --git a/src/mob/mobshell/card.jsx b/src/mob/mobshell/card.jsx
index 263391c..ca91322 100644
--- a/src/mob/mobshell/card.jsx
+++ b/src/mob/mobshell/card.jsx
@@ -29,8 +29,12 @@
const CommonMenuBar = asyncComponent(() => import('@/mob/components/menubar/common-menubar'))
const Balcony = asyncComponent(() => import('@/menu/components/card/balcony'))
const Timeline = asyncComponent(() => import('@/menu/components/timeline/normal-timeline'))
+const OfficialAccount = asyncComponent(() => import('@/mob/components/official'))
+const ShareCode = asyncComponent(() => import('@/mob/components/sharecode'))
+const Iframe = asyncComponent(() => import('@/menu/components/iframe'))
+const DoubleDataCard = asyncComponent(() => import('@/menu/components/card/double-data-card'))
-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 },
@@ -64,22 +68,28 @@
style = { opacity: 0.3}
}
- let 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
+ if (card.style && card.style.clear === 'left') {
+ style.clear = 'left'
+ } else if (card.style && card.style.clear === 'right') {
+ style.float = 'right'
}
+
+ let 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') {
@@ -104,16 +114,18 @@
return (<DataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'card' && card.subtype === 'propcard') {
return (<PropCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'card' && card.subtype === 'dualdatacard') {
+ return (<DoubleDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'carousel' && card.subtype === 'datacard') {
return (<CarouselDataCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'carousel' && card.subtype === 'propcard') {
return (<CarouselPropCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
- } else if (card.type === 'table' && card.subtype === 'tablecard') {
+ } else if (card.type === 'card' && card.subtype === 'tablecard') {
return (<TableCard card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'table' && card.subtype === 'normaltable') {
return (<NormalTable 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 === 'code') {
return (<CodeSandbox card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'editor') {
@@ -132,6 +144,12 @@
return (<Balcony card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'timeline') {
return (<Timeline card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'officialAccount') {
+ return (<OfficialAccount card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'iframe') {
+ return (<Iframe card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'sharecode') {
+ return (<ShareCode card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
}
}
--
Gitblit v1.8.0