From 06a670976e2145a10ea05207041d3cf3164cd380 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 18:13:25 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 239 +++++++++++++++++++++++++++--------------------------------
1 files changed, 108 insertions(+), 131 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 16d6feb..d985b05 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -23,6 +23,8 @@
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 ShareLink = asyncComponent(() => import('@/tabviews/zshare/actionList/shareLink'))
const EditLine = asyncComponent(() => import('@/tabviews/zshare/actionList/editLine'))
const BarCode = asyncComponent(() => import('@/components/barcode'))
const QrCode = asyncComponent(() => import('@/components/qrcode'))
@@ -655,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
}
}
@@ -701,7 +701,7 @@
urls.forEach((u, i) => {
contents.push(<div className={'ant-col ant-col-' + card.width} 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}/>
+ <MkPicture style={_imagestyle} lostTip={card.lostTip !== 'false'} scale={scale} url={u} urls={urls}/>
</div>
</div>)
})
@@ -1010,148 +1010,125 @@
if (card.wrapStyle) {
_style_ = {..._style_, ...card.wrapStyle}
}
+
+ let MkButton = null
if (['exec', 'prompt', 'pop', 'form'].includes(card.OpenType)) {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <NormalButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- columns={cards.columns}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <NormalButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ columns={cards.columns}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'excelIn') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <ExcelInButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <ExcelInButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'excelOut') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <ExcelOutButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <ExcelOutButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'popview') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <PopupButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <PopupButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'tab') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <TabButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <TabButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'innerpage') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <NewPageButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <NewPageButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ selectedData={_data}
+ />
} else if (card.OpenType === 'funcbutton') {
if (card.funcType === 'changeuser' || card.funcType === 'closetab') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <ChangeUserButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <ChangeUserButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ selectedData={_data}
+ />
} else if (card.funcType === 'print') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <PrintButton
- btn={card}
- BID={data.$$BID}
- BData={data.$$BData || ''}
- disabled={_disabled}
- setting={cards.setting}
- columns={cards.columns}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <PrintButton
+ btn={card}
+ BID={data.$$BID}
+ BData={data.$$BData || ''}
+ disabled={_disabled}
+ setting={cards.setting}
+ columns={cards.columns}
+ selectedData={_data}
+ />
} else if (card.funcType === 'megvii') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <FuncMegvii
- btn={card}
- BID={data.$$BID}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ MkButton = <FuncMegvii
+ btn={card}
+ BID={data.$$BID}
+ disabled={_disabled}
+ setting={cards.setting}
+ selectedData={_data}
+ />
} else if (card.funcType === 'filezip') {
- contents.push(
- <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
- <FuncZip
- btn={card}
- BID={data.$$BID}
- disabled={_disabled}
- setting={cards.setting}
- selectedData={_data}
- />
- </div>
- )
+ 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 === 'shareLink') {
+ MkButton = <ShareLink
+ BID={data.$$BID}
+ btn={card}
+ selectedData={_data}
+ />
} 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>
- )
+ MkButton = <EditLine
+ btn={card}
+ disabled={_disabled}
+ selectedData={_data}
+ />
}
}
+
+ if (MkButton) {
+ contents.push(
+ <div className={'ant-col mk-cell-btn ant-col-' + card.width} key={card.uuid} style={_style_} span={card.width}>
+ {MkButton}
+ </div>
+ )
+ }
}
})
--
Gitblit v1.8.0