From bf292de8879e2ce71696cb3ddc4dc8fa88d91a20 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 10 六月 2022 16:51:22 +0800
Subject: [PATCH] 2022-06-10
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 266 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 173 insertions(+), 93 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index bfbb71e..fd968c0 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1,9 +1,10 @@
import React, {Component} from 'react'
import PropTypes from 'prop-types'
import { is, fromJS } from 'immutable'
-import { Col, Tooltip, notification } from 'antd'
+import { Col, Tooltip, notification, Typography } from 'antd'
import moment from 'moment'
+// import Api from '@/api'
import asyncComponent from './asyncButtonComponent'
import asyncElementComponent from '@/utils/asyncComponent'
import { getMark } from '@/utils/utils.js'
@@ -12,6 +13,7 @@
import LostPng from '@/assets/img/lost.png'
import './index.scss'
+const { Paragraph } = Typography
const NormalButton = asyncComponent(() => import('@/tabviews/zshare/actionList/normalbutton'))
const ExcelInButton = asyncComponent(() => import('@/tabviews/zshare/actionList/excelInbutton'))
const ExcelOutButton = asyncComponent(() => import('@/tabviews/zshare/actionList/exceloutbutton'))
@@ -20,6 +22,7 @@
const NewPageButton = asyncComponent(() => import('@/tabviews/zshare/actionList/newpagebutton'))
const ChangeUserButton = asyncComponent(() => import('@/tabviews/zshare/actionList/changeuserbutton'))
const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
+const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
@@ -71,6 +74,14 @@
openNewView = (e, card) => {
const { cardCell, data, cards } = this.props
+ if (data.$disabled) return
+
+ if (card.anchors && card.anchors.length > 0) {
+ let id = card.anchors[card.anchors.length - 1]
+ let node = document.getElementById('anchor' + id)
+ node && node.scrollIntoView({behavior: 'smooth', block: 'center', inline: 'nearest'})
+ }
+
if (!card.link) return
e.stopPropagation()
@@ -104,50 +115,85 @@
return
}
- if (/^sso$/ig.test(url)) {
- if (!data.LinkUrl1) {
- notification.warning({
- top: 92,
- message: '閾炬帴鍦板潃涓嶅瓨鍦紒',
- duration: 5
- })
- return
- }
+ // positecgroup
+ // if (/^sso$/ig.test(url)) {
+ // if (!data.LinkUrl1) {
+ // notification.warning({
+ // top: 92,
+ // message: '閾炬帴鍦板潃涓嶅瓨鍦紒',
+ // duration: 5
+ // })
+ // return
+ // }
- let _url = data.LinkUrl1
- if (/index\.html/ig.test(_url)) {
- _url = _url.replace(/index\.html.*/ig, '')
- } else if (!/\/$/ig.test(_url)) {
- _url = _url + '/'
- }
+ // let _url = data.LinkUrl1
+ // if (/index\.html/ig.test(_url)) {
+ // _url = _url.replace(/index\.html.*/ig, '')
+ // } else if (!/\/$/ig.test(_url)) {
+ // _url = _url + '/'
+ // }
- url = _url + 'index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
- UserID: sessionStorage.getItem('UserID'),
- LoginUID: sessionStorage.getItem('LoginUID'),
- User_Name: sessionStorage.getItem('User_Name'),
- Full_Name: sessionStorage.getItem('Full_Name'),
- avatar: sessionStorage.getItem('avatar'),
- dataM: data.dataM ? 'true' : '',
- debug: data.debug || '',
- role_id: data.role_id || ''
- })))
+ // let key = (() => {
+ // let uuid = []
+ // let timestamp = new Date().getTime()
+ // let _options = '0123456789abcdefghigklmnopqrstuv'
+ // for (let i = 0; i < 19; i++) {
+ // uuid.push(_options.substr(Math.floor(Math.random() * 0x20), 1))
+ // }
+ // uuid = timestamp + uuid.join('')
+ // return uuid
+ // })()
+
+ // let _param = {
+ // func: 'webapi_scan_binding_key',
+ // binding_type: 'mk',
+ // scan_type: 'toggle',
+ // scan_appkey: data.scan_appkey || '',
+ // id: key
+ // }
+
+ // Api.getSystemConfig(_param).then(res => {
+ // if (!res.status) {
+ // notification.warning({
+ // top: 92,
+ // message: res.message,
+ // duration: 5
+ // })
+ // } else if (res.thd_party_appid && res.thd_party_member_id && res.thd_party_openid) {
+ // let href = _url + 'admin/index.html#/ssologin/' + window.btoa(window.encodeURIComponent(JSON.stringify({
+ // appid: res.thd_party_appid,
+ // memberId: res.thd_party_member_id,
+ // openid: res.thd_party_openid,
+ // key: key
+ // })))
+
+ // window.open(href)
+ // } else {
+ // notification.warning({
+ // top: 92,
+ // message: '淇℃伅缂哄け锛岃鑱旂郴绠＄悊鍛橈紒',
+ // duration: 5
+ // })
+ // }
+ // })
+ // return
+ // }
+
+ let Id = ''
+ let con = '?'
+
+ if (/\?/ig.test(url)) {
+ con = '&'
+ }
+
+ if (cards.subtype === 'propcard' && cardCell) {
+ Id = cardCell.setting.primaryId || ''
} else {
- let Id = ''
- let con = '?'
-
- if (/\?/ig.test(url)) {
- con = '&'
- }
-
- if (cards.subtype === 'propcard' && cardCell) {
- Id = cardCell.setting.primaryId || ''
- } else {
- Id = data[cards.setting.primaryKey] || ''
- }
-
- if (card.joint === 'true') {
- url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
- }
+ Id = data[cards.setting.primaryKey] || ''
+ }
+
+ if (card.joint === 'true') {
+ url = url + `${con}id=${Id}&appkey=${window.GLOB.appkey}&userid=${sessionStorage.getItem('UserID')}&LoginUID=${sessionStorage.getItem('LoginUID') || ''}`
}
window.open(url)
@@ -290,7 +336,16 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ let orival = val
+ 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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
+ if (card.copyable === 'true') {
+ val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
+ }
}
if (card.marks) {
@@ -300,15 +355,19 @@
if (mark.icon) {
if (mark.position === 'front') {
- val = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {val}</span>
+ val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
- val = <span>{val} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
}
- if (card.link) {
+ if (card.link || (card.anchors && card.anchors.length > 0)) {
_style.cursor = 'pointer'
+ }
+
+ if (card.bgImage && data[card.bgImage]) {
+ _style.backgroundImage = `url('${data[card.bgImage]}')`
}
return (
@@ -328,7 +387,7 @@
val = data[card.field]
}
- if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
return null
}
@@ -362,7 +421,12 @@
}
if (val !== '') {
- val = `${card.prefix || ''}${val}${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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
}
if (card.marks) {
@@ -372,9 +436,9 @@
if (mark.icon) {
if (mark.position === 'front') {
- val = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {val}</span>
+ val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
- val = <span>{val} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
}
@@ -399,8 +463,8 @@
<Col key={card.uuid} span={card.width}>
<div style={card.style}>
{val ? <Tooltip title={val}>
- <MkIcon type={card.icon}/>
- </Tooltip> : <MkIcon type={card.icon}/>}
+ <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>
+ </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: card.innerHeight || 'auto'}} type={card.icon}/>}
</div>
</Col>
)
@@ -541,10 +605,18 @@
return null
}
+ let poster = ''
+
+ if (card.posterType === 'dynamic') {
+ poster = data[card.posterField] || ''
+ } else {
+ poster = card.posterUrl || ''
+ }
+
return (
<Col key={card.uuid} span={card.width}>
- <div style={card.style}>
- <Video card={card} value={url}/>
+ <div className="video-wrap" style={card.style}>
+ <Video card={card} poster={poster} value={url}/>
</div>
</Col>
)
@@ -571,10 +643,19 @@
</Col>
)
} else if (card.eleType === 'currentDate') {
+ let val = moment().format(card.dateFormat || 'YYYY-MM-DD')
+
+ 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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
+ }
+
return (
<Col key={card.uuid} span={card.width}>
<div className="ant-mk-date" style={card.style}>
- {card.dateFormat ? `${card.prefix || ''}${moment().format(card.dateFormat)}${card.postfix || ''}` : null}
+ {val}
</div>
</Col>
)
@@ -601,7 +682,7 @@
}
}
- if (!val) return
+ // if (!val) return
val += _val
})
@@ -624,11 +705,21 @@
val = _val === undefined ? '' : _val
}
+ if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+ return null
+ }
+
if (val !== '') {
- val = `${card.prefix || ''}${val}${card.postfix || ''}`
- if (card.eval === 'false') {
+ if (val && typeof(val) === 'string') {
val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, ' ')
val = <span dangerouslySetInnerHTML={{__html: val}}></span>
+ }
+
+ 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>{val}<span style={_s}>{card.postfix || ''}</span></>
+ } else {
+ val = `${card.prefix || ''}${val}${card.postfix || ''}`
}
}
@@ -639,9 +730,9 @@
if (mark.icon) {
if (mark.position === 'front') {
- val = <span><MkIcon style={{color: mark.color}} type={mark.icon} /> {val}</span>
+ val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
} else {
- val = <span>{val} <MkIcon style={{color: mark.color}} type={mark.icon} /></span>
+ val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
}
}
}
@@ -671,23 +762,20 @@
if (data.$$type === 'extendCard') {
_data = data.$$selectedData || []
- } else if (data.$$empty) {
- _data = []
} else if (card.$sync) {
_data = this.props.syncData
+ } else if (data.$$empty) {
+ _data = []
}
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<NormalButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
columns={cards.columns}
selectedData={_data}
@@ -698,13 +786,10 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<ExcelInButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
selectedData={_data}
/>
@@ -714,14 +799,12 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<ExcelOutButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
- lineId={data.$$key || ''}
disabled={_disabled}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
+ selectedData={_data}
/>
</Col>
)
@@ -729,13 +812,10 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<PopupButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
selectedData={_data}
/>
@@ -745,12 +825,9 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<TabButton
+ btn={card}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
selectedData={_data}
/>
@@ -760,12 +837,9 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<NewPageButton
+ btn={card}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
selectedData={_data}
/>
@@ -776,13 +850,10 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<ChangeUserButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
- btn={card}
- show={card.show}
- style={card.style}
setting={cards.setting}
selectedData={_data}
/>
@@ -792,13 +863,22 @@
return (
<Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
<PrintButton
+ btn={card}
BID={data.$$BID}
BData={data.$$BData || ''}
disabled={_disabled}
- lineId={data.$$key || ''}
+ setting={cards.setting}
+ selectedData={_data}
+ />
+ </Col>
+ )
+ } else if (card.funcType === 'megvii') {
+ return (
+ <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+ <FuncMegvii
btn={card}
- show={card.show}
- style={card.style}
+ BID={data.$$BID}
+ disabled={_disabled}
setting={cards.setting}
selectedData={_data}
/>
--
Gitblit v1.8.0