From 43008f1240d6568a3364721bb01fc7e31b33d147 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 24 十二月 2023 23:39:51 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/cardcellList/index.jsx | 220 +++++++++++++++++++++++-------------------------------
1 files changed, 93 insertions(+), 127 deletions(-)
diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx
index 5535c30..142622f 100644
--- a/src/tabviews/custom/components/card/cardcellList/index.jsx
+++ b/src/tabviews/custom/components/card/cardcellList/index.jsx
@@ -1011,148 +1011,114 @@
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}
+ disabled={_disabled}
+ setting={cards.setting}
+ 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