From 89f85223ff7b1b5ee3931ae01efa3dd17d5524fc Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 十一月 2022 16:03:27 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/card/cardcellList/index.jsx |   75 ++++++++++++++++++++++++-------------
 1 files changed, 48 insertions(+), 27 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index aa8772a..a0eb57b 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -229,6 +229,12 @@
     let contents = []
 
     elements.forEach(card => {
+      let _style_ = null
+
+      if (card.style && card.style.clear === 'left') {
+        _style_ = {clear: 'left'}
+      }
+
       if (card.eleType === 'sequence') {
         let _style = {}
         if (card.marks) {
@@ -241,7 +247,7 @@
           _style = mark.style
         }
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}><span className="sequence-wrap" style={_style}>{data.$Index || ''}</span></div>
             </div>
@@ -379,7 +385,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} 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>
@@ -446,7 +452,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={_style}>
               <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
             </div>
@@ -454,7 +460,14 @@
         )
       } else if (card.eleType === 'icon') {
         let val = ''
+        let icon = ''
         let height = card.innerHeight
+
+        if (card.datatype === 'dynamic') {
+          icon = data[card.field] || ''
+        } else {
+          icon = card.icon
+        }
 
         if (!height) { // 鍏煎
           let fontSize = 14
@@ -470,18 +483,18 @@
           height = fontSize * lineHeight
         }
   
-        if (card.datatype === 'static') {
+        if (data.hasOwnProperty(card.tooltip)) {
+          val = data[card.tooltip]
+        } else {
           val = card.tooltip
-        } else if (data.hasOwnProperty(card.field)) {
-          val = data[card.field]
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               {val ? <Tooltip title={val}>
-                <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>
-              </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={card.icon}/>}
+                <MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>
+              </Tooltip> : <MkIcon className="ant-mk-icon" style={{height: height}} type={icon}/>}
             </div>
           </Col>
         )
@@ -507,7 +520,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               <MkProgress value={val} config={card} color={color}/>
             </div>
@@ -558,7 +571,7 @@
         let urls = url ? url.split(',').filter(Boolean) : ['']
 
         urls.forEach((u, i) => {
-          contents.push(<Col key={card.uuid + i} span={card.width}>
+          contents.push(<Col key={card.uuid + i} style={_style_} span={card.width}>
             <div style={_style} onClick={(e) => {this.openNewView(e, card)}}>
               <MkPicture style={_imagestyle} scale={scale} url={u} urls={urls}/>
             </div>
@@ -566,8 +579,10 @@
         })
       } else if (card.eleType === 'splitline') {
         let _borderWidth = card.borderWidth === undefined ? 1 : card.borderWidth
+        _style_ = _style_ || {}
+        _style_.minHeight = _borderWidth
         contents.push(
-          <Col key={card.uuid} span={card.width} style={{minHeight: _borderWidth}}>
+          <Col key={card.uuid} span={card.width} style={_style_}>
             <div style={card.style}>
               <div className="ant-mk-splitline" style={{borderColor: card.color, borderWidth: _borderWidth}}></div>
             </div>
@@ -587,7 +602,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               <div style={{height: card.innerHeight || 25}}>
                 {val ? <BarCode card={card} value={val}/> : null}
@@ -620,7 +635,7 @@
   
         urls.forEach((u, i) => {
           contents.push(
-            <Col key={card.uuid + i} span={card.width}>
+            <Col key={card.uuid + i} style={_style_} span={card.width}>
               <div className="video-wrap" style={card.style}>
                 <Video card={card} poster={poster} value={u}/>
               </div>
@@ -641,7 +656,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               <div style={{minHeight: card.qrWidth || 50}}>
                 {val ? <QrCode card={card} value={val}/> : null}
@@ -660,7 +675,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={card.style}>
               <div className="ant-mk-text line1" style={{height: card.innerHeight || 'auto'}}>{val}</div>
             </div>
@@ -745,7 +760,7 @@
         }
   
         contents.push(
-          <Col key={card.uuid} span={card.width}>
+          <Col key={card.uuid} style={_style_} span={card.width}>
             <div style={_style}>
               <div className={'ant-mk-text line' + (card.height || '')} style={{height: card.innerHeight || 'auto'}}>{val}</div>
             </div>
@@ -774,10 +789,15 @@
         } else if (data.$$empty) {
           _data = []
         }
+
+        _style_ = _style_ || {}
+        if (card.wrapStyle) {
+          _style_ = {..._style_, ...card.wrapStyle}
+        }
   
         if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <NormalButton
                 btn={card}
                 BID={data.$$BID}
@@ -791,7 +811,7 @@
           )
         } else if (card.OpenType === 'excelIn') {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <ExcelInButton
                 btn={card}
                 BID={data.$$BID}
@@ -804,7 +824,7 @@
           )
         } else if (card.OpenType === 'excelOut') {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <ExcelOutButton
                 btn={card}
                 BID={data.$$BID}
@@ -817,7 +837,7 @@
           )
         } else if (card.OpenType === 'popview') {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <PopupButton
                 btn={card}
                 BID={data.$$BID}
@@ -830,9 +850,10 @@
           )
         } else if (card.OpenType === 'tab') {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <TabButton
                 btn={card}
+                BID={data.$$BID}
                 BData={data.$$BData || ''}
                 disabled={_disabled}
                 selectedData={_data}
@@ -841,7 +862,7 @@
           )
         } else if (card.OpenType === 'innerpage') {
           contents.push(
-            <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+            <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
               <NewPageButton
                 btn={card}
                 BData={data.$$BData || ''}
@@ -853,7 +874,7 @@
         } 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}>
+              <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
                 <ChangeUserButton
                   btn={card}
                   BID={data.$$BID}
@@ -866,7 +887,7 @@
             )
           } else if (card.funcType === 'print') {
             contents.push(
-              <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+              <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
                 <PrintButton
                   btn={card}
                   BID={data.$$BID}
@@ -879,7 +900,7 @@
             )
           } else if (card.funcType === 'megvii') {
             contents.push(
-              <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+              <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
                 <FuncMegvii
                   btn={card}
                   BID={data.$$BID}
@@ -891,7 +912,7 @@
             )
           } else if (card.funcType === 'filezip') {
             contents.push(
-              <Col key={card.uuid} className="mk-cell-btn" style={card.wrapStyle} span={card.width}>
+              <Col key={card.uuid} className="mk-cell-btn" style={_style_} span={card.width}>
                 <FuncZip
                   btn={card}
                   BID={data.$$BID}

--
Gitblit v1.8.0