From d7534812c8199bf1e9faa0279b63e434737d6374 Mon Sep 17 00:00:00 2001 From: king <18310653075@163.com> Date: 星期五, 16 四月 2021 16:06:27 +0800 Subject: [PATCH] 2021-04-16 --- src/tabviews/custom/components/card/cardcellList/index.jsx | 157 +++++++++++++++++++++++---------------------------- 1 files changed, 71 insertions(+), 86 deletions(-) diff --git a/src/tabviews/custom/components/card/cardcellList/index.jsx b/src/tabviews/custom/components/card/cardcellList/index.jsx index def201a..940bb35 100644 --- a/src/tabviews/custom/components/card/cardcellList/index.jsx +++ b/src/tabviews/custom/components/card/cardcellList/index.jsx @@ -542,123 +542,108 @@ return null } } + if (['exec', 'prompt', 'pop'].includes(card.OpenType)) { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <NormalButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - columns={cards.columns} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <NormalButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + columns={cards.columns} + selectedData={[data]} + /> </Col> ) } else if (card.OpenType === 'excelIn') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <ExcelInButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <ExcelInButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } else if (card.OpenType === 'excelOut') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <ExcelOutButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <ExcelOutButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + /> </Col> ) } else if (card.OpenType === 'popview') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <PopupButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <PopupButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } else if (card.OpenType === 'tab') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <TabButton - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <TabButton + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } else if (card.OpenType === 'innerpage') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <NewPageButton - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <NewPageButton + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } else if (card.OpenType === 'funcbutton') { if (card.funcType === 'changeuser') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <ChangeUserButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <ChangeUserButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } else if (card.funcType === 'print') { return ( - <Col key={card.uuid} span={card.width}> - <div style={card.style}> - <PrintButton - BID={data.$$BID} - btn={card} - show={card.show} - style={card.btnstyle} - setting={cards.setting} - selectedData={[data]} - /> - </div> + <Col key={card.uuid} className="mk-cell-btn" span={card.width}> + <PrintButton + BID={data.$$BID} + btn={card} + show={card.show} + style={card.style} + setting={cards.setting} + selectedData={[data]} + /> </Col> ) } -- Gitblit v1.8.0