From 7394ee2faadece376a76c86c0a94c7e776d1a796 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 15 三月 2024 15:28:02 +0800
Subject: [PATCH] 2024-03-15
---
src/tabviews/custom/components/card/table-card/index.jsx | 18 ++++++++++++++++--
src/menu/components/share/normalheader/index.scss | 4 ++++
src/menu/components/share/searchcomponent/index.scss | 11 ++++++++---
3 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/menu/components/share/normalheader/index.scss b/src/menu/components/share/normalheader/index.scss
index 0d9f65f..1c0c375 100644
--- a/src/menu/components/share/normalheader/index.scss
+++ b/src/menu/components/share/normalheader/index.scss
@@ -41,6 +41,10 @@
border: 1px solid #d9d9d9;
opacity: 0.6;
}
+ .ant-input-search.ant-input-group-wrapper {
+ position: relative;
+ top: 5px;
+ }
}
.normal-header:not(.tree-search) {
display: flex;
diff --git a/src/menu/components/share/searchcomponent/index.scss b/src/menu/components/share/searchcomponent/index.scss
index fd5bdac..48586a9 100644
--- a/src/menu/components/share/searchcomponent/index.scss
+++ b/src/menu/components/share/searchcomponent/index.scss
@@ -1,9 +1,14 @@
.model-custom-header-search-list {
padding: 0px;
- .ant-row >.ant-col {
- float: right;
- padding: 0 6px;
+ >.ant-row {
+ text-align: right;
+ >.ant-col {
+ display: inline-block;
+ float: none;
+ padding: 0 6px;
+ text-align: left;
+ }
}
.page-card {
diff --git a/src/tabviews/custom/components/card/table-card/index.jsx b/src/tabviews/custom/components/card/table-card/index.jsx
index 8dcb134..d09cbd1 100644
--- a/src/tabviews/custom/components/card/table-card/index.jsx
+++ b/src/tabviews/custom/components/card/table-card/index.jsx
@@ -12,6 +12,7 @@
import './index.scss'
const CardCellComponent = asyncComponent(() => import('../cardcellList'))
+const MainAction = asyncComponent(() => import('@/tabviews/zshare/actionList'))
const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
class TableCard extends Component {
@@ -514,6 +515,7 @@
config.subcards.forEach((item, index) => {
let display = item.setting.condition !== 'true'
+ let type = ''
if (!display && item.setting.controlField) {
let val = data[item.setting.controlField]
@@ -531,12 +533,14 @@
} else if (item.setting.controlType === '<' && val < item.setting.controlValue) {
display = true
}
+
+ type = 'mk_tb_' + val
}
if (!display) return
line.push(
- <Col key={index} span={24}>
+ <Col key={index} className={type} span={24}>
<div className="card-item-box" style={item.style} onClick={() => {this.openView(item, data)}}>
<CardCellComponent data={data} cards={config} cardCell={item} elements={item.elements}/>
</div>
@@ -571,7 +575,7 @@
}
render() {
- const { config, loading, data, BID, pageIndex, total } = this.state
+ const { config, loading, data, BID, pageIndex, total, BData } = this.state
if (config.wrap.empty === 'hidden' && (!data || data.length === 0)) return null
@@ -584,6 +588,16 @@
</div> : null
}
<NormalHeader config={config} BID={BID} refresh={this.refreshSearch} />
+ {config.action && config.action.length > 0 ?
+ <MainAction
+ BID={BID}
+ BData={BData}
+ setting={config.setting}
+ actions={config.action}
+ columns={config.columns}
+ selectedData={[]}
+ /> : null
+ }
{data && data.length > 0 ? <Row className={'card-row-list' + (config.wrap.parity === 'true' ? ' mk-parity' : '')} style={{height: config.wrap.contentHeight}}>
{data.map(item => this.getLines(item))}
</Row> : null}
--
Gitblit v1.8.0