From eebe63a6727e6495321d1433ebd2779b5a36d45a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 31 十二月 2020 22:08:14 +0800
Subject: [PATCH] 2020-12-31
---
src/menu/menushell/card.jsx | 50 ++++++++++++++++++++++++++++++++------------------
1 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/src/menu/menushell/card.jsx b/src/menu/menushell/card.jsx
index 1a4e8e7..15108b4 100644
--- a/src/menu/menushell/card.jsx
+++ b/src/menu/menushell/card.jsx
@@ -1,17 +1,22 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon } from 'antd'
import asyncComponent from '@/utils/asyncComponent'
import './index.scss'
const AntvBar = asyncComponent(() => import('@/menu/components/chart/antv-bar'))
+const MainSearch = asyncComponent(() => import('@/menu/components/search/main-search'))
+const AntvPie = asyncComponent(() => import('@/menu/components/chart/antv-pie'))
const AntvTabs = asyncComponent(() => import('@/menu/components/tabs/antv-tabs'))
+const DataCard = asyncComponent(() => import('@/menu/components/card/data-card'))
+const PropCard = asyncComponent(() => import('@/menu/components/card/prop-card'))
+const TableCard = asyncComponent(() => import('@/menu/components/card/table-card'))
+const NormalTable = asyncComponent(() => import('@/menu/components/table/normal-table'))
-const Card = ({ id, menu, card, moveCard, findCard, delCard, hasDrop, doubleClickCard, updateConfig }) => {
+const Card = ({ id, card, moveCard, findCard, delCard, updateConfig }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
- item: { type: 'menu', id, originalIndex },
+ item: { type: 'menu', id, originalIndex, floor: card.floor },
collect: monitor => ({
isDragging: monitor.isDragging(),
}),
@@ -20,17 +25,16 @@
accept: 'menu',
canDrop: () => true,
drop: (item) => {
- if (!item.hasOwnProperty('originalIndex')) {
- hasDrop(card)
+ const { id: draggedId, originalIndex, floor } = item
+ if (originalIndex === undefined) {
+ item.dropTargetId = id
+ } else if (draggedId && floor === card.floor) {
+ if (draggedId !== id) {
+ const { index: overIndex } = findCard(id)
+ moveCard(draggedId, overIndex)
+ }
}
- },
- hover({ id: draggedId }) {
- if (!draggedId) return
- if (draggedId !== id) {
- const { index: overIndex } = findCard(id)
- moveCard(draggedId, overIndex)
- }
- },
+ }
})
let style = { opacity: 1}
@@ -40,16 +44,26 @@
const getCardComponent = () => {
if (card.type === 'bar' || card.type === 'line') {
- return (<AntvBar menu={menu} card={card} updateConfig={updateConfig} />)
+ return (<AntvBar card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'search') {
+ return (<MainSearch card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'pie') {
+ return (<AntvPie card={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
} else if (card.type === 'tabs') {
- return (<AntvTabs menu={menu} tabs={card} updateConfig={updateConfig} />)
+ return (<AntvTabs tabs={card} updateConfig={updateConfig} deletecomponent={delCard}/>)
+ } else if (card.type === 'card' && card.subtype === 'datacard') {
+ 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 === 'table' && 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}/>)
}
}
-
return (
- <div className={'ant-col mk-component-card ant-col-' + (card.setting ? card.setting.span : 12)} ref={node => drag(drop(node))} style={style}>
+ <div className={'ant-col mk-component-card ant-col-' + (card.width || 24)} ref={node => drag(drop(node))} style={style}>
{getCardComponent()}
- <Icon className="remove-component" title="delete" type="delete" onClick={() => delCard(id)} />
</div>
)
}
--
Gitblit v1.8.0