From fc241324087e605b145e8bbcc4ee3aece61dbf14 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 21 三月 2022 15:59:45 +0800
Subject: [PATCH] 2022-03-21
---
src/tabviews/custom/components/table/edit-table/normalTable/index.jsx | 60 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
index c72e73b..4daf315 100644
--- a/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
+++ b/src/tabviews/custom/components/table/edit-table/normalTable/index.jsx
@@ -1943,34 +1943,38 @@
let height = setting.height || false
return (
- <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
- <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
- {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
- <Table
- rowKey="$$uuid"
- components={components}
- style={setting.style}
- size={setting.size || 'middle'}
- bordered={setting.bordered !== 'false'}
- rowSelection={rowSelection}
- columns={_columns}
- dataSource={_data}
- loading={this.props.loading}
- scroll={{ x: '100%', y: height }}
- onRow={(record, index) => {
- return {
- lineMarks,
- data: record,
- onClick: () => {this.changeRow(record.$$uuid)},
- }
- }}
- onChange={this.changeTable}
- pagination={_pagination}
- />
- {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
- {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
- {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
- </div>
+ <>
+ <div className="edit-custom-table-btn-wrap" style={submit.wrapStyle}>
+ {pickup ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-table" type="link">鎻愪氦</Button> : null}
+ <Switch title="缂栬緫" className="main-pickup" checkedChildren="寮�" unCheckedChildren="鍏�" disabled={loading || this.props.loading} checked={pickup} onChange={this.pickupChange} />
+ </div>
+ <div className={`edit-custom-table ${pickup ? 'editable' : ''} ${setting.tableHeader || ''} ${setting.operType || ''} ${height ? 'fixed-height' : ''} ${setting.mode || ''}`} id={tableId}>
+ <Table
+ rowKey="$$uuid"
+ components={components}
+ style={setting.style}
+ size={setting.size || 'middle'}
+ bordered={setting.bordered !== 'false'}
+ rowSelection={rowSelection}
+ columns={_columns}
+ dataSource={_data}
+ loading={this.props.loading}
+ scroll={{ x: '100%', y: height }}
+ onRow={(record, index) => {
+ return {
+ lineMarks,
+ data: record,
+ onClick: () => {this.changeRow(record.$$uuid)},
+ }
+ }}
+ onChange={this.changeTable}
+ pagination={_pagination}
+ />
+ {_footer ? <div className={'normal-table-footer ' + (_pagination ? 'pagination' : '')}>{_footer}</div> : null}
+ {pickup && setting.addable === 'true' ? <Button className="mk-add-line" onClick={() => this.addLine()} disabled={this.props.loading} type="link"><PlusOutlined /></Button> : null}
+ {pickup && _data.length > 10 ? <Button style={submit.style} onClick={() => setTimeout(() => {this.checkData()}, 10)} loading={loading} className="submit-footer-table" type="link">鎻愪氦</Button> : null}
+ </div>
+ </>
)
}
}
--
Gitblit v1.8.0