From 6ed4e1dc4b9575a22f74f57fbf90abe02b315de7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 21 十一月 2024 10:10:33 +0800
Subject: [PATCH] 2024-11-21
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 218 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 174 insertions(+), 44 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index bff2d66..1c1b983 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -1,6 +1,9 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
-import { Icon, Popover } from 'antd'
+import { Popover } from 'antd'
+import { EditOutlined, CopyOutlined, CloseOutlined, FontColorsOutlined, CaretUpOutlined, CaretDownOutlined } from '@ant-design/icons'
+
+import MkIcon from '@/components/mk-icon'
import moment from 'moment'
import demo1 from '@/assets/img/demo1.jpg'
@@ -8,16 +11,25 @@
import demo3 from '@/assets/img/demo3.jpg'
import demo4 from '@/assets/img/demo4.jpg'
import demo5 from '@/assets/img/demo5.jpg'
+import MKEmitter from '@/utils/events.js'
import asyncComponent from '@/utils/asyncComponent'
import asyncIconComponent from '@/utils/asyncIconComponent'
-
+import { resetStyle } from '@/utils/utils-custom.js'
import './index.scss'
const BarCode = asyncComponent(() => import('@/components/barcode'))
+const MkProgress = asyncComponent(() => import('./mkProgress'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
-const MarkColumn = asyncIconComponent(() => import('@/menu/components/table/normal-table/columns/markcolumn'))
+const Video = asyncComponent(() => import('@/components/video'))
+const MarkColumn = asyncIconComponent(() => import('@/menu/components/share/markcomponent'))
+const PicRadio = {
+ '4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
+ '5:1': '20%', '6:1': '16.67%', '7:1': '14.29%', '8:1': '12.5%', '9:1': '11.11%',
+ '10:1': '10%', '3:4': '133.33%', '2:3': '150%', '9:16': '177.78%'
+}
+const appType = sessionStorage.getItem('appType')
-const Card = ({ id, fields, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle, updateMarks }) => {
+const Card = ({ id, parent, fields, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle, updateMarks }) => {
const originalIndex = findCard(id).index
const [{ isDragging }, drag] = useDrag({
item: { type: 'action', id, originalIndex },
@@ -28,7 +40,13 @@
const [, drop] = useDrop({
accept: 'action',
canDrop: () => true,
- drop({ id: draggedId }) {
+ drop(item) {
+ const { id: draggedId } = item
+
+ if (item.$init) {
+ item.overIndex = id
+ }
+
if (!draggedId || draggedId === id) return
const { index: originIndex } = findCard(draggedId)
@@ -39,56 +57,83 @@
},
})
- let _style = {opacity: isDragging ? 0 : 1}
+ let _style = {opacity: isDragging ? 0.3 : 1}
- if (card.style) {
- _style = {...card.style, opacity: isDragging ? 0 : 1}
+ if (card.style && card.eleType !== 'tag') {
+ _style = {...card.style, opacity: isDragging ? 0.3 : 1}
+ _style = resetStyle(_style)
+ }
+ if (card.eleType === 'picture' && card.maxWidth) {
+ _style.maxWidth = card.maxWidth
+ let left = _style.marginLeft || 'auto'
+ let right = _style.marginRight || 'auto'
+
+ if (_style.marginLeft === '0px' && _style.marginRight === '0px') {
+ left = 'auto'
+ right = 'auto'
+ }
+
+ _style.margin = (_style.marginTop || 0) + ' ' + right + ' ' + (_style.marginBottom || 0) + ' ' + left
+ delete _style.marginLeft
+ delete _style.marginRight
+ delete _style.marginTop
+ delete _style.marginBottom
}
const getContent = () => {
if (card.eleType === 'sequence') {
return (
- <div className={'ant-mk-text'}>1</div>
+ <div style={{height: card.innerHeight || 'auto'}} className="ant-mk-text">{card.prefix || ''}1{card.postfix || ''}</div>
)
} else if (card.eleType === 'text' || card.eleType === 'number') {
let val = `${card.prefix || ''}${card.datatype === 'static' ? (card.value || '') : (card.field || '')}${card.postfix || ''}`
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{`${card.datatype === 'static' ? (card.value || '') : (card.field || '')}`}<span style={_s}>{card.postfix || ''}</span></>
+ }
+ if (card.sortField) {
+ val = <><span>{val}</span><span className="sort-wrap"><CaretUpOutlined /><CaretDownOutlined /></span></>
+ }
return (
- <div className={'ant-mk-text line' + card.height} style={{height: card.innerHeight || 21}}>{val}</div>
+ <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
)
} else if (card.eleType === 'icon') {
- return (<Icon type={card.icon}/>)
+ if (card.tipType === 'text') {
+ return <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{card.value || card.field || ''}</div>
+ }
+ return (<MkIcon style={{height: card.innerHeight || 'auto'}} className="ant-mk-icon" type={card.icon || 'bell'}/>)
} else if (card.eleType === 'slider') {
let val = card.value ? (card.value / card.maxValue) * 100 : 30
- return (
- <div className="ant-mk-slider">
- <div className="ant-mk-slider-rail"></div>
- <div className="ant-mk-slider-track" style={{width: `${val}%`, backgroundColor: card.color}}></div>
- <div className="ant-mk-slider-handle" style={{left: `${val}%`, borderColor: card.color}}></div>
- </div>
- )
+ return <MkProgress value={val} config={card}/>
+ // return (
+ // <div className="ant-mk-slider">
+ // <div className="ant-mk-slider-rail"></div>
+ // <div className="ant-mk-slider-track" style={{width: `${val}%`, backgroundColor: card.color}}></div>
+ // <div className="ant-mk-slider-handle" style={{left: `${val}%`, borderColor: card.color}}></div>
+ // </div>
+ // )
} else if (card.eleType === 'picture') {
- let _imagestyle = {}
+ let _imagestyle = {
+ backgroundSize: card.style.backgroundSize || 'cover',
+ backgroundPosition: card.style.backgroundPosition || 'center',
+ backgroundRepeat: card.style.backgroundRepeat || 'no-repeat',
+ borderRadius: card.style.borderRadius || 0
+ }
+ let url = card.url !== '@icon@' ? card.url : sessionStorage.getItem('CloudAvatar')
- if (card.url) {
- _imagestyle = {backgroundImage: `url('${card.url}')`}
+ if (url) {
+ url = url.replace(/@mywebsite@\//ig, window.GLOB.baseurl)
+ _imagestyle.backgroundImage = `url('${url}')`
} else {
let index = card.uuid.match(/\d{1}/g)
index = index.slice(-1)[0] % 5
let demos = [demo1, demo2, demo3, demo4, demo5]
- _imagestyle = {backgroundImage: `url('${demos[index]}')`}
+ _imagestyle.backgroundImage = `url('${demos[index]}')`
}
- if (card.style && card.style.borderRadius) {
- _imagestyle.borderRadius = card.style.borderRadius
- }
-
- if (card.lenWidRadio === '16:9') {
- _imagestyle.paddingTop = '56.25%'
- } else if (card.lenWidRadio === '3:2') {
- _imagestyle.paddingTop = '66.67%'
- } else if (card.lenWidRadio === '4:3') {
- _imagestyle.paddingTop = '75%'
+ if (PicRadio[card.lenWidRadio]) {
+ _imagestyle.paddingTop = PicRadio[card.lenWidRadio]
} else {
_imagestyle.paddingTop = '100%'
}
@@ -99,7 +144,7 @@
} else if (card.eleType === 'splitline') {
let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
return (
- <div style={{paddingTop: '1px'}}>
+ <div style={{paddingTop: _borderWidth ? '1px' : '10px'}}>
<div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
</div>
)
@@ -115,27 +160,112 @@
<QrCode card={card} value={card.value || 'mksoft'}/>
</div>
)
- } else if (card.eleType === 'currentDate') {
+ } else if (card.eleType === 'video') {
+ _style.overflow = 'hidden'
return (
- <div className="ant-mk-date">
- {`${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}`}
+ <div className="video-wrap">
+ <Video card={card} poster={card.posterUrl || ''} value={card.url || 'http://qingqiumarket.cn/mkwms/Content/images/upload/20210104/trailer.mp4'}/>
</div>
+ )
+ } else if (card.eleType === 'currentDate') {
+ let val = `${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}`
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{moment().format(card.dateFormat)}<span style={_s}>{card.postfix || ''}</span></>
+ }
+ return (
+ <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>
+ {val}
+ </div>
+ )
+ } else if (card.eleType === 'formula') {
+ let val = `${card.prefix || ''}${card.formula}${card.postfix || ''}`
+ if (card.fixStyle === 'alone') {
+ let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+ val = <><span style={_s}>{card.prefix || ''}</span>{card.formula}<span style={_s}>{card.postfix || ''}</span></>
+ }
+
+ return (
+ <div className="ant-mk-text" style={{height: card.innerHeight || 'auto'}}>
+ {val}
+ </div>
+ )
+ } else if (card.eleType === 'tag') {
+ let vals = []
+ if (card.datatype === 'static') {
+ vals = card.value.split(',').filter(Boolean)
+ } else {
+ vals = [card.field || '']
+ }
+
+ let _style = resetStyle(card.style)
+
+ return (
+ <div className="ant-mk-tag">
+ {vals.map((val, index) => <span key={index} className="tag-item" style={_style}>{val}</span>)}
+ </div>
+ )
+ } else if (card.eleType === 'color') {
+ _style.overflow = 'hidden'
+ let _bgstyle = {backgroundColor: card.value || '#1890ff'}
+
+ if (PicRadio[card.lenWidRadio]) {
+ _bgstyle.paddingTop = PicRadio[card.lenWidRadio]
+ } else {
+ _bgstyle.paddingTop = '100%'
+ }
+
+ return (
+ <div style={_bgstyle}></div>
)
}
}
+ const clickComponent = (e) => {
+ if (sessionStorage.getItem('style-control') === 'true' || sessionStorage.getItem('style-control') === 'cardcell') {
+ e.stopPropagation()
+ MKEmitter.emit('clickComponent', card.uuid, parent.uuid)
+ }
+ }
+
+ let able = true
+ if ((appType === 'mob' || appType === 'pc') && parent.setting && (parent.setting.click === 'menu' || parent.setting.click === 'menus')) {
+ able = false
+ }
+
+ let _style_ = null
+
+ if (card.style && card.style.clear === 'left') {
+ _style_ = {clear: 'left'}
+ } else if (card.style && card.style.clear === 'right') {
+ _style_ = {float: 'right'}
+ }
+
+ let mark = ['text', 'number', 'slider', 'sequence', 'formula', 'icon'].includes(card.eleType)
+ if (parent.setting && parent.setting.cardRole === 'header') {
+ mark = false
+ } else if (card.eleType === 'formula' && card.eval === 'func') {
+ mark = false
+ }
+
+ let className = 'ant-col card-cell ant-col-' + card.width
+
+ if (card.noValue === 'hide') {
+ className += ' no-value-hide'
+ }
+
return (
<Popover overlayClassName="mk-popover-control-wrap" mouseLeaveDelay={0.2} mouseEnterDelay={0.2} content={
- <div className="mk-popover-control">
- <Icon className="edit" title="缂栬緫" type="edit" onClick={() => editCard(id)} />
- <Icon className="copy" title="澶嶅埗" type="copy" onClick={() => copyCard(id)} />
- <Icon className="close" title="鍒犻櫎" type="close" onClick={() => delCard(id)} />
- <Icon className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)} type="font-colors" />
- {['text', 'number'].includes(card.eleType) ? <MarkColumn columns={fields} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
+ <div className="mk-popover-control" onDoubleClick={(e) => e.stopPropagation()}>
+ <EditOutlined className="edit" title="缂栬緫" onClick={() => editCard(id)} />
+ <CopyOutlined className="copy" title="澶嶅埗" onClick={() => copyCard(id)} />
+ <CloseOutlined className="close" title="鍒犻櫎" onClick={() => delCard(id)} />
+ <FontColorsOutlined className="style" title="璋冩暣鏍峰紡" onClick={() => changeStyle(id)}/>
+ {mark ? <MarkColumn field={card.field || ''} columns={fields} type={card.eleType} marks={card.marks} onSubmit={(vals) => updateMarks({...card, marks: vals})} /> : null }
</div>
} trigger="hover">
- <div ref={node => drag(drop(node))} className={'ant-col card-cell ant-col-' + card.width}>
- <div style={_style}>
+ <div ref={node => drag(drop(node))} style={_style_} className={className}>
+ <div style={_style} onClick={clickComponent} onDoubleClick={() => able && editCard(id)} id={card.uuid}>
{getContent()}
</div>
</div>
--
Gitblit v1.8.0