2022-06-10

king

2022-06-10 bf292de8879e2ce71696cb3ddc4dc8fa88d91a20

 src/tabviews/custom/components/card/cardcellList/index.jsx

@@ -1,7 +1,7 @@
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'
@@ -13,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'))
@@ -335,11 +336,15 @@
      }

      if (val !== '') {
        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>
        }
      }

@@ -350,9 +355,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>
          }
        }
      }
@@ -431,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>
          }
        }
      }
@@ -458,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>
      )
@@ -610,7 +615,7 @@

      return (
        <Col key={card.uuid} span={card.width}>
          <div style={card.style}>
          <div className="video-wrap" style={card.style}>
            <Video card={card} poster={poster} value={url}/>
          </div>
        </Col>
@@ -725,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>
          }
        }
      }