From a9ac16fecc0cf9bc66dfaefe4e9b35fa3c722812 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 10 十一月 2020 16:58:43 +0800
Subject: [PATCH] 2020-11-10
---
src/menu/components/card/cardcellcomponent/dragaction/card.jsx | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
index d5741ea..e71af59 100644
--- a/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
+++ b/src/menu/components/card/cardcellcomponent/dragaction/card.jsx
@@ -1,13 +1,19 @@
import React from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { Icon, Popover } from 'antd'
-import './index.scss'
+import moment from 'moment'
import demo1 from '@/assets/img/demo1.jpg'
import demo2 from '@/assets/img/demo2.jpg'
import demo3 from '@/assets/img/demo3.jpg'
import demo4 from '@/assets/img/demo4.jpg'
import demo5 from '@/assets/img/demo5.jpg'
+import asyncComponent from '@/utils/asyncComponent'
+
+import './index.scss'
+
+const BarCode = asyncComponent(() => import('@/components/barcode'))
+const QrCode = asyncComponent(() => import('@/components/qrcode'))
const Card = ({ id, cardIds, card, moveCard, findCard, editCard, delCard, copyCard, changeStyle }) => {
const originalIndex = findCard(id).index
@@ -94,9 +100,28 @@
<div className="ant-mk-picture" style={_imagestyle}></div>
)
} else if (card.eleType === 'splitline') {
+ let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
return (
<div style={{paddingTop: '1px'}}>
- <div className="ant-mk-splitline" style={{borderColor: card.color}}></div>
+ <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
+ </div>
+ )
+ } else if (card.eleType === 'barcode') {
+ return (
+ <div style={{height: card.innerHeight || 25}}>
+ <BarCode card={card} value={card.value || 'mksoft'}/>
+ </div>
+ )
+ } else if (card.eleType === 'qrcode') {
+ return (
+ <div style={{minHeight: card.qrWidth || 50}}>
+ <QrCode card={card} value={card.value || 'mksoft'}/>
+ </div>
+ )
+ } else if (card.eleType === 'currentDate') {
+ return (
+ <div className="ant-mk-date">
+ {`${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}`}
</div>
)
}
--
Gitblit v1.8.0