From 2292d1826e69e21c8a411c217faef635fe57d458 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 07 一月 2021 10:48:49 +0800
Subject: [PATCH] Merge branch 'bms' of ssh://39.106.218.81:29418/~jinfei/pc-plat into bms
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 9f8f546..a65a2cf 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -22,6 +22,7 @@
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
+const Video = asyncComponent(() => import('@/components/video'))
class CardCellComponent extends Component {
static propTpyes = {
@@ -428,6 +429,22 @@
</div>
</Col>
)
+ } else if (card.eleType === 'video') {
+ let url = ''
+
+ if (card.datatype === 'static') {
+ url = card.url
+ } else {
+ url = data[card.field] || ''
+ }
+
+ return (
+ <Col key={card.uuid} span={card.width}>
+ <div style={card.style}>
+ <Video card={card} value={url}/>
+ </div>
+ </Col>
+ )
} else if (card.eleType === 'qrcode') {
let val = ''
@@ -498,7 +515,6 @@
show={card.show}
style={card.btnstyle}
setting={cards.setting}
- // getexceloutparam={getexceloutparam}
updateStatus={this.props.updateStatus}
/>
</div>
--
Gitblit v1.8.0