From 84aa4415e0702faf99a20efbedadd6ab36d7a962 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 02 一月 2024 17:00:12 +0800
Subject: [PATCH] 2023-01-02
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 142622f..a958493 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -23,6 +23,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 ExportPdf = asyncComponent(() => import('@/tabviews/zshare/actionList/exportPdf'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncComponent(() => import('@/components/barcode'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
@@ -656,10 +657,8 @@
let url = ''
if (card.maxWidth) {
_style.maxWidth = card.maxWidth
- if (_style.marginLeft === '0px') {
+ if (_style.marginLeft === '0px' && _style.marginRight === '0px') {
delete _style.marginLeft
- }
- if (_style.marginRight === '0px') {
delete _style.marginRight
}
}
@@ -1099,10 +1098,15 @@
MkButton = <FuncZip
btn={card}
BID={data.$$BID}
+ BData={data.$$BData || ''}
disabled={_disabled}
setting={cards.setting}
selectedData={_data}
/>
+ } else if (card.funcType === 'expPdf') {
+ MkButton = <ExportPdf
+ btn={card}
+ />
} else if (card.funcType === 'addline' || card.funcType === 'delline') {
MkButton = <EditLine
btn={card}
--
Gitblit v1.8.0