From b91c28df2f734b680198e755b7828666e238cea0 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 21 六月 2024 16:43:44 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/card/data-card/index.jsx | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/card/data-card/index.jsx b/src/tabviews/custom/components/card/data-card/index.jsx
index f5d8dd2..b442a83 100644
--- a/src/tabviews/custom/components/card/data-card/index.jsx
+++ b/src/tabviews/custom/components/card/data-card/index.jsx
@@ -188,6 +188,23 @@
}
}
+ if (_config.wrap.zHeight) {
+ if (_config.wrap.zHeight <= 100) {
+ if (_config.wrap.zHeight < 0) {
+ _config.wrap.zHeight = `calc(100vh - ${-_config.wrap.zHeight}px)`
+ } else {
+ _config.wrap.zHeight = _config.wrap.zHeight + 'vh'
+ }
+ }
+
+ if (_config.style) {
+ delete _config.style.height
+ }
+ _config.wrap.layout += ' fix-height'
+ } else {
+ _config.wrap.zHeight = 'none'
+ }
+
this.setState({
pageSize: _config.setting.pageSize || 10,
pageOptions,
@@ -599,7 +616,7 @@
MKEmitter.emit('resetSelectLine', config.uuid, last ? last.$$uuid : '', last)
MKEmitter.emit('syncBalconyData', config.uuid, items, data.length > 0 && data.length === keys.length)
if (items.length === 0) {
- message.warning('鏈幏鍙栧埌鏁版嵁锛�')
+ message.warning(window.GLOB.dict['no_data'] || '鏈幏鍙栧埌鏁版嵁锛�')
}
} else {
this.setState({
@@ -1205,10 +1222,10 @@
selectedData={selectedData}
/> : null
}
- {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren="寮�" unCheckedChildren="鍏�" checked={pickup} onChange={this.pickupChange} /></div> : null}
+ {config.wrap.pickup === 'true' && this.state.data.length > 0 ? <div className="pickup-wrap"><Switch title="鏀惰捣" checkedChildren={window.GLOB.dict['open'] || '寮�'} unCheckedChildren={window.GLOB.dict['shut'] || '鍏�'} checked={pickup} onChange={this.pickupChange} /></div> : null}
<div className={`data-zoom ${config.wrap.wrapClass}`}>
{switchable ? <div className={'prev-page ' + (pageIndex === 1 ? 'disabled' : '')} onClick={this.prevPage}><div><div><img src={preImg} alt=""/></div></div></div> : null}
- <Row className={'card-row-list ' + config.wrap.layout}>
+ <Row className={'card-row-list ' + config.wrap.layout} style={{maxHeight: config.wrap.zHeight}}>
{precards.map((item, index) => (
<Col key={'pre' + index} className="extend-card" style={item.wStyle} span={item.setting.width || 6}>
{item.setting.cardRole === 'header' ? <TableHeader card={item} data={extendData} refresh={this.refreshByHeader}>
@@ -1254,8 +1271,8 @@
{switchable ? <div className={'prev-page ' + (total <= _total ? 'disabled' : '')} onClick={this.nextPage}><div><div><img src={nextImg} alt=""/></div></div></div> : null}
</div>
{config.$empty && data.length === 0 ? <Empty description={false}/> : null}
- {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} 鍏� ${total} 鏉 : `鍏� ${total} 鏉} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
- {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>鏌ョ湅鏇村<DownOutlined/></div> : null}
+ {config.wrap.pagestyle === 'page' ? <Pagination size="small" total={total} showTotal={(t, range) => total > 0 ? `${range[0]}-${range[1]} ${window.GLOB.dict['of'] || '鍏�'} ${total} ${window.GLOB.dict['items'] || '鏉�'}` : `${total} ${window.GLOB.dict['items'] || '鏉�'}`} pageSize={pageSize} showSizeChanger={true} pageSizeOptions={this.state.pageOptions} onChange={this.changePageIndex} onShowSizeChange={this.pageSizeChange} current={pageIndex}/> : null}
+ {config.wrap.pagestyle === 'more' && data.length > 0 ? <div className={'mk-more' + (pageSize * pageIndex >= total ? ' disabled' : '')} onClick={this.loadMore}>{window.GLOB.dict['view_more'] || '鏌ョ湅鏇村'}<DownOutlined/></div> : null}
</div>
)
}
--
Gitblit v1.8.0