From 8d66ff34fae5b048a6b7923cc75d34f13a08be9d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 八月 2022 11:42:43 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 21d6ad7..00b8a4e 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -23,6 +23,7 @@
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 FuncZip = asyncComponent(() => import('@/tabviews/zshare/actionList/funczip'))
const BarCode = asyncElementComponent(() => import('@/components/barcode'))
const QrCode = asyncElementComponent(() => import('@/components/qrcode'))
const MkProgress = asyncElementComponent(() => import('@/components/mkProgress'))
@@ -262,11 +263,11 @@
if (card.datatype === 'static') {
val = card.value || ''
- if (/@username@|@fullName@|@login_city@/ig.test(val)) {
+ if (/@username@|@fullName@|@mk_city@/ig.test(val)) {
let userName = sessionStorage.getItem('User_Name') || ''
let fullName = sessionStorage.getItem('Full_Name') || ''
let city = sessionStorage.getItem('city') || ''
- val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@login_city@/ig, city)
+ val = val.replace(/@username@/ig, userName).replace(/@fullName@/ig, fullName).replace(/@mk_city@/ig, city)
}
} else if (data.hasOwnProperty(card.field)) {
val = data[card.field]
@@ -355,9 +356,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>
}
}
}
@@ -436,9 +437,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>
}
}
}
@@ -512,6 +513,9 @@
if (card.datatype === 'static') {
url = card.url || ''
+ if (url === '@icon@') {
+ url = sessionStorage.getItem('avatar') || ''
+ }
} else {
url = data[card.field] || ''
}
@@ -730,9 +734,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>
}
}
}
@@ -884,6 +888,18 @@
/>
</Col>
)
+ } else if (card.funcType === 'filezip') {
+ return (
+ <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>
+ )
}
}
}
--
Gitblit v1.8.0