From b8e1395f02c929eaa96b949cf6027ee2a43856a6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 九月 2022 19:03:37 +0800
Subject: [PATCH] 2022-09-06

---
 src/tabviews/custom/components/card/cardcellList/index.jsx | 1217 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 600 insertions(+), 617 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index ac0e2cc..9c9e2c4 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -44,21 +44,7 @@
     elements: PropTypes.array,       // 鍏冪礌闆�
   }
 
-  state = {
-    card: null,          // 缂栬緫涓厓绱�
-    elements: null,      // 鎸夐挳缁�
-  }
-
-  /**
-   * @description 鎼滅储鏉′欢鍒濆鍖�
-   */
-  UNSAFE_componentWillMount () {
-    const { elements } = this.props
-
-    this.setState({
-      elements: fromJS(elements).toJS()
-    })
-  }
+  state = {}
 
   shouldComponentUpdate (nextProps, nextState) {
     return !is(fromJS(this.state), fromJS(nextState)) || !is(fromJS(this.props), fromJS(nextProps))
@@ -237,628 +223,562 @@
     return color
   }
 
-  getContent = (card) => {
-    const { data, cards } = this.props
+  getContent = () => {
+    const { data, cards, elements } = this.props
 
-    if (card.eleType === 'sequence') {
-      let _style = {}
-      if (card.marks) {
-        _style.width = card.innerHeight
-        _style.height = card.innerHeight
-        _style.lineHeight = card.innerHeight + 'px'
+    let contents = []
 
-        let mark = getMark(card.marks, data, _style)
-
-        _style = mark.style
-      }
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={card.style}>
-            <div className="ant-mk-text"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'text') {
-      let val = ''
-      let _style = card.style ? {...card.style} : {}
-
-      if (card.datatype === 'static') {
-        val = card.value || ''
-        if (/@username@|@fullName@|@mk_city@|@bid@/ig.test(val)) {
-          let userName = sessionStorage.getItem('User_Name') || ''
-          let fullName = sessionStorage.getItem('Full_Name') || ''
-          let city = sessionStorage.getItem('city') || ''
-          let bid = data.$$BID || ''
-          val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@bid@/ig, bid)
+    elements.forEach(card => {
+      if (card.eleType === 'sequence') {
+        let _style = {}
+        if (card.marks) {
+          _style.width = card.innerHeight
+          _style.height = card.innerHeight
+          _style.lineHeight = card.innerHeight + 'px'
+  
+          let mark = getMark(card.marks, data, _style)
+  
+          _style = mark.style
         }
-      } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field]
-      }
-
-      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-
-      if (val !== '' && card.format) {
-        let _val = null
-
-        if (card.format === 'calendar1') {
-          _val = moment(val).calendar(null, {
-            sameDay: '[浠婂ぉ] ahh:mm',
-            nextDay: '[鏄庡ぉ] ahh:mm',
-            nextWeek: 'MM鏈圖D鏃� ahh:mm',
-            lastDay: '[鏄ㄥぉ] ahh:mm',
-            lastWeek: 'dddd ahh:mm',
-            sameElse: 'MM鏈圖D鏃� ahh:mm'
-          })
-        } else if (card.format === 'calendar2') {
-          let time = new Date(val).getTime()
-          if (!isNaN(time)) {
-            time = parseInt(time / 60000)                                     // 鏃堕棿鍊�
-            let now = parseInt(new Date().getTime() / 60000)                  // 褰撳墠鏃堕棿鍊�
-            let start = new Date(new Date().toDateString()).getTime() / 60000 // 浠婂ぉ闆剁偣鏃堕棿鍊�
-            let split = now - time
-
-            if (split < 0) { // 鏃堕棿鍊煎湪褰撳墠鏃堕棿涔嬪悗
-              _val = moment(val).format('MM鏈圖D鏃� HH:mm')
-            } else if (split < 3) {
-              _val = '鍒氬垰'
-            } else if (split < 5) {
-              _val = '3鍒嗛挓鍓�'
-            } else if (split < 10) {
-              _val = '5鍒嗛挓鍓�'
-            } else if (split < 20) {
-              _val = '10鍒嗛挓鍓�'
-            } else if (split < 30) {
-              _val = '20鍒嗛挓鍓�'
-            } else if (split < 60) {
-              _val = '30鍒嗛挓鍓�'
-            } else if (split < 420 || time > start) { // 7灏忔椂鍐呮垨鏃堕棿鍊煎湪浠婂ぉ闆剁偣鍚�
-              _val = parseInt(split / 60) + '灏忔椂鍓�'
-            } else {                                  // 鏃堕棿鍊煎湪浠婂ぉ闆剁偣涔嬪墠
-              let _day = parseInt((start - time) / (24 * 60)) + 1
-              if (_day === 1) {
-                _val = '鏄ㄥぉ'
-              } else if (_day <= 30) {
-                _val = _day + '澶╁墠'
-              } else {
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={card.style}>
+              <div className="ant-mk-text"><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'text') {
+        let val = ''
+        let _style = card.style ? {...card.style} : {}
+  
+        if (card.datatype === 'static') {
+          val = card.value || ''
+          if (/@username@|@fullName@|@mk_city@|@bid@/ig.test(val)) {
+            let userName = sessionStorage.getItem('User_Name') || ''
+            let fullName = sessionStorage.getItem('Full_Name') || ''
+            let city = sessionStorage.getItem('city') || ''
+            let bid = data.$$BID || ''
+            val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city).replace(/@bid@/ig, bid)
+          }
+        } else if (data.hasOwnProperty(card.field)) {
+          val = data[card.field]
+        }
+  
+        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
+  
+        if (val !== '' && card.format) {
+          let _val = null
+  
+          if (card.format === 'calendar1') {
+            _val = moment(val).calendar(null, {
+              sameDay: '[浠婂ぉ] ahh:mm',
+              nextDay: '[鏄庡ぉ] ahh:mm',
+              nextWeek: 'MM鏈圖D鏃� ahh:mm',
+              lastDay: '[鏄ㄥぉ] ahh:mm',
+              lastWeek: 'dddd ahh:mm',
+              sameElse: 'MM鏈圖D鏃� ahh:mm'
+            })
+          } else if (card.format === 'calendar2') {
+            let time = new Date(val).getTime()
+            if (!isNaN(time)) {
+              time = parseInt(time / 60000)                                     // 鏃堕棿鍊�
+              let now = parseInt(new Date().getTime() / 60000)                  // 褰撳墠鏃堕棿鍊�
+              let start = new Date(new Date().toDateString()).getTime() / 60000 // 浠婂ぉ闆剁偣鏃堕棿鍊�
+              let split = now - time
+  
+              if (split < 0) { // 鏃堕棿鍊煎湪褰撳墠鏃堕棿涔嬪悗
                 _val = moment(val).format('MM鏈圖D鏃� HH:mm')
+              } else if (split < 3) {
+                _val = '鍒氬垰'
+              } else if (split < 5) {
+                _val = '3鍒嗛挓鍓�'
+              } else if (split < 10) {
+                _val = '5鍒嗛挓鍓�'
+              } else if (split < 20) {
+                _val = '10鍒嗛挓鍓�'
+              } else if (split < 30) {
+                _val = '20鍒嗛挓鍓�'
+              } else if (split < 60) {
+                _val = '30鍒嗛挓鍓�'
+              } else if (split < 420 || time > start) { // 7灏忔椂鍐呮垨鏃堕棿鍊煎湪浠婂ぉ闆剁偣鍚�
+                _val = parseInt(split / 60) + '灏忔椂鍓�'
+              } else {                                  // 鏃堕棿鍊煎湪浠婂ぉ闆剁偣涔嬪墠
+                let _day = parseInt((start - time) / (24 * 60)) + 1
+                if (_day === 1) {
+                  _val = '鏄ㄥぉ'
+                } else if (_day <= 30) {
+                  _val = _day + '澶╁墠'
+                } else {
+                  _val = moment(val).format('MM鏈圖D鏃� HH:mm')
+                }
               }
             }
-          }
-        } else {
-          _val = moment(val).format(card.format)
-        }
-        
-        // if (card.format === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
-        //   val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
-        // }
-        if (_val && _val !== 'Invalid date') {
-          val = _val
-        }
-      }
-
-      if (val !== '') {
-        let orival = val
-        if (card.format === 'encryption') {
-          val = <Encrypts value={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 = <span>{card.prefix || ''}{val}{card.postfix || ''}</span>
-        }
-        if (card.copyable === 'true') {
-          val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
-        }
-      }
-
-      if (card.marks) {
-        let mark = getMark(card.marks, data, _style)
-
-        _style = mark.style
-
-        if (mark.icon) {
-          if (mark.position === 'front') {
-            val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
           } else {
-            val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
-          }
-        }
-      }
-
-      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 (
-        <Col key={card.uuid} span={card.width}>
-          <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
-            <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'number') {
-      let val = ''
-      let _style = card.style ? {...card.style} : {}
-
-      if (card.datatype === 'static') {
-        val = card.value
-      } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field]
-      }
-
-      if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-
-      if (typeof(val) === 'number') {
-        if (card.format === 'percent') {
-          val = val * 100
-        } else if (card.format === 'abs') {
-          val = Math.abs(val)
-        }
-
-        if (typeof(card.decimal) === 'number') {
-          let decimal = card.decimal
-
-          if (card.format === 'percent') {
-            decimal = decimal - 2
-          }
-          if (decimal < 0) {
-            decimal = 0
+            _val = moment(val).format(card.format)
           }
           
-          val = val.toFixed(decimal)
-        } else {
-          val = '' + val
+          // if (card.format === 'YYYY-MM-DD' && /^[1-9]\d{3}(-|\/)(0[1-9]|1[0-2])(-|\/)(0[1-9]|[1-2][0-9]|3[0-1])/.test(val)) {
+          //   val = `${val.substr(0, 4)}-${val.substr(5, 2)}-${val.substr(8, 2)}`
+          // }
+          if (_val && _val !== 'Invalid date') {
+            val = _val
+          }
+        }
+  
+        if (val !== '') {
+          let orival = val
+          if (card.format === 'encryption') {
+            val = <Encrypts value={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 = <span>{card.prefix || ''}{val}{card.postfix || ''}</span>
+          }
+          if (card.copyable === 'true') {
+            val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
+          }
+        }
+  
+        if (card.marks) {
+          let mark = getMark(card.marks, data, _style)
+  
+          _style = mark.style
+  
+          if (mark.icon) {
+            if (mark.position === 'front') {
+              val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
+            } else {
+              val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+            }
+          }
+        }
+  
+        if (card.link || (card.anchors && card.anchors.length > 0)) {
+          _style.cursor = 'pointer'
+        }
+    
+        if (card.bgImage && data[card.bgImage]) {
+          _style.backgroundImage = `url('${data[card.bgImage]}')`
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+              <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'number') {
+        let val = ''
+        let _style = card.style ? {...card.style} : {}
+  
+        if (card.datatype === 'static') {
+          val = card.value
+        } else if (data.hasOwnProperty(card.field)) {
+          val = data[card.field]
+        }
+  
+        if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
+  
+        if (typeof(val) === 'number') {
+          if (card.round) {
+            val = Math.round(val * card.round) / card.round
+          }
+          if (card.format === 'percent') {
+            val = val * 100
+          } else if (card.format === 'abs') {
+            val = Math.abs(val)
+          }
+  
+          if (card.round) {
+            val = val.toFixed(card.decimal)
+          } else {
+            val = '' + val
+          }
+
+          if (card.format === 'percent' && (!card.postfix || card.postfix.indexOf('%') === -1)) {
+            val = val + '%'
+          } else if (card.format === 'thdSeparator') {
+            val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+          }
+        }
+  
+        if (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.format === 'percent' && (!card.postfix || card.postfix.indexOf('%') === -1)) {
-          val = val + '%'
-        } else if (card.format === 'thdSeparator') {
-          val = val.replace(/\d{1,3}(?=(\d{3})+(\.\d*)?$)/g, '$&,')
+        if (card.marks) {
+          let mark = getMark(card.marks, data, _style)
+  
+          _style = mark.style
+  
+          if (mark.icon) {
+            if (mark.position === 'front') {
+              val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
+            } else {
+              val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+            }
+          }
         }
-      }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={_style}>
+              <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'icon') {
+        let val = ''
+  
+        if (card.datatype === 'static') {
+          val = card.tooltip
+        } else if (data.hasOwnProperty(card.field)) {
+          val = data[card.field]
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={card.style}>
+              {val ? <Tooltip title={val}>
+                <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>
+        )
+      } else if (card.eleType === 'slider') {
+        let val = 0
+        let color = card.color
+  
+        if (card.datatype === 'static') {
+          val = card.value
+        } else if (data.hasOwnProperty(card.field)) {
+          val = parseFloat(data[card.field])
+          if (isNaN(val)) {
+            val = 0
+          }
+        }
+  
+        val = val / card.maxValue * 100
+        val = parseInt(val * 100) / 100
+  
+        if (card.marks) {
+          let _color = this.getColor(card.marks)
+          color = _color ? _color : color
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={card.style}>
+              <MkProgress value={val} config={card} color={color}/>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'picture') {
+        let _imagestyle = {}
+        let _style = card.style ? {margin: '0 auto', ...card.style} : {}
+        let url = ''
+        if (card.maxWidth) {
+          _style.maxWidth = card.maxWidth
+          if (_style.marginLeft === '0px') {
+            delete _style.marginLeft
+          }
+          if (_style.marginRight === '0px') {
+            delete _style.marginRight
+          }
+        }
+  
+        if (card.datatype === 'static') {
+          url = card.url || ''
+          if (url === '@icon@') {
+            url = sessionStorage.getItem('avatar') || ''
+          }
+        } else {
+          url = data[card.field] || ''
+        }
+  
+        if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
 
-      if (val !== '') {
+        if (_style.borderRadius) {
+          _imagestyle.borderRadius = _style.borderRadius
+        }
+  
+        if (PicRadio[card.lenWidRadio]) {
+          _imagestyle.paddingTop = PicRadio[card.lenWidRadio]
+        } else {
+          _imagestyle.paddingTop = '100%'
+        }
+  
+        if (card.link) {
+          _style.cursor = 'pointer'
+        }
+  
+        let scale = url && card.scale === 'true'
+        let urls = url ? url.split(',').filter(Boolean) : [LostPng]
+  
+        if (!url) {
+          _imagestyle = {backgroundSize: 'contain'}
+        }
+
+        urls.forEach((u, i) => {
+          contents.push(<Col key={card.uuid + i} span={card.width}>
+            <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
+              <div
+                className={'ant-mk-picture' + (scale ? ' scale' : '')}
+                onClick={(e) => {
+                  if (!scale) return
+
+                  e.stopPropagation()
+  
+                  MKEmitter.emit('mkImageScale', url, urls)
+                }}
+                style={{..._imagestyle, backgroundImage: `url('${u}')`}}
+              ></div>
+            </div>
+          </Col>)
+        })
+      } else if (card.eleType === 'splitline') {
+        let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
+        contents.push(
+          <Col key={card.uuid} span={card.width} style={{minHeight: _borderWidth}}>
+            <div style={card.style}>
+              <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'barcode') {
+        let val = ''
+  
+        if (card.datatype === 'static') {
+          val = card.value
+        } else if (data.hasOwnProperty(card.field)) {
+          val = data[card.field] || ''
+        }
+  
+        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={card.style}>
+              <div style={{height: card.innerHeight || 25}}>
+                {val ? <BarCode card={card} value={val}/> : null}
+              </div>
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'video') {
+        let url = ''
+  
+        if (card.datatype === 'static') {
+          url = card.url
+        } else {
+          url = data[card.field] || ''
+        }
+  
+        if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
+  
+        let poster = ''
+  
+        if (card.posterType === 'dynamic') {
+          poster = data[card.posterField] || ''
+        } else {
+          poster = card.posterUrl || ''
+        }
+
+        let urls = url.split(',').filter(Boolean)
+  
+        urls.forEach((u, i) => {
+          contents.push(
+            <Col key={card.uuid + i} span={card.width}>
+              <div className="video-wrap" style={card.style}>
+                <Video card={card} poster={poster} value={u}/>
+              </div>
+            </Col>
+          )
+        })
+      } else if (card.eleType === 'qrcode') {
+        let val = ''
+  
+        if (card.datatype === 'static') {
+          val = card.value
+        } else if (data.hasOwnProperty(card.field)) {
+          val = data[card.field] || ''
+        }
+  
+        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+          return null
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={card.style}>
+              <div style={{minHeight: card.qrWidth || 50}}>
+                {val ? <QrCode card={card} value={val}/> : null}
+              </div>
+            </div>
+          </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 || ''}`
         }
-      }
-      
-      if (card.marks) {
-        let mark = getMark(card.marks, data, _style)
-
-        _style = mark.style
-
-        if (mark.icon) {
-          if (mark.position === 'front') {
-            val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
-          } else {
-            val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div className="ant-mk-date" style={card.style}>
+              {val}
+            </div>
+          </Col>
+        )
+      } else if (card.eleType === 'formula') {
+        let val = 0
+        let _style = card.style ? {...card.style} : {}
+  
+        if (card.$sync) {
+          if (card.eval === 'false') {
+            val = ''
           }
-        }
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={_style}>
-            <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'icon') {
-      let val = ''
-
-      if (card.datatype === 'static') {
-        val = card.tooltip
-      } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field]
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={card.style}>
-            {val ? <Tooltip title={val}>
-              <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>
-      )
-    } else if (card.eleType === 'slider') {
-      let val = 0
-      let color = card.color
-
-      if (card.datatype === 'static') {
-        val = card.value
-      } else if (data.hasOwnProperty(card.field)) {
-        val = parseFloat(data[card.field])
-        if (isNaN(val)) {
-          val = 0
-        }
-      }
-
-      val = val / card.maxValue * 100
-      val = parseInt(val * 100) / 100
-
-      if (card.marks) {
-        let _color = this.getColor(card.marks)
-        color = _color ? _color : color
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={card.style}>
-            <MkProgress value={val} config={card} color={color}/>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'picture') {
-      let _imagestyle = {}
-      let _style = card.style ? {margin: '0 auto', ...card.style} : {}
-      let url = ''
-      if (card.maxWidth) {
-        _style.maxWidth = card.maxWidth
-        if (_style.marginLeft === '0px') {
-          delete _style.marginLeft
-        }
-        if (_style.marginRight === '0px') {
-          delete _style.marginRight
-        }
-      }
-
-      if (card.datatype === 'static') {
-        url = card.url || ''
-        if (url === '@icon@') {
-          url = sessionStorage.getItem('avatar') || ''
-        }
-      } else {
-        url = data[card.field] || ''
-      }
-
-      if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-      
-      if (url) {
-        _imagestyle = {backgroundImage: `url('${url}')`}
-      } else {
-        _imagestyle = {backgroundImage: `url(${LostPng})`, backgroundSize: 'contain'}
-      }
-
-      if (_style.borderRadius) {
-        _imagestyle.borderRadius = _style.borderRadius
-      }
-
-      if (PicRadio[card.lenWidRadio]) {
-        _imagestyle.paddingTop = PicRadio[card.lenWidRadio]
-      } else {
-        _imagestyle.paddingTop = '100%'
-      }
-
-      if (card.link) {
-        _style.cursor = 'pointer'
-      }
-
-      let scale = url && card.scale === 'true'
-      
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
-            <div
-              className={'ant-mk-picture' + (scale ? ' scale' : '')}
-              onClick={(e) => {
-                if (scale) {
-                  e.stopPropagation()
-                } else {
-                  return
-                }
-
-                MKEmitter.emit('mkImageScale', url)
-              }}
-              style={_imagestyle}
-            ></div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'splitline') {
-      let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
-      return (
-        <Col key={card.uuid} span={card.width} style={{minHeight: _borderWidth}}>
-          <div style={card.style}>
-            <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'barcode') {
-      let val = ''
-
-      if (card.datatype === 'static') {
-        val = card.value
-      } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field] || ''
-      }
-
-      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={card.style}>
-            <div style={{height: card.innerHeight || 25}}>
-              {val ? <BarCode card={card} value={val}/> : null}
-            </div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'video') {
-      let url = ''
-
-      if (card.datatype === 'static') {
-        url = card.url
-      } else {
-        url = data[card.field] || ''
-      }
-
-      if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        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 className="video-wrap" style={card.style}>
-            <Video card={card} poster={poster} value={url}/>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'qrcode') {
-      let val = ''
-
-      if (card.datatype === 'static') {
-        val = card.value
-      } else if (data.hasOwnProperty(card.field)) {
-        val = data[card.field] || ''
-      }
-
-      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={card.style}>
-            <div style={{minHeight: card.qrWidth || 50}}>
-              {val ? <QrCode card={card} value={val}/> : null}
-            </div>
-          </div>
-        </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}>
-            {val}
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'formula') {
-      let val = 0
-      let _style = card.style ? {...card.style} : {}
-
-      if (card.$sync) {
-        if (card.eval === 'false') {
-          val = ''
-        }
-        this.props.syncData.forEach(item => {
-          let _val = card.formula
-          Object.keys(item).forEach(key => {
-            let reg = new RegExp('@' + key + '@', 'ig')
-            _val = _val.replace(reg, item[key])
+          this.props.syncData.forEach(item => {
+            let _val = card.formula
+            Object.keys(item).forEach(key => {
+              let reg = new RegExp('@' + key + '@', 'ig')
+              _val = _val.replace(reg, item[key])
+            })
+            if (card.eval !== 'false') {
+              try {
+                // eslint-disable-next-line
+                _val = eval(_val)
+              } catch (e) {
+                _val = 0
+              }
+            }
+  
+            // if (!val) return
+  
+            val += _val
           })
+        } else if (data) {
+          let _val = card.formula
+          Object.keys(data).forEach(key => {
+            let reg = new RegExp('@' + key + '@', 'ig')
+            _val = _val.replace(reg, data[key])
+          })
+  
           if (card.eval !== 'false') {
             try {
               // eslint-disable-next-line
               _val = eval(_val)
             } catch (e) {
-              _val = 0
+              _val = ''
             }
           }
-
-          // if (!val) return
-
-          val += _val
-        })
-      } else if (data) {
-        let _val = card.formula
-        Object.keys(data).forEach(key => {
-          let reg = new RegExp('@' + key + '@', 'ig')
-          _val = _val.replace(reg, data[key])
-        })
-
-        if (card.eval !== 'false') {
-          try {
-            // eslint-disable-next-line
-            _val = eval(_val)
-          } catch (e) {
-            _val = ''
-          }
+  
+          val = _val === undefined ? '' : _val
         }
-
-        val = _val === undefined ? '' : _val
-      }
-
-      if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
-        return null
-      }
-
-      if (val !== '') {
-        if (val && typeof(val) === 'string') {
-          val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
-          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 || ''}`
-        }
-      }
-
-      if (card.marks) {
-        let mark = getMark(card.marks, data, _style)
-
-        _style = mark.style
-
-        if (mark.icon) {
-          if (mark.position === 'front') {
-            val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
-          } else {
-            val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
-          }
-        }
-      }
-
-      return (
-        <Col key={card.uuid} span={card.width}>
-          <div style={_style}>
-            <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
-          </div>
-        </Col>
-      )
-    } else if (card.eleType === 'button') {
-      let _disabled = data.$disabled
-      if (card.control === 'hidden') {
-        let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
-        if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
+  
+        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
-      } else if (card.control === 'disabled') {
-        let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
-        if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
-          _disabled = true
+  
+        if (val !== '') {
+          if (val && typeof(val) === 'string') {
+            val = val.replace(/\n/ig, '<br/>').replace(/\s/ig, '&nbsp;')
+            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 || ''}`
+          }
         }
-      }
-      
-      let _data = [data]
-
-      if (data.$$type === 'extendCard') {
-        _data = data.$$selectedData || []
-      } 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}
-              setting={cards.setting}
-              columns={cards.columns}
-              selectedData={_data}
-            />
+  
+        if (card.marks) {
+          let mark = getMark(card.marks, data, _style)
+  
+          _style = mark.style
+  
+          if (mark.icon) {
+            if (mark.position === 'front') {
+              val = <span><MkIcon style={mark.innerStyle} type={mark.icon} /> {val}</span>
+            } else {
+              val = <span>{val} <MkIcon style={mark.innerStyle} type={mark.icon} /></span>
+            }
+          }
+        }
+  
+        contents.push(
+          <Col key={card.uuid} span={card.width}>
+            <div style={_style}>
+              <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
+            </div>
           </Col>
         )
-      } else if (card.OpenType === 'excelIn') {
-        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}
-              setting={cards.setting}
-              selectedData={_data}
-            />
-          </Col>
-        )
-      } else if (card.OpenType === 'excelOut') {
-        return (
-          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-            <ExcelOutButton
-              btn={card}
-              BID={data.$$BID}
-              BData={data.$$BData || ''}
-              disabled={_disabled}
-              setting={cards.setting}
-              selectedData={_data}
-            />
-          </Col>
-        )
-      } else if (card.OpenType === 'popview') {
-        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}
-              setting={cards.setting}
-              selectedData={_data}
-            />
-          </Col>
-        )
-      } else if (card.OpenType === 'tab') {
-        return (
-          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-            <TabButton
-              btn={card}
-              BData={data.$$BData || ''}
-              disabled={_disabled}
-              setting={cards.setting}
-              selectedData={_data}
-            />
-          </Col>
-        )
-      } else if (card.OpenType === 'innerpage') {
-        return (
-          <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-            <NewPageButton
-              btn={card}
-              BData={data.$$BData || ''}
-              disabled={_disabled}
-              setting={cards.setting}
-              selectedData={_data}
-            />
-          </Col>
-        )
-      } else if (card.OpenType === 'funcbutton') {
-        if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
-          return (
+      } else if (card.eleType === 'button') {
+        let _disabled = data.$disabled
+        if (card.control === 'hidden') {
+          let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
+          if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
+            return null
+          }
+        } else if (card.control === 'disabled') {
+          let s = data[card.controlField] !== undefined ? data[card.controlField] + '' : ''
+          if (s === card.controlVal || (card.controlVal && card.controlVal.split(',').includes(s))) {
+            _disabled = true
+          }
+        }
+        
+        let _data = [data]
+  
+        if (data.$$type === 'extendCard') {
+          _data = data.$$selectedData || []
+        } else if (card.$sync) {
+          _data = this.props.syncData
+        } else if (data.$$empty) {
+          _data = []
+        }
+  
+        if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
+          contents.push(
             <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-              <ChangeUserButton
+              <NormalButton
+                btn={card}
+                BID={data.$$BID}
+                BData={data.$$BData || ''}
+                disabled={_disabled}
+                setting={cards.setting}
+                columns={cards.columns}
+                selectedData={_data}
+              />
+            </Col>
+          )
+        } else if (card.OpenType === 'excelIn') {
+          contents.push(
+            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+              <ExcelInButton
                 btn={card}
                 BID={data.$$BID}
                 BData={data.$$BData || ''}
@@ -868,10 +788,10 @@
               />
             </Col>
           )
-        } else if (card.funcType === 'print') {
-          return (
+        } else if (card.OpenType === 'excelOut') {
+          contents.push(
             <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-              <PrintButton
+              <ExcelOutButton
                 btn={card}
                 BID={data.$$BID}
                 BData={data.$$BData || ''}
@@ -881,43 +801,106 @@
               />
             </Col>
           )
-        } else if (card.funcType === 'megvii') {
-          return (
+        } else if (card.OpenType === 'popview') {
+          contents.push(
             <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-              <FuncMegvii
+              <PopupButton
                 btn={card}
                 BID={data.$$BID}
+                BData={data.$$BData || ''}
                 disabled={_disabled}
                 setting={cards.setting}
                 selectedData={_data}
               />
             </Col>
           )
-        } else if (card.funcType === 'filezip') {
-          return (
+        } else if (card.OpenType === 'tab') {
+          contents.push(
             <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
-              <FuncZip
+              <TabButton
                 btn={card}
-                BID={data.$$BID}
+                BData={data.$$BData || ''}
                 disabled={_disabled}
                 setting={cards.setting}
                 selectedData={_data}
               />
             </Col>
           )
+        } else if (card.OpenType === 'innerpage') {
+          contents.push(
+            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+              <NewPageButton
+                btn={card}
+                BData={data.$$BData || ''}
+                disabled={_disabled}
+                setting={cards.setting}
+                selectedData={_data}
+              />
+            </Col>
+          )
+        } else if (card.OpenType === 'funcbutton') {
+          if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
+            contents.push(
+              <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}
+                  setting={cards.setting}
+                  selectedData={_data}
+                />
+              </Col>
+            )
+          } else if (card.funcType === 'print') {
+            contents.push(
+              <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}
+                  setting={cards.setting}
+                  selectedData={_data}
+                />
+              </Col>
+            )
+          } else if (card.funcType === 'megvii') {
+            contents.push(
+              <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+                <FuncMegvii
+                  btn={card}
+                  BID={data.$$BID}
+                  disabled={_disabled}
+                  setting={cards.setting}
+                  selectedData={_data}
+                />
+              </Col>
+            )
+          } else if (card.funcType === 'filezip') {
+            contents.push(
+              <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+                <FuncZip
+                  btn={card}
+                  BID={data.$$BID}
+                  disabled={_disabled}
+                  setting={cards.setting}
+                  selectedData={_data}
+                />
+              </Col>
+            )
+          }
         }
       }
-    }
+    })
 
-    return null
+    return contents
   }
 
   render() {
-    const { elements } = this.state
-
     return (
       <div className="card-cell-list">
-        {elements.map(item => this.getContent(item))}
+        {this.getContent()}
       </div>
     )
   }

--
Gitblit v1.8.0