From 4587b07918b19e9724439d773b0ba28f388057df Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 15 五月 2023 21:05:40 +0800
Subject: [PATCH] Merge branch 'develop'

---
 src/tabviews/custom/components/card/cardcellList/index.jsx |   41 +++++++++++++++++++++++++++++++++++------
 1 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index fb48b4b..4c7985a 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -24,6 +24,7 @@
 const PrintButton = asyncComponent(() => import('@/tabviews/zshare/actionList/printbutton'))
 const FuncMegvii = asyncComponent(() => import('@/tabviews/zshare/actionList/funcMegvii'))
 const FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
+const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
 const BarCode = asyncElementComponent(() => import('@/components/barcode'))
 const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
 const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
@@ -131,6 +132,13 @@
         _url = _url + `?subject=鏉ヨ嚜${fullName}鐨勯偖浠禶
       }
       window.open(_url)
+      return
+    } else if (card.linkType === 'qywx') {
+      notification.warning({
+        top: 92,
+        message: 'PC涓嶆敮鎸佹墦寮�浼佷笟寰俊锛�',
+        duration: 5
+      })
       return
     }
 
@@ -316,7 +324,7 @@
           val = data[card.field]
         }
   
-        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
@@ -406,6 +414,9 @@
               val = <Paragraph copyable={{ text: orival }}>{val}</Paragraph>
             }
           }
+        } else if (card.fixStyle === 'alone') {
+          let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+          val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
         }
   
         let className = ''
@@ -485,6 +496,9 @@
           } else {
             val = `${card.prefix || ''}${val}${card.postfix || ''}`
           }
+        } else if (card.fixStyle === 'alone') {
+          let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+          val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
         }
         
         let className = ''
@@ -640,7 +654,7 @@
           val = data[card.field] || ''
         }
   
-        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
@@ -662,7 +676,7 @@
           url = data[card.field] || ''
         }
   
-        if (url === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!url && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
@@ -694,7 +708,7 @@
           val = data[card.field] || ''
         }
   
-        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
@@ -751,6 +765,8 @@
   
             val += _val
           })
+        } else if (data && data.$$empty) {
+          val = ''
         } else if (data) {
           let _val = card.formula
           Object.keys(data).forEach(key => {
@@ -770,7 +786,7 @@
           val = _val === undefined ? '' : _val
         }
 
-        if (val === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!val && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
   
@@ -790,6 +806,9 @@
           } else {
             val = <>{card.prefix || ''}{val}{card.postfix || ''}</>
           }
+        } else if (card.fixStyle === 'alone') {
+          let _s = {fontSize: card.fixSize, color: card.fixColor, marginLeft: card.fixLeft, marginRight: card.fixRight}
+          val = <span style={_s}>{card.prefix || ''}{card.postfix || ''}</span>
         }
 
         let className = ''
@@ -825,7 +844,7 @@
           color = data[card.field] || ''
         }
   
-        if (color === '' && card.noValue === 'hide') { // 绌哄�奸殣钘�
+        if (!color && card.noValue === 'hide') { // 绌哄�奸殣钘�
           return null
         }
 
@@ -1006,6 +1025,16 @@
                 />
               </div>
             )
+          } else if (card.funcType === 'addline' || card.funcType === 'delline') {
+            contents.push(
+              <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+                <EditLine
+                  btn={card}
+                  disabled={_disabled}
+                  selectedData={_data}
+                />
+              </div>
+            )
           }
         }
       }

--
Gitblit v1.8.0